prepare rebasing on master for electromag diag writter

Author: UCaromel

pyphare/pyphare/pharein/diagnostics.py

@@ -196,6 +196,8 @@ def _setSubTypeAttributes(self, **kwargs):
                 MHDDiagnostics.mhd_quantities
             )
             raise ValueError(error_msg.format(kwargs["quantity"]))
+        elif kwargs["quantity"] == "B":
+            self.quantity = "/EM_B"
         else:
             self.quantity = "/mhd/" + kwargs["quantity"]
 

pyphare/pyphare/pharein/initialize/hybrid.py

@@ -49,8 +49,8 @@ def populateDict(sim):
 
     add_string("simulation/electromag/name", "EM")
     add_string("simulation/electromag/electric/name", "E")
-
     add_string("simulation/electromag/magnetic/name", "B")
+
     maginit_path = "simulation/electromag/magnetic/initializer/"
     addInitFunction(maginit_path + "x_component", fn_wrapper(modelDict["bx"]))
     addInitFunction(maginit_path + "y_component", fn_wrapper(modelDict["by"]))

src/diagnostic/detail/h5writer.hpp

@@ -76,7 +76,8 @@ class H5Writer
         else if constexpr (std::is_same_v<Identifier, MHDIdentifier>)
             typeWriters_ = {
                 {"meta", make_writer<MetaDiagnosticWriter<This>>()},
-                {"mhd", make_writer<MHDDiagnosticWriter<This>>()} //
+                {"mhd", make_writer<MHDDiagnosticWriter<This>>()},
+                {"electromag", make_writer<ElectromagDiagnosticWriter<This>>()} //
             };
     }
 

src/diagnostic/detail/types/mhd.hpp

@@ -11,7 +11,6 @@ namespace PHARE::diagnostic::h5
 /* Possible outputs
  * /t#/pl#/p#/mhd/density
  * /t#/pl#/p#/mhd/velocity/(x,y,z)
- * /t#/pl#/p#/mhd/B/(x,y,z)
  * /t#/pl#/p#/mhd/pressure
  * /t#/pl#/p#/mhd/rhoV/(x,y,z)
  * /t#/pl#/p#/mhd/Etot
@@ -67,7 +66,7 @@ template<typename H5Writer>
 void MHDDiagnosticWriter<H5Writer>::createFiles(DiagnosticProperties& diagnostic)
 {
     std::string tree{"/mhd/"};
-    checkCreateFileFor_(diagnostic, fileData_, tree, "rho", "V", "B", "P", "rhoV", "Etot");
+    checkCreateFileFor_(diagnostic, fileData_, tree, "rho", "V", "P", "rhoV", "Etot");
 }
 
 template<typename H5Writer>
@@ -80,7 +79,7 @@ void MHDDiagnosticWriter<H5Writer>::compute(DiagnosticProperties& diagnostic)
 
     auto& rho  = modelView.getRho();
     auto& V    = modelView.getV();
-    auto& B    = modelView.getB();
+    auto& B    = *modelView.getElectromagFields()[0];
     auto& P    = modelView.getP();
     auto& rhoV = modelView.getRhoV();
     auto& Etot = modelView.getEtot();
@@ -115,7 +114,6 @@ void MHDDiagnosticWriter<H5Writer>::getDataSetInfo(DiagnosticProperties& diagnos
     auto& h5Writer         = this->h5Writer_;
     auto& rho              = h5Writer.modelView().getRho();
     auto& V                = h5Writer.modelView().getV();
-    auto& B                = h5Writer.modelView().getB();
     auto& P                = h5Writer.modelView().getP();
     auto& rhoV             = h5Writer.modelView().getRhoV();
     auto& Etot             = h5Writer.modelView().getEtot();
@@ -147,8 +145,6 @@ void MHDDiagnosticWriter<H5Writer>::getDataSetInfo(DiagnosticProperties& diagnos
         infoDS(rho, "rho", patchAttributes[lvlPatchID]["mhd"]);
     if (isActiveDiag(diagnostic, tree, "V"))
         infoVF(V, "V", patchAttributes[lvlPatchID]["mhd"]);
-    if (isActiveDiag(diagnostic, tree, "B"))
-        infoVF(B, "B", patchAttributes[lvlPatchID]["mhd"]);
     if (isActiveDiag(diagnostic, tree, "P"))
         infoDS(P, "P", patchAttributes[lvlPatchID]["mhd"]);
     if (isActiveDiag(diagnostic, tree, "rhoV"))
@@ -200,8 +196,6 @@ void MHDDiagnosticWriter<H5Writer>::initDataSets(
             initDS(path, attr["mhd"], "rho", null);
         if (isActiveDiag(diagnostic, tree, "V"))
             initVF(path, attr["mhd"], "V", null);
-        if (isActiveDiag(diagnostic, tree, "B"))
-            initVF(path, attr["mhd"], "B", null);
         if (isActiveDiag(diagnostic, tree, "P"))
             initDS(path, attr["mhd"], "P", null);
         if (isActiveDiag(diagnostic, tree, "rhoV"))
@@ -219,7 +213,6 @@ void MHDDiagnosticWriter<H5Writer>::write(DiagnosticProperties& diagnostic)
     auto& h5Writer = this->h5Writer_;
     auto& rho      = h5Writer.modelView().getRho();
     auto& V        = h5Writer.modelView().getV();
-    auto& B        = h5Writer.modelView().getB();
     auto& P        = h5Writer.modelView().getP();
     auto& rhoV     = h5Writer.modelView().getRhoV();
     auto& Etot     = h5Writer.modelView().getEtot();
@@ -237,8 +230,6 @@ void MHDDiagnosticWriter<H5Writer>::write(DiagnosticProperties& diagnostic)
         writeDS(path + "rho", rho);
     if (isActiveDiag(diagnostic, tree, "V"))
         writeTF(path + "V", V);
-    if (isActiveDiag(diagnostic, tree, "B"))
-        writeTF(path + "B", B);
     if (isActiveDiag(diagnostic, tree, "P"))
         writeDS(path + "P", P);
     if (isActiveDiag(diagnostic, tree, "rhoV"))

src/diagnostic/diagnostic_manager.hpp

@@ -29,7 +29,7 @@ void registerDiagnostics(DiagManager& dMan, initializer::PHAREDict const& diagsP
         }
         else if constexpr (std::is_same_v<typename DiagManager::Identifier, MHDIdentifier>)
         {
-            return std::vector<std::string>{"mhd", "meta"};
+            return std::vector<std::string>{"mhd", "meta", "electromag"};
         }
     }();
 

src/diagnostic/diagnostic_model_view.hpp

@@ -191,7 +191,11 @@ class ModelView<Hierarchy, Model, MHDIdentifier> : public BaseModelView<Hierarch
 
     NO_DISCARD VecField& getV() const { return this->model_.state.V; }
 
-    NO_DISCARD VecField& getB() const { return this->model_.state.B; }
+    // compatibility with the electromag diagnostic writer
+    NO_DISCARD std::vector<VecField*> getElectromagFields() const
+    {
+        return {&this->model_.state.B};
+    }
 
     NO_DISCARD Field& getP() const { return this->model_.state.P; }
 

tests/functional/mhd_orszagtang/orszag_tang_merged.py

@@ -12,7 +12,7 @@
 cpp = cpp_lib()
 startMPI()
 
-diag_outputs = "phare_outputs/test/orszag-tang/2d"
+diag_outputs = "phare_outputs"
 time_step_nbr = 357
 time_step = 0.0014
 dt = 10 * time_step
@@ -78,8 +78,10 @@ def p(x, y):
 
     ph.MHDModel(density=density, vx=vx, vy=vy, vz=vz, bx=bx, by=by, bz=bz, p=p)
 
-    for quantity in ["rho", "V", "B", "P"]:
-        ph.MHDDiagnostics(quantity=quantity, write_timestamps=timestamps)
+    ph.ElectromagDiagnostics(quantity="B", write_timestamps=timestamps)
+
+    # for quantity in ["rho", "V", "B", "P"]:
+    #     ph.MHDDiagnostics(quantity=quantity, write_timestamps=timestamps)
 
     return sim