starting refactor

Author: UCaromel

pyphare/pyphare/mock_mhd_simulator/__init__.py

@@ -79,20 +79,14 @@ def add_double(path, val):
             add_double("mesh_size/z", simulation.dl[2])
             add_double("origin/z", simulation.origin[2])
 
-    add_double("godunov/resistivity", simulation.eta)
-    add_double("godunov/hyper_resistivity", simulation.nu)
-    add_double("godunov/heat_capacity_ratio", simulation.gamma)
-    add_string("godunov/terms", simulation.terms)
-    add_string("godunov/reconstruction", simulation.reconstruction)
-    add_string("godunov/limiter", simulation.limiter)
-    add_string("godunov/riemann", simulation.riemann)
+    add_double("fv_method/resistivity", simulation.eta)
+    add_double("fv_method/hyper_resistivity", simulation.nu)
+    add_double("fv_method/heat_capacity_ratio", simulation.gamma)
+    add_double("fv_euler/heat_capacity_ratio", simulation.gamma)
     add_double("to_primitive/heat_capacity_ratio", simulation.gamma)
     add_double("to_conservative/heat_capacity_ratio", simulation.gamma)
-    add_string("integrator", simulation.integrator)
 
     add_string("state/name", "state")
-    add_string("state1/name", "state1")
-    add_string("state2/name", "state2")
 
     d = simulation.model.model_dict
 
@@ -104,21 +98,3 @@ def add_double(path, val):
     addInitFunction("state/magnetic/initializer/y_component", fn_wrapper(d["by"]))
     addInitFunction("state/magnetic/initializer/z_component", fn_wrapper(d["bz"]))
     addInitFunction("state/pressure/initializer", fn_wrapper(d["p"]))
-
-    addInitFunction("state1/density/initializer", fn_wrapper(d["density"]))
-    addInitFunction("state1/velocity/initializer/x_component", fn_wrapper(d["vx"]))
-    addInitFunction("state1/velocity/initializer/y_component", fn_wrapper(d["vy"]))
-    addInitFunction("state1/velocity/initializer/z_component", fn_wrapper(d["vz"]))
-    addInitFunction("state1/magnetic/initializer/x_component", fn_wrapper(d["bx"]))
-    addInitFunction("state1/magnetic/initializer/y_component", fn_wrapper(d["by"]))
-    addInitFunction("state1/magnetic/initializer/z_component", fn_wrapper(d["bz"]))
-    addInitFunction("state1/pressure/initializer", fn_wrapper(d["p"]))
-
-    addInitFunction("state2/density/initializer", fn_wrapper(d["density"]))
-    addInitFunction("state2/velocity/initializer/x_component", fn_wrapper(d["vx"]))
-    addInitFunction("state2/velocity/initializer/y_component", fn_wrapper(d["vy"]))
-    addInitFunction("state2/velocity/initializer/z_component", fn_wrapper(d["vz"]))
-    addInitFunction("state2/magnetic/initializer/x_component", fn_wrapper(d["bx"]))
-    addInitFunction("state2/magnetic/initializer/y_component", fn_wrapper(d["by"]))
-    addInitFunction("state2/magnetic/initializer/z_component", fn_wrapper(d["bz"]))
-    addInitFunction("state2/pressure/initializer", fn_wrapper(d["p"]))

pyphare/pyphare/mock_mhd_simulator/simulator.py

@@ -7,10 +7,25 @@ def pyMHD():
     return importlib.import_module("pybindlibs.pyMHD")
 
 
-def make_cpp_simulator(dim, interp):
+def make_cpp_simulator(
+    dim,
+    interp,
+    time_integrator,
+    reconstruction,
+    riemann,
+    hall=False,
+    resistivity=False,
+    hyper_resistivity=False,
+    limiter="",
+):
     import pybindlibs.pyMHD
 
-    make_sim = f"make_mhd_mock_simulator_{dim}_{interp}"
+    hall_suffix = "_hall" if hall else ""
+    resistivity_suffix = "_res" if resistivity else ""
+    hyper_res_suffix = "_hyperres" if hyper_resistivity else ""
+    limiter_suffix = f"_{limiter}" if limiter else ""
+
+    make_sim = f"make_mhd_mock_simulator_{dim}_{interp}_{time_integrator}_{reconstruction}{limiter_suffix}_{riemann}{hall_suffix}{resistivity_suffix}{hyper_res_suffix}"
     return getattr(pyMHD(), make_sim)()
 
 
@@ -35,9 +50,22 @@ def initialize(self):
             )
 
         populateDict()
+
+        hall = getattr(self.simulation, "hall", False)
+        resistivity = getattr(self.simulation, "resistivity", False)
+        hyper_resistivity = getattr(self.simulation, "hyper_resistivity", False)
+        limiter = getattr(self.simulation, "limiter", "")
+
         self.cpp_sim = make_cpp_simulator(
             self.simulation.ndim,
             self.simulation.order,
+            self.simulation.time_integrator,
+            self.simulation.reconstruction,
+            self.simulation.riemann,
+            hall,
+            resistivity,
+            hyper_resistivity,
+            limiter,
         )
 
     def _check_init(self):

res/cmake/test.cmake

@@ -30,6 +30,7 @@ if (test AND ${PHARE_EXEC_LEVEL_MIN} GREATER 0) # 0 = no tests
   add_subdirectory(tests/core/numerics/faraday)
   add_subdirectory(tests/core/numerics/ohm)
   add_subdirectory(tests/core/numerics/ion_updater)
+  add_subdirectory(tests/core/numerics/mock_mhd_simulator)
 
 
   add_subdirectory(tests/initializer)