keep moving EB functions out of WarpX class

lucafedeli88 · Jul 22, 2024 · 82a7102 · 82a7102
1 parent 1492442
commit 82a7102
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/Source/EmbeddedBoundary/WarpXInitEB.H b/Source/EmbeddedBoundary/WarpXInitEB.H
@@ -51,6 +51,8 @@ namespace warpx::embedded_boundary
 
     public:
 
+        EmbeddedBoundary(int nlevs_max);
+
         /**
         * \brief Initialize information for cell extensions.
         *        The flags convention for m_flag_info_face is as follows

diff --git a/Source/EmbeddedBoundary/WarpXInitEB.cpp b/Source/EmbeddedBoundary/WarpXInitEB.cpp
@@ -315,6 +315,21 @@ ScaleAreas(std::array< std::unique_ptr<amrex::MultiFab>, 3 >& face_areas,
 }
 
 
+void
+EmbeddedBoundary::EmbeddedBoundary(const int nlevs_max)
+{
+    m_field_factory.resize(nlevs_max);
+
+    for (int lev = 0; lev < nlevs_max; ++lev)
+    {
+        int max_guard = guard_cells.ng_FieldSolver.max();
+        m_field_factory[lev] = amrex::makeEBFabFactory(
+            Geom(lev), ba, dm,
+            {max_guard, max_guard, max_guard},
+            amrex::EBSupport::full);
+    }
+}
+
 void
 EmbeddedBoundary::MarkCells(const std::array<amrex::Real,3>& cell_size, const int max_level)
 {

diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
@@ -406,7 +406,9 @@ WarpX::WarpX ()
     costs.resize(nlevs_max);
     load_balance_efficiency.resize(nlevs_max);
 
-    m_field_factory.resize(nlevs_max);
+#ifdef AMREX_USE_EB
+    m_embedded_boundary = warpx:embedded_boundary::EmbeddedBoundary(nlevs_max);
+#endif
 
     if (em_solver_medium == MediumForEM::Macroscopic) {
         // create object for macroscopic solver
@@ -2164,17 +2166,6 @@ WarpX::AllocLevelData (int lev, const BoxArray& ba, const DistributionMapping& d
         use_filter,
         bilinear_filter.stencil_length_each_dir);
 
-
-#ifdef AMREX_USE_EB
-        int max_guard = guard_cells.ng_FieldSolver.max();
-        m_field_factory[lev] = amrex::makeEBFabFactory(Geom(lev), ba, dm,
-                                                       {max_guard, max_guard, max_guard},
-                                                       amrex::EBSupport::full);
-#else
-        m_field_factory[lev] = std::make_unique<FArrayBoxFactory>();
-#endif
-
-
     if (mypc->nSpeciesDepositOnMainGrid() && n_current_deposition_buffer == 0) {
         n_current_deposition_buffer = 1;
         // This forces the allocation of buffers and allows the code associated
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,8 @@ namespace warpx::embedded_boundary @@
         public:
+            EmbeddedBoundary(int nlevs_max);
             /**
             * \brief Initialize information for cell extensions.
             *        The flags convention for m_flag_info_face is as follows
@@ Expand Down @@