reduce reliance on WarpX::GetInstance()

Author: lucafedeli88

Source/Diagnostics/Diagnostics.H

@@ -22,7 +22,26 @@
 #include <vector>
 
 /** All types of diagnostics. */
-enum struct DiagTypes {Full, BackTransformed, BoundaryScraping, TimeAveraged};
+enum struct DiagTypes
+{
+    Full,
+    BackTransformed,
+    BoundaryScraping,
+    TimeAveraged
+};
+
+/** A struct containing the parameters required to initialize a diagnostics */
+struct InitDiagnosticsParameters
+{
+    int finest_level;
+    int max_level;
+
+    int do_moving_window;
+    int moving_window_dir;
+    amrex::Real moving_window_x;
+    amrex::Real cell_size_lev0_mwdir;
+};
+
 /**
  * \brief base class for diagnostics.
  * Contains main routines to filter, compute and flush diagnostics.
@@ -71,9 +90,10 @@ public:
      * (including metadata listing the total number of particles) even if the snapshot is incomplete
      */
     virtual void Flush (int i_buffer, bool force_flush) = 0;
+
     /** Initialize pointers to main fields and allocate output multifab m_mf_output. */
-    void InitData ();
-    void InitDataBeforeRestart ();
+    void InitData (const InitDiagnosticsParameters& params);
+    void InitDataBeforeRestart (const InitDiagnosticsParameters& params);
     void InitDataAfterRestart ();
     /** Initialize functors that store pointers to the fields requested by the user.
      *
@@ -193,7 +213,7 @@ protected:
     /** Whether to output a message when diagnostics are output */
     int m_verbose = 2;
     /** Initialize member variables of the base Diagnostics class. */
-    void InitBaseData ();
+    void InitBaseData (const InitDiagnosticsParameters& params);
     /** Initialize m_mf_output vectors and data required to construct the buffers
      * \param[in] i_buffer index of buffer for which the output MultiFab is defined.
      * \param[in] lev level on which the output MultiFab is defined

Source/Diagnostics/Diagnostics.cpp

@@ -325,10 +325,10 @@ Diagnostics::BaseReadParameters ()
 
 
 void
-Diagnostics::InitDataBeforeRestart ()
+Diagnostics::InitDataBeforeRestart (const InitDiagnosticsParameters& params)
 {
     // initialize member variables and arrays in base class::Diagnostics
-    InitBaseData();
+    InitBaseData(params);
     // initialize member variables and arrays specific to each derived class
     // (FullDiagnostics, BTDiagnostics, etc.)
     DerivedInitData();
@@ -404,15 +404,10 @@ Diagnostics::InitDataAfterRestart ()
 
 
 void
-Diagnostics::InitData ()
+Diagnostics::InitData (const InitDiagnosticsParameters& params)
 {
-    auto& warpx = WarpX::GetInstance();
-
-    // Get current finest level available
-    const int finest_level = warpx.finestLevel();
-
     // initialize member variables and arrays in base class::Diagnostics
-    InitBaseData();
+    InitBaseData(params);
     // initialize member variables and arrays specific to each derived class
     // (FullDiagnostics, BTDiagnostics, etc.)
     DerivedInitData();
@@ -421,7 +416,7 @@ Diagnostics::InitData ()
         // This includes full diagnostics and BTD as well as cell-center functors for BTD.
         // Note that the cell-centered data for BTD is computed for all levels and hence
         // the corresponding functor is also initialized for all the levels
-        for (int lev = 0; lev <= finest_level; ++lev) {
+        for (int lev = 0; lev <= params.finest_level; ++lev) {
             // allocate and initialize m_all_field_functors depending on diag type
             InitializeFieldFunctors(lev);
         }
@@ -484,24 +479,23 @@ Diagnostics::InitData ()
 
 
 void
-Diagnostics::InitBaseData ()
+Diagnostics::InitBaseData (const InitDiagnosticsParameters& params)
 {
-    auto & warpx = WarpX::GetInstance();
     // Number of levels in the simulation at the current timestep
-    nlev = warpx.finestLevel() + 1;
+    nlev = params.finest_level + 1;
     // default number of levels to be output = nlev
     nlev_output = nlev;
     // Maximum number of levels that will be allocated in the simulation
-    nmax_lev = warpx.maxLevel() + 1;
+    nmax_lev = params.max_level + 1;
     m_all_field_functors.resize( nmax_lev );
 
     // For restart, move the m_lo and m_hi of the diag consistent with the
     // current moving_window location
-    if (WarpX::do_moving_window) {
-        const int moving_dir = WarpX::moving_window_dir;
-        const int shift_num_base = static_cast<int>((warpx.getmoving_window_x() - m_lo[moving_dir]) / warpx.Geom(0).CellSize(moving_dir) );
-        m_lo[moving_dir] += shift_num_base * warpx.Geom(0).CellSize(moving_dir);
-        m_hi[moving_dir] += shift_num_base * warpx.Geom(0).CellSize(moving_dir);
+    if (params.do_moving_window) {
+        const int moving_dir = params.moving_window_dir;
+        const int shift_num_base = static_cast<int>((params.moving_window_x - m_lo[moving_dir]) / params.cell_size_lev0_mwdir);
+        m_lo[moving_dir] += shift_num_base * params.cell_size_lev0_mwdir;
+        m_hi[moving_dir] += shift_num_base * params.cell_size_lev0_mwdir;
     }
     // Construct Flush class.
     if        (m_format == "plotfile"){

Source/Diagnostics/MultiDiagnostics.H

@@ -22,7 +22,7 @@ public:
     /** \brief Read Input parameters. Called in constructor. */
     void ReadParameters ();
     /** \brief Loop over diags in alldiags and call their InitDiags */
-    void InitData ();
+    void InitData (const InitDiagnosticsParameters& params);
     /** Check if any diagnostics will do compute and pack. */
     bool DoComputeAndPack (int step, bool force_flush=false);
     /** \brief Called at each iteration. Compute diags and flush. */

Source/Diagnostics/MultiDiagnostics.cpp

@@ -34,10 +34,10 @@ MultiDiagnostics::MultiDiagnostics ()
 }
 
 void
-MultiDiagnostics::InitData ()
+MultiDiagnostics::InitData (const InitDiagnosticsParameters& params)
 {
     for( auto& diag : alldiags ){
-        diag->InitData();
+        diag->InitData(params);
     }
 }
 

Source/Diagnostics/WarpXIO.cpp

@@ -18,6 +18,7 @@
 #include "Utils/TextMsg.H"
 #include "Utils/WarpXProfilerWrapper.H"
 #include "WarpX.H"
+#include "Diagnostics.H"
 #include "Diagnostics/MultiDiagnostics.H"
 #include "Diagnostics/ReducedDiags/MultiReducedDiags.H"
 
@@ -229,13 +230,19 @@ WarpX::InitFromCheckpoint ()
         is >> time_of_last_gal_shift;
         ablastr::utils::text::goto_next_line(is);
 
+        // Parameters used to initialize diagnostics
+        const auto init_diag_params = InitDiagnosticsParameters {
+            finestLevel(), maxLevel(),
+            do_moving_window, moving_window_dir,
+            moving_window_x, Geom(0).CellSize(moving_window_dir)};
+
         for (int idiag = 0; idiag < multi_diags->GetTotalDiags(); ++idiag)
         {
             if( multi_diags->diagstypes(idiag) == DiagTypes::BackTransformed )
             {
                 auto& diag = multi_diags->GetDiag(idiag);
                 if (diag.getnumbuffers() > 0) {
-                    diag.InitDataBeforeRestart();
+                    diag.InitDataBeforeRestart(init_diag_params);
                     for (int i_buffer=0; i_buffer<diag.getnumbuffers(); ++i_buffer){
                         amrex::Real tlab;
                         is >> tlab;
@@ -270,10 +277,10 @@ WarpX::InitFromCheckpoint ()
                     }
                     diag.InitDataAfterRestart();
                 } else {
-                    diag.InitData();
+                    diag.InitData(init_diag_params);
                 }
             } else {
-                multi_diags->GetDiag(idiag).InitData();
+                multi_diags->GetDiag(idiag).InitData(init_diag_params);
             }
         }
     }

Source/Initialization/WarpXInitData.cpp

@@ -699,7 +699,14 @@ WarpX::AddExternalFields (int const lev)
 
 void
 WarpX::InitDiagnostics () {
-    multi_diags->InitData();
+
+    // Parameters used to initialize diagnostics
+    const auto init_diag_params = InitDiagnosticsParameters {
+        finestLevel(), maxLevel(),
+        do_moving_window, moving_window_dir,
+        moving_window_x, Geom(0).CellSize(moving_window_dir)};
+
+    multi_diags->InitData(init_diag_params);
     reduced_diags->InitData();
 }