v522 - EnKF initialization bug fix

bug fix: disable iterative solution of stage for :ResFlow rvc command (found by OPG) (Reservoir.cpp/.h; ParseInitialConditions.cpp/EnKF.cpp)

Author: James Craig

src/EnKF.cpp

@@ -633,7 +633,7 @@ void CEnKFEnsemble::UpdateFromStateMatrix(CModel* pModel,optStruct& Options,cons
          if (pBasin->GetReservoir() != NULL)
          {
            time_struct tt_dummy;
-           pBasin->GetReservoir()->SetInitialFlow(_state_matrix[e][ii],_state_matrix[e][ii+1],tt_dummy,Options);
+           pBasin->GetReservoir()->SetInitialFlow(_state_matrix[e][ii],_state_matrix[e][ii+1],false,tt_dummy,Options);
            ii+=2;
          }
 

src/ParseInitialConditionFile.cpp

@@ -624,7 +624,7 @@ bool ParseInitialConditionsFile(CModel *&pModel, const optStruct &Options)
         else if(!strcmp(s[0],":ResFlow"))
         {
           if(Len>=3) {
-            pBasin->GetReservoir()->SetInitialFlow(s_to_d(s[1]),s_to_d(s[2]),tt,Options);
+            pBasin->GetReservoir()->SetInitialFlow(s_to_d(s[1]),s_to_d(s[2]),true,tt,Options);
           }
         }
         else if (!strcmp(s[0], ":ControlFlow"))
@@ -657,7 +657,7 @@ bool ParseInitialConditionsFile(CModel *&pModel, const optStruct &Options)
       time_struct tt;
       JulianConvert(0.0,Options.julian_start_day,Options.julian_start_year,Options.calendar,tt);
       pBasin->GetReservoir()->UpdateReservoir(tt,Options); //ensures correct discharge rating curve is used to calculate flow
-      pBasin->GetReservoir()->SetInitialFlow(AutoOrDouble(s[2]),AutoOrDouble(s[2]),tt,Options);
+      pBasin->GetReservoir()->SetInitialFlow(AutoOrDouble(s[2]),AutoOrDouble(s[2]),false,tt,Options); //iteratively calculates  corresponding stage
       break;
     }
     case(8):  //----------------------------------------------

src/Reservoir.cpp

@@ -1404,15 +1404,18 @@ void CReservoir::UpdateReservoir(const time_struct &tt, const optStruct &Options
 //////////////////////////////////////////////////////////////////
 /// \brief initialize stage,volume, area to specified initial inflow
 /// \param initQ [in] initial inflow
+/// \param initQlast [in] inflow at start of last timestep
+/// \param justFlow [in] true if reading from .rvc file :ResFlow - assumes :ResStage read elsewhere (false if using :InitialReservoirFlow)
 /// \note - ignores extraction and PET ; won't work for initQ=0, which could be non-uniquely linked to stage
 //
-void  CReservoir::SetInitialFlow(const double &initQ,const double &initQlast,const time_struct &tt,const optStruct& Options)
+void  CReservoir::SetInitialFlow(const double &initQ,const double &initQlast,const bool justFlow,const time_struct &tt,const optStruct& Options)
 {
-  if(initQ!=initQlast) {//reading from .rvc file
+  if ((initQ == 0.0) || (justFlow)) {//reading from .rvc file - don't iteratively estimate stage
     _Qout=initQ;
     _Qout_last=initQlast;
     return;
   }
+
   const double RES_TOLERANCE=0.001; //[m]
   const int RES_MAXITER=20;
   double dh=0.0001;

src/Reservoir.h

@@ -229,7 +229,7 @@ class CReservoir
   //Manipulators
   void              SetMinStage              (const double &min_z);
   void              SetMaxCapacity           (const double &max_cap);
-  void              SetInitialFlow           (const double &Q,const double &Qlast,const time_struct &tt, const optStruct &Options);
+  void              SetInitialFlow           (const double &Q,const double &Qlast,const bool justFlow, const time_struct &tt, const optStruct &Options);
   void              SetReservoirStage        (const double &ht, const double &ht_last);
   void              SetControlFlow           (const int i, const double &Q, const double &Qlast);
   void              SetOptimizedOutflow      (const double &Qout);