v528 - !A[] commands; :StartDate QC

support !A[-n] reservoir stage history in management expressions (DemandExpressionHandling.cpp; DemandOptimization.cpp/.h)
-new CDemandOptimizer member _aAhist

bug fix:
-moved QA/QC for missing :StartDate to after read of runinfo file (Parse

Author: James Craig

src/DemandExpressionHandling.cpp

@@ -1585,6 +1585,7 @@ double CDemandOptimizer::EvaluateTerm(expressionTerm **pTerms,const int k, const
 
     if      (tmp=='Q'){return _aQhist[_aSBIndices[p]][nshift]; }
     else if (tmp=='h'){return _ahhist[_aSBIndices[p]][nshift]; }
+    else if (tmp=='A'){return _aAhist[_aSBIndices[p]][nshift]; }
     else if (tmp=='D'){return _aDhist[_aSBIndices[p]][nshift]; }
     else if (tmp=='I'){return _aIhist[_aSBIndices[p]][nshift]; }
     else if (tmp=='B'){return _pModel->GetSubBasin(p)->GetSpecifiedInflow(t+pT->timeshift*1.0); } //ASSUMES DAILY TIMESTEP! \todo[funct] should be Options.timestep

src/DemandOptimization.cpp

@@ -68,6 +68,7 @@ CDemandOptimizer::CDemandOptimizer(CModel *pMod)
   _aDhist=NULL;
   _aIhist=NULL;
   _ahhist=NULL;
+  _aAhist=NULL;
 
   _nGoals=0;
   _pGoals=NULL;
@@ -113,10 +114,12 @@ CDemandOptimizer::~CDemandOptimizer()
       delete [] _aDhist[p];
       delete [] _aIhist[p];
       delete [] _ahhist[p];
+      delete [] _aAhist[p];
     }
   }
   delete [] _aQhist;
   delete [] _ahhist;
+  delete [] _aAhist;
   delete [] _aDhist;
   delete [] _aIhist;
   delete [] _aUserConstants;
@@ -768,19 +771,22 @@ void CDemandOptimizer::InitializePostRVMRead(CModel* pModel, const optStruct& Op
   _ahhist = new double *[_nEnabledSubBasins];
   _aDhist = new double *[_nEnabledSubBasins];
   _aIhist = new double *[_nEnabledSubBasins];
-  ExitGracefullyIf(_aDhist==NULL,"CDemandOptimizer::InitializePostRVMRead",OUT_OF_MEMORY);
+  _aAhist = new double *[_nEnabledSubBasins];
+  ExitGracefullyIf(_aAhist==NULL,"CDemandOptimizer::InitializePostRVMRead",OUT_OF_MEMORY);
   for (int pp=0;pp<_nEnabledSubBasins;pp++){
     _aDhist[pp]=NULL;
     _aQhist[pp] = new double[_nHistoryItems];
     _ahhist[pp] = new double[_nHistoryItems];
     _aDhist[pp] = new double[_nHistoryItems];
     _aIhist[pp] = new double[_nHistoryItems];
-    ExitGracefullyIf(_aDhist[pp]==NULL,"CDemandOptimizer::InitializePostRVMRead (2)",OUT_OF_MEMORY);
+    _aAhist[pp] = new double[_nHistoryItems];
+    ExitGracefullyIf(_aAhist[pp]==NULL,"CDemandOptimizer::InitializePostRVMRead (2)",OUT_OF_MEMORY);
     for (int i = 0; i < _nHistoryItems; i++) {
       _aQhist[pp][i]=0.0;
       _ahhist[pp][i]=0.0;
       _aDhist[pp][i]=0.0;
       _aIhist[pp][i]=0.0;
+      _aAhist[pp][i]=0.0;
     }
   }
 
@@ -1290,17 +1296,20 @@ void CDemandOptimizer::UpdateHistoryArrays()
         _aDhist[pp][i]=_aDhist[pp][i-1];
         _aIhist[pp][i]=_aIhist[pp][i-1];
         _ahhist[pp][i]=_ahhist[pp][i-1];
+        _aAhist[pp][i]=_aAhist[pp][i-1];
       }
       _aQhist[pp][0]=pSB->GetOutflowRate();
       _aDhist[pp][0]=0.0;
       _aIhist[pp][0]=0.0;
       _ahhist[pp][0]=0.0;
+      _aAhist[pp][0]=0.0;
       for (int ii=0;ii<pSB->GetNumWaterDemands();ii++){
         _aDhist[pp][0]+=pSB->GetDemandDelivery(ii);
       }
       if (pSB->GetReservoir()!=NULL){
         _aIhist[pp][0]=pSB->GetChannelOutflowRate();
         _ahhist[pp][0]=pSB->GetReservoir()->GetResStage();
+        _aAhist[pp][0]=pSB->GetReservoir()->GetSurfaceArea();
       }
     }
   }

src/DemandOptimization.h

@@ -261,6 +261,7 @@ class CDemandOptimizer
   double        **_aDhist;             //< history of actual delivery [size: _nEnabledSBs * _nHistoryItems]
   double        **_aIhist;             //< history of reservoir inflows [size: _nEnabledSBs * _nHistoryItems]
   double        **_ahhist;             //< history of actual reservoir stages  (or 0 for non-reservoir basins) [size: _nEnabledSBs * _nHistoryItems]
+  double        **_aAhist;             //< history of actual reservoir areas [size: _nEnabledSBs * _nHistoryItems] 
 
   int             _nSolverResiduals;   //< number of residuals of solution (equal to lp_lib::nRows)
   double         *_aSolverResiduals;   //< vector of residuals of solution [size: _nSolverResiduals]

src/ParseInput.cpp

@@ -113,6 +113,8 @@ bool ParseInputFiles (CModel      *&pModel,
       ExitGracefully("Cannot find or read NetCDF runinfo file", BAD_DATA); return false;
     }
   }
+  ExitGracefullyIf(Options.julian_start_year==1666,
+                  "ParseMainInputFile:: no :StartDate supplied in .rvi or runinfo.nc file.",BAD_DATA_WARN);
 
   // Class Property file (.rvp)
   //--------------------------------------------------------------------------------
@@ -3640,8 +3642,6 @@ bool ParseMainInputFile (CModel     *&pModel,
                    "ParseMainInputFile::Must have a postitive time step",BAD_DATA);
   ExitGracefullyIf(Options.duration<0,
                    "ParseMainInputFile::Model duration less than zero. Make sure :EndDate is after :StartDate.",BAD_DATA_WARN);
-  ExitGracefullyIf(Options.julian_start_year==1666,
-                   "ParseMainInputFile:: no :StartDate supplied in .rvi or runinfo.nc file.",BAD_DATA_WARN);
 
   if((Options.nNetCDFattribs>0) && (Options.output_format!=OUTPUT_NETCDF)){
     WriteAdvisory("ParseMainInputFile: NetCDF attributes were specified but output format is not NetCDF.",Options.noisy);

src/Solvers.cpp

@@ -548,7 +548,7 @@ void MassEnergyBalance( CModel            *pModel,
     pBasin->UpdateSubBasin(tt,Options);
   }
 
-  // Management optimization - determines optimal demand delivery/reservoir outflows
+  // Management optimization - determines optimal demand delivery/reservoir outflows/return flows
   // ----------------------------------------------------------------------------------------
   if (Options.management_optimization)
   {