update amrex and FFT solver

erf-model · Nov 24, 2024 · 3b96a18 · 3b96a18
1 parent e852d02
commit 3b96a18
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 88 deletions.
diff --git a/Source/LinearSolvers/ERF_solve_with_fft.cpp b/Source/LinearSolvers/ERF_solve_with_fft.cpp
@@ -112,93 +112,6 @@ void ERF::solve_with_fft (int lev, MultiFab& rhs, MultiFab& phi, Array<MultiFab,
         amrex::Abort("FFT isn't appropriate for spatially varying terrain");
     }
 
-    phi.FillBoundary(geom[lev].periodicity());
-
-    // ****************************************************************************
-    // Impose bc's on pprime
-    // ****************************************************************************
-#ifdef _OPENMP
-#pragma omp parallel if (Gpu::notInLaunchRegion())
-#endif
-    for (MFIter mfi(phi,TilingIfNotGPU()); mfi.isValid(); ++mfi)
-    {
-        Array4<Real> const& pp_arr  = phi.array(mfi);
-        Box const& bx    = mfi.tilebox();
-        auto const bx_lo = lbound(bx);
-        auto const bx_hi = ubound(bx);
-        if (bx_lo.x == dom_lo.x) {
-            auto bc_type = domain_bc_type[Orientation(0,Orientation::low)];
-            if (bc_type == "Outflow" || bc_type == "Open") {
-                ParallelFor(makeSlab(bx,0,dom_lo.x), [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept
-                {
-                    pp_arr(i-1,j,k) = -pp_arr(i,j,k);
-                });
-            } else {
-                ParallelFor(makeSlab(bx,0,dom_lo.x), [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept
-                {
-                    pp_arr(i-1,j,k) = pp_arr(i,j,k);
-                });
-            }
-        }
-        if (bx_lo.y == dom_lo.y) {
-            auto bc_type = domain_bc_type[Orientation(1,Orientation::low)];
-            if (bc_type == "Outflow" || bc_type == "Open") {
-                ParallelFor(makeSlab(bx,1,dom_lo.y), [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept
-                {
-                    pp_arr(i,j-1,k) = -pp_arr(i,j,k);
-                });
-            } else {
-                ParallelFor(makeSlab(bx,1,dom_lo.y), [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept
-                {
-                    pp_arr(i,j-1,k) = pp_arr(i,j,k);
-                });
-            }
-        }
-        if (bx_lo.z == dom_lo.z) {
-            ParallelFor(makeSlab(bx,2,dom_lo.z), [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept
-            {
-                pp_arr(i,j,k-1) = pp_arr(i,j,k);
-            });
-        }
-        if (bx_hi.x == dom_hi.x) {
-            auto bc_type = domain_bc_type[Orientation(0,Orientation::high)];
-            if (bc_type == "Outflow" || bc_type == "Open") {
-                ParallelFor(makeSlab(bx,0,dom_hi.x), [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept
-                {
-                    pp_arr(i+1,j,k) = -pp_arr(i,j,k);
-                });
-            } else {
-                ParallelFor(makeSlab(bx,0,dom_hi.x), [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept
-                {
-                    pp_arr(i+1,j,k) = pp_arr(i,j,k);
-                });
-            }
-        }
-        if (bx_hi.y == dom_hi.y) {
-            auto bc_type = domain_bc_type[Orientation(1,Orientation::high)];
-            if (bc_type == "Outflow" || bc_type == "Open") {
-                ParallelFor(makeSlab(bx,1,dom_hi.y), [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept
-                {
-                    pp_arr(i,j+1,k) = -pp_arr(i,j,k);
-                });
-            } else {
-                ParallelFor(makeSlab(bx,1,dom_hi.y), [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept
-                {
-                    pp_arr(i,j+1,k) = pp_arr(i,j,k);
-                });
-            }
-        }
-        if (bx_hi.z == dom_hi.z) {
-            ParallelFor(makeSlab(bx,2,dom_hi.z), [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept
-            {
-                pp_arr(i,j,k+1) = pp_arr(i,j,k);
-            });
-        }
-    } // mfi
-
-    // Now overwrite with periodic fill outside domain and fine-fine fill inside
-    phi.FillBoundary(geom[lev].periodicity());
-
 #ifdef _OPENMP
 #pragma omp parallel if (Gpu::notInLaunchRegion())
 #endif

diff --git a/Submodules/AMReX b/Submodules/AMReX
+1 −1		Docs/sphinx_documentation/source/Basics.rst
+60 −0		Src/Base/AMReX_Random.H
+7 −0		Src/Base/AMReX_Random.cpp
+2 −2		Src/Base/AMReX_VisMF.cpp
+12 −5		Src/Base/Parser/AMReX_IParser.H
+7 −1		Src/Base/Parser/AMReX_IParser.cpp
+13 −6		Src/Base/Parser/AMReX_Parser.H
+7 −1		Src/Base/Parser/AMReX_Parser.cpp
+19 −0		Src/Base/Parser/AMReX_Parser_Y.H
+1 −0		Src/Base/Parser/amrex_parser.l
+125 −119		Src/Base/Parser/amrex_parser.lex.nolint.H
+111 −3		Src/FFT/AMReX_FFT_Poisson.H
+24 −7		Src/FFT/AMReX_FFT_R2C.H
+23 −1		Src/FFT/AMReX_FFT_R2X.H
+40 −22		Src/LinearSolvers/AMReX_GMRES.H
+1 −1		Src/Particle/AMReX_ParticleContainerI.H
+1 −1		Src/Particle/AMReX_ParticleUtil.H
+9 −47		Tests/FFT/Poisson/main.cpp