From 5345b1df012f23e883fe48130fa29f8e991353be Mon Sep 17 00:00:00 2001 From: Thibault Hallouin Date: Wed, 18 Aug 2021 12:01:14 +0200 Subject: [PATCH] fix mistake in routing parameter used for "educated guess" as initial conditions This mistake will have had impacts only if the "extra" information 'aar'/'r-o_ratio'/'r-o_split' was provided, and even then, the model is rarely used without a warm-up run, so that this mistake would have been largely smoothened by the warm-up run with some impacts on the simulation run far down the decimal places. --- smartpy/structure.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/smartpy/structure.py b/smartpy/structure.py index 1c4d042..8eb5952 100644 --- a/smartpy/structure.py +++ b/smartpy/structure.py @@ -103,7 +103,7 @@ def run(area_m2, delta, nd_initial_wu[model_variables.index('V_ove')] = \ (extra['aar'] * extra['r-o_ratio']) * extra['r-o_split'][0] / 1000 * area_m2 / 8766 * nd_parameters[6] nd_initial_wu[model_variables.index('V_dra')] = \ - (extra['aar'] * extra['r-o_ratio']) * extra['r-o_split'][1] / 1000 * area_m2 / 8766 * nd_parameters[7] + (extra['aar'] * extra['r-o_ratio']) * extra['r-o_split'][1] / 1000 * area_m2 / 8766 * nd_parameters[6] nd_initial_wu[model_variables.index('V_int')] = \ (extra['aar'] * extra['r-o_ratio']) * extra['r-o_split'][2] / 1000 * area_m2 / 8766 * nd_parameters[7] nd_initial_wu[model_variables.index('V_sgw')] = \ @@ -128,11 +128,11 @@ def run(area_m2, delta, nd_initial[model_variables.index('V_ove')] = \ (extra['aar'] * extra['r-o_ratio']) * extra['r-o_split'][0] / 1000 * area_m2 / 8766 * nd_parameters[6] nd_initial[model_variables.index('V_dra')] = \ - (extra['aar'] * extra['r-o_ratio']) * extra['r-o_split'][1] / 1000 * area_m2 / 8766 * nd_parameters[7] + (extra['aar'] * extra['r-o_ratio']) * extra['r-o_split'][1] / 1000 * area_m2 / 8766 * nd_parameters[6] nd_initial[model_variables.index('V_int')] = \ (extra['aar'] * extra['r-o_ratio']) * extra['r-o_split'][2] / 1000 * area_m2 / 8766 * nd_parameters[7] nd_initial[model_variables.index('V_sgw')] = \ - (extra['aar'] * extra['r-o_ratio']) * extra['r-o_split'][3] / 1000 * area_m2 / 8766 * nd_parameters[7] + (extra['aar'] * extra['r-o_ratio']) * extra['r-o_split'][3] / 1000 * area_m2 / 8766 * nd_parameters[8] nd_initial[model_variables.index('V_dgw')] = \ (extra['aar'] * extra['r-o_ratio']) * extra['r-o_split'][4] / 1000 * area_m2 / 8766 * nd_parameters[8] nd_initial[model_variables.index('V_river')] = \