set max limit on the max_valid_soil_types (25 soils), removed +=0.

configs/README.md

@@ -15,7 +15,7 @@ A detailed description of the parameters for model configuration (i.e., initiali
 | forcing_resolution | double (scalar)| - | sec/min/hr | temporal resolution | - | timestep of the forcing data. Recommended value of 3600 seconds. |
 | endtime | double (scalar)| >0 | sec, min, hr, d | simulation duration | - | time at which model simulation ends |
 | layer_soil_type | int (1D array) | - | - | state variable | - | layer soil type (read from the database file soil_params_file) |
-| max_valid_soil_types | int | >1 | - | - | - | maximum number of valid soil types read from the file soil_params_file (default is set to 12; model not valid for soil_type = waterbody, lava, glacier, etc.) |
+| max_valid_soil_types | int | >= 1 and <= 25 | - | - | - | maximum number of valid soil types read from the file soil_params_file (default is set to 12; model not valid for soil_type = waterbody, lava, glacier, etc.) |
 | wilting_point_psi | double (scalar) | - | cm | state variable | - | wilting point (the amount of water not available for plants) used in computing AET. Suggested value is 15495.0 cm, corresponding to 15 atm. |
 | field_capacity_psi | double (scalar) | - | cm | state variable | - | capillary head corresponding to volumetric water content at which gravity drainage becomes slower, used in computing AET. Suggested value is 340.9 cm for most soils, corresponding to 1/3 atm, and 103.3 cm for sands, corresponding to 1/10 atm. |
 | use_closed_form_G | bool | true or false | - | - | - | determines whether the numeric integral or closed form for G is used; a value of true will use the closed form. This defaults to false. |

src/bmi_lgar.cxx

@@ -89,17 +89,17 @@ Update()
   if (state->lgar_bmi_params.is_invalid_soil_type) {
     // add to mass balance accumulated variables
     state->lgar_mass_balance.volprecip_cm  += state->lgar_bmi_input_params->precipitation_mm_per_h * mm_to_cm;
-    state->lgar_mass_balance.volin_cm      += 0.0;
+    state->lgar_mass_balance.volin_cm       = 0.0;
     state->lgar_mass_balance.volon_cm       = 0.0;
     state->lgar_mass_balance.volend_cm      = state->lgar_mass_balance.volstart_cm;
-    state->lgar_mass_balance.volAET_cm     += 0.0;
-    state->lgar_mass_balance.volrech_cm    += 0.0;
+    state->lgar_mass_balance.volAET_cm      = 0.0;
+    state->lgar_mass_balance.volrech_cm     = 0.0;
     state->lgar_mass_balance.volrunoff_cm  += state->lgar_bmi_input_params->precipitation_mm_per_h * mm_to_cm;
     state->lgar_mass_balance.volQ_cm       += state->lgar_bmi_input_params->precipitation_mm_per_h * mm_to_cm;
-    state->lgar_mass_balance.volQ_gw_cm    += 0.0;
-    state->lgar_mass_balance.volPET_cm     += 0.0;
-    state->lgar_mass_balance.volrunoff_giuh_cm  += 0.0;
-    state->lgar_mass_balance.volchange_calib_cm += 0.0;
+    state->lgar_mass_balance.volQ_gw_cm     = 0.0;
+    state->lgar_mass_balance.volPET_cm      = 0.0;
+    state->lgar_mass_balance.volrunoff_giuh_cm  = 0.0;
+    state->lgar_mass_balance.volchange_calib_cm = 0.0;
 
     // converted values, a struct local to the BMI and has bmi output variables
     bmi_unit_conv.mass_balance_m        = state->lgar_mass_balance.local_mass_balance * state->units.cm_to_m;

src/lgar.cxx

@@ -351,7 +351,7 @@ extern void InitFromConfigFile(string config_file, struct model_state *state)
       continue;
     }
     else if (param_key == "max_valid_soil_types") {
-      state->lgar_bmi_params.num_soil_types = stod(param_value);
+      state->lgar_bmi_params.num_soil_types = fmax(stod(param_value), 25.0);
       is_max_valid_soil_types_set = true;
       continue;
     }