different models in python for hybrid and mhd

Author: UCaromel

.github/workflows/cmake_ubuntu.yml

@@ -88,7 +88,7 @@ jobs:
 
     - name: Build
       working-directory: ${{runner.workspace}}/build
-      run: cmake --build . -j 2
+      run: cmake --build . -j 1
 
     - name: Test
       working-directory: ${{runner.workspace}}/build

pyphare/pyphare/simulator/simulator.py

@@ -2,15 +2,16 @@
 #
 #
 
-import os
-import datetime
 import atexit
+import datetime
+import os
 import time as timem
+from pathlib import Path
+
 import numpy as np
 import pyphare.pharein as ph
-from pathlib import Path
-from . import monitoring as mon
 
+from . import monitoring as mon
 
 life_cycles = {}
 SIM_MONITOR = os.getenv("PHARE_SIM_MON", "False").lower() in ("true", "1", "t")
@@ -26,13 +27,35 @@ def simulator_shutdown():
     life_cycles.clear()
 
 
-def make_cpp_simulator(dim, interp, nbrRefinedPart, hier):
+def make_cpp_simulator(
+    hier,
+    dim,
+    interp,
+    nbrRefinedPart,
+    mhd_timestepper,
+    reconstruction,
+    limiter,
+    riemann,
+    hall,
+    res,
+    hyper_res,
+):
     from pyphare.cpp import cpp_lib
 
     if SCOPE_TIMING:
         mon.timing_setup(cpp_lib())
 
-    make_sim = f"make_simulator_{dim}_{interp}_{nbrRefinedPart}"
+    nbrRefinedPart_suffix = f"_{nbrRefinedPart}" if nbrRefinedPart else ""
+    mhd_timestepper_suffix = f"_{mhd_timestepper}" if mhd_timestepper else ""
+    reconstruction_suffix = f"_{reconstruction}" if reconstruction else ""
+    limiter_suffix = f"_{limiter}" if limiter else ""
+    riemann_suffix = f"_{riemann}" if riemann else ""
+    hall_suffix = "_hall" if hall else ""
+    res_suffix = "_res" if res else ""
+    hyper_res_suffix = "_hyper_res" if hyper_res else ""
+
+    make_sim = f"make_simulator_{dim}_{interp}{nbrRefinedPart_suffix}{mhd_timestepper_suffix}{reconstruction_suffix}{limiter_suffix}{riemann_suffix}{hall_suffix}{res_suffix}{hyper_res_suffix}"
+
     return getattr(cpp_lib(), make_sim)(hier)
 
 
@@ -109,8 +132,8 @@ def __del__(self):
     def setup(self):
         # mostly to detach C++ class construction/dict parsing from C++ Simulator::init
         try:
-            from pyphare.cpp import cpp_lib
             import pyphare.cpp.validate as validate_cpp
+            from pyphare.cpp import cpp_lib
 
             startMPI()
 
@@ -124,11 +147,29 @@ def setup(self):
             ph.populateDict()
             self.cpp_hier = cpp_lib().make_hierarchy()
 
+            refined_particle_nbr = getattr(
+                self.simulation, "refined_particle_nbr", False
+            )
+            mhd_timestepper = getattr(self.simulation, "mhd_timestepper", False)
+            reconstruction = getattr(self.simulation, "reconstruction", False)
+            limiter = getattr(self.simulation, "limiter", False)
+            riemann = getattr(self.simulation, "riemann", False)
+            hall = getattr(self.simulation, "hall", False)
+            res = getattr(self.simulation, "res", False)
+            hyper_res = getattr(self.simulation, "hyper_res", False)
+
             self.cpp_sim = make_cpp_simulator(
+                self.cpp_hier,
                 self.simulation.ndim,
                 self.simulation.interp_order,
-                self.simulation.refined_particle_nbr,
-                self.cpp_hier,
+                refined_particle_nbr,
+                mhd_timestepper,
+                reconstruction,
+                limiter,
+                riemann,
+                hall,
+                res,
+                hyper_res,
             )
             return self
         except Exception:

src/python3/cpp_mhd_parameters.hpp

@@ -195,8 +195,8 @@ class RegistererSelector
 
         bool constexpr compile_one
             = (TI == TimeIntegratorType::TVDRK3 && RC == ReconstructionType::WENOZ
-               && SL == SlopeLimiterType::count && RS == RiemannSolverType::Rusanov
-               && (Hall || !Hall) && !Resistivity && !HyperResistivity);
+               && SL == SlopeLimiterType::count && RS == RiemannSolverType::Rusanov && !Resistivity
+               && !HyperResistivity);
 
         return !compile_one;
     }

src/simulator/simulator.hpp

@@ -474,7 +474,7 @@ void Simulator<_dimension, _interp_order, _nbRefinedPart, MHDTimeStepper>::initi
     try
     {
         if (isInitialized)
-            std::runtime_error("cannot initialize  - simulator already isInitialized");
+            throw std::runtime_error("cannot initialize  - simulator already isInitialized");
 
         if (integrator_ != nullptr)
             integrator_->initialize();

tests/simulator/test_initialization.py

@@ -9,15 +9,12 @@
 from pyphare.core.box import nDBox
 from pyphare.core.phare_utilities import assert_fp_any_all_close
 from pyphare.pharein import ElectronModel, MaxwellianFluidModel
-from pyphare.pharein.diagnostics import (
-    ElectromagDiagnostics,
-    FluidDiagnostics,
-    ParticleDiagnostics,
-)
+from pyphare.pharein.diagnostics import (ElectromagDiagnostics,
+                                         FluidDiagnostics, ParticleDiagnostics)
 from pyphare.pharein.simulation import Simulation
 from pyphare.pharesee.geometry import level_ghost_boxes
-from pyphare.pharesee.hierarchy.hierarchy_utils import merge_particles
 from pyphare.pharesee.hierarchy import hierarchy_from
+from pyphare.pharesee.hierarchy.hierarchy_utils import merge_particles
 from pyphare.pharesee.particles import aggregate as aggregate_particles
 from pyphare.simulator.simulator import Simulator
 
@@ -268,7 +265,7 @@ def _test_B_is_as_provided_by_user(self, dim, interp_order, **kwargs):
 
         from pyphare.pharein import global_vars
 
-        model = global_vars.sim.model
+        model = global_vars.sim.maxwellian_fluid_model
 
         bx_fn = model.model_dict["bx"]
         by_fn = model.model_dict["by"]
@@ -334,7 +331,7 @@ def _test_bulkvel_is_as_provided_by_user(self, dim, interp_order):
 
         from pyphare.pharein import global_vars
 
-        model = global_vars.sim.model
+        model = global_vars.sim.maxwellian_fluid_model
         # protons and beam have same bulk vel here so take only proton func.
         vx_fn = model.model_dict["protons"]["vx"]
         vy_fn = model.model_dict["protons"]["vy"]
@@ -462,7 +459,7 @@ def _test_density_is_as_provided_by_user(self, dim, interp_order):
 
         from pyphare.pharein import global_vars
 
-        model = global_vars.sim.model
+        model = global_vars.sim.maxwellian_fluid_model
         proton_density_fn = model.model_dict["protons"]["density"]
         beam_density_fn = model.model_dict["beam"]["density"]
 
@@ -551,7 +548,7 @@ def _test_density_decreases_as_1overSqrtN(
 
             from pyphare.pharein import global_vars
 
-            model = global_vars.sim.model
+            model = global_vars.sim.maxwellian_fluid_model
             density_fn = model.model_dict["protons"]["density"]
 
             patch = hier.level(0).patches[0]