fix the bc fill for when we have fine patches and terrain

erf-model · Jul 12, 2024 · 211c3d8 · 211c3d8
1 parent c381e25
commit 211c3d8
Showing 1 changed file with 65 additions and 4 deletions.
diff --git a/Source/BoundaryConditions/ERF_PhysBCFunct.cpp b/Source/BoundaryConditions/ERF_PhysBCFunct.cpp
@@ -31,6 +31,21 @@ void ERFPhysBCFunct_cons::operator() (MultiFab& mf, int icomp, int ncomp,
         }
     }
 
+    Box ndomain  = convert(domain,IntVect(1,1,1));
+
+    MultiFab z_nd_mf_loc;
+    if (m_z_phys_nd) {
+        BoxList bl_z_phys = convert(mf.boxArray(),IntVect(1,1,1)).boxList();
+        for (auto& b : bl_z_phys) {
+            b &= ndomain;
+            b.setSmall(2,0);
+            b.setBig(2,1);
+        }
+        BoxArray ba_z(std::move(bl_z_phys));
+        z_nd_mf_loc.define(ba_z,mf.DistributionMap(),1,0);
+        z_nd_mf_loc.ParallelCopy(*m_z_phys_nd,0,0,1,0,0,m_geom.periodicity());
+    }
+
 #ifdef AMREX_USE_OMP
 #pragma omp parallel if (Gpu::notInLaunchRegion())
 #endif
@@ -53,7 +68,7 @@ void ERFPhysBCFunct_cons::operator() (MultiFab& mf, int icomp, int ncomp,
 
             if (m_z_phys_nd)
             {
-                z_nd_arr = m_z_phys_nd->const_array(mfi);
+                z_nd_arr = z_nd_mf_loc.const_array(mfi);
             }
 
             if (!gdomain.contains(cbx2))
@@ -89,6 +104,21 @@ void ERFPhysBCFunct_u::operator() (MultiFab& mf, int /*icomp*/, int /*ncomp*/,
         }
     }
 
+    Box ndomain  = convert(domain,IntVect(1,1,1));
+
+    MultiFab z_nd_mf_loc;
+    if (m_z_phys_nd) {
+        BoxList bl_z_phys = convert(mf.boxArray(),IntVect(1,1,1)).boxList();
+        for (auto& b : bl_z_phys) {
+            b &= ndomain;
+            b.setSmall(2,0);
+            b.setBig(2,1);
+        }
+        BoxArray ba_z(std::move(bl_z_phys));
+        z_nd_mf_loc.define(ba_z,mf.DistributionMap(),1,IntVect(1,0,0));
+        z_nd_mf_loc.ParallelCopy(*m_z_phys_nd,0,0,1,IntVect(1,0,0),IntVect(1,0,0),m_geom.periodicity());
+    }
+
 #ifdef AMREX_USE_OMP
 #pragma omp parallel if (Gpu::notInLaunchRegion())
 #endif
@@ -111,7 +141,7 @@ void ERFPhysBCFunct_u::operator() (MultiFab& mf, int /*icomp*/, int /*ncomp*/,
 
             if (m_z_phys_nd)
             {
-                z_nd_arr = m_z_phys_nd->const_array(mfi);
+                z_nd_arr = z_nd_mf_loc.const_array(mfi);
             }
 
             if (!gdomainx.contains(xbx2))
@@ -150,6 +180,21 @@ void ERFPhysBCFunct_v::operator() (MultiFab& mf, int /*icomp*/, int /*ncomp*/,
         }
     }
 
+    Box ndomain  = convert(domain,IntVect(1,1,1));
+
+    MultiFab z_nd_mf_loc;
+    if (m_z_phys_nd) {
+        BoxList bl_z_phys = convert(mf.boxArray(),IntVect(1,1,1)).boxList();
+        for (auto& b : bl_z_phys) {
+            b &= ndomain;
+            b.setSmall(2,0);
+            b.setBig(2,1);
+        }
+        BoxArray ba_z(std::move(bl_z_phys));
+        z_nd_mf_loc.define(ba_z,mf.DistributionMap(),1,IntVect(0,1,0));
+        z_nd_mf_loc.ParallelCopy(*m_z_phys_nd,0,0,1,IntVect(0,1,0),IntVect(0,1,0),m_geom.periodicity());
+    }
+
 #ifdef AMREX_USE_OMP
 #pragma omp parallel if (Gpu::notInLaunchRegion())
 #endif
@@ -172,7 +217,7 @@ void ERFPhysBCFunct_v::operator() (MultiFab& mf, int /*icomp*/, int /*ncomp*/,
 
             if (m_z_phys_nd)
             {
-                z_nd_arr = m_z_phys_nd->const_array(mfi);
+                z_nd_arr = z_nd_mf_loc.const_array(mfi);
             }
 
             if (!gdomainy.contains(ybx2))
@@ -214,6 +259,22 @@ void ERFPhysBCFunct_w::operator() (MultiFab& mf, MultiFab& xvel, MultiFab& yvel,
     // We want to make sure we impose the z-vels at k=0  if the box includes k=0
     if (gdomainz.smallEnd(2) == 0) gdomainz.setSmall(2,1);
 
+    Box ndomain  = convert(domain,IntVect(1,1,1));
+
+    MultiFab z_nd_mf_loc;
+    if (m_z_phys_nd) {
+        BoxList bl_z_phys = convert(mf.boxArray(),IntVect(1,1,1)).boxList();
+        for (auto& b : bl_z_phys) {
+            b &= ndomain;
+            b.setSmall(2,0);
+            b.setBig(2,1);
+        }
+        BoxArray ba_z(std::move(bl_z_phys));
+        z_nd_mf_loc.define(ba_z,mf.DistributionMap(),1,IntVect(nghost[0],nghost[1],0));
+        z_nd_mf_loc.ParallelCopy(*m_z_phys_nd,0,0,1,IntVect(nghost[0],nghost[1],0),
+                                                    IntVect(nghost[0],nghost[1],0),m_geom.periodicity());
+    }
+
 #ifdef AMREX_USE_OMP
 #pragma omp parallel if (Gpu::notInLaunchRegion())
 #endif
@@ -235,7 +296,7 @@ void ERFPhysBCFunct_w::operator() (MultiFab& mf, MultiFab& xvel, MultiFab& yvel,
 
             if (m_z_phys_nd)
             {
-                z_nd_arr = m_z_phys_nd->const_array(mfi);
+                z_nd_arr = z_nd_mf_loc.const_array(mfi);
             }
 
             Array4<const Real> const& velx_arr = xvel.const_array(mfi);;