Merge branch 'release/devel_v8.1.0' into feature_nc_input

DrylandEcology · Nov 12, 2024 · c35d5e9 · c35d5e9
2 parents f7d4b00 + f254f40
commit c35d5e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/include/SW_datastructs.h b/include/SW_datastructs.h
@@ -404,7 +404,6 @@ typedef struct {
                      `swrcp` but we need to loop over soil layers for every
                      vegetation type in `my_transp_rng`
     */
-
     /** SWRC parameters of the mineral soil component */
     double swrcpMineralSoil[MAX_LAYERS][SWRC_PARAM_NMAX];
     /** SWRC parameters of the organic soil component

diff --git a/src/SW_Site.c b/src/SW_Site.c
@@ -230,6 +230,12 @@ static Bool SW_check_soil_properties(
         fval = SW_Site->soils.fractionWeight_om[layerno];
         errtype = Str_Dup("organic matter content", LogInfo);
 
+    } else if (LT(SW_Site->soils.evap_coeff[layerno], 0.) ||
+               GT(SW_Site->soils.evap_coeff[layerno], 1.)) {
+        res = swFALSE;
+        fval = SW_Site->soils.fractionWeight_om[layerno];
+        errtype = Str_Dup("organic matter content", LogInfo);
+
     } else if (LT(SW_Site->soils.evap_coeff[layerno], 0.) ||
                GT(SW_Site->soils.evap_coeff[layerno], 1.)) {
         res = swFALSE;
@@ -2561,7 +2567,7 @@ void SW_SIT_init_run(
 
         /* Check parameters of bulk soil SWRC */
         if (!SWRC_check_parameters(
-                SW_Site->swrc_type[s], SW_Site->soils.swrcp[s], LogInfo
+                SW_Site->swrc_type[s], SW_Site->swrcpMineralSoil[s], LogInfo
             )) {
             LogError(
                 LogInfo,