Release v6.3.1 (#250)

* Simulation output remains the same as the previous version.
* SOILWAT2 updated to v8.1.1

* Fix methods that interact with depth of sapric conditions.
* Fix scaling of daily meteorological variables.

Author: dschlaep

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: rSOILWAT2
-Version: 6.3.0
+Version: 6.3.1
 Title: An Ecohydrological Ecosystem-Scale Water Balance Simulation Model
-Description: Access to the C-based SOILWAT2 v8.1.0 and functionality for
+Description: Access to the C-based SOILWAT2 v8.1.1 and functionality for
   SQLite-database of weather data.
 Authors@R: c(
   person(

NAMESPACE

@@ -388,6 +388,7 @@ exportMethods(swSite_SoilTemperatureFlag)
 exportMethods(swSite_SurfaceTempMethod)
 exportMethods(swSite_TranspCoefficients)
 exportMethods(swSite_TranspirationRegions)
+exportMethods(swSite_depthSapric)
 exportMethods(swSite_hasSWRCp)
 exportMethods(swSoils_Layers)
 exportMethods(swSoils_SWRCp)

NEWS.md

@@ -1,3 +1,12 @@
+# rSOILWAT2 v6.3.1
+* Simulation output remains the same as the previous version.
+* `SOILWAT2` updated to v8.1.1
+
+## Bugfix
+* Fix methods that interact with depth of sapric conditions.
+* Fix scaling of daily meteorological variables.
+
+
 # rSOILWAT2 v6.3.0
 ## Breaking changes
 * `SOILWAT2` updated to v8.1.0

R/A_swGenericMethods.R

@@ -1766,6 +1766,7 @@ setGeneric(
 #' @param object An object of class \code{\linkS4class{swSite}} or
 #'   \code{\linkS4class{swInputData}}.
 #' @seealso \code{\linkS4class{swSite}} and \code{\linkS4class{swInputData}}
+#' @exportMethod swSite_depthSapric
 setGeneric(
   "swSite_depthSapric",
   function(object) standardGeneric("swSite_depthSapric")

R/F_swSite.R

@@ -449,7 +449,7 @@ setReplaceMethod(
   "swSite_depthSapric",
   signature = "swSite",
   definition = function(object, value) {
-    object@has_swrcp <- isTRUE(as.logical(value))
+    object@depth_sapric <- as.numeric(value)
     validObject(object)
     object
   }

data/sw_exampleData.rda

@@ -74,7 +74,6 @@ TIMESTEP dy wk mo yr # must be lowercase
 
 # Simulation output directory/filenames
 Output/			# Path for output files: / for same directory, or e.g., Output/; PROGRAMMER NOTE: This is currently the 13th position; if this changes then update function SW_Files.c/SW_F_read()
-logfile.log	        # Output file to which warnings, errors, and other important information is written (can also be stdout); relative to output directory
 
 sw2_daily.csv	        # Output file if daily output time period was selected; relative to output directory
 sw2_weekly.csv	        # Output file if weekly output time period was selected; relative to output directory

inst/extdata/example1/Input/outsetup.in

@@ -14,6 +14,7 @@ Input/domain.in
 
 #--- Description of a model run
 Input/modelrun.in	# Input file for model time: start - end years
+logs/logfile.log	# Output file to which warnings, errors, and other important information is written (can also be stdout)
 
 #--- Description of simulated site
 Input/siteparam.in	# Input file for site location, initialization, and miscellaneous model parameters

inst/extdata/example1/Output/.gitignore

@@ -993,12 +993,13 @@ SEXP sw_consts(void) {
     "eNCIn", "eNCInAtt", "eNCOutVars",
     "eDomain",
     "eModel",
+    "eLog",
     "eSite", "eLayers", "eSWRCp",
     "eWeather", "eMarkovProb", "eMarkovCov", "eSky",
     "eVegProd", "eVegEstab",
     "eCarbon",
     "eSoilwat",
-    "eOutput", "eLog",
+    "eOutput",
     "eOutputDaily", "eOutputWeekly", "eOutputMonthly", "eOutputYearly",
     "eOutputDaily_soil", "eOutputWeekly_soil", "eOutputMonthly_soil", "eOutputYearly_soil"
   };

inst/extdata/example1/files.in

@@ -433,3 +433,24 @@ test_that("Weather data fixing", {
   )
 
 })
+
+
+test_that("Weather data scaling", {
+  swin <- rSOILWAT2::sw_exampleData
+
+  ref <- sw_exec(swin)
+
+  scalingParams <- setdiff(
+    colnames(swWeather_MonScalingParams(swin)),
+    "ShortWR" # ShortWR only works if we provide daily radiation as input
+  )
+
+  for (k in seq_along(scalingParams)) {
+    x <- swin
+    swWeather_MonScalingParams(x)[, scalingParams[[k]]] <- 2
+    res <- sw_exec(x)
+
+    # Expect that the scaled simulation produces different SWC than the default
+    expect_false(isTRUE(all.equal(res@SWCBULK@Day, ref@SWCBULK@Day)))
+  }
+})