update internal fluxes (#333)

* update internal fluxes * fix format --------- Co-authored-by: Apolline Elbaz <[email protected]>
DassHydro · Sep 27, 2024 · 4989cae · 4989cae
1 parent 4833726
commit 4989cae
Show file tree

Hide file tree

Showing 7 changed files with 958 additions and 830 deletions.
diff --git a/smash/_constant.py b/smash/_constant.py
@@ -174,16 +174,18 @@ def get_neurons_from_hydrological_module(hydrological_module: str, hidden_neuron
     zip(
         HYDROLOGICAL_MODULE,
         (
-            [["pn", "en", "pr", "perc", "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", "lexc", "prr", "prd", "qr", "qd", "qt"]]
+            + [["pn", "en", "pr", "perc", "ps", "es", "lexc", "prr", "prd", "qr", "qd", "qt"]]
             * 3  # % gr5, gr5_mlp, gr5_ri
-            + [["pn", "en", "pr", "perc", "lexc", "prr", "prd", "pre", "qr", "qd", "qe", "qt"]]
+            + [["pn", "en", "pr", "perc", "ps", "es", "lexc", "prr", "prd", "pre", "qr", "qd", "qe", "qt"]]
             * 2  # % gr6, gr6_mlp
-            + [["pn", "en", "pr", "perc", "lexc", "prr", "prd", "prl", "qr", "qd", "ql", "qt"]]
+            + [["pn", "en", "pr", "perc", "ps", "es", "lexc", "prr", "prd", "prl", "qr", "qd", "ql", "qt"]]
             * 2  # % grc, grc_mlp
-            + [["ei", "pn", "en", "pr", "perc", "prr", "qr", "qt"]] * 2  # % grd, grd_mlp
-            + [["ei", "pn", "en", "pr", "perc", "prr", "prd", "qr", "qd", "qt"]] * 2  # % loieau, loieau_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
             + [["pn", "en", "qr", "qb", "qt"]]  # % vic3l
         ),
     )

diff --git a/smash/fcore/forward/forward_db.f90 b/smash/fcore/forward/forward_db.f90
diff --git a/smash/fcore/forward/forward_openmp_db.f90 b/smash/fcore/forward/forward_openmp_db.f90
diff --git a/smash/fcore/operator/md_gr_operator.f90 b/smash/fcore/operator/md_gr_operator.f90
diff --git a/smash/tests/baseline.hdf5 b/smash/tests/baseline.hdf5
diff --git a/smash/tests/diff_baseline.csv b/smash/tests/diff_baseline.csv
diff --git 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", "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", "lexc", "prr", "prd", "qr", "qd", "qt"]] * 3  # % gr5, gr5_mlp, gr5_ri
-        + [["pn", "en", "pr", "perc", "lexc", "prr", "prd", "pre", "qr", "qd", "qe", "qt"]]
+        + [["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", "lexc", "prr", "prd", "prl", "qr", "qd", "ql", "qt"]]
+        + [["pn", "en", "pr", "perc", "ps", "es", "lexc", "prr", "prd", "prl", "qr", "qd", "ql", "qt"]]
         * 2  # % grc, grc_mlp
-        + [["ei", "pn", "en", "pr", "perc", "prr", "qr", "qt"]] * 2  # % grd, grd_mlp
-        + [["ei", "pn", "en", "pr", "perc", "prr", "prd", "qr", "qd", "qt"]] * 2  # % loieau, loieau_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
         + [["pn", "en", "qr", "qb", "qt"]]  # % vic3l
     )