Skip to content

Commit ab99452

Browse files
James CraigJames Craig
authored andcommitted
v503 - Assimilation bug fix
1 parent 8a8d791 commit ab99452

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

src/Assimilate.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,11 @@ void CModel::PrepareAssimilation(const optStruct &Options,const time_struct &tt)
152152
for(int pp=_nSubBasins-1; pp>=0; pp--)//downstream to upstream
153153
{
154154
p=GetOrderedSubBasinIndex(pp);
155-
pdown = GetSubBasinByID(_pSubBasins[p]->GetDownstreamID())->GetGlobalIndex();
156155

156+
pdown=DOESNT_EXIST;
157+
if (_pSubBasins[p]->GetDownstreamID()!=DOESNT_EXIST){
158+
pdown = GetSubBasinByID(_pSubBasins[p]->GetDownstreamID())->GetGlobalIndex();
159+
}
157160
bool ObsExists=false; //observation available in THIS basin
158161
// observations in this basin, determine scaling variables based upon blank/not blank
159162
//----------------------------------------------------------------
@@ -228,7 +231,11 @@ void CModel::PrepareAssimilation(const optStruct &Options,const time_struct &tt)
228231
for(int pp=0;pp<_nSubBasins; pp++)//upstream to downstream
229232
{
230233
p=GetOrderedSubBasinIndex(pp);
231-
pdown = GetSubBasinByID(_pSubBasins[p]->GetDownstreamID())->GetGlobalIndex();
234+
235+
pdown=DOESNT_EXIST;
236+
if (_pSubBasins[p]->GetDownstreamID()!=DOESNT_EXIST){
237+
pdown = GetSubBasinByID(_pSubBasins[p]->GetDownstreamID())->GetGlobalIndex();
238+
}
232239
if (_aDAoverride[p]) {
233240
_aDADrainSum[p]=_pSubBasins[p]->GetDrainageArea();
234241
}
@@ -258,4 +265,4 @@ void CModel::PrepareAssimilation(const optStruct &Options,const time_struct &tt)
258265
_aDAQadjust[p] = _aDAQadjust[p]*ECCCwt;
259266
}
260267
}
261-
}
268+
}

src/RavenParameters.dat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ SNOW_ROUGHNESS GLOBAL [mm] False 0.2 0.0 -9999
8181
SNOW_TEMPERATURE GLOBAL [C] False 0.0 -7 7
8282
ADIABATIC_LAPSE GLOBAL [C/km] False 6.4 5 8
8383
WET_ADIABATIC_LAPSE GLOBAL [C/km] False 5.0 3.0 7.0
84-
PRECIP_LAPSE GLOBAL [mm/d/km] False -9999 0.0 -9999
84+
PRECIP_LAPSE GLOBAL [mm/d/km] False 0 0.0 50
8585
RAINSNOW_TEMP GLOBAL [C] False -0.15 -3.0 3.0
8686
RAINSNOW_DELTA GLOBAL [C] False 2.0 0.0 5.0
8787
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
9595
ALB_DECAY_MELT GLOBAL [1/d] False 0.12 0.05 0.3
9696
BARE_GROUND_ALBEDO GLOBAL [0..1] False 0.2 0.1 0.4
9797
SNOWFALL_ALBTHRESH GLOBAL [mm/d] False 10 5 20
98-
AVG_ANNUAL_SNOW GLOBAL [mm] False -9999 0.0 10000
99-
AVG_ANNUAL_RUNOFF GLOBAL [mm] False -9999 0.0 10000
98+
AVG_ANNUAL_SNOW GLOBAL [mm] False 100 0.0 10000
99+
AVG_ANNUAL_RUNOFF GLOBAL [mm] False 400 0.0 10000
100100
MAX_REACH_SEGLENGTH GLOBAL [km] False 100 0.0 1000000
101101
UBC_S_CORR GLOBAL [0..1][12] True 1.0 0.25 2.0
102102
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
105105
UBC_CLOUD_PENET GLOBAL [0..1] False -9999 0.0 1.0
106106
UBC_LW_FOREST_FACT GLOBAL [mm/d/C] False -9999 0.0 9999
107107
UBC_FLASH_PONDING GLOBAL [mm] False -9999 0.0 9999
108-
AIRSNOW_COEFF GLOBAL [1/d] False -9999 0.0 9999
108+
AIRSNOW_COEFF GLOBAL [1/d] False 0.1 0.0 9999
109109
MOHYSE_PET_COEFF GLOBAL [mm/d] True -9999 0.0 9999
110110
TOC_MULTIPLIER GLOBAL [mm] True 1.0 0.2 5.0
111111

0 commit comments

Comments
 (0)