From 88962c256a63ec8881d53c9aea9f056a74aa82fe Mon Sep 17 00:00:00 2001
From: Apolline Elbaz <aelbaz@localhost.localdomain>
Date: Fri, 27 Sep 2024 17:24:32 +0200
Subject: [PATCH] fix ps/es gr-ri

---
 smash/fcore/forward/forward_db.f90        |  18 ++-
 smash/fcore/forward/forward_openmp_db.f90 |  62 ++++----
 smash/fcore/operator/md_gr_operator.f90   |  12 +-
 smash/tests/baseline.hdf5                 | Bin 6290188 -> 6290188 bytes
 smash/tests/diff_baseline.csv             | 186 +++++++++++-----------
 5 files changed, 148 insertions(+), 130 deletions(-)

diff --git a/smash/fcore/forward/forward_db.f90 b/smash/fcore/forward/forward_db.f90
index da1cba7d..51bd5a71 100644
--- a/smash/fcore/forward/forward_db.f90
+++ b/smash/fcore/forward/forward_db.f90
@@ -15666,7 +15666,8 @@ SUBROUTINE GR4_RI_TIME_STEP_D(setup, mesh, input_data, options, &
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp, ac_pet
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp_d
     INTEGER :: row, col, k, time_step_returns
-    REAL(sp) :: beta, pn, en, pr, perc, l, prr, prd, qr, qd, split
+    REAL(sp) :: beta, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, &
+&   split
     REAL(sp) :: pn_d, en_d, pr_d, perc_d, l_d, prr_d, prd_d, qr_d, qd_d&
 &   , split_d
     INTRINSIC TANH
@@ -15764,7 +15765,8 @@ SUBROUTINE GR4_RI_TIME_STEP_B(setup, mesh, input_data, options, &
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp, ac_pet
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp_b
     INTEGER :: row, col, k, time_step_returns
-    REAL(sp) :: beta, pn, en, pr, perc, l, prr, prd, qr, qd, split
+    REAL(sp) :: beta, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, &
+&   split
     REAL(sp) :: pn_b, en_b, pr_b, perc_b, l_b, prr_b, prd_b, qr_b, qd_b&
 &   , split_b
     INTRINSIC TANH
@@ -15903,7 +15905,8 @@ SUBROUTINE GR4_RI_TIME_STEP(setup, mesh, input_data, options, returns&
     REAL(sp), DIMENSION(mesh%nac), INTENT(INOUT) :: ac_qt
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp, ac_pet
     INTEGER :: row, col, k, time_step_returns
-    REAL(sp) :: beta, pn, en, pr, perc, l, prr, prd, qr, qd, split
+    REAL(sp) :: beta, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, &
+&   split
     INTRINSIC TANH
     INTRINSIC MAX
     CALL GET_AC_ATMOS_DATA_TIME_STEP(setup, mesh, input_data, time_step&
@@ -17479,7 +17482,8 @@ SUBROUTINE GR5_RI_TIME_STEP_D(setup, mesh, input_data, options, &
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp, ac_pet
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp_d
     INTEGER :: row, col, k, time_step_returns
-    REAL(sp) :: beta, pn, en, pr, perc, l, prr, prd, qr, qd, split
+    REAL(sp) :: beta, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, &
+&   split
     REAL(sp) :: pn_d, en_d, pr_d, perc_d, l_d, prr_d, prd_d, qr_d, qd_d&
 &   , split_d
     INTRINSIC TANH
@@ -17578,7 +17582,8 @@ SUBROUTINE GR5_RI_TIME_STEP_B(setup, mesh, input_data, options, &
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp, ac_pet
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp_b
     INTEGER :: row, col, k, time_step_returns
-    REAL(sp) :: beta, pn, en, pr, perc, l, prr, prd, qr, qd, split
+    REAL(sp) :: beta, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, &
+&   split
     REAL(sp) :: pn_b, en_b, pr_b, perc_b, l_b, prr_b, prd_b, qr_b, qd_b&
 &   , split_b
     INTRINSIC TANH
@@ -17719,7 +17724,8 @@ SUBROUTINE GR5_RI_TIME_STEP(setup, mesh, input_data, options, returns&
     REAL(sp), DIMENSION(mesh%nac), INTENT(INOUT) :: ac_qt
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp, ac_pet
     INTEGER :: row, col, k, time_step_returns
-    REAL(sp) :: beta, pn, en, pr, perc, l, prr, prd, qr, qd, split
+    REAL(sp) :: beta, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, &
+&   split
     INTRINSIC TANH
     INTRINSIC MAX
     CALL GET_AC_ATMOS_DATA_TIME_STEP(setup, mesh, input_data, time_step&
diff --git a/smash/fcore/forward/forward_openmp_db.f90 b/smash/fcore/forward/forward_openmp_db.f90
index 3f5c71bd..2f4f7ea6 100644
--- a/smash/fcore/forward/forward_openmp_db.f90
+++ b/smash/fcore/forward/forward_openmp_db.f90
@@ -15852,7 +15852,8 @@ SUBROUTINE GR4_RI_TIME_STEP_D(setup, mesh, input_data, options, &
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp, ac_pet
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp_d
     INTEGER :: row, col, k, time_step_returns
-    REAL(sp) :: beta, pn, en, pr, perc, l, prr, prd, qr, qd, split
+    REAL(sp) :: beta, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, &
+&   split
     REAL(sp) :: pn_d, en_d, pr_d, perc_d, l_d, prr_d, prd_d, qr_d, qd_d&
 &   , split_d
     INTRINSIC TANH
@@ -15871,9 +15872,9 @@ SUBROUTINE GR4_RI_TIME_STEP_D(setup, mesh, input_data, options, &
 !$OMP&returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_ct, ac_kexc, &
 !$OMP&ac_hi, ac_hp, ac_ht, ac_qt), SHARED(ac_prcp_d, ac_ci_d, ac_cp_d, &
 !$OMP&ac_ct_d, ac_kexc_d, ac_hi_d, ac_hp_d, ac_ht_d, ac_qt_d), PRIVATE(&
-!$OMP&row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr&
-!$OMP&, qd, split), PRIVATE(pn_d, en_d, pr_d, perc_d, l_d, prr_d, prd_d&
-!$OMP&, qr_d, qd_d, split_d), PRIVATE(temp), SCHEDULE(static)
+!$OMP&row, col, k, time_step_returns, pn, en, pr, perc, ps, es, l, prr, &
+!$OMP&prd, qr, qd, split), PRIVATE(pn_d, en_d, pr_d, perc_d, l_d, prr_d&
+!$OMP&, prd_d, qr_d, qd_d, split_d), PRIVATE(temp), SCHEDULE(static)
     DO col=1,mesh%ncol
       DO row=1,mesh%nrow
         IF (.NOT.(mesh%active_cell(row, col) .EQ. 0 .OR. mesh%&
@@ -15957,7 +15958,8 @@ SUBROUTINE GR4_RI_TIME_STEP_B(setup, mesh, input_data, options, &
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp, ac_pet
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp_b
     INTEGER :: row, col, k, time_step_returns
-    REAL(sp) :: beta, pn, en, pr, perc, l, prr, prd, qr, qd, split
+    REAL(sp) :: beta, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, &
+&   split
     REAL(sp) :: pn_b, en_b, pr_b, perc_b, l_b, prr_b, prd_b, qr_b, qd_b&
 &   , split_b
     INTRINSIC TANH
@@ -15977,8 +15979,8 @@ SUBROUTINE GR4_RI_TIME_STEP_B(setup, mesh, input_data, options, &
 !$OMP PARALLEL NUM_THREADS(options%comm%ncpu), SHARED(setup, mesh, &
 !$OMP&returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_ct, ac_kexc, &
 !$OMP&ac_hi, ac_hp, ac_ht, ac_qt), PRIVATE(row, col, k, &
-!$OMP&time_step_returns, pn, en, pr, perc, l, prr, prd, qr, qd, split), &
-!$OMP&PRIVATE(chunk_start, chunk_end)
+!$OMP&time_step_returns, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, &
+!$OMP&split), PRIVATE(chunk_start, chunk_end)
     CALL GETSTATICSCHEDULE(1, mesh%ncol, 1, chunk_start, chunk_end)
     DO col=chunk_start,chunk_end
       DO row=1,mesh%nrow
@@ -16038,10 +16040,10 @@ SUBROUTINE GR4_RI_TIME_STEP_B(setup, mesh, input_data, options, &
 !$OMP&returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_ct, ac_kexc, &
 !$OMP&ac_hi, ac_hp, ac_ht, ac_qt), SHARED(ac_prcp_b, ac_ci_b, ac_cp_b, &
 !$OMP&ac_ct_b, ac_kexc_b, ac_hi_b, ac_hp_b, ac_ht_b, ac_qt_b), PRIVATE(&
-!$OMP&row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr&
-!$OMP&, qd, split), PRIVATE(pn_b, en_b, pr_b, perc_b, l_b, prr_b, prd_b&
-!$OMP&, qr_b, qd_b, split_b), PRIVATE(branch, chunk_end, chunk_start), &
-!$OMP&PRIVATE(temp_b)
+!$OMP&row, col, k, time_step_returns, pn, en, pr, perc, ps, es, l, prr, &
+!$OMP&prd, qr, qd, split), PRIVATE(pn_b, en_b, pr_b, perc_b, l_b, prr_b&
+!$OMP&, prd_b, qr_b, qd_b, split_b), PRIVATE(branch, chunk_end, &
+!$OMP&chunk_start), PRIVATE(temp_b)
     CALL POPREAL4(en)
     CALL POPREAL4(split)
     CALL POPREAL4(prr)
@@ -16139,7 +16141,8 @@ SUBROUTINE GR4_RI_TIME_STEP(setup, mesh, input_data, options, returns&
     REAL(sp), DIMENSION(mesh%nac), INTENT(INOUT) :: ac_qt
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp, ac_pet
     INTEGER :: row, col, k, time_step_returns
-    REAL(sp) :: beta, pn, en, pr, perc, l, prr, prd, qr, qd, split
+    REAL(sp) :: beta, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, &
+&   split
     INTRINSIC TANH
     INTRINSIC MAX
     CALL GET_AC_ATMOS_DATA_TIME_STEP(setup, mesh, input_data, time_step&
@@ -16152,8 +16155,8 @@ SUBROUTINE GR4_RI_TIME_STEP(setup, mesh, input_data, options, returns&
 !$OMP PARALLEL DO NUM_THREADS(options%comm%ncpu), SHARED(setup, mesh, &
 !$OMP&returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_ct, ac_kexc, &
 !$OMP&ac_hi, ac_hp, ac_ht, ac_qt), PRIVATE(row, col, k, &
-!$OMP&time_step_returns, pn, en, pr, perc, l, prr, prd, qr, qd, split), &
-!$OMP&                                                  SCHEDULE(static)
+!$OMP&time_step_returns, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, &
+!$OMP&split), SCHEDULE(static)
     DO col=1,mesh%ncol
       DO row=1,mesh%nrow
         IF (.NOT.(mesh%active_cell(row, col) .EQ. 0 .OR. mesh%&
@@ -17903,7 +17906,8 @@ SUBROUTINE GR5_RI_TIME_STEP_D(setup, mesh, input_data, options, &
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp, ac_pet
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp_d
     INTEGER :: row, col, k, time_step_returns
-    REAL(sp) :: beta, pn, en, pr, perc, l, prr, prd, qr, qd, split
+    REAL(sp) :: beta, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, &
+&   split
     REAL(sp) :: pn_d, en_d, pr_d, perc_d, l_d, prr_d, prd_d, qr_d, qd_d&
 &   , split_d
     INTRINSIC TANH
@@ -17923,9 +17927,9 @@ SUBROUTINE GR5_RI_TIME_STEP_D(setup, mesh, input_data, options, &
 !$OMP&, ac_ct, ac_kexc, ac_aexc, ac_hi, ac_hp, ac_ht, ac_qt), SHARED(&
 !$OMP&ac_prcp_d, ac_ci_d, ac_cp_d, ac_alpha1_d, ac_alpha2_d, ac_ct_d, &
 !$OMP&ac_kexc_d, ac_aexc_d, ac_hi_d, ac_hp_d, ac_ht_d, ac_qt_d), PRIVATE&
-!$OMP&(row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr&
-!$OMP&, qd, split), PRIVATE(pn_d, en_d, pr_d, perc_d, l_d, prr_d, prd_d&
-!$OMP&, qr_d, qd_d, split_d), PRIVATE(temp), SCHEDULE(static)
+!$OMP&(row, col, k, time_step_returns, pn, en, pr, perc, ps, es, l, prr&
+!$OMP&, prd, qr, qd, split), PRIVATE(pn_d, en_d, pr_d, perc_d, l_d, &
+!$OMP&prr_d, prd_d, qr_d, qd_d, split_d), PRIVATE(temp), SCHEDULE(static)
     DO col=1,mesh%ncol
       DO row=1,mesh%nrow
         IF (.NOT.(mesh%active_cell(row, col) .EQ. 0 .OR. mesh%&
@@ -18010,7 +18014,8 @@ SUBROUTINE GR5_RI_TIME_STEP_B(setup, mesh, input_data, options, &
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp, ac_pet
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp_b
     INTEGER :: row, col, k, time_step_returns
-    REAL(sp) :: beta, pn, en, pr, perc, l, prr, prd, qr, qd, split
+    REAL(sp) :: beta, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, &
+&   split
     REAL(sp) :: pn_b, en_b, pr_b, perc_b, l_b, prr_b, prd_b, qr_b, qd_b&
 &   , split_b
     INTRINSIC TANH
@@ -18030,8 +18035,8 @@ SUBROUTINE GR5_RI_TIME_STEP_B(setup, mesh, input_data, options, &
 !$OMP PARALLEL NUM_THREADS(options%comm%ncpu), SHARED(setup, mesh, &
 !$OMP&returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_alpha1, ac_alpha2&
 !$OMP&, ac_ct, ac_kexc, ac_aexc, ac_hi, ac_hp, ac_ht, ac_qt), PRIVATE(&
-!$OMP&row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr&
-!$OMP&, qd, split), PRIVATE(chunk_start, chunk_end)
+!$OMP&row, col, k, time_step_returns, pn, en, pr, perc, ps, es, l, prr, &
+!$OMP&prd, qr, qd, split), PRIVATE(chunk_start, chunk_end)
     CALL GETSTATICSCHEDULE(1, mesh%ncol, 1, chunk_start, chunk_end)
     DO col=chunk_start,chunk_end
       DO row=1,mesh%nrow
@@ -18093,10 +18098,10 @@ SUBROUTINE GR5_RI_TIME_STEP_B(setup, mesh, input_data, options, &
 !$OMP&, ac_ct, ac_kexc, ac_aexc, ac_hi, ac_hp, ac_ht, ac_qt), SHARED(&
 !$OMP&ac_prcp_b, ac_ci_b, ac_cp_b, ac_alpha1_b, ac_alpha2_b, ac_ct_b, &
 !$OMP&ac_kexc_b, ac_aexc_b, ac_hi_b, ac_hp_b, ac_ht_b, ac_qt_b), PRIVATE&
-!$OMP&(row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr&
-!$OMP&, qd, split), PRIVATE(pn_b, en_b, pr_b, perc_b, l_b, prr_b, prd_b&
-!$OMP&, qr_b, qd_b, split_b), PRIVATE(branch, chunk_end, chunk_start), &
-!$OMP&PRIVATE(temp_b)
+!$OMP&(row, col, k, time_step_returns, pn, en, pr, perc, ps, es, l, prr&
+!$OMP&, prd, qr, qd, split), PRIVATE(pn_b, en_b, pr_b, perc_b, l_b, &
+!$OMP&prr_b, prd_b, qr_b, qd_b, split_b), PRIVATE(branch, chunk_end, &
+!$OMP&chunk_start), PRIVATE(temp_b)
     CALL POPREAL4(en)
     CALL POPREAL4(split)
     CALL POPREAL4(prr)
@@ -18195,7 +18200,8 @@ SUBROUTINE GR5_RI_TIME_STEP(setup, mesh, input_data, options, returns&
     REAL(sp), DIMENSION(mesh%nac), INTENT(INOUT) :: ac_qt
     REAL(sp), DIMENSION(mesh%nac) :: ac_prcp, ac_pet
     INTEGER :: row, col, k, time_step_returns
-    REAL(sp) :: beta, pn, en, pr, perc, l, prr, prd, qr, qd, split
+    REAL(sp) :: beta, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, &
+&   split
     INTRINSIC TANH
     INTRINSIC MAX
     CALL GET_AC_ATMOS_DATA_TIME_STEP(setup, mesh, input_data, time_step&
@@ -18208,8 +18214,8 @@ SUBROUTINE GR5_RI_TIME_STEP(setup, mesh, input_data, options, returns&
 !$OMP PARALLEL DO NUM_THREADS(options%comm%ncpu), SHARED(setup, mesh, &
 !$OMP&returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_alpha1, ac_alpha2&
 !$OMP&, ac_ct, ac_kexc, ac_aexc, ac_hi, ac_hp, ac_ht, ac_qt), PRIVATE(&
-!$OMP&row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr&
-!$OMP&, qd, split), SCHEDULE(static)
+!$OMP&row, col, k, time_step_returns, pn, en, pr, perc, ps, es, l, prr, &
+!$OMP&prd, qr, qd, split), SCHEDULE(static)
     DO col=1,mesh%ncol
       DO row=1,mesh%nrow
         IF (.NOT.(mesh%active_cell(row, col) .EQ. 0 .OR. mesh%&
diff --git a/smash/fcore/operator/md_gr_operator.f90 b/smash/fcore/operator/md_gr_operator.f90
index e35b28f4..c02db588 100644
--- a/smash/fcore/operator/md_gr_operator.f90
+++ b/smash/fcore/operator/md_gr_operator.f90
@@ -602,7 +602,7 @@ subroutine gr4_ri_time_step(setup, mesh, input_data, options, returns, time_step
 
         real(sp), dimension(mesh%nac) :: ac_prcp, ac_pet
         integer :: row, col, k, time_step_returns
-        real(sp) :: beta, pn, en, pr, perc, l, prr, prd, qr, qd, split
+        real(sp) :: beta, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, split
 
         call get_ac_atmos_data_time_step(setup, mesh, input_data, time_step, "prcp", ac_prcp)
         call get_ac_atmos_data_time_step(setup, mesh, input_data, time_step, "pet", ac_pet)
@@ -615,7 +615,7 @@ subroutine gr4_ri_time_step(setup, mesh, input_data, options, returns, time_step
         !$OMP parallel do schedule(static) num_threads(options%comm%ncpu) &
         !$OMP& shared(setup, mesh, returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, &
         !$OMP&  ac_ct, ac_kexc, ac_hi, ac_hp, ac_ht, ac_qt) &
-        !$OMP& private(row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr, qd, split)
+        !$OMP& private(row, col, k, time_step_returns, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, split)
 #endif
         do col = 1, mesh%ncol
             do row = 1, mesh%nrow
@@ -668,7 +668,7 @@ subroutine gr4_ri_time_step(setup, mesh, input_data, options, returns, time_step
                                 col, &
                                 time_step_returns, &
                                 setup%n_snow_fluxes + 1:setup%n_snow_fluxes + setup%n_hydro_fluxes &
-                                ) = (/pn, en, pr, perc, l, prr, prd, qr, qd, ac_qt(k)/)
+                                ) = (/pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, ac_qt(k)/)
                         end if
                     end if
                 end if
@@ -1178,7 +1178,7 @@ subroutine gr5_ri_time_step(setup, mesh, input_data, options, returns, time_step
 
         real(sp), dimension(mesh%nac) :: ac_prcp, ac_pet
         integer :: row, col, k, time_step_returns
-        real(sp) :: beta, pn, en, pr, perc, l, prr, prd, qr, qd, split
+        real(sp) :: beta, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, split
 
         call get_ac_atmos_data_time_step(setup, mesh, input_data, time_step, "prcp", ac_prcp)
         call get_ac_atmos_data_time_step(setup, mesh, input_data, time_step, "pet", ac_pet)
@@ -1192,7 +1192,7 @@ subroutine gr5_ri_time_step(setup, mesh, input_data, options, returns, time_step
         !$OMP parallel do schedule(static) num_threads(options%comm%ncpu) &
         !$OMP& shared(setup, mesh, returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, &
         !$OMP& ac_alpha1, ac_alpha2, ac_ct, ac_kexc, ac_aexc, ac_hi, ac_hp, ac_ht, ac_qt) &
-        !$OMP& private(row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr, qd, split)
+        !$OMP& private(row, col, k, time_step_returns, pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, split)
 #endif
         do col = 1, mesh%ncol
             do row = 1, mesh%nrow
@@ -1246,7 +1246,7 @@ subroutine gr5_ri_time_step(setup, mesh, input_data, options, returns, time_step
                                 col, &
                                 time_step_returns, &
                                 setup%n_snow_fluxes + 1:setup%n_snow_fluxes + setup%n_hydro_fluxes &
-                                ) = (/pn, en, pr, perc, l, prr, prd, qr, qd, ac_qt(k)/)
+                                ) = (/pn, en, pr, perc, ps, es, l, prr, prd, qr, qd, ac_qt(k)/)
                         end if
                     end if
                 end if
diff --git a/smash/tests/baseline.hdf5 b/smash/tests/baseline.hdf5
index 65289975cd408434c733c3241a7be973bb37956c..8f144817cd6fb02b49dad330c58bf3f6df445471 100644
GIT binary patch
delta 3025
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

delta 3031
zcmZvec~I5Y703O(`+oZqL{XoVCx`^7OI(5*CA_$@NI@eivOQ?iAT~)IWyS>!q>^G9
z6Hy-AE=k3tGgk6@KvV6pty^rST1P8QOopTq634_zYmlZiYMTuG{x;fV`p0MHeb2q;
zo^#K=zjNQd&xSqwKtrR@=sCv1&+_<<qMvSsS&PDhVb;o@Ybx=3#2rloVMYUCuhc~4
zN#b0AX9dLH^W{lm9I?rwU-+t(pDWeFZFQ25w@()9{yUn|^1<X(zH1e$rG?4jRh8d5
zg?P#Li<>n*<Gko+!FZ9nZukx;{Gr8Sm_OD7+q1CUu8M)JArH3v0m09b0wT@&gu!-p
z4QyuGp8NnkQ6#3QR?_T4%otwdX;vussMsgi#=paOyG}cx(1p!n*&;i9X2(eQM-xP<
zzvaiW#i!ixufk?6#Q7h@Ry%xdqDW^93G;fdxZ$@ZQdWm}P~rY}U@{BGd{ab<?(ia9
z@pbW<lY<{dJF)&-V!4w;QHqqN+9haC5~+VCwnk|SB{*3%xCUcFo{WIqOQbMA>GMqz
zrkdMDyup>QSk+4}*XdC87`V<}JL1{^WB)Lc;3q<uXq9hbg-!{^SlI4vgv~4;TMV0>
z*Mcolro@XY^fv2=`Me!c3vbBvMzzI@8lO-nwbRC((p`}!uGGBzzTXAntnCUhba}5d
zQQ<Fq%jXvYrkJI$AMTLMWf7|R$CAO0K?bW-$ex!V&)TES3Xe9Vh;WHc8PfSEhUF>P
zA!3&Qb<FC8bdKdRq^HhW5>EVWDdLH$qtk|jLiF}yFb;!Pjv^lUKbD3B_G@VC40!uL
zFr2o__3i&$im-<v_g6+CP@*Iotim0oP_+C{fo*a%zd1>cFlo0$g{pb%X;U$K8>D?R
zs%K#I@Q6Gz4>B?$Z)QRM2GTj!9C=6(iYSmL2UX9NC-Gr1^B7C9<h>^)Iy7unYxZ{_
z#d^nyZ+-$Y2GS}Eb#Ienz081i>e7he<OVk%{+t}~6g0SXX~SR%2A#UJ%ky>f<D_@H
z<kJE_eN6Z%9a^q&fwH>f*F2=ZD!(?4ihAT0g+hNa>#*(>+1csMUhHKLq*I6MSbDPI
zj#mFoj?l@wrsI(zdAygc#n72E=C`{_Pz+%^eIY18mBmJ6_ZEy(4Auo{7cx4aL|9a(
zBdIV&LG+{0&et{@vzK+j*}fbZkOrhvgr$l>`wA39=lQ1NbqqPDyB^V_>GFCrdPleH
zUWpobT&*=d`nQ-KA7IEi(%s0!`%5>IBR^1dA0J-9e0)`orcvQCZ6~uj9E$h_t>j9s
zz}hk0stctZR)$jOkpXk%t{&xhfPQ`lzxkcdu<CCQDt1FVzEH&t?SpiBnWh@T4tiWy
z%^HQ_YPZ6GYOt-4cI#?LF}<Q%6(>`9jv8S{M`U&eWNe!|+O$-~krb#%<b1x0E#_g!
zIg<5Qcbh#EC)8Yt=ws=@DnzIJ3#Lc(R(0p-|9e&V^UJ)OTAscb%W+%6#Gh7=FQKb%
zm`?pYW|#vFs$0pwAfeME^2iOy4NtkFH$Ops@%K!})H|kQGlra2Cuj!y73A%(+35#0
z$inZd?gtX98Ny$wFIGdba`(W=Y-rS-qM<rBpzU*9Fh`59`bKzJjd6R1w%Xc}`7(Wv
zx;E%B9=proA^RDBuS}oFpIVfX$WN9ETRE-NB4ljQkldXj4X60RMe}#CPAe~@<hRV<
zv)<H@^q;dex5@S)%TYO++h0G@@Ql^#e!4M;>3qSU)@nUFtPFFkW2f!+H1v71gA1?F
z<NwxDRlDim!3^gHjMkmb{d}(GK86!uvpV+)*qjTL0Gsvntj^Qy0?=@p?mT~#o~|Q>
zrU&$hrzVdE>NK>S3z@pX-f(Agd4-Pa@?FfM>_WXpqx1xENU$sPzmNKtO6NWhV`$f!
zsDQw`EA>4*CN*vfFMCO<rJgDsPrX%y&uh&L3Tt({2-H|_M%usIOwoG6{<T4OKkmKQ
zi}m=eDAC<7{D51BKG^I7=0Cw=RvqM0-R%=EyLD)X&1riP-FboqgGP7hxHTs*XfM)#
zR*$gcGTm(#7g3Y~NXwO1z6n_ZX-%d>*K{2DGtf>GylG~NGiHBu=kV%5XN&AZ*sKdo
zzqqG|i|yli7mw|gz0!EamLH8s^X+7x+H$7CLZL6sdj`^3tImf<q?KOW?ZZaS!EQY+
zeDi*v!OAP~yxad4egwG}($4($VIMLNLpxuC;d?BZ9fNjm;yb>~G!|3k%x}upMuR92
z4aR^NFcyphv0yxy044%Im;~a$*FZc7fXN^MB!Vd*2}}ja;69K7Qb8K{I+#Y;+Vq;B
z{B7^3QJzsA>n1hz=1vDQz)WyIm<48oIbbe$0HlL?U_Mv?7J^08o11a)5#E_QeOgnv
zGXs1BWP%4l76^iez+$ijECtKJa<BqqgB*|x^1w=v555TsKp|KKR)dGZ8c+n*f^}d$
zC<Yrq2`B|+pd3_CxHB{uORrxFy{z!mOQ9FZ`?mSB`Yrt2_kL)uLi67Xt@H3pABX&W
l_q3%78SjS@Rko=!qpc=qJk2;)k*x4aZz!7zKMkEy{sY-ffr|hD

diff --git a/smash/tests/diff_baseline.csv b/smash/tests/diff_baseline.csv
index ef50e831..befd1613 100644
--- a/smash/tests/diff_baseline.csv
+++ b/smash/tests/diff_baseline.csv
@@ -1,10 +1,16 @@
-commit 483372605c5ad4c3b08c83ff36158aba9c313988
-Author: Ngo Nghi Truyen Huynh <129378719+nghi-truyen@users.noreply.github.com>
-Date:   Tue Sep 24 20:03:17 2024 +0200
+commit 4989caec358cde9c251ffb711d8751e28ff0b5ad
+Author: asjeb <151923475+asjeb@users.noreply.github.com>
+Date:   Fri Sep 27 12:34:10 2024 +0200
 
-    ENH: Add hybrid models for gr and loieau structures (#327)
+    update internal fluxes (#333)
     
-    * Apply suggestion changes from FC and PAG reviews
+    * update internal fluxes
+    
+    * fix format
+    
+    ---------
+    
+    Co-authored-by: Apolline Elbaz <aelbaz@localhost.localdomain>
 
 TEST NAME                                                      |STATUS
 bbox_mesh.active_cell                                          |NON MODIFIED
@@ -465,79 +471,79 @@ generate_samples.uniform                                       |NON MODIFIED
 hydrograph_segmentation.by_obs                                 |NON MODIFIED
 hydrograph_segmentation.by_sim                                 |NON MODIFIED
 internal_fluxes.zero-gr4-kw.en                                 |NON MODIFIED
-internal_fluxes.zero-gr4-kw.es                                 |ADDED
+internal_fluxes.zero-gr4-kw.es                                 |NON MODIFIED
 internal_fluxes.zero-gr4-kw.lexc                               |NON MODIFIED
 internal_fluxes.zero-gr4-kw.perc                               |NON MODIFIED
 internal_fluxes.zero-gr4-kw.pn                                 |NON MODIFIED
 internal_fluxes.zero-gr4-kw.pr                                 |NON MODIFIED
 internal_fluxes.zero-gr4-kw.prd                                |NON MODIFIED
 internal_fluxes.zero-gr4-kw.prr                                |NON MODIFIED
-internal_fluxes.zero-gr4-kw.ps                                 |ADDED
+internal_fluxes.zero-gr4-kw.ps                                 |NON MODIFIED
 internal_fluxes.zero-gr4-kw.qd                                 |NON MODIFIED
 internal_fluxes.zero-gr4-kw.qim1j                              |NON MODIFIED
 internal_fluxes.zero-gr4-kw.qr                                 |NON MODIFIED
 internal_fluxes.zero-gr4-kw.qt                                 |NON MODIFIED
 internal_fluxes.zero-gr4-lag0.en                               |NON MODIFIED
-internal_fluxes.zero-gr4-lag0.es                               |ADDED
+internal_fluxes.zero-gr4-lag0.es                               |NON MODIFIED
 internal_fluxes.zero-gr4-lag0.lexc                             |NON MODIFIED
 internal_fluxes.zero-gr4-lag0.perc                             |NON MODIFIED
 internal_fluxes.zero-gr4-lag0.pn                               |NON MODIFIED
 internal_fluxes.zero-gr4-lag0.pr                               |NON MODIFIED
 internal_fluxes.zero-gr4-lag0.prd                              |NON MODIFIED
 internal_fluxes.zero-gr4-lag0.prr                              |NON MODIFIED
-internal_fluxes.zero-gr4-lag0.ps                               |ADDED
+internal_fluxes.zero-gr4-lag0.ps                               |NON MODIFIED
 internal_fluxes.zero-gr4-lag0.qd                               |NON MODIFIED
 internal_fluxes.zero-gr4-lag0.qr                               |NON MODIFIED
 internal_fluxes.zero-gr4-lag0.qt                               |NON MODIFIED
 internal_fluxes.zero-gr4-lag0.qup                              |NON MODIFIED
 internal_fluxes.zero-gr4-lr.en                                 |NON MODIFIED
-internal_fluxes.zero-gr4-lr.es                                 |ADDED
+internal_fluxes.zero-gr4-lr.es                                 |NON MODIFIED
 internal_fluxes.zero-gr4-lr.lexc                               |NON MODIFIED
 internal_fluxes.zero-gr4-lr.perc                               |NON MODIFIED
 internal_fluxes.zero-gr4-lr.pn                                 |NON MODIFIED
 internal_fluxes.zero-gr4-lr.pr                                 |NON MODIFIED
 internal_fluxes.zero-gr4-lr.prd                                |NON MODIFIED
 internal_fluxes.zero-gr4-lr.prr                                |NON MODIFIED
-internal_fluxes.zero-gr4-lr.ps                                 |ADDED
+internal_fluxes.zero-gr4-lr.ps                                 |NON MODIFIED
 internal_fluxes.zero-gr4-lr.qd                                 |NON MODIFIED
 internal_fluxes.zero-gr4-lr.qr                                 |NON MODIFIED
 internal_fluxes.zero-gr4-lr.qt                                 |NON MODIFIED
 internal_fluxes.zero-gr4-lr.qup                                |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-kw.en                             |NON MODIFIED
-internal_fluxes.zero-gr4_mlp-kw.es                             |ADDED
+internal_fluxes.zero-gr4_mlp-kw.es                             |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-kw.lexc                           |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-kw.perc                           |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-kw.pn                             |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-kw.pr                             |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-kw.prd                            |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-kw.prr                            |NON MODIFIED
-internal_fluxes.zero-gr4_mlp-kw.ps                             |ADDED
+internal_fluxes.zero-gr4_mlp-kw.ps                             |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-kw.qd                             |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-kw.qim1j                          |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-kw.qr                             |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-kw.qt                             |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lag0.en                           |NON MODIFIED
-internal_fluxes.zero-gr4_mlp-lag0.es                           |ADDED
+internal_fluxes.zero-gr4_mlp-lag0.es                           |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lag0.lexc                         |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lag0.perc                         |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lag0.pn                           |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lag0.pr                           |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lag0.prd                          |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lag0.prr                          |NON MODIFIED
-internal_fluxes.zero-gr4_mlp-lag0.ps                           |ADDED
+internal_fluxes.zero-gr4_mlp-lag0.ps                           |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lag0.qd                           |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lag0.qr                           |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lag0.qt                           |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lag0.qup                          |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lr.en                             |NON MODIFIED
-internal_fluxes.zero-gr4_mlp-lr.es                             |ADDED
+internal_fluxes.zero-gr4_mlp-lr.es                             |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lr.lexc                           |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lr.perc                           |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lr.pn                             |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lr.pr                             |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lr.prd                            |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lr.prr                            |NON MODIFIED
-internal_fluxes.zero-gr4_mlp-lr.ps                             |ADDED
+internal_fluxes.zero-gr4_mlp-lr.ps                             |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lr.qd                             |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lr.qr                             |NON MODIFIED
 internal_fluxes.zero-gr4_mlp-lr.qt                             |NON MODIFIED
@@ -573,163 +579,163 @@ internal_fluxes.zero-gr4_ode_mlp-lr.pn                         |NON MODIFIED
 internal_fluxes.zero-gr4_ode_mlp-lr.qt                         |NON MODIFIED
 internal_fluxes.zero-gr4_ode_mlp-lr.qup                        |NON MODIFIED
 internal_fluxes.zero-gr4_ri-kw.en                              |NON MODIFIED
-internal_fluxes.zero-gr4_ri-kw.es                              |ADDED
+internal_fluxes.zero-gr4_ri-kw.es                              |MODIFIED
 internal_fluxes.zero-gr4_ri-kw.lexc                            |MODIFIED
 internal_fluxes.zero-gr4_ri-kw.perc                            |NON MODIFIED
 internal_fluxes.zero-gr4_ri-kw.pn                              |NON MODIFIED
 internal_fluxes.zero-gr4_ri-kw.pr                              |NON MODIFIED
 internal_fluxes.zero-gr4_ri-kw.prd                             |NON MODIFIED
 internal_fluxes.zero-gr4_ri-kw.prr                             |MODIFIED
-internal_fluxes.zero-gr4_ri-kw.ps                              |ADDED
+internal_fluxes.zero-gr4_ri-kw.ps                              |NON MODIFIED
 internal_fluxes.zero-gr4_ri-kw.qd                              |MODIFIED
 internal_fluxes.zero-gr4_ri-kw.qim1j                           |NON MODIFIED
 internal_fluxes.zero-gr4_ri-kw.qr                              |MODIFIED
 internal_fluxes.zero-gr4_ri-kw.qt                              |MODIFIED
 internal_fluxes.zero-gr4_ri-lag0.en                            |NON MODIFIED
-internal_fluxes.zero-gr4_ri-lag0.es                            |ADDED
+internal_fluxes.zero-gr4_ri-lag0.es                            |MODIFIED
 internal_fluxes.zero-gr4_ri-lag0.lexc                          |MODIFIED
 internal_fluxes.zero-gr4_ri-lag0.perc                          |NON MODIFIED
 internal_fluxes.zero-gr4_ri-lag0.pn                            |NON MODIFIED
 internal_fluxes.zero-gr4_ri-lag0.pr                            |NON MODIFIED
 internal_fluxes.zero-gr4_ri-lag0.prd                           |NON MODIFIED
 internal_fluxes.zero-gr4_ri-lag0.prr                           |MODIFIED
-internal_fluxes.zero-gr4_ri-lag0.ps                            |ADDED
+internal_fluxes.zero-gr4_ri-lag0.ps                            |NON MODIFIED
 internal_fluxes.zero-gr4_ri-lag0.qd                            |MODIFIED
 internal_fluxes.zero-gr4_ri-lag0.qr                            |MODIFIED
 internal_fluxes.zero-gr4_ri-lag0.qt                            |MODIFIED
 internal_fluxes.zero-gr4_ri-lag0.qup                           |NON MODIFIED
 internal_fluxes.zero-gr4_ri-lr.en                              |NON MODIFIED
-internal_fluxes.zero-gr4_ri-lr.es                              |ADDED
+internal_fluxes.zero-gr4_ri-lr.es                              |MODIFIED
 internal_fluxes.zero-gr4_ri-lr.lexc                            |MODIFIED
 internal_fluxes.zero-gr4_ri-lr.perc                            |NON MODIFIED
 internal_fluxes.zero-gr4_ri-lr.pn                              |NON MODIFIED
 internal_fluxes.zero-gr4_ri-lr.pr                              |NON MODIFIED
 internal_fluxes.zero-gr4_ri-lr.prd                             |NON MODIFIED
 internal_fluxes.zero-gr4_ri-lr.prr                             |MODIFIED
-internal_fluxes.zero-gr4_ri-lr.ps                              |ADDED
+internal_fluxes.zero-gr4_ri-lr.ps                              |NON MODIFIED
 internal_fluxes.zero-gr4_ri-lr.qd                              |MODIFIED
 internal_fluxes.zero-gr4_ri-lr.qr                              |MODIFIED
 internal_fluxes.zero-gr4_ri-lr.qt                              |MODIFIED
 internal_fluxes.zero-gr4_ri-lr.qup                             |NON MODIFIED
 internal_fluxes.zero-gr5-kw.en                                 |NON MODIFIED
-internal_fluxes.zero-gr5-kw.es                                 |ADDED
+internal_fluxes.zero-gr5-kw.es                                 |NON MODIFIED
 internal_fluxes.zero-gr5-kw.lexc                               |NON MODIFIED
 internal_fluxes.zero-gr5-kw.perc                               |NON MODIFIED
 internal_fluxes.zero-gr5-kw.pn                                 |NON MODIFIED
 internal_fluxes.zero-gr5-kw.pr                                 |NON MODIFIED
 internal_fluxes.zero-gr5-kw.prd                                |NON MODIFIED
 internal_fluxes.zero-gr5-kw.prr                                |NON MODIFIED
-internal_fluxes.zero-gr5-kw.ps                                 |ADDED
+internal_fluxes.zero-gr5-kw.ps                                 |NON MODIFIED
 internal_fluxes.zero-gr5-kw.qd                                 |NON MODIFIED
 internal_fluxes.zero-gr5-kw.qim1j                              |NON MODIFIED
 internal_fluxes.zero-gr5-kw.qr                                 |NON MODIFIED
 internal_fluxes.zero-gr5-kw.qt                                 |NON MODIFIED
 internal_fluxes.zero-gr5-lag0.en                               |NON MODIFIED
-internal_fluxes.zero-gr5-lag0.es                               |ADDED
+internal_fluxes.zero-gr5-lag0.es                               |NON MODIFIED
 internal_fluxes.zero-gr5-lag0.lexc                             |NON MODIFIED
 internal_fluxes.zero-gr5-lag0.perc                             |NON MODIFIED
 internal_fluxes.zero-gr5-lag0.pn                               |NON MODIFIED
 internal_fluxes.zero-gr5-lag0.pr                               |NON MODIFIED
 internal_fluxes.zero-gr5-lag0.prd                              |NON MODIFIED
 internal_fluxes.zero-gr5-lag0.prr                              |NON MODIFIED
-internal_fluxes.zero-gr5-lag0.ps                               |ADDED
+internal_fluxes.zero-gr5-lag0.ps                               |NON MODIFIED
 internal_fluxes.zero-gr5-lag0.qd                               |NON MODIFIED
 internal_fluxes.zero-gr5-lag0.qr                               |NON MODIFIED
 internal_fluxes.zero-gr5-lag0.qt                               |NON MODIFIED
 internal_fluxes.zero-gr5-lag0.qup                              |NON MODIFIED
 internal_fluxes.zero-gr5-lr.en                                 |NON MODIFIED
-internal_fluxes.zero-gr5-lr.es                                 |ADDED
+internal_fluxes.zero-gr5-lr.es                                 |NON MODIFIED
 internal_fluxes.zero-gr5-lr.lexc                               |NON MODIFIED
 internal_fluxes.zero-gr5-lr.perc                               |NON MODIFIED
 internal_fluxes.zero-gr5-lr.pn                                 |NON MODIFIED
 internal_fluxes.zero-gr5-lr.pr                                 |NON MODIFIED
 internal_fluxes.zero-gr5-lr.prd                                |NON MODIFIED
 internal_fluxes.zero-gr5-lr.prr                                |NON MODIFIED
-internal_fluxes.zero-gr5-lr.ps                                 |ADDED
+internal_fluxes.zero-gr5-lr.ps                                 |NON MODIFIED
 internal_fluxes.zero-gr5-lr.qd                                 |NON MODIFIED
 internal_fluxes.zero-gr5-lr.qr                                 |NON MODIFIED
 internal_fluxes.zero-gr5-lr.qt                                 |NON MODIFIED
 internal_fluxes.zero-gr5-lr.qup                                |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-kw.en                             |NON MODIFIED
-internal_fluxes.zero-gr5_mlp-kw.es                             |ADDED
+internal_fluxes.zero-gr5_mlp-kw.es                             |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-kw.lexc                           |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-kw.perc                           |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-kw.pn                             |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-kw.pr                             |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-kw.prd                            |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-kw.prr                            |NON MODIFIED
-internal_fluxes.zero-gr5_mlp-kw.ps                             |ADDED
+internal_fluxes.zero-gr5_mlp-kw.ps                             |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-kw.qd                             |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-kw.qim1j                          |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-kw.qr                             |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-kw.qt                             |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lag0.en                           |NON MODIFIED
-internal_fluxes.zero-gr5_mlp-lag0.es                           |ADDED
+internal_fluxes.zero-gr5_mlp-lag0.es                           |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lag0.lexc                         |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lag0.perc                         |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lag0.pn                           |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lag0.pr                           |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lag0.prd                          |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lag0.prr                          |NON MODIFIED
-internal_fluxes.zero-gr5_mlp-lag0.ps                           |ADDED
+internal_fluxes.zero-gr5_mlp-lag0.ps                           |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lag0.qd                           |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lag0.qr                           |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lag0.qt                           |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lag0.qup                          |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lr.en                             |NON MODIFIED
-internal_fluxes.zero-gr5_mlp-lr.es                             |ADDED
+internal_fluxes.zero-gr5_mlp-lr.es                             |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lr.lexc                           |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lr.perc                           |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lr.pn                             |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lr.pr                             |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lr.prd                            |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lr.prr                            |NON MODIFIED
-internal_fluxes.zero-gr5_mlp-lr.ps                             |ADDED
+internal_fluxes.zero-gr5_mlp-lr.ps                             |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lr.qd                             |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lr.qr                             |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lr.qt                             |NON MODIFIED
 internal_fluxes.zero-gr5_mlp-lr.qup                            |NON MODIFIED
 internal_fluxes.zero-gr5_ri-kw.en                              |NON MODIFIED
-internal_fluxes.zero-gr5_ri-kw.es                              |ADDED
+internal_fluxes.zero-gr5_ri-kw.es                              |MODIFIED
 internal_fluxes.zero-gr5_ri-kw.lexc                            |MODIFIED
 internal_fluxes.zero-gr5_ri-kw.perc                            |NON MODIFIED
 internal_fluxes.zero-gr5_ri-kw.pn                              |NON MODIFIED
 internal_fluxes.zero-gr5_ri-kw.pr                              |NON MODIFIED
 internal_fluxes.zero-gr5_ri-kw.prd                             |NON MODIFIED
 internal_fluxes.zero-gr5_ri-kw.prr                             |MODIFIED
-internal_fluxes.zero-gr5_ri-kw.ps                              |ADDED
+internal_fluxes.zero-gr5_ri-kw.ps                              |NON MODIFIED
 internal_fluxes.zero-gr5_ri-kw.qd                              |MODIFIED
 internal_fluxes.zero-gr5_ri-kw.qim1j                           |NON MODIFIED
 internal_fluxes.zero-gr5_ri-kw.qr                              |MODIFIED
 internal_fluxes.zero-gr5_ri-kw.qt                              |MODIFIED
 internal_fluxes.zero-gr5_ri-lag0.en                            |NON MODIFIED
-internal_fluxes.zero-gr5_ri-lag0.es                            |ADDED
+internal_fluxes.zero-gr5_ri-lag0.es                            |MODIFIED
 internal_fluxes.zero-gr5_ri-lag0.lexc                          |MODIFIED
 internal_fluxes.zero-gr5_ri-lag0.perc                          |NON MODIFIED
 internal_fluxes.zero-gr5_ri-lag0.pn                            |NON MODIFIED
 internal_fluxes.zero-gr5_ri-lag0.pr                            |NON MODIFIED
 internal_fluxes.zero-gr5_ri-lag0.prd                           |NON MODIFIED
 internal_fluxes.zero-gr5_ri-lag0.prr                           |MODIFIED
-internal_fluxes.zero-gr5_ri-lag0.ps                            |ADDED
+internal_fluxes.zero-gr5_ri-lag0.ps                            |NON MODIFIED
 internal_fluxes.zero-gr5_ri-lag0.qd                            |MODIFIED
 internal_fluxes.zero-gr5_ri-lag0.qr                            |MODIFIED
 internal_fluxes.zero-gr5_ri-lag0.qt                            |MODIFIED
 internal_fluxes.zero-gr5_ri-lag0.qup                           |NON MODIFIED
 internal_fluxes.zero-gr5_ri-lr.en                              |NON MODIFIED
-internal_fluxes.zero-gr5_ri-lr.es                              |ADDED
+internal_fluxes.zero-gr5_ri-lr.es                              |MODIFIED
 internal_fluxes.zero-gr5_ri-lr.lexc                            |MODIFIED
 internal_fluxes.zero-gr5_ri-lr.perc                            |NON MODIFIED
 internal_fluxes.zero-gr5_ri-lr.pn                              |NON MODIFIED
 internal_fluxes.zero-gr5_ri-lr.pr                              |NON MODIFIED
 internal_fluxes.zero-gr5_ri-lr.prd                             |NON MODIFIED
 internal_fluxes.zero-gr5_ri-lr.prr                             |MODIFIED
-internal_fluxes.zero-gr5_ri-lr.ps                              |ADDED
+internal_fluxes.zero-gr5_ri-lr.ps                              |NON MODIFIED
 internal_fluxes.zero-gr5_ri-lr.qd                              |MODIFIED
 internal_fluxes.zero-gr5_ri-lr.qr                              |MODIFIED
 internal_fluxes.zero-gr5_ri-lr.qt                              |MODIFIED
 internal_fluxes.zero-gr5_ri-lr.qup                             |NON MODIFIED
 internal_fluxes.zero-gr6-kw.en                                 |NON MODIFIED
-internal_fluxes.zero-gr6-kw.es                                 |ADDED
+internal_fluxes.zero-gr6-kw.es                                 |NON MODIFIED
 internal_fluxes.zero-gr6-kw.lexc                               |NON MODIFIED
 internal_fluxes.zero-gr6-kw.perc                               |NON MODIFIED
 internal_fluxes.zero-gr6-kw.pn                                 |NON MODIFIED
@@ -737,14 +743,14 @@ internal_fluxes.zero-gr6-kw.pr                                 |NON MODIFIED
 internal_fluxes.zero-gr6-kw.prd                                |NON MODIFIED
 internal_fluxes.zero-gr6-kw.pre                                |NON MODIFIED
 internal_fluxes.zero-gr6-kw.prr                                |NON MODIFIED
-internal_fluxes.zero-gr6-kw.ps                                 |ADDED
+internal_fluxes.zero-gr6-kw.ps                                 |NON MODIFIED
 internal_fluxes.zero-gr6-kw.qd                                 |NON MODIFIED
 internal_fluxes.zero-gr6-kw.qe                                 |NON MODIFIED
 internal_fluxes.zero-gr6-kw.qim1j                              |NON MODIFIED
 internal_fluxes.zero-gr6-kw.qr                                 |NON MODIFIED
 internal_fluxes.zero-gr6-kw.qt                                 |NON MODIFIED
 internal_fluxes.zero-gr6-lag0.en                               |NON MODIFIED
-internal_fluxes.zero-gr6-lag0.es                               |ADDED
+internal_fluxes.zero-gr6-lag0.es                               |NON MODIFIED
 internal_fluxes.zero-gr6-lag0.lexc                             |NON MODIFIED
 internal_fluxes.zero-gr6-lag0.perc                             |NON MODIFIED
 internal_fluxes.zero-gr6-lag0.pn                               |NON MODIFIED
@@ -752,14 +758,14 @@ internal_fluxes.zero-gr6-lag0.pr                               |NON MODIFIED
 internal_fluxes.zero-gr6-lag0.prd                              |NON MODIFIED
 internal_fluxes.zero-gr6-lag0.pre                              |NON MODIFIED
 internal_fluxes.zero-gr6-lag0.prr                              |NON MODIFIED
-internal_fluxes.zero-gr6-lag0.ps                               |ADDED
+internal_fluxes.zero-gr6-lag0.ps                               |NON MODIFIED
 internal_fluxes.zero-gr6-lag0.qd                               |NON MODIFIED
 internal_fluxes.zero-gr6-lag0.qe                               |NON MODIFIED
 internal_fluxes.zero-gr6-lag0.qr                               |NON MODIFIED
 internal_fluxes.zero-gr6-lag0.qt                               |NON MODIFIED
 internal_fluxes.zero-gr6-lag0.qup                              |NON MODIFIED
 internal_fluxes.zero-gr6-lr.en                                 |NON MODIFIED
-internal_fluxes.zero-gr6-lr.es                                 |ADDED
+internal_fluxes.zero-gr6-lr.es                                 |NON MODIFIED
 internal_fluxes.zero-gr6-lr.lexc                               |NON MODIFIED
 internal_fluxes.zero-gr6-lr.perc                               |NON MODIFIED
 internal_fluxes.zero-gr6-lr.pn                                 |NON MODIFIED
@@ -767,14 +773,14 @@ internal_fluxes.zero-gr6-lr.pr                                 |NON MODIFIED
 internal_fluxes.zero-gr6-lr.prd                                |NON MODIFIED
 internal_fluxes.zero-gr6-lr.pre                                |NON MODIFIED
 internal_fluxes.zero-gr6-lr.prr                                |NON MODIFIED
-internal_fluxes.zero-gr6-lr.ps                                 |ADDED
+internal_fluxes.zero-gr6-lr.ps                                 |NON MODIFIED
 internal_fluxes.zero-gr6-lr.qd                                 |NON MODIFIED
 internal_fluxes.zero-gr6-lr.qe                                 |NON MODIFIED
 internal_fluxes.zero-gr6-lr.qr                                 |NON MODIFIED
 internal_fluxes.zero-gr6-lr.qt                                 |NON MODIFIED
 internal_fluxes.zero-gr6-lr.qup                                |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-kw.en                             |NON MODIFIED
-internal_fluxes.zero-gr6_mlp-kw.es                             |ADDED
+internal_fluxes.zero-gr6_mlp-kw.es                             |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-kw.lexc                           |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-kw.perc                           |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-kw.pn                             |NON MODIFIED
@@ -782,14 +788,14 @@ internal_fluxes.zero-gr6_mlp-kw.pr                             |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-kw.prd                            |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-kw.pre                            |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-kw.prr                            |NON MODIFIED
-internal_fluxes.zero-gr6_mlp-kw.ps                             |ADDED
+internal_fluxes.zero-gr6_mlp-kw.ps                             |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-kw.qd                             |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-kw.qe                             |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-kw.qim1j                          |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-kw.qr                             |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-kw.qt                             |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lag0.en                           |NON MODIFIED
-internal_fluxes.zero-gr6_mlp-lag0.es                           |ADDED
+internal_fluxes.zero-gr6_mlp-lag0.es                           |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lag0.lexc                         |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lag0.perc                         |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lag0.pn                           |NON MODIFIED
@@ -797,14 +803,14 @@ internal_fluxes.zero-gr6_mlp-lag0.pr                           |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lag0.prd                          |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lag0.pre                          |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lag0.prr                          |NON MODIFIED
-internal_fluxes.zero-gr6_mlp-lag0.ps                           |ADDED
+internal_fluxes.zero-gr6_mlp-lag0.ps                           |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lag0.qd                           |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lag0.qe                           |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lag0.qr                           |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lag0.qt                           |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lag0.qup                          |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lr.en                             |NON MODIFIED
-internal_fluxes.zero-gr6_mlp-lr.es                             |ADDED
+internal_fluxes.zero-gr6_mlp-lr.es                             |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lr.lexc                           |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lr.perc                           |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lr.pn                             |NON MODIFIED
@@ -812,14 +818,14 @@ internal_fluxes.zero-gr6_mlp-lr.pr                             |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lr.prd                            |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lr.pre                            |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lr.prr                            |NON MODIFIED
-internal_fluxes.zero-gr6_mlp-lr.ps                             |ADDED
+internal_fluxes.zero-gr6_mlp-lr.ps                             |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lr.qd                             |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lr.qe                             |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lr.qr                             |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lr.qt                             |NON MODIFIED
 internal_fluxes.zero-gr6_mlp-lr.qup                            |NON MODIFIED
 internal_fluxes.zero-grc-kw.en                                 |NON MODIFIED
-internal_fluxes.zero-grc-kw.es                                 |ADDED
+internal_fluxes.zero-grc-kw.es                                 |NON MODIFIED
 internal_fluxes.zero-grc-kw.lexc                               |NON MODIFIED
 internal_fluxes.zero-grc-kw.perc                               |NON MODIFIED
 internal_fluxes.zero-grc-kw.pn                                 |NON MODIFIED
@@ -827,14 +833,14 @@ internal_fluxes.zero-grc-kw.pr                                 |NON MODIFIED
 internal_fluxes.zero-grc-kw.prd                                |NON MODIFIED
 internal_fluxes.zero-grc-kw.prl                                |NON MODIFIED
 internal_fluxes.zero-grc-kw.prr                                |NON MODIFIED
-internal_fluxes.zero-grc-kw.ps                                 |ADDED
+internal_fluxes.zero-grc-kw.ps                                 |NON MODIFIED
 internal_fluxes.zero-grc-kw.qd                                 |NON MODIFIED
 internal_fluxes.zero-grc-kw.qim1j                              |NON MODIFIED
 internal_fluxes.zero-grc-kw.ql                                 |NON MODIFIED
 internal_fluxes.zero-grc-kw.qr                                 |NON MODIFIED
 internal_fluxes.zero-grc-kw.qt                                 |NON MODIFIED
 internal_fluxes.zero-grc-lag0.en                               |NON MODIFIED
-internal_fluxes.zero-grc-lag0.es                               |ADDED
+internal_fluxes.zero-grc-lag0.es                               |NON MODIFIED
 internal_fluxes.zero-grc-lag0.lexc                             |NON MODIFIED
 internal_fluxes.zero-grc-lag0.perc                             |NON MODIFIED
 internal_fluxes.zero-grc-lag0.pn                               |NON MODIFIED
@@ -842,14 +848,14 @@ internal_fluxes.zero-grc-lag0.pr                               |NON MODIFIED
 internal_fluxes.zero-grc-lag0.prd                              |NON MODIFIED
 internal_fluxes.zero-grc-lag0.prl                              |NON MODIFIED
 internal_fluxes.zero-grc-lag0.prr                              |NON MODIFIED
-internal_fluxes.zero-grc-lag0.ps                               |ADDED
+internal_fluxes.zero-grc-lag0.ps                               |NON MODIFIED
 internal_fluxes.zero-grc-lag0.qd                               |NON MODIFIED
 internal_fluxes.zero-grc-lag0.ql                               |NON MODIFIED
 internal_fluxes.zero-grc-lag0.qr                               |NON MODIFIED
 internal_fluxes.zero-grc-lag0.qt                               |NON MODIFIED
 internal_fluxes.zero-grc-lag0.qup                              |NON MODIFIED
 internal_fluxes.zero-grc-lr.en                                 |NON MODIFIED
-internal_fluxes.zero-grc-lr.es                                 |ADDED
+internal_fluxes.zero-grc-lr.es                                 |NON MODIFIED
 internal_fluxes.zero-grc-lr.lexc                               |NON MODIFIED
 internal_fluxes.zero-grc-lr.perc                               |NON MODIFIED
 internal_fluxes.zero-grc-lr.pn                                 |NON MODIFIED
@@ -857,14 +863,14 @@ internal_fluxes.zero-grc-lr.pr                                 |NON MODIFIED
 internal_fluxes.zero-grc-lr.prd                                |NON MODIFIED
 internal_fluxes.zero-grc-lr.prl                                |NON MODIFIED
 internal_fluxes.zero-grc-lr.prr                                |NON MODIFIED
-internal_fluxes.zero-grc-lr.ps                                 |ADDED
+internal_fluxes.zero-grc-lr.ps                                 |NON MODIFIED
 internal_fluxes.zero-grc-lr.qd                                 |NON MODIFIED
 internal_fluxes.zero-grc-lr.ql                                 |NON MODIFIED
 internal_fluxes.zero-grc-lr.qr                                 |NON MODIFIED
 internal_fluxes.zero-grc-lr.qt                                 |NON MODIFIED
 internal_fluxes.zero-grc-lr.qup                                |NON MODIFIED
 internal_fluxes.zero-grc_mlp-kw.en                             |NON MODIFIED
-internal_fluxes.zero-grc_mlp-kw.es                             |ADDED
+internal_fluxes.zero-grc_mlp-kw.es                             |NON MODIFIED
 internal_fluxes.zero-grc_mlp-kw.lexc                           |NON MODIFIED
 internal_fluxes.zero-grc_mlp-kw.perc                           |NON MODIFIED
 internal_fluxes.zero-grc_mlp-kw.pn                             |NON MODIFIED
@@ -872,14 +878,14 @@ internal_fluxes.zero-grc_mlp-kw.pr                             |NON MODIFIED
 internal_fluxes.zero-grc_mlp-kw.prd                            |NON MODIFIED
 internal_fluxes.zero-grc_mlp-kw.prl                            |NON MODIFIED
 internal_fluxes.zero-grc_mlp-kw.prr                            |NON MODIFIED
-internal_fluxes.zero-grc_mlp-kw.ps                             |ADDED
+internal_fluxes.zero-grc_mlp-kw.ps                             |NON MODIFIED
 internal_fluxes.zero-grc_mlp-kw.qd                             |NON MODIFIED
 internal_fluxes.zero-grc_mlp-kw.qim1j                          |NON MODIFIED
 internal_fluxes.zero-grc_mlp-kw.ql                             |NON MODIFIED
 internal_fluxes.zero-grc_mlp-kw.qr                             |NON MODIFIED
 internal_fluxes.zero-grc_mlp-kw.qt                             |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lag0.en                           |NON MODIFIED
-internal_fluxes.zero-grc_mlp-lag0.es                           |ADDED
+internal_fluxes.zero-grc_mlp-lag0.es                           |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lag0.lexc                         |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lag0.perc                         |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lag0.pn                           |NON MODIFIED
@@ -887,14 +893,14 @@ internal_fluxes.zero-grc_mlp-lag0.pr                           |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lag0.prd                          |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lag0.prl                          |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lag0.prr                          |NON MODIFIED
-internal_fluxes.zero-grc_mlp-lag0.ps                           |ADDED
+internal_fluxes.zero-grc_mlp-lag0.ps                           |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lag0.qd                           |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lag0.ql                           |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lag0.qr                           |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lag0.qt                           |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lag0.qup                          |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lr.en                             |NON MODIFIED
-internal_fluxes.zero-grc_mlp-lr.es                             |ADDED
+internal_fluxes.zero-grc_mlp-lr.es                             |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lr.lexc                           |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lr.perc                           |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lr.pn                             |NON MODIFIED
@@ -902,7 +908,7 @@ internal_fluxes.zero-grc_mlp-lr.pr                             |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lr.prd                            |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lr.prl                            |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lr.prr                            |NON MODIFIED
-internal_fluxes.zero-grc_mlp-lr.ps                             |ADDED
+internal_fluxes.zero-grc_mlp-lr.ps                             |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lr.qd                             |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lr.ql                             |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lr.qr                             |NON MODIFIED
@@ -910,144 +916,144 @@ internal_fluxes.zero-grc_mlp-lr.qt                             |NON MODIFIED
 internal_fluxes.zero-grc_mlp-lr.qup                            |NON MODIFIED
 internal_fluxes.zero-grd-kw.ei                                 |NON MODIFIED
 internal_fluxes.zero-grd-kw.en                                 |NON MODIFIED
-internal_fluxes.zero-grd-kw.es                                 |ADDED
+internal_fluxes.zero-grd-kw.es                                 |NON MODIFIED
 internal_fluxes.zero-grd-kw.perc                               |NON MODIFIED
 internal_fluxes.zero-grd-kw.pn                                 |NON MODIFIED
 internal_fluxes.zero-grd-kw.pr                                 |NON MODIFIED
 internal_fluxes.zero-grd-kw.prr                                |NON MODIFIED
-internal_fluxes.zero-grd-kw.ps                                 |ADDED
+internal_fluxes.zero-grd-kw.ps                                 |NON MODIFIED
 internal_fluxes.zero-grd-kw.qim1j                              |NON MODIFIED
 internal_fluxes.zero-grd-kw.qr                                 |NON MODIFIED
 internal_fluxes.zero-grd-kw.qt                                 |NON MODIFIED
 internal_fluxes.zero-grd-lag0.ei                               |NON MODIFIED
 internal_fluxes.zero-grd-lag0.en                               |NON MODIFIED
-internal_fluxes.zero-grd-lag0.es                               |ADDED
+internal_fluxes.zero-grd-lag0.es                               |NON MODIFIED
 internal_fluxes.zero-grd-lag0.perc                             |NON MODIFIED
 internal_fluxes.zero-grd-lag0.pn                               |NON MODIFIED
 internal_fluxes.zero-grd-lag0.pr                               |NON MODIFIED
 internal_fluxes.zero-grd-lag0.prr                              |NON MODIFIED
-internal_fluxes.zero-grd-lag0.ps                               |ADDED
+internal_fluxes.zero-grd-lag0.ps                               |NON MODIFIED
 internal_fluxes.zero-grd-lag0.qr                               |NON MODIFIED
 internal_fluxes.zero-grd-lag0.qt                               |NON MODIFIED
 internal_fluxes.zero-grd-lag0.qup                              |NON MODIFIED
 internal_fluxes.zero-grd-lr.ei                                 |NON MODIFIED
 internal_fluxes.zero-grd-lr.en                                 |NON MODIFIED
-internal_fluxes.zero-grd-lr.es                                 |ADDED
+internal_fluxes.zero-grd-lr.es                                 |NON MODIFIED
 internal_fluxes.zero-grd-lr.perc                               |NON MODIFIED
 internal_fluxes.zero-grd-lr.pn                                 |NON MODIFIED
 internal_fluxes.zero-grd-lr.pr                                 |NON MODIFIED
 internal_fluxes.zero-grd-lr.prr                                |NON MODIFIED
-internal_fluxes.zero-grd-lr.ps                                 |ADDED
+internal_fluxes.zero-grd-lr.ps                                 |NON MODIFIED
 internal_fluxes.zero-grd-lr.qr                                 |NON MODIFIED
 internal_fluxes.zero-grd-lr.qt                                 |NON MODIFIED
 internal_fluxes.zero-grd-lr.qup                                |NON MODIFIED
 internal_fluxes.zero-grd_mlp-kw.ei                             |NON MODIFIED
 internal_fluxes.zero-grd_mlp-kw.en                             |NON MODIFIED
-internal_fluxes.zero-grd_mlp-kw.es                             |ADDED
+internal_fluxes.zero-grd_mlp-kw.es                             |NON MODIFIED
 internal_fluxes.zero-grd_mlp-kw.perc                           |NON MODIFIED
 internal_fluxes.zero-grd_mlp-kw.pn                             |NON MODIFIED
 internal_fluxes.zero-grd_mlp-kw.pr                             |NON MODIFIED
 internal_fluxes.zero-grd_mlp-kw.prr                            |NON MODIFIED
-internal_fluxes.zero-grd_mlp-kw.ps                             |ADDED
+internal_fluxes.zero-grd_mlp-kw.ps                             |NON MODIFIED
 internal_fluxes.zero-grd_mlp-kw.qim1j                          |NON MODIFIED
 internal_fluxes.zero-grd_mlp-kw.qr                             |NON MODIFIED
 internal_fluxes.zero-grd_mlp-kw.qt                             |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lag0.ei                           |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lag0.en                           |NON MODIFIED
-internal_fluxes.zero-grd_mlp-lag0.es                           |ADDED
+internal_fluxes.zero-grd_mlp-lag0.es                           |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lag0.perc                         |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lag0.pn                           |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lag0.pr                           |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lag0.prr                          |NON MODIFIED
-internal_fluxes.zero-grd_mlp-lag0.ps                           |ADDED
+internal_fluxes.zero-grd_mlp-lag0.ps                           |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lag0.qr                           |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lag0.qt                           |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lag0.qup                          |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lr.ei                             |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lr.en                             |NON MODIFIED
-internal_fluxes.zero-grd_mlp-lr.es                             |ADDED
+internal_fluxes.zero-grd_mlp-lr.es                             |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lr.perc                           |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lr.pn                             |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lr.pr                             |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lr.prr                            |NON MODIFIED
-internal_fluxes.zero-grd_mlp-lr.ps                             |ADDED
+internal_fluxes.zero-grd_mlp-lr.ps                             |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lr.qr                             |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lr.qt                             |NON MODIFIED
 internal_fluxes.zero-grd_mlp-lr.qup                            |NON MODIFIED
 internal_fluxes.zero-loieau-kw.ei                              |NON MODIFIED
 internal_fluxes.zero-loieau-kw.en                              |NON MODIFIED
-internal_fluxes.zero-loieau-kw.es                              |ADDED
+internal_fluxes.zero-loieau-kw.es                              |NON MODIFIED
 internal_fluxes.zero-loieau-kw.perc                            |NON MODIFIED
 internal_fluxes.zero-loieau-kw.pn                              |NON MODIFIED
 internal_fluxes.zero-loieau-kw.pr                              |NON MODIFIED
 internal_fluxes.zero-loieau-kw.prd                             |NON MODIFIED
 internal_fluxes.zero-loieau-kw.prr                             |NON MODIFIED
-internal_fluxes.zero-loieau-kw.ps                              |ADDED
+internal_fluxes.zero-loieau-kw.ps                              |NON MODIFIED
 internal_fluxes.zero-loieau-kw.qd                              |NON MODIFIED
 internal_fluxes.zero-loieau-kw.qim1j                           |NON MODIFIED
 internal_fluxes.zero-loieau-kw.qr                              |NON MODIFIED
 internal_fluxes.zero-loieau-kw.qt                              |NON MODIFIED
 internal_fluxes.zero-loieau-lag0.ei                            |NON MODIFIED
 internal_fluxes.zero-loieau-lag0.en                            |NON MODIFIED
-internal_fluxes.zero-loieau-lag0.es                            |ADDED
+internal_fluxes.zero-loieau-lag0.es                            |NON MODIFIED
 internal_fluxes.zero-loieau-lag0.perc                          |NON MODIFIED
 internal_fluxes.zero-loieau-lag0.pn                            |NON MODIFIED
 internal_fluxes.zero-loieau-lag0.pr                            |NON MODIFIED
 internal_fluxes.zero-loieau-lag0.prd                           |NON MODIFIED
 internal_fluxes.zero-loieau-lag0.prr                           |NON MODIFIED
-internal_fluxes.zero-loieau-lag0.ps                            |ADDED
+internal_fluxes.zero-loieau-lag0.ps                            |NON MODIFIED
 internal_fluxes.zero-loieau-lag0.qd                            |NON MODIFIED
 internal_fluxes.zero-loieau-lag0.qr                            |NON MODIFIED
 internal_fluxes.zero-loieau-lag0.qt                            |NON MODIFIED
 internal_fluxes.zero-loieau-lag0.qup                           |NON MODIFIED
 internal_fluxes.zero-loieau-lr.ei                              |NON MODIFIED
 internal_fluxes.zero-loieau-lr.en                              |NON MODIFIED
-internal_fluxes.zero-loieau-lr.es                              |ADDED
+internal_fluxes.zero-loieau-lr.es                              |NON MODIFIED
 internal_fluxes.zero-loieau-lr.perc                            |NON MODIFIED
 internal_fluxes.zero-loieau-lr.pn                              |NON MODIFIED
 internal_fluxes.zero-loieau-lr.pr                              |NON MODIFIED
 internal_fluxes.zero-loieau-lr.prd                             |NON MODIFIED
 internal_fluxes.zero-loieau-lr.prr                             |NON MODIFIED
-internal_fluxes.zero-loieau-lr.ps                              |ADDED
+internal_fluxes.zero-loieau-lr.ps                              |NON MODIFIED
 internal_fluxes.zero-loieau-lr.qd                              |NON MODIFIED
 internal_fluxes.zero-loieau-lr.qr                              |NON MODIFIED
 internal_fluxes.zero-loieau-lr.qt                              |NON MODIFIED
 internal_fluxes.zero-loieau-lr.qup                             |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-kw.ei                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-kw.en                          |NON MODIFIED
-internal_fluxes.zero-loieau_mlp-kw.es                          |ADDED
+internal_fluxes.zero-loieau_mlp-kw.es                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-kw.perc                        |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-kw.pn                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-kw.pr                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-kw.prd                         |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-kw.prr                         |NON MODIFIED
-internal_fluxes.zero-loieau_mlp-kw.ps                          |ADDED
+internal_fluxes.zero-loieau_mlp-kw.ps                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-kw.qd                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-kw.qim1j                       |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-kw.qr                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-kw.qt                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lag0.ei                        |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lag0.en                        |NON MODIFIED
-internal_fluxes.zero-loieau_mlp-lag0.es                        |ADDED
+internal_fluxes.zero-loieau_mlp-lag0.es                        |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lag0.perc                      |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lag0.pn                        |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lag0.pr                        |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lag0.prd                       |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lag0.prr                       |NON MODIFIED
-internal_fluxes.zero-loieau_mlp-lag0.ps                        |ADDED
+internal_fluxes.zero-loieau_mlp-lag0.ps                        |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lag0.qd                        |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lag0.qr                        |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lag0.qt                        |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lag0.qup                       |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lr.ei                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lr.en                          |NON MODIFIED
-internal_fluxes.zero-loieau_mlp-lr.es                          |ADDED
+internal_fluxes.zero-loieau_mlp-lr.es                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lr.perc                        |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lr.pn                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lr.pr                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lr.prd                         |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lr.prr                         |NON MODIFIED
-internal_fluxes.zero-loieau_mlp-lr.ps                          |ADDED
+internal_fluxes.zero-loieau_mlp-lr.ps                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lr.qd                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lr.qr                          |NON MODIFIED
 internal_fluxes.zero-loieau_mlp-lr.qt                          |NON MODIFIED
@@ -1103,7 +1109,7 @@ model_ddt_io.mesh.xmin                                         |NON MODIFIED
 model_ddt_io.mesh.xres                                         |NON MODIFIED
 model_ddt_io.mesh.ymax                                         |NON MODIFIED
 model_ddt_io.mesh.yres                                         |NON MODIFIED
-model_ddt_io.nn_parameters.bias_1                              |MODIFIED
+model_ddt_io.nn_parameters.bias_1                              |NON MODIFIED
 model_ddt_io.nn_parameters.bias_2                              |NON MODIFIED
 model_ddt_io.nn_parameters.bias_3                              |NON MODIFIED
 model_ddt_io.nn_parameters.weight_1                            |NON MODIFIED