fixes to reservoir assim triggering

Author: analytophile

src/CommonFunctions.cpp

@@ -1429,7 +1429,7 @@ void HandleNetCDFErrors(int error_code){
   if(error_code==0){ return; }
   else{
     string warn;
-    warn="NetCDF error ["+ to_string(nc_strerror(error_code))+"] occured.";
+    warn="NetCDF library error ["+ to_string(nc_strerror(error_code))+"] occured.";
     ExitGracefully(warn.c_str(),BAD_DATA);
   }
 #endif

src/ParseFEWSRunInfo.cpp

@@ -11,7 +11,7 @@ void GetNetCDFTimeInfo(const int ncid, int &time_dimid,int &ntime, int &start_ti
 void GetNetCDFStationArray(const int ncid, const string filename,int &stat_dimid,int &stat_varid, long *&aStations,  string *&aStat_string,int &nStations);
 
 //////////////////////////////////////////////////////////////////
-/// \brief Parses Deltares FEWS RunInfo file
+/// \brief Parses Deltares FEWS RunInfo file; called after .rvi file parse
 ///
 /// \param *&pModel [out] Reference to model object
 /// \param &Options [out] Global model options information

src/ParseInitialConditionFile.cpp

@@ -230,19 +230,19 @@ bool ParseInitialConditionsFile(CModel *&pModel, const optStruct &Options)
         typ = pModel->GetStateVarInfo()->StringToSVType(s[1],layer_ind,false);
 
         if (typ==UNRECOGNIZED_SVTYPE){
-          WriteWarning(":UniformInitialConditions: unrecognized state variable type "+to_string(s[1]),Options.noisy);
-          break;
-        }
-
-        SVind=pModel->GetStateVarIndex(typ,layer_ind);
-
-        if (SVind!=DOESNT_EXIST){
-          for (k=0;k<pModel->GetNumHRUs();k++){
-            SetInitialStateVar(pModel,SVind,typ,layer_ind,k,s_to_d(s[2]));
+          WriteWarning(":UniformInitialConditions: unrecognized state variable type "+to_string(s[1]),Options.noisy);break;
+        } 
+        else {
+          SVind=pModel->GetStateVarIndex(typ,layer_ind);
+
+          if (SVind!=DOESNT_EXIST){
+            for (k=0;k<pModel->GetNumHRUs();k++){
+              SetInitialStateVar(pModel,SVind,typ,layer_ind,k,s_to_d(s[2]));
+            }
+          }
+          else{
+            WriteWarning("Initial conditions specified for state variable not in model ("+to_string(s[1])+")",Options.noisy);
           }
-        }
-        else{
-          WriteWarning("Initial conditions specified for state variable not in model ("+to_string(s[1])+")",Options.noisy);
         }
       }
       else{
@@ -942,7 +942,9 @@ bool ParseInitialConditionsFile(CModel *&pModel, const optStruct &Options)
   // check quality of initial state variables
   //======================================================================
   CHydroUnit *pHRU;
-  double *v=new double [pModel->GetNumStateVars()];
+  double *v=NULL;
+  v=new double [pModel->GetNumStateVars()];
+  ExitGracefullyIf(v == NULL, "ParseInitialConditionsFile: out of memory ",OUT_OF_MEMORY);
   for (int k=0;k<pModel->GetNumHRUs();k++)
   {
     pHRU=pModel->GetHydroUnit(k);

src/ParseInput.cpp

@@ -112,10 +112,10 @@ bool ParseInputFiles (CModel      *&pModel,
     if (!ParseNetCDFRunInfoFile(pModel, Options, runname_overridden,runmode_overridden)){
       ExitGracefully("Cannot find or read NetCDF runinfo file", BAD_DATA); return false;
     }
-  }
-  ExitGracefullyIf(Options.julian_start_year==1666,
+    ExitGracefullyIf(Options.julian_start_year==1666,
                   "ParseMainInputFile:: no :StartDate supplied in .rvi or runinfo.nc file.",BAD_DATA_WARN);
-
+  }
+  
   // Class Property file (.rvp)
   //--------------------------------------------------------------------------------
   if (!ParseClassPropertiesFile  (pModel,Options,terr_reqd)){

src/Reservoir.cpp

@@ -1375,7 +1375,7 @@ void CReservoir::UpdateReservoir(const time_struct &tt, const optStruct &Options
   }
 
   // Assimilate lake stage-------------------------------
-  if(_assimilate_stage)
+  if ((Options.assimilate_stage) && (_assimilate_stage))
   {
     _assim_blank=true;
     if(tt.model_time>Options.assimilation_start-Options.timestep/2.0)
@@ -1545,7 +1545,7 @@ double  CReservoir::RouteWater(const double &Qin_old,
                                res_constraint &constraint,
                                double *aQstruct) const
 {
-  if ((_assimilate_stage) && (!_assim_blank))
+  if ((Options.assimilate_stage) && (_assimilate_stage) && (!_assim_blank))
   {
     if ((Options.management_optimization) && (_Qoptimized != RAV_BLANK_DATA)) {
       res_outflow=_Qoptimized;