second order

corrected van leer slope limiter

second order

corrected van leer slope limiter

Author: UCaromel

pyphare/pyphare/mock_mhd_simulator/__init__.py

@@ -1,8 +1,10 @@
 import numpy as np
 
+
 def is_scalar(arg):
     return not isinstance(arg, (list, tuple)) and not is_nd_array(arg)
 
+
 def is_nd_array(arg):
     return isinstance(arg, np.ndarray)
 
@@ -45,10 +47,12 @@ def clearDict():
 
     pp.stop()
 
+
 def populateDict():
-    from .global_vars import sim as simulation
     import pybindlibs.dictator as pp
 
+    from .global_vars import sim as simulation
+
     def add_int(path, val):
         pp.add_int(path, int(val))
 
@@ -79,10 +83,14 @@ def add_double(path, val):
     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("to_primitive/heat_capacity_ratio", simulation.gamma)
     add_double("to_conservative/heat_capacity_ratio", simulation.gamma)
+    add_string("integrator", simulation.integrator)
 
-    d=simulation.model.model_dict
+    d = simulation.model.model_dict
 
     addInitFunction("density/initializer", fn_wrapper(d["density"]))
     addInitFunction("velocity/initializer/x_component", fn_wrapper(d["vx"]))

src/amr/solvers/solver_mhd.hpp

@@ -87,12 +87,15 @@ class SolverMHD : public ISolver<AMR_Types>
     ConstrainedTransport_t constrained_transport_;
     Faraday_t faraday_;
 
+    std::string const integrator_;
+
 public:
     SolverMHD(PHARE::initializer::PHAREDict const& dict)
         : ISolver<AMR_Types>{"MHDSolver"}
         , godunov_{dict["godunov"]}
         , to_primitive_{dict["to_primitive"]}
         , to_conservative_{dict["to_conservative"]}
+        , integrator_{dict["integrator"].template to<std::string>()}
     {
     }
 
@@ -251,14 +254,21 @@ void SolverMHD<MHDModel, AMR_Types, Messenger, ModelViews_t>::time_integrator_(
     to_conservative_(views.layouts, views.rho, views.V, views.B, views.P, views.rhoV, views.Etot);
 
     Q Un = make_q(views.rho, views.rhoV, views.B, views.Etot);
-    // Q U1(views.rho1, views.rhoV1, views.B1, views.Etot1);
 
     Q F_x = make_q(views.rho_x, views.rhoV_x, views.B_x, views.Etot_x);
 
     if constexpr (dimension == 1)
     {
-        euler_(fromCoarser, level, newTime, views.layouts, Un, views.E, views.model().state.E, Un,
-               dt, F_x);
+        if (integrator_ == "euler")
+            euler_(fromCoarser, level, newTime, views.layouts, Un, views.E, views.model().state.E,
+                   Un, dt, F_x);
+        /*else if (integrator_ == "TVDRK2")*/
+        /*{*/
+        /*    Q U1(views.rho1, views.rhoV1, views.B1, views.Etot1);*/
+        /*    euler_(fromCoarser, level, newTime, views.layouts, Un, views.E,
+         * views.model().state.E,*/
+        /*           U1, dt, F_x);*/
+        /*}*/
     }
     if constexpr (dimension >= 2)
     {