v499 - added warnings for specified parameters not used in model configuration

Author: James Craig

src/ParseFEWSRunInfo.cpp

@@ -292,7 +292,6 @@ bool ParseNetCDFRunInfoFile(CModel *&pModel, optStruct &Options, bool runname_ov
           string att_name_s=to_string(att_name);
 
           // NamedConstant(s) ----------------------------------------------------
-
           if (att_name_s.substr(0, 14) == "NamedConstant_") 
           {
             string name=att_name_s.substr(14,att_name_s.length());
@@ -302,7 +301,7 @@ bool ParseNetCDFRunInfoFile(CModel *&pModel, optStruct &Options, bool runname_ov
             retval = nc_get_att_text(ncid,varid_props,att_name,my_value);       HandleNetCDFErrors(retval);// read attribute text
             my_value[att_len] = '\0';// add string determining character
             att_value=s_to_d(my_value);
-            delete my_value;
+            delete [] my_value;
 
             //cout<<"RUN INFO NAMED CONSTANT = "<<name<<" value = "<<att_value <<endl;
             if (Options.management_optimization){

src/ParseInput.cpp

@@ -2217,7 +2217,7 @@ bool ParseMainInputFile (CModel     *&pModel,
       else if (!strcmp(s[1],"INF_PRMS"        )){itype=INF_PRMS;      }
       else if (!strcmp(s[1],"INF_HBV"         )){itype=INF_HBV;       }
       else if (!strcmp(s[1],"INF_UBC"         )){itype=INF_UBC;       }
-      else if (!strcmp(s[1],"INF_PARTITION"   )){itype=INF_RATIONAL;  }
+      else if (!strcmp(s[1],"INF_PARTITION"   )){itype=INF_RATIONAL;  } //backward compatible
       else if (!strcmp(s[1],"INF_GR4J"        )){itype=INF_GR4J;      }
       else if (!strcmp(s[1],"INF_SCS"              )){itype=INF_SCS;       }
       else if (!strcmp(s[1],"INF_SCS_NOABSTRACTION")){itype=INF_SCS_NOABSTRACTION;  }

src/ParsePropertyFile.cpp

@@ -531,6 +531,17 @@ bool ParseClassPropertiesFile(CModel         *&pModel,
           CSoilClass::SetSoilProperty(*parsed_soils[indices[i]],aParamStrings[j+1],properties[i][j]);
         }
       }
+      bool found_in_master;
+      for (int j=0;j<nParamStrings-1;j++){
+        found_in_master=false;
+        for (int k = 0; k < nPmaster; k++) {
+          if ((aPCmaster[k] == CLASS_SOIL) && (aPmaster[k]==aParamStrings[j+1])){found_in_master=true; break;}
+        }
+        if (!found_in_master) {
+          string warn="ParseClassPropertiesFile: Soil parameter "+aParamStrings[j+1]+" specified in .rvp file, but is not used within this model formulation.";
+          WriteAdvisory(warn.c_str(), Options.noisy);
+        }
+      }
       break;
     }
     //===========================================================================================
@@ -617,6 +628,17 @@ bool ParseClassPropertiesFile(CModel         *&pModel,
                                             properties[i][j]);
         }
       }
+      bool found_in_master;
+      for (int j=0;j<nParamStrings-1;j++){
+        found_in_master=false;
+        for (int k = 0; k < nPmaster; k++) {
+          if ((aPCmaster[k] == CLASS_LANDUSE) && (aPmaster[k]==aParamStrings[j+1])){found_in_master=true; break;}
+        }
+        if (!found_in_master) {
+          string warn="ParseClassPropertiesFile: Land Use parameter "+aParamStrings[j+1]+" specified in .rvp file, but is not used within this model formulation.";
+          WriteAdvisory(warn.c_str(), Options.noisy);
+        }
+      }
       break;
     }
     case(102):  //----------------------------------------------
@@ -752,6 +774,17 @@ bool ParseClassPropertiesFile(CModel         *&pModel,
                                                   properties   [i][j]);
         }
       }
+      bool found_in_master;
+      for (int j=0;j<nParamStrings-1;j++){
+        found_in_master=false;
+        for (int k = 0; k < nPmaster; k++) {
+          if ((aPCmaster[k] == CLASS_VEGETATION) && (aPmaster[k]==aParamStrings[j+1])){found_in_master=true; break;}
+        }
+        if (!found_in_master) {
+          string warn="ParseClassPropertiesFile: Vegetation parameter "+aParamStrings[j+1]+" specified in .rvp file, but is not used within this model formulation.";
+          WriteAdvisory(warn.c_str(), Options.noisy);
+        }
+      }
       break;
     }
     case(207):  //----------------------------------------------
@@ -1476,13 +1509,13 @@ bool ParseClassPropertiesFile(CModel         *&pModel,
 
   if (!Options.silent){cout<<"Autocalculating Model Parameters..."<<endl;}
 
-  pModel->GetGlobalParams()->AutoCalculateGlobalParams          (parsed_globals,global_template);
+  pModel->GetGlobalParams()->AutoCalculateGlobalParams(parsed_globals,global_template);
 
   for (int c=1;c<num_parsed_veg;c++){
-    pVegClasses [c-1]->AutoCalculateVegetationProps (parsed_veg[c],parsed_veg[0]);
+    pVegClasses [c-1]->AutoCalculateVegetationProps  (parsed_veg[c],parsed_veg[0]);
   }
   for (int c=1;c<num_parsed_soils;c++){
-    pSoilClasses[c]->AutoCalculateSoilProps       (*parsed_soils[c],*parsed_soils[0],pModel->GetTransportModel()->GetNumConstituents());
+    pSoilClasses[c]->AutoCalculateSoilProps          (*parsed_soils[c],*parsed_soils[0],pModel->GetTransportModel()->GetNumConstituents());
   }
   for (int c=1;c<num_parsed_lult;c++) {
     pModel->GetLanduseClass(c-1)->AutoCalculateLandUseProps(parsed_surf[c], parsed_surf[0]);

src/SubBasin.cpp

@@ -1417,6 +1417,47 @@ double CSubBasin::ScaleAllFlows(const double &scale, const bool overriding, cons
   _rivulet_storage*=scale; va+=_rivulet_storage*sf;
   return va;
 }
+//////////////////////////////////////////////////////////////////
+/// \brief adjust all internal flows by adjustment factor (for assimilation/nudging)
+/// \remark Messes with mass balance something fierce!
+/// \param &scale [in] Flow adjustment, m3/s
+/// \param &scale_last [in] True if Qlast should be scaled (overriding); false for no-data scaling
+/// \param &tstep [in] time step [d]
+/// \return volume added to system [m3]
+//
+double CSubBasin::AdjustAllFlows(const double &adjust, const bool overriding, const double &tstep, const double &t)
+{
+  double va=0.0; //volume added [m3]
+
+  if(!overriding)
+  {
+    for(int n=0;n<_nQinHist; n++) {
+      _aQinHist[n]+=adjust; upperswap(_aQinHist[n],0.0);
+      va+=adjust*tstep*SEC_PER_DAY;
+    }
+    for(int i=0;i<_nSegments;i++) {
+      _aQout[i]+=adjust; upperswap(_aQout[i],0.0);
+      va+=adjust*tstep*SEC_PER_DAY;
+    }
+  }
+
+  if((overriding) && (_pReservoir==NULL)) {
+    for (int i=0;i<_nSegments;i++)
+    {
+      _aQout[i]+=adjust;  upperswap(_aQout[i],0.0);
+      va+=adjust*tstep*SEC_PER_DAY;
+    }
+  }
+
+  if(_pReservoir!=NULL) {
+    //va+=_pReservoir->ScaleFlow(scale,overriding,tstep,t);
+  }
+
+  //Estivate volume added through scaling
+  //_channel_storage+=adjust*tstep*SEC_PER_DAY; //va+=_channel_storage*sf;
+  //_rivulet_storage+=adjust*tstep*SEC_PER_DAY; //va+=_rivulet_storage*sf;
+  return va;
+}
 /////////////////////////////////////////////////////////////////
 /// \brief Sets (i.e., overrides initial) Downstream ID (use sparingly!)
 /// \param down_SBID [in] ID of downstream subbasin

src/SubBasin.h

@@ -301,6 +301,7 @@ class CSubBasin
   void            Disable                  ();
   void            Enable                   ();
   double          ScaleAllFlows            (const double &scale_factor, const bool scale_last, const double &tstep, const double &t);
+  double          AdjustAllFlows           (const double &adjustment, const bool scale_last, const double &tstep, const double &t);
   void            SetUnusableFlowPercentage(const double &val);
   void            IncludeInAssimilation    ();