v523 - lake assimilation bug fix

bug fix: glitch in AdjustFlows for lake assimilation (found by City of Calgary) (Reservoir.cpp;SubBasin.cpp)

Changed error to warning when no assimilation points provided but assimilation is on (Assimilate.cpp)

Author: James Craig

src/Assimilate.cpp

@@ -53,7 +53,7 @@ void CModel::InitializeDataAssimilation(const optStruct &Options)
       }
     }
     if(count==0) {
-      ExitGracefully("InitializeDataAssimlation: :AssimilateStreamflow command was used in .rvi file, but no observations were enabled for assimilation using :AssimilateStreamflow command in .rvt file",BAD_DATA_WARN);
+      WriteWarning("InitializeDataAssimlation: :AssimilateStreamflow command was used in .rvi file, but no observations were enabled for assimilation using :AssimilateStreamflow command in .rvt file",Options.noisy);
     }
   }
 

src/Reservoir.cpp

@@ -1232,6 +1232,11 @@ double CReservoir::ScaleFlow(const double& scale,const bool overriding, const do
 }
 double CReservoir::AdjustFlow(const double& Qadjust, const bool overriding, const double& tstep, const double& t)
 {
+
+  _DAscale=1.0;
+  _DAscale_last=1.0;
+  return 0.0; //scaling always stops at reservoir or only adjusts inflow
+
   double scale=(_Qout+Qadjust)/_Qout;
   if (_Qout=0){scale=1.0;}
 

src/SubBasin.cpp

@@ -1475,10 +1475,10 @@ double CSubBasin::AdjustAllFlows(const double &adjust, const bool overriding, co
   }
 
   if(_pReservoir!=NULL) {
-    va+=_pReservoir->ScaleFlow(adjust,overriding,tstep,t);
+    va+=_pReservoir->AdjustFlow(adjust,overriding,tstep,t);
   }
 
-  //Estivate volume added through scaling
+  //Estimate 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;