Remove call to WarpX::GetInstance from InitializeMacroMultiFabUsingPa…

…rser (#4138) * remove call to WarpX::GetInstance from InitializeMacroMultiFabUsingParser * fix bug * fix bugs
ECP-WarpX · Nov 3, 2023 · 707e0bf · 707e0bf
1 parent c034b66
commit 707e0bf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.H
@@ -49,7 +49,8 @@ public:
       */
      void InitializeMacroMultiFabUsingParser (amrex::MultiFab *macro_mf,
                                   amrex::ParserExecutor<3> const& macro_parser,
-                                  int lev);
+                                  const amrex::GpuArray<amrex::Real, AMREX_SPACEDIM>& dx_lev,
+                                  const amrex::RealBox& prob_domain_lev);
 
      /** Gpu Vector with index type of the conductivity multifab */
      amrex::GpuArray<int, 3> sigma_IndexType;

diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp
@@ -144,7 +144,8 @@ MacroscopicProperties::InitData ()
 
     } else if (m_sigma_s == "parse_sigma_function") {
 
-        InitializeMacroMultiFabUsingParser(m_sigma_mf.get(), m_sigma_parser->compile<3>(), lev);
+        InitializeMacroMultiFabUsingParser(m_sigma_mf.get(), m_sigma_parser->compile<3>(),
+            warpx.Geom(lev).CellSizeArray(), warpx.Geom(lev).ProbDomain());
     }
     // Initialize epsilon
     if (m_epsilon_s == "constant") {
@@ -153,7 +154,8 @@ MacroscopicProperties::InitData ()
 
     } else if (m_epsilon_s == "parse_epsilon_function") {
 
-        InitializeMacroMultiFabUsingParser(m_eps_mf.get(), m_epsilon_parser->compile<3>(), lev);
+        InitializeMacroMultiFabUsingParser(m_eps_mf.get(), m_epsilon_parser->compile<3>(),
+        warpx.Geom(lev).CellSizeArray(), warpx.Geom(lev).ProbDomain());
 
     }
     // In the Maxwell solver, `epsilon` is used in the denominator.
@@ -169,7 +171,8 @@ MacroscopicProperties::InitData ()
 
     } else if (m_mu_s == "parse_mu_function") {
 
-        InitializeMacroMultiFabUsingParser(m_mu_mf.get(), m_mu_parser->compile<3>(), lev);
+        InitializeMacroMultiFabUsingParser(m_mu_mf.get(), m_mu_parser->compile<3>(),
+            warpx.Geom(lev).CellSizeArray(), warpx.Geom(lev).ProbDomain());
 
     }
 
@@ -204,11 +207,9 @@ void
 MacroscopicProperties::InitializeMacroMultiFabUsingParser (
                        amrex::MultiFab *macro_mf,
                        amrex::ParserExecutor<3> const& macro_parser,
-                       const int lev)
+                       const amrex::GpuArray<amrex::Real, AMREX_SPACEDIM>& dx_lev,
+                       const amrex::RealBox& prob_domain_lev)
 {
-    WarpX& warpx = WarpX::GetInstance();
-    const amrex::GpuArray<amrex::Real, AMREX_SPACEDIM> dx_lev = warpx.Geom(lev).CellSizeArray();
-    const amrex::RealBox& real_box = warpx.Geom(lev).ProbDomain();
     const amrex::IntVect iv = macro_mf->ixType().toIntVect();
     for ( amrex::MFIter mfi(*macro_mf, TilingIfNotGPU()); mfi.isValid(); ++mfi ) {
         // Initialize ghost cells in addition to valid cells
@@ -223,20 +224,20 @@ MacroscopicProperties::InitializeMacroMultiFabUsingParser (
                 const amrex::Real x = 0._rt;
                 const amrex::Real y = 0._rt;
                 const amrex::Real fac_z = (1._rt - iv[0]) * dx_lev[0] * 0.5_rt;
-                const amrex::Real z = j * dx_lev[0] + real_box.lo(0) + fac_z;
+                const amrex::Real z = j * dx_lev[0] + prob_domain_lev.lo(0) + fac_z;
 #elif defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ)
                 const amrex::Real fac_x = (1._rt - iv[0]) * dx_lev[0] * 0.5_rt;
-                const amrex::Real x = i * dx_lev[0] + real_box.lo(0) + fac_x;
+                const amrex::Real x = i * dx_lev[0] + prob_domain_lev.lo(0) + fac_x;
                 const amrex::Real y = 0._rt;
                 const amrex::Real fac_z = (1._rt - iv[1]) * dx_lev[1] * 0.5_rt;
-                const amrex::Real z = j * dx_lev[1] + real_box.lo(1) + fac_z;
+                const amrex::Real z = j * dx_lev[1] + prob_domain_lev.lo(1) + fac_z;
 #else
                 const amrex::Real fac_x = (1._rt - iv[0]) * dx_lev[0] * 0.5_rt;
-                const amrex::Real x = i * dx_lev[0] + real_box.lo(0) + fac_x;
+                const amrex::Real x = i * dx_lev[0] + prob_domain_lev.lo(0) + fac_x;
                 const amrex::Real fac_y = (1._rt - iv[1]) * dx_lev[1] * 0.5_rt;
-                const amrex::Real y = j * dx_lev[1] + real_box.lo(1) + fac_y;
+                const amrex::Real y = j * dx_lev[1] + prob_domain_lev.lo(1) + fac_y;
                 const amrex::Real fac_z = (1._rt - iv[2]) * dx_lev[2] * 0.5_rt;
-                const amrex::Real z = k * dx_lev[2] + real_box.lo(2) + fac_z;
+                const amrex::Real z = k * dx_lev[2] + prob_domain_lev.lo(2) + fac_z;
 #endif
                 // initialize the macroparameter
                 macro_fab(i,j,k) = macro_parser(x,y,z);