Modify the unit

Author: Qianyu Li

models/sipnet/R/model2netcdf.SIPNET.R

@@ -196,7 +196,7 @@ model2netcdf.SIPNET <- function(outdir, sitelat, sitelon, start_date, end_date,
      output[["Qle"]] <- (sub.sipnet.output$evapotranspiration * 10 * PEcAn.data.atmosphere::get.lv()) / timestep.s  # Qle W/m2
     }
     output[["Transp"]] <- (sub.sipnet.output$fluxestranspiration * 10) / timestep.s  # Transpiration kgW/m2/s
-    output[["SoilMoist"]] <- sub.sipnet.output$soilWater   # Soil moisture cm
+    output[["SoilMoist"]] <- (sub.sipnet.output$soilWater * 10)  # Soil moisture kgW/m2
     output[["SoilMoistFrac"]] <- (sub.sipnet.output$soilWetnessFrac)  # Fractional soil wetness
     output[["SWE"]] <- (sub.sipnet.output$snow * 10)  # SWE
     output[["litter_carbon_content"]] <- sub.sipnet.output$litter * 0.001  ## litter kgC/m2

models/sipnet/R/write.configs.SIPNET.R

@@ -555,9 +555,9 @@ write.config.SIPNET <- function(defaults, trait.values, settings, run.id, inputs
       #here we use litterWaterContent/litterWHC to calculate the litterWFracInit
       param[which(param[, 1] == "litterWFracInit"), 2] <- IC$litter_mass_content_of_water/(param[which(param[, 1] == "litterWHC"), 2]*10)
     }
-    ## soilWater 
+    ## soilWater IC$soilWater is in kg/m2, and soilWHC is in cm
     if ("soilWater" %in% ic.names) {
-      param[which(param[, 1] == "soilWFracInit"), 2] <- IC$soilWater/param[which(param[, 1] == "soilWHC"), 2]
+      param[which(param[, 1] == "soilWFracInit"), 2] <- IC$soilWater/(param[which(param[, 1] == "soilWHC"), 2]*10)
     }
     ## soilWFracInit fraction
     if ("soilWFrac" %in% ic.names) {

modules/assim.sequential/inst/MultiSite-Exs/SDA/Create_Multi_settings.R

@@ -122,7 +122,7 @@ template <- PEcAn.settings::Settings(list(
       #you could add more state variables here
       variable = structure(list(variable.name = "AbvGrndWood", unit = "MgC/ha", min_value = 0, max_value = 9999)),
       variable = structure(list(variable.name = "LAI", unit = "", min_value = 0, max_value = 9999)),
-      variable = structure(list(variable.name = "SoilMoist", unit = "cm", min_value = 0, max_value = 100)),
+      variable = structure(list(variable.name = "SoilMoist", unit = "kg/m^2", min_value = 0, max_value = 1000)),
       variable = structure(list(variable.name = "SoilMoistFrac", unit = "", min_value = 0, max_value = 1)),#soilWFracInit
       variable = structure(list(variable.name = "TotSoilCarb", unit = "kg/m^2", min_value = 0, max_value = 9999))
     )),