Increase ghost cells for the level mask (#691)

AMReX-Combustion · Sep 12, 2023 · 1d47741 · 1d47741
1 parent 21e4a4b
commit 1d47741
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 20 deletions.
diff --git a/Source/Constants.H b/Source/Constants.H
@@ -22,10 +22,30 @@ very_small_num()
 {
   return std::numeric_limits<amrex::Real>::epsilon() * 1e-100;
 }
+
+AMREX_GPU_HOST_DEVICE constexpr int
+level_mask_interior()
+{
+  return 0;
+}
+
+AMREX_GPU_HOST_DEVICE constexpr int
+level_mask_covered()
+{
+  return 1;
+}
+
 AMREX_GPU_HOST_DEVICE constexpr int
 level_mask_notcovered()
 {
   return 2;
 }
+
+AMREX_GPU_HOST_DEVICE constexpr int
+level_mask_physbnd()
+{
+  return 3;
+}
+
 } // namespace constants
 #endif
diff --git a/Source/Params/_cpp_parameters b/Source/Params/_cpp_parameters
@@ -6,11 +6,6 @@
 
 @namespace: pelec PeleC static
 
-levmsk_interior              int         0
-levmsk_covered               int         1
-levmsk_notcovered            int         2
-levmsk_physbnd               int         3
-
 #-----------------------------------------------------------------------------
 # category: AMR
 #-----------------------------------------------------------------------------

diff --git a/Source/Params/param_includes/pelec_defaults.H b/Source/Params/param_includes/pelec_defaults.H
@@ -3,10 +3,6 @@
 // or add runtime parameters, please edit _cpp_parameters and then run
 // mk_params.sh
 
-int PeleC::levmsk_interior = 0;
-int PeleC::levmsk_covered = 1;
-int PeleC::levmsk_notcovered = 2;
-int PeleC::levmsk_physbnd = 3;
 int PeleC::state_interp_order = 1;
 int PeleC::lin_limit_state_interp = 1;
 int PeleC::state_nghost = 0;

diff --git a/Source/Params/param_includes/pelec_params.H b/Source/Params/param_includes/pelec_params.H
@@ -3,10 +3,6 @@
 // or add runtime parameters, please edit _cpp_parameters and then run
 // mk_params.sh
 
-static int levmsk_interior;
-static int levmsk_covered;
-static int levmsk_notcovered;
-static int levmsk_physbnd;
 static int state_interp_order;
 static int lin_limit_state_interp;
 static int state_nghost;

diff --git a/Source/Params/param_includes/pelec_queries.H b/Source/Params/param_includes/pelec_queries.H
@@ -3,10 +3,6 @@
 // or add runtime parameters, please edit _cpp_parameters and then run
 // mk_params.sh
 
-pp.query("levmsk_interior", levmsk_interior);
-pp.query("levmsk_covered", levmsk_covered);
-pp.query("levmsk_notcovered", levmsk_notcovered);
-pp.query("levmsk_physbnd", levmsk_physbnd);
 pp.query("state_interp_order", state_interp_order);
 pp.query("lin_limit_state_interp", lin_limit_state_interp);
 pp.query("state_nghost", state_nghost);

diff --git a/Source/PeleC.cpp b/Source/PeleC.cpp
@@ -623,10 +623,11 @@ PeleC::buildMetrics()
   amrex::MultiFab::Copy(vfrac, ebfactory.getVolFrac(), 0, 0, 1, numGrow());
 
   level_mask.clear();
-  level_mask.define(grids, dmap, 1, 1);
+  level_mask.define(grids, dmap, 1, 3);
   level_mask.BuildMask(
-    geom.Domain(), geom.periodicity(), levmsk_covered, levmsk_notcovered,
-    levmsk_physbnd, levmsk_interior);
+    geom.Domain(), geom.periodicity(), constants::level_mask_covered(),
+    constants::level_mask_notcovered(), constants::level_mask_physbnd(),
+    constants::level_mask_interior());
 
   if (level == 0) {
     setGridInfo();