resolving conflicts

anandrdbz · Apr 1, 2024 · 2b2da23 · 2b2da23
1 parent 5fc1692
commit 2b2da23
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 232 deletions.
diff --git a/src/simulation/m_rhs.fpp b/src/simulation/m_rhs.fpp
@@ -1895,7 +1895,7 @@ contains
             @:DEALLOCATE_GLOBAL(qL_rsz_vf, qR_rsz_vf)
         end if
 
-        if (weno_Re_flux) then
+        if (any(Re_size > 0) .and. weno_Re_flux) then
             @:DEALLOCATE_GLOBAL(dqL_rsx_vf, dqR_rsx_vf)
 
             if (n > 0) then

diff --git a/src/simulation/m_start_up.fpp b/src/simulation/m_start_up.fpp
@@ -128,7 +128,7 @@ contains
         ! Namelist of the global parameters which may be specified by user
         namelist /user_inputs/ case_dir, run_time_info, m, n, p, dt, &
             t_step_start, t_step_stop, t_step_save, &
-            model_eqns, adv_alphan, &
+            model_eqns, num_fluids, adv_alphan, &
             mpp_lim, time_stepper, weno_eps, weno_flat, &
             riemann_flat, cu_mpi, cu_tensor, &
             mapped_weno, mp_weno, weno_avg, &
@@ -143,7 +143,7 @@ contains
             rhoref, pref, bubbles, bubble_model, &
             R0ref, &
 #:if not MFC_CASE_OPTIMIZATION
-            nb, weno_order, num_fluids, &
+            nb, weno_order, &
 #:endif
             Ca, Web, Re_inv, &
             monopole, mono, num_mono, &

diff --git a/toolchain/mfc/run/:wq b/toolchain/mfc/run/:wq
diff --git a/toolchain/mfc/run/input.py b/toolchain/mfc/run/input.py
@@ -207,7 +207,7 @@ def _default() -> str:
             "pre_process"  : self.__get_pre_fpp,
             "simulation"   : self.__get_sim_fpp,
             "post_process" : self.__get_post_fpp,
-        }.get(build.get_target(target).name, _default)()
+        }.get(build.get_target(target).name, _default)(print)
         return result
 
     def generate_fpp(self, target) -> None:

diff --git a/toolchain/mfc/run/mpi_bins.py b/toolchain/mfc/run/mpi_bins.py