Activate load-balancing

ECP-WarpX · Jan 12, 2025 · eb43087 · eb43087
1 parent e6d93f9
commit eb43087
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/Source/Parallelization/WarpXRegrid.cpp b/Source/Parallelization/WarpXRegrid.cpp
@@ -174,6 +174,14 @@ WarpX::RemakeLevel (int lev, Real /*time*/, const BoxArray& ba, const Distributi
     using ablastr::fields::Direction;
     using warpx::fields::FieldType;
 
+    const auto RemakeMultiFab = [&](auto& mf){
+        if (mf == nullptr) { return; }
+        const IntVect& ng = mf->nGrowVect();
+        auto pmf = std::remove_reference_t<decltype(mf)>{};
+        AllocInitMultiFab(pmf, mf->boxArray(), dm, mf->nComp(), ng, lev, mf->tags()[0]);
+        mf = std::move(pmf);
+    };
+
     bool const eb_enabled = EB::enabled();
     if (ba == boxArray(lev))
     {
@@ -187,6 +195,8 @@ WarpX::RemakeLevel (int lev, Real /*time*/, const BoxArray& ba, const Distributi
         {
             if (eb_enabled) {
                 if (WarpX::electromagnetic_solver_id != ElectromagneticSolverAlgo::PSATD) {
+                    RemakeMultiFab( m_eb_update_E[lev][idim] );
+                    RemakeMultiFab( m_eb_update_B[lev][idim] );
                     if (WarpX::electromagnetic_solver_id == ElectromagneticSolverAlgo::ECT) {
                         m_borrowing[lev][idim] = std::make_unique<amrex::LayoutData<FaceInfoBox>>(amrex::convert(ba, Bfield_fp[lev][idim]->ixType().toIntVect()), dm);
                     }

diff --git a/Source/WarpX.H b/Source/WarpX.H
@@ -1015,7 +1015,7 @@ public:
     /** Set a flag to indicate on which grid points the field `field`
      *  should be updated.
      *
-     * More specifically, this function fill the iMultiFabs in `eb_update`
+     * More specifically, this function fills the iMultiFabs in `eb_update`
      * (which have the same indexType as the MultiFabs in `field`) with 1
      * or 0, depending on whether the grid point is in the valid region
      * or in the embedded boundary.
@@ -1034,7 +1034,7 @@ public:
 
     // TODO documentation
     void MarkECTUpdateECells (
-        std::array< std::unique_ptr<amrex::iMultiFab>,3> & eb_update_B,
+        std::array< std::unique_ptr<amrex::iMultiFab>,3> & eb_update_E,
         ablastr::fields::VectorField const& edge_lengths );
 
     // TODO documentation

diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
@@ -2304,14 +2304,14 @@ WarpX::AllocLevelMFs (int lev, const BoxArray& ba, const DistributionMapping& dm
         if (lev == maxLevel()) {
             if (WarpX::electromagnetic_solver_id != ElectromagneticSolverAlgo::PSATD) {
 
-               AllocInitMultiFab(m_eb_update_E[lev][0], amrex::convert(ba, Ex_nodal_flag), dm, ncomps,
+                AllocInitMultiFab(m_eb_update_E[lev][0], amrex::convert(ba, Ex_nodal_flag), dm, ncomps,
                                   guard_cells.ng_FieldSolver, lev, "m_eb_update_E[x]");
                 AllocInitMultiFab(m_eb_update_E[lev][1], amrex::convert(ba, Ey_nodal_flag), dm, ncomps,
                                   guard_cells.ng_FieldSolver, lev, "m_eb_update_E[y]");
                 AllocInitMultiFab(m_eb_update_E[lev][2], amrex::convert(ba, Ez_nodal_flag), dm, ncomps,
                                   guard_cells.ng_FieldSolver, lev, "m_eb_update_E[z]");
 
-               AllocInitMultiFab(m_eb_update_B[lev][0], amrex::convert(ba, Bx_nodal_flag), dm, ncomps,
+                AllocInitMultiFab(m_eb_update_B[lev][0], amrex::convert(ba, Bx_nodal_flag), dm, ncomps,
                                   guard_cells.ng_FieldSolver, lev, "m_eb_update_B[x]");
                 AllocInitMultiFab(m_eb_update_B[lev][1], amrex::convert(ba, By_nodal_flag), dm, ncomps,
                                   guard_cells.ng_FieldSolver, lev, "m_eb_update_B[y]");