v517 - rounding bug in ForcingGrid.cpp for single time-step simulation; decay in ECCC assimilation

Author: James Craig

src/Assimilate.cpp

@@ -287,12 +287,11 @@ void CModel::AssimilationBackPropagate(const optStruct &Options,const time_struc
 
   // Apply time and space correction factors
   //----------------------------------------------------------------
-  double time_fact = _pGlobalParams->GetParams()->assim_time_decay;
   double distfact  = _pGlobalParams->GetParams()->assim_upstream_decay/M_PER_KM; //[1/km]->[1/m]
   double ECCCwt;
   for(p=0; p<_nSubBasins; p++)
   {
-    //_aDAQadjust[p] *=exp(-distfact*_aDAlength[p])*exp(-time_fact*_aDAtimesince[p]);
+    _aDAQadjust[p] *=exp(-distfact*_aDAlength[p]);
     ECCCwt=1.0;
     if (_aDADrainSum[p]!=0.0){
       ECCCwt = (_pSubBasins[p]->GetDrainageArea() - _aDADrainSum[p])/(_aDADownSum[p]-_aDADrainSum[p]);

src/ForcingGrid.cpp

@@ -680,7 +680,7 @@ bool CForcingGrid::ReadData(const optStruct   &Options,
 
     // determine chunk size
     // -------------------------------
-    iChunkSize = min(_ChunkSize,int((Options.duration - global_model_time) / _interval));
+    iChunkSize = min(_ChunkSize,static_cast<int>((Options.duration - global_model_time) / _interval+0.1));//0.1 handles rounding error
 
     // Open NetCDF file, Get the id of the forcing data, varid_f
     // -------------------------------

src/GlobalParams.cpp

@@ -296,7 +296,7 @@ void CGlobalParams::AutoCalculateGlobalParams(const global_struct &Gtmp, const g
   autocalc=SetCalculableValue(G.assim_upstream_decay,Gtmp.assim_upstream_decay,Gtemplate.assim_upstream_decay);
   if(autocalc)
   {
-    G.assim_upstream_decay=0.01; //[1/km]
+    G.assim_upstream_decay=0.0; //[1/km]
   }
   autocalc=SetCalculableValue(G.assim_time_decay,Gtmp.assim_time_decay,Gtemplate.assim_time_decay);
   if(autocalc)
@@ -382,7 +382,7 @@ void CGlobalParams::InitializeGlobalParameters(global_struct &g, bool is_templat
 
   g.max_reach_seglength  =DEFAULT_MAX_REACHLENGTH;//defaults to one segment per reach
   g.reservoir_relax      =0.4;
-  g.assim_upstream_decay =0.01;
+  g.assim_upstream_decay =0.0;
   g.assim_time_decay     =0.2;
   g.assimilation_fact    =1.0;
   g.reservoir_demand_mult=1.0;