v495 - support for management in FEWS

-read Named constant as string (ParseFEWSRunInfo.cpp)
-pass Options to AddReservoirConstraints (DemandOptimization.h/.cpp)
-handle final blank line in FEWS csv in :LookupTableFromCSV command (ParseManagementFile.cpp)
-properly handle diversion indices in Demand Optimization (DemandOptimization.cpp)

Author: analytophile

src/DemandOptimization.cpp

@@ -742,7 +742,7 @@ void CDemandOptimizer::InitializePostRVMRead(CModel* pModel, const optStruct& Op
   // Convert reservoir commands to user-specified constraints
   //   allowed here because it doesnt introduce new DVs
   //------------------------------------------------------------------
-  AddReservoirConstraints();
+  AddReservoirConstraints(Options);
 
   // Calculate penalty units correction for reservoirs
   //------------------------------------------------------------------
@@ -858,8 +858,9 @@ void CDemandOptimizer::InitializePostRVMRead(CModel* pModel, const optStruct& Op
     }
 
     string tmpstr,tmpstr2;
-    cout<<" # History Items: "     <<_nHistoryItems<<endl;
+    cout<<" # Lookback intervals: "<<_nHistoryItems<<endl;
     cout<<" # Slack Vars: "        <<_nSlackVars<<endl;
+    cout<<" # Named constants : "  <<_nUserConstants<<endl;
     cout<<" # Constraints/Goals: " <<_nGoals<<endl;
     for (int i = 0; i < _nGoals; i++) {
       if (_pGoals[i]->is_goal){tmpstr="[GOAL]      "; }
@@ -935,7 +936,7 @@ void TokenizeString(string instring, char **s, int &Len)
 // these are done as if the corresponding constraints were read in as expressions from the .rvm file
 // initialization step: called from InitializePostRVMFileRead()
 //
-void CDemandOptimizer::AddReservoirConstraints()
+void CDemandOptimizer::AddReservoirConstraints(const optStruct &Options)
 {
   int               p;
   CSubBasin        *pSB;
@@ -960,7 +961,7 @@ void CDemandOptimizer::AddReservoirConstraints()
       int k=pSB->GetReservoir()->GetHRUIndex();
       if (k==DOESNT_EXIST){
         advice="AddReservoirConstraints: The reservoir in subbasin "+SBIDs+" doesnt have an :HRUID - this will negatively impact the units scaling of management optimization penalties.";
-        ExitGracefully(advice.c_str(), BAD_DATA_WARN);
+        WriteAdvisory(advice.c_str(), Options.noisy);
       }
 
       //Max Stage constraints
@@ -1301,6 +1302,7 @@ void CDemandOptimizer::SolveDemandProblem(CModel *pModel, const optStruct &Optio
   double *h_iter =new double [_pModel->GetNumSubBasins()];
   double *Q_iter =new double [_pModel->GetNumSubBasins()];
   int    *lprow  =new int    [_pModel->GetNumSubBasins()]; //index of goal equation for non-linear reservoir stage discharge curve in subbasin p
+  int    *lpsbrow=new int    [_pModel->GetNumSubBasins()]; //index of constraint equation for subbasin reaches
 
   // instantiate linear programming solver
   // ----------------------------------------------------------------
@@ -1642,6 +1644,8 @@ void CDemandOptimizer::SolveDemandProblem(CModel *pModel, const optStruct &Optio
       retval = lp_lib::add_constraintex(pLinProg,i,row_val,col_ind,ROWTYPE_EQ,RHS);
       ExitGracefullyIf(retval==0,"SolveDemandProblem::Error adding mass balance constraint",RUNTIME_ERR);
       IncrementAndSetRowName(pLinProg,rowcount,"reach_MB_"+to_string(pSB->GetID()));
+        
+      lpsbrow[p]=lp_lib::get_Nrows(pLinProg);
     }
   }
 
@@ -2051,12 +2055,12 @@ void CDemandOptimizer::SolveDemandProblem(CModel *pModel, const optStruct &Optio
           sum_diverted+=div_Q;
         }
 
-        RHS=lp_lib::get_rh(pLinProg,lprow[p]);//TMP DEBUG - NOT SAME LPROW AS RESERVOIRS !!!
+        RHS=lp_lib::get_rh(pLinProg,lpsbrow[p]);
 
         RHS+=(sum_diverted-aDivGuess[p]);
         aDivGuess[p]=sum_diverted;
 
-        lp_lib::set_rh (pLinProg,lprow[p],RHS);
+        lp_lib::set_rh (pLinProg,lpsbrow[p],RHS);
       }
     }
   }/*end iteration loop*/
@@ -2076,6 +2080,7 @@ void CDemandOptimizer::SolveDemandProblem(CModel *pModel, const optStruct &Optio
   delete [] h_iter;
   delete [] Q_iter;
   delete [] lprow;
+  delete [] lpsbrow;
   delete [] aDivert;
   delete [] aDivGuess;
 

src/DemandOptimization.h

@@ -270,7 +270,7 @@ class CDemandOptimizer
   //Called during initialization
   void              AddDecisionVar(const decision_var *pDV);
   bool        UserTimeSeriesExists(string TSname) const;
-  void     AddReservoirConstraints();
+  void     AddReservoirConstraints(const optStruct &Options);
   void     IdentifyUpstreamDemands();
   bool          VariableNameExists(const string &name) const;
 

src/ParseFEWSRunInfo.cpp

@@ -293,14 +293,21 @@ bool ParseNetCDFRunInfoFile(CModel *&pModel, optStruct &Options, bool runname_ov
 
           // NamedConstant(s) ----------------------------------------------------
 
-          if (att_name_s.substr(0, 14) == "NamedConstant_") {
+          if (att_name_s.substr(0, 14) == "NamedConstant_") 
+          {
             string name=att_name_s.substr(14,att_name_s.length());
 
-            retval=nc_get_att_double(ncid,varid_props,att_name,&att_value);
+            retval = nc_inq_attlen(ncid,varid_props,att_name,&att_len);         HandleNetCDFErrors(retval);
+            char* my_value = new char[att_len + 1];
+            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;
 
             cout<<"RUN INFO NAMED CONSTANT = "<<name<<" value = "<<att_value <<endl;
-
-            pModel->GetManagementOptimizer()->AddUserConstant(att_name,att_value);
+            if (Options.management_optimization){
+              pModel->GetManagementOptimizer()->AddUserConstant(name,att_value);
+            }
           }
 
           // TargetStageSet_ ----------------------------------------------------
@@ -726,6 +733,11 @@ bool ParseNetCDFFlowStateFile(CModel*& pModel,const optStruct& Options)
 bool ParseNetCDFManagementFile(CModel*& pModel,const optStruct& Options) 
 {
   if(Options.maninfo_filename=="") { return true; }
+  if (!Options.management_optimization) 
+  {
+    WriteWarning(":FEWSManagmentInfoFile command will be ignored; Management optimization is not enabled.",Options.noisy);
+    return true;
+  }
 
 #ifdef _RVNETCDF_
   int     ncid;                // NetCDF file id
@@ -797,8 +809,10 @@ bool ParseNetCDFManagementFile(CModel*& pModel,const optStruct& Options)
                                               manfile, "UserTimeSeries_"+userTSnames[i],
                                               "None", "time", //this assumes "time" is FEWS standard for time dimension
                                               0, 0.0, 1.0, 0.0);
-
-    pModel->GetManagementOptimizer()->AddUserTimeSeries(pTS);
+    if (Options.management_optimization){
+      cout<<"ADDING USER TIME SERIES "<<endl;
+      pModel->GetManagementOptimizer()->AddUserTimeSeries(pTS);
+    }
   }
   delete [] userTSnames;
 

src/ParseManagementFile.cpp

@@ -851,26 +851,27 @@ bool ParseManagementFile(CModel *&pModel,const optStruct &Options)
       N=0;
       do {
         eof=ppCSV->Tokenize(s,Len);
-        if(IsComment(s[0],Len)) { }
+        if      ((eof) || (IsComment(s[0],Len))) { }
         else {
           if(Len>=2) {
             aX[N] = s_to_d(s[0]);
             aY[N] = s_to_d(s[1]);
             N++;
           }
           else {
+            delete [] aX;delete [] aY;delete ppCSV;
             WriteWarning("Incorrect line length (<2) in :LookupTableFromCSV table",Options.noisy);
             break;
           }
         }
       } while (!eof);
 
       LUCSV.close();
-
       CLookupTable *pLUT = new CLookupTable(name,aX,aY,N);
       pDO->AddUserLookupTable(pLUT);
       delete [] aX;
       delete [] aY;
+      delete ppCSV;
       break;
     }