Read more daily input

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "src/SOILWAT2"]
 	path = src/SOILWAT2
 	url = https://github.com/DrylandEcology/SOILWAT2
-	branch = release/devel_v7.0.0
+	branch = read_more_daily_input

R/D_swWeather.R

@@ -57,10 +57,10 @@ setClass(
   prototype = list(
     MonthlyScalingParams = array(
       NA_real_,
-      dim = c(12, 6),
+      dim = c(12, 8),
       dimnames = list(
         NULL,
-        c("PPT", "MaxT", "MinT", "SkyCover", "Wind", "rH")
+        c("PPT", "MaxT", "MinT", "SkyCover", "Wind", "rH", "actVP", "shortWR")
       )
     )
   )
@@ -72,10 +72,10 @@ setValidity(
     val <- TRUE
     temp <- dim(object@MonthlyScalingParams)
 
-    if (temp[2] != 6) {
+    if (temp[2] != 8) {
       msg <- paste(
         "@MonthlyScalingParams must have exactly 6 columns ",
-        "corresponding to PPT, MaxT, MinT, SkyCover, Wind, rH"
+        "corresponding to PPT, MaxT, MinT, SkyCover, Wind, rH, ActVP, ShortWR"
       )
       val <- if (isTRUE(val)) msg else c(val, msg)
     }
@@ -163,7 +163,24 @@ setClass(
     pct_SnowRunoff = "numeric",
     use_weathergenerator = "logical",
     use_weathergenerator_only = "logical",
-    FirstYear_Historical = "integer"
+    FirstYear_Historical = "integer",
+    use_cloudCoverMonthly = "logical",
+    use_windSpeedMonthly = "logical",
+    use_humidityMonthly = "logical",
+    has_tempMax = "logical",
+    has_tempMin = "logical",
+    has_ppt = "logical",
+    has_cloudCover = "logical",
+    has_sfcWind = "logical",
+    has_windEast = "logical",
+    has_windNorth = "logical",
+    has_hurs = "logical",
+    has_hursMax = "logical",
+    has_hursMin = "logical",
+    has_huss = "logical",
+    has_tdps = "logical",
+    has_vp = "logical",
+    has_rsds = "logical"
   ),
   # TODO: this class should not contain `swMonthlyScalingParams` but
   # instead be a composition, i.e., have a slot of that class
@@ -174,7 +191,24 @@ setClass(
     pct_SnowRunoff = NA_real_,
     use_weathergenerator = NA,
     use_weathergenerator_only = NA,
-    FirstYear_Historical = NA_integer_
+    FirstYear_Historical = NA_integer_,
+    use_cloudCoverMonthly = NA,
+    use_windSpeedMonthly = NA,
+    use_humidityMonthly = NA,
+    has_tempMax = NA,
+    has_tempMin = NA,
+    has_ppt = NA,
+    has_cloudCover = NA,
+    has_sfcWind = NA,
+    has_windEast = NA,
+    has_windNorth = NA,
+    has_hurs = NA,
+    has_hursMax = NA,
+    has_hursMin = NA,
+    has_huss = NA,
+    has_tdps = NA,
+    has_vp = NA,
+    has_rsds = NA
   )
 )
 
@@ -427,9 +461,23 @@ setMethod(
     object@pct_SnowRunoff <- readNumeric(infiletext[6])
     object@use_weathergenerator <- readLogical(infiletext[7])
     object@FirstYear_Historical <- readInteger(infiletext[8])
-
-    data <- matrix(data = c(rep(1, 12), rep(NA, 12 * 5)), nrow = 12, ncol = 6)
-    colnames(data) <- c("PPT", "MaxT", "MinT", "SkyCover", "Wind", "rH")
+    object@use_cloudCoverMonthly <- readLogical(infiletext[9])
+    object@use_windSpeedMonthly <- readLogical(infiletext[10])
+    object@use_relHumidityMonthly <- readLogical(infiletext[11])
+    object@has_temp2 <- readLogical(infiletext[12])
+    object@has_ppt <- readLogical(infiletext[13])
+    object@has_cloudCover <- readLogical(infiletext[14])
+    object@has_sfcWind <- readLogical(infiletext[15])
+    object@has_windComp <- readLogical(infiletext[16])
+    object@has_hurs <- readLogical(infiletext[17])
+    object@has_hurs2 <- readLogical(infiletext[18])
+    object@has_huss <- readLogical(infiletext[19])
+    object@has_tdps <- readLogical(infiletext[20])
+    object@has_vp <- readLogical(infiletext[21])
+    object@has_rsds <- readLogical(infiletext[22])
+
+    data <- matrix(data = c(rep(1, 12), rep(NA, 12 * 5)), nrow = 12, ncol = 8)
+    colnames(data) <- c("PPT", "MaxT", "MinT", "SkyCover", "Wind", "rH", "actVP", "shortWR")
     rownames(data) <- c("January", "February", "March", "April", "May",
       "June", "July", "August", "September", "October", "November", "December")
 

R/D_swWeatherData.R

@@ -68,8 +68,10 @@ setClass(
     # NOTE: 999 should be rSW2_glovars[["kSOILWAT2"]][["kNUM"]][["SW_MISSING"]]
     data = array(
       data = c(1:366, rep(999, 366 * 3)),
-      dim = c(366, 4),
-      dimnames = list(NULL, c("DOY", "Tmax_C", "Tmin_C", "PPT_cm"))
+      dim = c(366, 15),
+      dimnames = list(NULL, c("DOY", "Tmax_C", "Tmin_C", "PPT_cm", "cloudCov", "windSpeed",
+      "windSpeed_east", "windSpeed_north", "rel_H", "rel_H_max", "rel_H_min",
+      "spec_H", "dewpointTemp_C", "actVP", "shortWR"))
     ),
     year = NA_integer_
   )
@@ -87,7 +89,7 @@ setValidity(
     }
 
     tmp <- dim(object@data)
-    if (tmp[2] != 4) {
+    if (tmp[2] != rSW2_glovars[["kSOILWAT2"]][["kINT"]][["MAX_INPUT_COLUMNS"]] + 1) {
       msg <- paste(
         "@data must have exactly 4 columns corresponding to",
         "DOY, Tmax_C, Tmin_C, PPT_cm"

src/SW_R_lib.c

@@ -488,7 +488,7 @@ SEXP sw_consts(void) {
   #endif
 
   const int nret = 9; // length of cret
-  const int nINT = 13; // length of vINT and cINT
+  const int nINT = 14; // length of vINT and cINT
   const int nNUM = 1; // length of vNUM and cNUM
 
   #ifdef RSWDEBUG
@@ -528,14 +528,14 @@ SEXP sw_consts(void) {
     SWRC_PARAM_NMAX,
     eSW_NoTime, SW_OUTNPERIODS, SW_OUTNKEYS, SW_NSUMTYPES, NVEGTYPES,
     OUT_DIGITS,
-    N_SWRCs, N_PTFs
+    N_SWRCs, N_PTFs, MAX_INPUT_COLUMNS
   };
   char *cINT[] = {
     "SW_NFILES", "MAX_LAYERS", "MAX_TRANSP_REGIONS", "MAX_NYEAR",
     "SWRC_PARAM_NMAX",
     "eSW_NoTime", "SW_OUTNPERIODS", "SW_OUTNKEYS", "SW_NSUMTYPES", "NVEGTYPES",
     "OUT_DIGITS",
-    "N_SWRCs", "N_PTFs"
+    "N_SWRCs", "N_PTFs", "MAX_INPUT_COLUMNS"
   };
 
   // Vegetation types