Updates for version 1.0.2

jeroenpullens · May 19, 2016 · 3de1fb7 · 3de1fb7
1 parent 6c75f66
commit 3de1fb7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/NUCOMBog/DESCRIPTION b/NUCOMBog/DESCRIPTION
@@ -6,8 +6,8 @@ Authors@R: c(person("J.W.M.", "Pullens", email = "jeroenpullens@gmail.com", role
     person("R.", "Silveyra Gonzalez",role="aut"),
     person("M.","Bagnara",role ="aut"),
     person("F.","Hartig",role="aut"))
-Date: 2016-04-12
-Description: Modelling the vegetation, carbon, nitrogen and water dynamics of undisturbed open bog ecosystems in a temperate to sub-boreal climate. The test data can be downloaded from http://jeroenpullens.github.io/NUCOMBog_data/. And the executable of the model can downloaded from https://github.com/jeroenpullens/source_modelMEE
+Date: 2016-05-19
+Description: Modelling the vegetation, carbon, nitrogen and water dynamics of undisturbed open bog ecosystems in a temperate to sub-boreal climate. The test data can be downloaded from http://jeroenpullens.github.io/NUCOMBog_data/. And the executable of the model can downloaded from https://github.com/jeroenpullens/source_modelMEE.
 Depends:
     R (>= 3.0.0),
     snowfall

diff --git a/NUCOMBog/R/NUCOMBog.R b/NUCOMBog/R/NUCOMBog.R
@@ -2,7 +2,7 @@
 #'@name NUCOMBog
 #'@docType package
 #'@author JWM Pullens
-#'@source The test data can be downloaded from http://jeroenpullens.github.io/NUCOMBog_data/. And the executable of the model can downloaded from https://github.com/jeroenpullens/source_modelMEE
+#'@source The test data can be downloaded from \url{http://jeroenpullens.github.io/NUCOMBog_data/}. And the executable of the model can downloaded from \url{https://github.com/jeroenpullens/source_modelMEE}.
 
 #'@description The NUCOMBog R package provides an interface to the NUCOMBog model in R.
 #'

diff --git a/NUCOMBog/R/getData.R b/NUCOMBog/R/getData.R
@@ -14,6 +14,8 @@
 #' The getData function is integrated in all runnucom functions.
 #'
 #'@param setup setup_structure described in setupNUCOM
+#'@param startval From which row does the output need to be loaded. Default is 1, has to be setup in the setupNUCOM function.
+#'
 #'
 #'@examples
 #'\dontrun{

diff --git a/NUCOMBog/R/runNUCOM_wrapper.R b/NUCOMBog/R/runNUCOM_wrapper.R
@@ -1,5 +1,5 @@
 runnucom_wrapper<-function(runParameters){
-  # startval <- runParameters$startval
+  startval <- runParameters$startval
   setwd(dir = runParameters$runDir)
 
   make_filenames(WD = runParameters$runDir,climate = runParameters$climate,environment = runParameters$environment,inival = runParameters$inival,start = runParameters$start,end = runParameters$end)