v503 - Assimilation bug fix

Author: James Craig

src/Assimilate.cpp

@@ -152,8 +152,11 @@ void CModel::PrepareAssimilation(const optStruct &Options,const time_struct &tt)
   for(int pp=_nSubBasins-1; pp>=0; pp--)//downstream to upstream
   {
     p=GetOrderedSubBasinIndex(pp);
-    pdown = GetSubBasinByID(_pSubBasins[p]->GetDownstreamID())->GetGlobalIndex();
 
+    pdown=DOESNT_EXIST;
+    if (_pSubBasins[p]->GetDownstreamID()!=DOESNT_EXIST){
+      pdown = GetSubBasinByID(_pSubBasins[p]->GetDownstreamID())->GetGlobalIndex();
+    }
     bool ObsExists=false; //observation available in THIS basin
     // observations in this basin, determine scaling variables based upon blank/not blank
     //----------------------------------------------------------------
@@ -228,7 +231,11 @@ void CModel::PrepareAssimilation(const optStruct &Options,const time_struct &tt)
   for(int pp=0;pp<_nSubBasins; pp++)//upstream to downstream
   {
     p=GetOrderedSubBasinIndex(pp);
-    pdown = GetSubBasinByID(_pSubBasins[p]->GetDownstreamID())->GetGlobalIndex();
+
+    pdown=DOESNT_EXIST;
+    if (_pSubBasins[p]->GetDownstreamID()!=DOESNT_EXIST){
+      pdown = GetSubBasinByID(_pSubBasins[p]->GetDownstreamID())->GetGlobalIndex();
+    }
     if (_aDAoverride[p]) {
       _aDADrainSum[p]=_pSubBasins[p]->GetDrainageArea();
     }
@@ -258,4 +265,4 @@ void CModel::PrepareAssimilation(const optStruct &Options,const time_struct &tt)
       _aDAQadjust[p] = _aDAQadjust[p]*ECCCwt;
     }
   }
-}
+}

src/RavenParameters.dat

@@ -81,7 +81,7 @@ SNOW_ROUGHNESS GLOBAL [mm] False 0.2 0.0 -9999
 SNOW_TEMPERATURE GLOBAL [C] False 0.0 -7 7
 ADIABATIC_LAPSE GLOBAL [C/km] False 6.4 5 8
 WET_ADIABATIC_LAPSE GLOBAL [C/km] False 5.0 3.0 7.0
-PRECIP_LAPSE GLOBAL [mm/d/km] False -9999 0.0 -9999
+PRECIP_LAPSE GLOBAL [mm/d/km] False 0 0.0 50
 RAINSNOW_TEMP GLOBAL [C] False -0.15 -3.0 3.0
 RAINSNOW_DELTA GLOBAL [C] False 2.0 0.0 5.0
 SNOW_SWI_MIN GLOBAL [0..1] False 0.04 0.0 0.1
@@ -95,8 +95,8 @@ ALB_DECAY_COLD GLOBAL [1/d] False 0.008 0.001 0.15
 ALB_DECAY_MELT GLOBAL [1/d] False 0.12 0.05 0.3
 BARE_GROUND_ALBEDO GLOBAL [0..1] False 0.2 0.1 0.4
 SNOWFALL_ALBTHRESH GLOBAL [mm/d] False 10 5 20
-AVG_ANNUAL_SNOW GLOBAL [mm] False -9999 0.0 10000
-AVG_ANNUAL_RUNOFF GLOBAL [mm] False -9999 0.0 10000
+AVG_ANNUAL_SNOW GLOBAL [mm] False 100 0.0 10000
+AVG_ANNUAL_RUNOFF GLOBAL [mm] False 400 0.0 10000
 MAX_REACH_SEGLENGTH GLOBAL [km] False 100 0.0 1000000
 UBC_S_CORR GLOBAL [0..1][12] True 1.0 0.25 2.0
 UBC_N_CORR GLOBAL [0..1][12] True 1.0 0.25 2.0
@@ -105,7 +105,7 @@ UBC_EXPOSURE_FACT GLOBAL [0..1] False -9999 0.0 1.0
 UBC_CLOUD_PENET GLOBAL [0..1] False -9999 0.0 1.0
 UBC_LW_FOREST_FACT GLOBAL [mm/d/C] False -9999 0.0 9999
 UBC_FLASH_PONDING GLOBAL [mm] False -9999 0.0 9999
-AIRSNOW_COEFF GLOBAL [1/d] False -9999 0.0 9999
+AIRSNOW_COEFF GLOBAL [1/d] False 0.1 0.0 9999
 MOHYSE_PET_COEFF GLOBAL [mm/d] True -9999 0.0 9999
 TOC_MULTIPLIER GLOBAL [mm] True 1.0 0.2 5.0