From 420947419b38387eff277f747c0ce413eea81a5f Mon Sep 17 00:00:00 2001 From: Apolline Elbaz Date: Fri, 27 Sep 2024 10:24:29 +0200 Subject: [PATCH] fix format --- smash/_constant.py | 6 ++++-- smash/tests/test_constant.py | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/smash/_constant.py b/smash/_constant.py index 0c1d3e2a..9a3a0c29 100644 --- a/smash/_constant.py +++ b/smash/_constant.py @@ -174,7 +174,8 @@ def get_neurons_from_hydrological_module(hydrological_module: str, hidden_neuron zip( HYDROLOGICAL_MODULE, ( - [["pn", "en", "pr", "perc", "ps", "es", "lexc", "prr", "prd", "qr", "qd", "qt"]] * 3 # % gr4, gr4_mlp, gr4_ri + [["pn", "en", "pr", "perc", "ps", "es", "lexc", "prr", "prd", "qr", "qd", "qt"]] + * 3 # % gr4, gr4_mlp, gr4_ri + [["pn", "en", "lexc", "qt"]] * 2 # % gr4_ode, gr4_ode_mlp + [["pn", "en", "pr", "perc", "ps", "es", "lexc", "prr", "prd", "qr", "qd", "qt"]] * 3 # % gr5, gr5_mlp, gr5_ri @@ -183,7 +184,8 @@ def get_neurons_from_hydrological_module(hydrological_module: str, hidden_neuron + [["pn", "en", "pr", "perc", "ps", "es", "lexc", "prr", "prd", "prl", "qr", "qd", "ql", "qt"]] * 2 # % grc, grc_mlp + [["ei", "pn", "en", "pr", "perc", "ps", "es", "prr", "qr", "qt"]] * 2 # % grd, grd_mlp - + [["ei", "pn", "en", "pr", "perc", "ps", "es", "prr", "prd", "qr", "qd", "qt"]] * 2 # % loieau, loieau_mlp + + [["ei", "pn", "en", "pr", "perc", "ps", "es", "prr", "prd", "qr", "qd", "qt"]] + * 2 # % loieau, loieau_mlp + [["pn", "en", "qr", "qb", "qt"]] # % vic3l ), ) diff --git a/smash/tests/test_constant.py b/smash/tests/test_constant.py index 7d5bf94e..2531047f 100644 --- a/smash/tests/test_constant.py +++ b/smash/tests/test_constant.py @@ -120,15 +120,18 @@ def test_module_parameters(): # % Check hydrological module rr internal fluxes assert list(HYDROLOGICAL_MODULE_RR_INTERNAL_FLUXES.values()) == ( - [["pn", "en", "pr", "perc", "ps", "es", "lexc", "prr", "prd", "qr", "qd", "qt"]] * 3 # % gr4, gr4_mlp, gr4_ri + [["pn", "en", "pr", "perc", "ps", "es", "lexc", "prr", "prd", "qr", "qd", "qt"]] + * 3 # % gr4, gr4_mlp, gr4_ri + [["pn", "en", "lexc", "qt"]] * 2 # % gr4_ode, gr4_ode_mlp - + [["pn", "en", "pr", "perc", "ps", "es", "lexc", "prr", "prd", "qr", "qd", "qt"]] * 3 # % gr5, gr5_mlp, gr5_ri + + [["pn", "en", "pr", "perc", "ps", "es", "lexc", "prr", "prd", "qr", "qd", "qt"]] + * 3 # % gr5, gr5_mlp, gr5_ri + [["pn", "en", "pr", "perc", "ps", "es", "lexc", "prr", "prd", "pre", "qr", "qd", "qe", "qt"]] * 2 # % gr6, gr6_mlp + [["pn", "en", "pr", "perc", "ps", "es", "lexc", "prr", "prd", "prl", "qr", "qd", "ql", "qt"]] * 2 # % grc, grc_mlp + [["ei", "pn", "en", "pr", "perc", "ps", "es", "prr", "qr", "qt"]] * 2 # % grd, grd_mlp - + [["ei", "pn", "en", "pr", "perc", "ps", "es", "prr", "prd", "qr", "qd", "qt"]] * 2 # % loieau, loieau_mlp + + [["ei", "pn", "en", "pr", "perc", "ps", "es", "prr", "prd", "qr", "qd", "qt"]] + * 2 # % loieau, loieau_mlp + [["pn", "en", "qr", "qb", "qt"]] # % vic3l )