From 87ff1fe0032dee3e37580859714c322cd5353161 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Mon, 22 Jan 2024 14:23:25 -0800 Subject: [PATCH] Prepare for amrex changes --- .../channel_dumbbell/main_driver.cpp | 4 +- .../channel_multiblob/main_driver.cpp | 8 +- .../channel_rigid/main_driver.cpp | 10 +- .../flagellum/main_driver.cpp | 2 +- .../taylor_line/main_driver.cpp | 2 +- src_common/BCPhysToMath.cpp | 34 ++--- src_common/ComputeDivAndGrad.cpp | 12 +- src_common/ConvertStag.cpp | 36 +++--- src_common/MultiFabPhysBC.cpp | 28 ++-- src_deankow/multilevel/AmrCoreAdv.cpp | 4 +- src_hydro/BDS.cpp | 40 +++--- src_multispec/DiffusiveMassFluxdiv.cpp | 24 ++-- src_multispec/RhoUtil.cpp | 12 +- src_particles/DsmcParticleContainer.cpp | 4 +- src_particles/DsmcParticleContainer.cpp.old | 2 +- src_particles/FhdParticleContainer.cpp | 20 +-- src_particles/FhdParticleContainer_WF.cpp | 122 +++++++++--------- src_particles/particle_mobility.cpp | 2 +- unmaintained/src_chem/AmrCoreAdv.cpp | 4 +- 19 files changed, 185 insertions(+), 185 deletions(-) diff --git a/exec/immersed_boundary/channel_dumbbell/main_driver.cpp b/exec/immersed_boundary/channel_dumbbell/main_driver.cpp index 2052e1a99..e1bd8de3a 100644 --- a/exec/immersed_boundary/channel_dumbbell/main_driver.cpp +++ b/exec/immersed_boundary/channel_dumbbell/main_driver.cpp @@ -343,13 +343,13 @@ void main_driver(const char * argv) { init_vel(BL_TO_FORTRAN_BOX(bx), BL_TO_FORTRAN_ANYD(umac[d][mfi]), geom.CellSize(), geom.ProbLo(), geom.ProbHi(), & d, - ZFILL(realDomain.lo()), ZFILL(realDomain.hi()), + AMREX_ZFILL(realDomain.lo()), AMREX_ZFILL(realDomain.hi()), &prob_type); // initialize tracer init_s_vel(BL_TO_FORTRAN_BOX(bx), BL_TO_FORTRAN_ANYD(tracer[mfi]), - dx, ZFILL(realDomain.lo()), ZFILL(realDomain.hi())); + dx, AMREX_ZFILL(realDomain.lo()), AMREX_ZFILL(realDomain.hi())); } diff --git a/exec/immersed_boundary/channel_multiblob/main_driver.cpp b/exec/immersed_boundary/channel_multiblob/main_driver.cpp index 24f2998f5..377f8be19 100644 --- a/exec/immersed_boundary/channel_multiblob/main_driver.cpp +++ b/exec/immersed_boundary/channel_multiblob/main_driver.cpp @@ -411,20 +411,20 @@ void main_driver(const char * argv) { AMREX_D_TERM(dm=0; init_vel(BL_TO_FORTRAN_BOX(bx), BL_TO_FORTRAN_ANYD(umac[0][mfi]), geom.CellSize(), geom.ProbLo(), geom.ProbHi() ,&dm, - ZFILL(realDomain.lo()), ZFILL(realDomain.hi()));, + AMREX_ZFILL(realDomain.lo()), AMREX_ZFILL(realDomain.hi()));, dm=1; init_vel(BL_TO_FORTRAN_BOX(bx), BL_TO_FORTRAN_ANYD(umac[1][mfi]), geom.CellSize(), geom.ProbLo(), geom.ProbHi() ,&dm, - ZFILL(realDomain.lo()), ZFILL(realDomain.hi()));, + AMREX_ZFILL(realDomain.lo()), AMREX_ZFILL(realDomain.hi()));, dm=2; init_vel(BL_TO_FORTRAN_BOX(bx), BL_TO_FORTRAN_ANYD(umac[2][mfi]), geom.CellSize(), geom.ProbLo(), geom.ProbHi() ,&dm, - ZFILL(realDomain.lo()), ZFILL(realDomain.hi()));); + AMREX_ZFILL(realDomain.lo()), AMREX_ZFILL(realDomain.hi()));); // initialize tracer init_s_vel(BL_TO_FORTRAN_BOX(bx), BL_TO_FORTRAN_ANYD(tracer[mfi]), - dx, ZFILL(realDomain.lo()), ZFILL(realDomain.hi())); + dx, AMREX_ZFILL(realDomain.lo()), AMREX_ZFILL(realDomain.hi())); } diff --git a/exec/immersed_boundary/channel_rigid/main_driver.cpp b/exec/immersed_boundary/channel_rigid/main_driver.cpp index b6a393c50..298676c3d 100644 --- a/exec/immersed_boundary/channel_rigid/main_driver.cpp +++ b/exec/immersed_boundary/channel_rigid/main_driver.cpp @@ -324,20 +324,20 @@ void main_driver(const char * argv) { AMREX_D_TERM(dm=0; init_vel(BL_TO_FORTRAN_BOX(bx), BL_TO_FORTRAN_ANYD(umac[0][mfi]), geom.CellSize(), geom.ProbLo(), geom.ProbHi(), & dm, - ZFILL(realDomain.lo()), ZFILL(realDomain.hi()));, + AMREX_ZFILL(realDomain.lo()), AMREX_ZFILL(realDomain.hi()));, dm=1; init_vel(BL_TO_FORTRAN_BOX(bx), BL_TO_FORTRAN_ANYD(umac[1][mfi]), geom.CellSize(), geom.ProbLo(), geom.ProbHi(), & dm, - ZFILL(realDomain.lo()), ZFILL(realDomain.hi()));, + AMREX_ZFILL(realDomain.lo()), AMREX_ZFILL(realDomain.hi()));, dm=2; init_vel(BL_TO_FORTRAN_BOX(bx), BL_TO_FORTRAN_ANYD(umac[2][mfi]), geom.CellSize(), geom.ProbLo(), geom.ProbHi(), & dm, - ZFILL(realDomain.lo()), ZFILL(realDomain.hi()));); + AMREX_ZFILL(realDomain.lo()), AMREX_ZFILL(realDomain.hi()));); // initialize tracer init_s_vel(BL_TO_FORTRAN_BOX(bx), BL_TO_FORTRAN_ANYD(tracer[mfi]), - dx, ZFILL(realDomain.lo()), ZFILL(realDomain.hi())); + dx, AMREX_ZFILL(realDomain.lo()), AMREX_ZFILL(realDomain.hi())); } @@ -454,7 +454,7 @@ void main_driver(const char * argv) { // const Box& bx = mfi.validbox(); // init_s_vel(BL_TO_FORTRAN_BOX(bx), // BL_TO_FORTRAN_ANYD(mf_cc[0][mfi]), - // dx, ZFILL(realDomain.lo()), ZFILL(realDomain.hi())); + // dx, AMREX_ZFILL(realDomain.lo()), AMREX_ZFILL(realDomain.hi())); // } // } diff --git a/exec/immersed_boundary/flagellum/main_driver.cpp b/exec/immersed_boundary/flagellum/main_driver.cpp index b1df8c383..970f1c644 100644 --- a/exec/immersed_boundary/flagellum/main_driver.cpp +++ b/exec/immersed_boundary/flagellum/main_driver.cpp @@ -544,7 +544,7 @@ void main_driver(const char * argv) { init_vel(BL_TO_FORTRAN_BOX(bx), BL_TO_FORTRAN_ANYD(umac[d][mfi]), geom.CellSize(), geom.ProbLo(), geom.ProbHi(), & d, - ZFILL(realDomain.lo()), ZFILL(realDomain.hi()), + AMREX_ZFILL(realDomain.lo()), AMREX_ZFILL(realDomain.hi()), &prob_type); } diff --git a/exec/immersed_boundary/taylor_line/main_driver.cpp b/exec/immersed_boundary/taylor_line/main_driver.cpp index b1b21272c..a72a4db82 100644 --- a/exec/immersed_boundary/taylor_line/main_driver.cpp +++ b/exec/immersed_boundary/taylor_line/main_driver.cpp @@ -538,7 +538,7 @@ void main_driver(const char * argv) { init_vel(BL_TO_FORTRAN_BOX(bx), BL_TO_FORTRAN_ANYD(umac[d][mfi]), geom.CellSize(), geom.ProbLo(), geom.ProbHi(), & d, - ZFILL(realDomain.lo()), ZFILL(realDomain.hi()), + AMREX_ZFILL(realDomain.lo()), AMREX_ZFILL(realDomain.hi()), &prob_type); } diff --git a/src_common/BCPhysToMath.cpp b/src_common/BCPhysToMath.cpp index dceb30e69..8b31ef488 100644 --- a/src_common/BCPhysToMath.cpp +++ b/src_common/BCPhysToMath.cpp @@ -10,24 +10,24 @@ void BCPhysToMath(int bccomp, amrex::Vector& bc_lo, amrex::Vector& bc_ // set to interior/periodic by default; overwrite below for (int i=0; i first-order extrapolation - bc_lo[i] = FOEXTRAP; + bc_lo[i] = amrex::BCType::foextrap; } else if (bc_vel_lo[i] == -2) { // pressure inflow - bc_lo[i] = EXT_DIR; + bc_lo[i] = amrex::BCType::ext_dir; } if (bc_vel_hi[i] == 1 || bc_vel_hi[i] == 2) { // wall -> first-order extrapolation - bc_hi[i] = FOEXTRAP; + bc_hi[i] = amrex::BCType::foextrap; } else if (bc_vel_hi[i] == -2) { // pressure inflow - bc_hi[i] = EXT_DIR; + bc_hi[i] = amrex::BCType::ext_dir; } } } @@ -37,19 +37,19 @@ void BCPhysToMath(int bccomp, amrex::Vector& bc_lo, amrex::Vector& bc_ for (int i=0; i first-order extrapolation - bc_lo[i] = FOEXTRAP; + bc_lo[i] = amrex::BCType::foextrap; } else if (bc_mass_lo[i] == 2) { // reservoir -> dirichlet - bc_lo[i] = EXT_DIR; + bc_lo[i] = amrex::BCType::ext_dir; } if (bc_mass_hi[i] == 1) { // wall -> first-order extrapolation - bc_hi[i] = FOEXTRAP; + bc_hi[i] = amrex::BCType::foextrap; } else if (bc_mass_hi[i] == 2) { // reservoir -> dirichlet - bc_hi[i] = EXT_DIR; + bc_hi[i] = amrex::BCType::ext_dir; } } } @@ -57,19 +57,19 @@ void BCPhysToMath(int bccomp, amrex::Vector& bc_lo, amrex::Vector& bc_ for (int i=0; i first-order extrapolation - bc_lo[i] = FOEXTRAP; + bc_lo[i] = amrex::BCType::foextrap; } else if (bc_therm_lo[i] == 2) { // isothermal -> dirichlet - bc_lo[i] = EXT_DIR; + bc_lo[i] = amrex::BCType::ext_dir; } if (bc_therm_hi[i] == 1) { // adiabatic -> first-order extrapolation - bc_hi[i] = FOEXTRAP; + bc_hi[i] = amrex::BCType::foextrap; } else if (bc_therm_hi[i] == 2) { // isothermal -> dirichlet - bc_hi[i] = EXT_DIR; + bc_hi[i] = amrex::BCType::ext_dir; } } } @@ -77,19 +77,19 @@ void BCPhysToMath(int bccomp, amrex::Vector& bc_lo, amrex::Vector& bc_ for (int i=0; i & // boundary conditions // note: at physical boundaries, // alter stencil at boundary since ghost value represents value at boundary - if (bc_lo[0] == FOEXTRAP || bc_lo[0] == EXT_DIR) { + if (bc_lo[0] == amrex::BCType::foextrap || bc_lo[0] == amrex::BCType::ext_dir) { if (bx_x.smallEnd(0) <= dom.smallEnd(0)) { int lo = dom.smallEnd(0); amrex::ParallelFor(bx_x, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -106,7 +106,7 @@ void ComputeGrad(const MultiFab & phi_in, std::array & } } - if (bc_hi[0] == FOEXTRAP || bc_hi[0] == EXT_DIR) { + if (bc_hi[0] == amrex::BCType::foextrap || bc_hi[0] == amrex::BCType::ext_dir) { if (bx_x.bigEnd(0) >= dom.bigEnd(0)+1) { int hi = dom.bigEnd(0)+1; amrex::ParallelFor(bx_x, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -120,7 +120,7 @@ void ComputeGrad(const MultiFab & phi_in, std::array & } } - if (bc_lo[1] == FOEXTRAP || bc_lo[1] == EXT_DIR) { + if (bc_lo[1] == amrex::BCType::foextrap || bc_lo[1] == amrex::BCType::ext_dir) { if (bx_y.smallEnd(1) <= dom.smallEnd(1)) { int lo = dom.smallEnd(1); amrex::ParallelFor(bx_y, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -134,7 +134,7 @@ void ComputeGrad(const MultiFab & phi_in, std::array & } } - if (bc_hi[1] == FOEXTRAP || bc_hi[1] == EXT_DIR) { + if (bc_hi[1] == amrex::BCType::foextrap || bc_hi[1] == amrex::BCType::ext_dir) { if (bx_y.bigEnd(1) >= dom.bigEnd(1)+1) { int hi = dom.bigEnd(1)+1; amrex::ParallelFor(bx_y, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -149,7 +149,7 @@ void ComputeGrad(const MultiFab & phi_in, std::array & } #if (AMREX_SPACEDIM == 3) - if (bc_lo[2] == FOEXTRAP || bc_lo[2] == EXT_DIR) { + if (bc_lo[2] == amrex::BCType::foextrap || bc_lo[2] == amrex::BCType::ext_dir) { if (bx_z.smallEnd(2) <= dom.smallEnd(2)) { int lo = dom.smallEnd(2); amrex::ParallelFor(bx_z, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -163,7 +163,7 @@ void ComputeGrad(const MultiFab & phi_in, std::array & } } - if (bc_hi[2] == FOEXTRAP || bc_hi[2] == EXT_DIR) { + if (bc_hi[2] == amrex::BCType::foextrap || bc_hi[2] == amrex::BCType::ext_dir) { if (bx_z.bigEnd(2) >= dom.bigEnd(2)+1) { int hi = dom.bigEnd(2)+1; amrex::ParallelFor(bx_z, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept diff --git a/src_common/ConvertStag.cpp b/src_common/ConvertStag.cpp index 05267c413..c544e738d 100644 --- a/src_common/ConvertStag.cpp +++ b/src_common/ConvertStag.cpp @@ -81,7 +81,7 @@ void AverageCCToFace(const MultiFab& cc_in, std::array // note: at physical boundaries, // the value in the ghost cells represent the value ON the boundary // so we simply copy the ghost cell value into the value on the domain (and ghost faces too) - if (bc_lo[0] == FOEXTRAP || bc_lo[0] == EXT_DIR) { + if (bc_lo[0] == amrex::BCType::foextrap || bc_lo[0] == amrex::BCType::ext_dir) { if (bx_x.smallEnd(0) <= dom.smallEnd(0)) { int lo = dom.smallEnd(0); amrex::ParallelFor(bx_x, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -93,7 +93,7 @@ void AverageCCToFace(const MultiFab& cc_in, std::array } } - if (bc_hi[0] == FOEXTRAP || bc_hi[0] == EXT_DIR) { + if (bc_hi[0] == amrex::BCType::foextrap || bc_hi[0] == amrex::BCType::ext_dir) { if (bx_x.bigEnd(0) >= dom.bigEnd(0)+1) { int hi = dom.bigEnd(0)+1; amrex::ParallelFor(bx_x, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -105,7 +105,7 @@ void AverageCCToFace(const MultiFab& cc_in, std::array } } - if (bc_lo[1] == FOEXTRAP || bc_lo[1] == EXT_DIR) { + if (bc_lo[1] == amrex::BCType::foextrap || bc_lo[1] == amrex::BCType::ext_dir) { if (bx_y.smallEnd(1) <= dom.smallEnd(1)) { int lo = dom.smallEnd(1); amrex::ParallelFor(bx_y, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -117,7 +117,7 @@ void AverageCCToFace(const MultiFab& cc_in, std::array } } - if (bc_hi[1] == FOEXTRAP || bc_hi[1] == EXT_DIR) { + if (bc_hi[1] == amrex::BCType::foextrap || bc_hi[1] == amrex::BCType::ext_dir) { if (bx_y.bigEnd(1) >= dom.bigEnd(1)+1) { int hi = dom.bigEnd(1)+1; amrex::ParallelFor(bx_y, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -130,7 +130,7 @@ void AverageCCToFace(const MultiFab& cc_in, std::array } #if (AMREX_SPACEDIM == 3) - if (bc_lo[2] == FOEXTRAP || bc_lo[2] == EXT_DIR) { + if (bc_lo[2] == amrex::BCType::foextrap || bc_lo[2] == amrex::BCType::ext_dir) { if (bx_z.smallEnd(2) <= dom.smallEnd(2)) { int lo = dom.smallEnd(2); amrex::ParallelFor(bx_z, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -142,7 +142,7 @@ void AverageCCToFace(const MultiFab& cc_in, std::array } } - if (bc_hi[2] == FOEXTRAP || bc_hi[2] == EXT_DIR) { + if (bc_hi[2] == amrex::BCType::foextrap || bc_hi[2] == amrex::BCType::ext_dir) { if (bx_z.bigEnd(2) >= dom.bigEnd(2)+1) { int hi = dom.bigEnd(2)+1; amrex::ParallelFor(bx_z, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -298,7 +298,7 @@ void AverageCCToNode(const MultiFab& cc_in, MultiFab& node_in, int scomp, int nc // boundary conditions // note: at physical boundaries, // the value in ghost cells represents the value ON the boundary - if (bc_lo[0] == FOEXTRAP || bc_lo[0] == EXT_DIR) { + if (bc_lo[0] == amrex::BCType::foextrap || bc_lo[0] == amrex::BCType::ext_dir) { if (bx.smallEnd(0) <= dom.smallEnd(0)) { int lo = dom.smallEnd(0); amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -314,7 +314,7 @@ void AverageCCToNode(const MultiFab& cc_in, MultiFab& node_in, int scomp, int nc } } - if (bc_hi[0] == FOEXTRAP || bc_hi[0] == EXT_DIR) { + if (bc_hi[0] == amrex::BCType::foextrap || bc_hi[0] == amrex::BCType::ext_dir) { if (bx.bigEnd(0) >= dom.bigEnd(0)+1) { int hi = dom.bigEnd(0); amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -330,7 +330,7 @@ void AverageCCToNode(const MultiFab& cc_in, MultiFab& node_in, int scomp, int nc } } - if (bc_lo[1] == FOEXTRAP || bc_lo[1] == EXT_DIR) { + if (bc_lo[1] == amrex::BCType::foextrap || bc_lo[1] == amrex::BCType::ext_dir) { if (bx.smallEnd(1) <= dom.smallEnd(1)) { int lo = dom.smallEnd(1); amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -346,7 +346,7 @@ void AverageCCToNode(const MultiFab& cc_in, MultiFab& node_in, int scomp, int nc } } - if (bc_hi[1] == FOEXTRAP || bc_hi[1] == EXT_DIR) { + if (bc_hi[1] == amrex::BCType::foextrap || bc_hi[1] == amrex::BCType::ext_dir) { if (bx.bigEnd(1) >= dom.bigEnd(1)+1) { int hi = dom.bigEnd(1); amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -364,7 +364,7 @@ void AverageCCToNode(const MultiFab& cc_in, MultiFab& node_in, int scomp, int nc #if (AMREX_SPACEDIM == 3) - if (bc_lo[2] == FOEXTRAP || bc_lo[2] == EXT_DIR) { + if (bc_lo[2] == amrex::BCType::foextrap || bc_lo[2] == amrex::BCType::ext_dir) { if (bx.smallEnd(2) <= dom.smallEnd(2)) { int lo = dom.smallEnd(2); amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -376,7 +376,7 @@ void AverageCCToNode(const MultiFab& cc_in, MultiFab& node_in, int scomp, int nc } } - if (bc_hi[2] == FOEXTRAP || bc_hi[2] == EXT_DIR) { + if (bc_hi[2] == amrex::BCType::foextrap || bc_hi[2] == amrex::BCType::ext_dir) { if (bx.bigEnd(2) >= dom.bigEnd(2)+1) { int hi = dom.bigEnd(2); amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -455,7 +455,7 @@ void AverageCCToEdge(const MultiFab& cc_in, std::array& edge // the value in ghost cells represents the value ON the boundary // lo-x - if (bc_lo[0] == FOEXTRAP || bc_lo[0] == EXT_DIR) { + if (bc_lo[0] == amrex::BCType::foextrap || bc_lo[0] == amrex::BCType::ext_dir) { if (bx_xy.smallEnd(0) <= dom.smallEnd(0)) { int lo = dom.smallEnd(0); amrex::ParallelFor(bx_xy, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -477,7 +477,7 @@ void AverageCCToEdge(const MultiFab& cc_in, std::array& edge } // hi-x - if (bc_hi[0] == FOEXTRAP || bc_hi[0] == EXT_DIR) { + if (bc_hi[0] == amrex::BCType::foextrap || bc_hi[0] == amrex::BCType::ext_dir) { if (bx_xy.bigEnd(0) >= dom.smallEnd(0)+1) { int hi = dom.bigEnd(0); amrex::ParallelFor(bx_xy, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -499,7 +499,7 @@ void AverageCCToEdge(const MultiFab& cc_in, std::array& edge } // lo-y - if (bc_lo[1] == FOEXTRAP || bc_lo[1] == EXT_DIR) { + if (bc_lo[1] == amrex::BCType::foextrap || bc_lo[1] == amrex::BCType::ext_dir) { if (bx_xy.smallEnd(1) <= dom.smallEnd(1)) { int lo = dom.smallEnd(1); amrex::ParallelFor(bx_xy, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -521,7 +521,7 @@ void AverageCCToEdge(const MultiFab& cc_in, std::array& edge } // hi-y - if (bc_hi[1] == FOEXTRAP || bc_hi[1] == EXT_DIR) { + if (bc_hi[1] == amrex::BCType::foextrap || bc_hi[1] == amrex::BCType::ext_dir) { if (bx_xy.bigEnd(1) <= dom.bigEnd(1)) { int hi = dom.bigEnd(1); amrex::ParallelFor(bx_xy, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -543,7 +543,7 @@ void AverageCCToEdge(const MultiFab& cc_in, std::array& edge } // lo-z - if (bc_lo[2] == FOEXTRAP || bc_lo[2] == EXT_DIR) { + if (bc_lo[2] == amrex::BCType::foextrap || bc_lo[2] == amrex::BCType::ext_dir) { if (bx_xz.smallEnd(2) <= dom.smallEnd(2)) { int lo = dom.smallEnd(2); amrex::ParallelFor(bx_xz, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -565,7 +565,7 @@ void AverageCCToEdge(const MultiFab& cc_in, std::array& edge } // hi-z - if (bc_hi[2] == FOEXTRAP || bc_hi[2] == EXT_DIR) { + if (bc_hi[2] == amrex::BCType::foextrap || bc_hi[2] == amrex::BCType::ext_dir) { if (bx_xz.bigEnd(2) <= dom.bigEnd(2)) { int hi = dom.bigEnd(2); amrex::ParallelFor(bx_xz, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept diff --git a/src_common/MultiFabPhysBC.cpp b/src_common/MultiFabPhysBC.cpp index e389c18c6..529efaf59 100644 --- a/src_common/MultiFabPhysBC.cpp +++ b/src_common/MultiFabPhysBC.cpp @@ -3,8 +3,8 @@ // Ghost cell filling routine. // Fills in ALL ghost cells to the value ON the boundary. -// FOEXTRAP uses boundary conditions (Neumann) and 1 interior points. -// EXT_DIR copies the supplied Dirichlet condition into the ghost cells. +// amrex::BCType::foextrap uses boundary conditions (Neumann) and 1 interior points. +// amrex::BCType::ext_dir copies the supplied Dirichlet condition into the ghost cells. void MultiFabPhysBC(MultiFab& phi, const Geometry& geom, int scomp, int ncomp, int bccomp, const Real& time) { BL_PROFILE_VAR("MultiFabPhysBC()",MultiFabPhysBC); @@ -52,7 +52,7 @@ void MultiFabPhysBC(MultiFab& phi, const Geometry& geom, int scomp, int ncomp, i if (bx.smallEnd(0) < lo) { Real x = prob_lo[0]; - if (bc_lo[0] == FOEXTRAP) { + if (bc_lo[0] == amrex::BCType::foextrap) { amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept { if (i < lo) { @@ -62,7 +62,7 @@ void MultiFabPhysBC(MultiFab& phi, const Geometry& geom, int scomp, int ncomp, i } }); } - else if (bc_lo[0] == EXT_DIR) { + else if (bc_lo[0] == amrex::BCType::ext_dir) { amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept { if (i < lo) { @@ -76,7 +76,7 @@ void MultiFabPhysBC(MultiFab& phi, const Geometry& geom, int scomp, int ncomp, i if (bx.bigEnd(0) > hi) { Real x = prob_hi[0]; - if (bc_hi[0] == FOEXTRAP) { + if (bc_hi[0] == amrex::BCType::foextrap) { amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept { if (i > hi) { @@ -86,7 +86,7 @@ void MultiFabPhysBC(MultiFab& phi, const Geometry& geom, int scomp, int ncomp, i } }); } - else if (bc_hi[0] == EXT_DIR) { + else if (bc_hi[0] == amrex::BCType::ext_dir) { amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept { if (i > hi) { @@ -107,7 +107,7 @@ void MultiFabPhysBC(MultiFab& phi, const Geometry& geom, int scomp, int ncomp, i if (bx.smallEnd(1) < lo) { Real y = prob_lo[1]; - if (bc_lo[1] == FOEXTRAP) { + if (bc_lo[1] == amrex::BCType::foextrap) { amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept { if (j < lo) { @@ -117,7 +117,7 @@ void MultiFabPhysBC(MultiFab& phi, const Geometry& geom, int scomp, int ncomp, i } }); } - else if (bc_lo[1] == EXT_DIR) { + else if (bc_lo[1] == amrex::BCType::ext_dir) { amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept { if (j < lo) { @@ -131,7 +131,7 @@ void MultiFabPhysBC(MultiFab& phi, const Geometry& geom, int scomp, int ncomp, i if (bx.bigEnd(1) > hi) { Real y = prob_hi[1]; - if (bc_hi[1] == FOEXTRAP) { + if (bc_hi[1] == amrex::BCType::foextrap) { amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept { if (j > hi) { @@ -141,7 +141,7 @@ void MultiFabPhysBC(MultiFab& phi, const Geometry& geom, int scomp, int ncomp, i } }); } - else if (bc_hi[1] == EXT_DIR) { + else if (bc_hi[1] == amrex::BCType::ext_dir) { amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept { if (j > hi) { @@ -163,7 +163,7 @@ void MultiFabPhysBC(MultiFab& phi, const Geometry& geom, int scomp, int ncomp, i if (bx.smallEnd(2) < lo) { Real z = prob_lo[2]; - if (bc_lo[2] == FOEXTRAP) { + if (bc_lo[2] == amrex::BCType::foextrap) { amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept { if (k < lo) { @@ -173,7 +173,7 @@ void MultiFabPhysBC(MultiFab& phi, const Geometry& geom, int scomp, int ncomp, i } }); } - else if (bc_lo[2] == EXT_DIR) { + else if (bc_lo[2] == amrex::BCType::ext_dir) { amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept { if (k < lo) { @@ -187,7 +187,7 @@ void MultiFabPhysBC(MultiFab& phi, const Geometry& geom, int scomp, int ncomp, i if (bx.bigEnd(2) > hi) { Real z= prob_hi[2]; - if (bc_hi[2] == FOEXTRAP) { + if (bc_hi[2] == amrex::BCType::foextrap) { amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept { if (k > hi) { @@ -197,7 +197,7 @@ void MultiFabPhysBC(MultiFab& phi, const Geometry& geom, int scomp, int ncomp, i } }); } - else if (bc_hi[2] == EXT_DIR) { + else if (bc_hi[2] == amrex::BCType::ext_dir) { amrex::ParallelFor(bx, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept { if (k > hi) { diff --git a/src_deankow/multilevel/AmrCoreAdv.cpp b/src_deankow/multilevel/AmrCoreAdv.cpp index 1b9ee637f..96dd51f1b 100644 --- a/src_deankow/multilevel/AmrCoreAdv.cpp +++ b/src_deankow/multilevel/AmrCoreAdv.cpp @@ -85,8 +85,8 @@ AmrCoreAdv::AmrCoreAdv () /* // walls (Neumann) - int bc_lo[] = {FOEXTRAP, FOEXTRAP, FOEXTRAP}; - int bc_hi[] = {FOEXTRAP, FOEXTRAP, FOEXTRAP}; + int bc_lo[] = {amrex::BCType::foextrap, amrex::BCType::foextrap, amrex::BCType::foextrap}; + int bc_hi[] = {amrex::BCType::foextrap, amrex::BCType::foextrap, amrex::BCType::foextrap}; */ bcs.resize(1); // Setup 1-component diff --git a/src_hydro/BDS.cpp b/src_hydro/BDS.cpp index b82f754e1..8701f9fa3 100644 --- a/src_hydro/BDS.cpp +++ b/src_hydro/BDS.cpp @@ -179,10 +179,10 @@ void BDS_ComputeSlopes(Box const& bx, Vector bc_hi(AMREX_SPACEDIM); BCPhysToMath(bccomp,bc_lo,bc_hi); - bool lo_x_physbc = (bc_lo[0] == FOEXTRAP || bc_lo[0] == EXT_DIR) ? true : false; - bool hi_x_physbc = (bc_hi[0] == FOEXTRAP || bc_hi[0] == EXT_DIR) ? true : false; - bool lo_y_physbc = (bc_lo[1] == FOEXTRAP || bc_lo[1] == EXT_DIR) ? true : false; - bool hi_y_physbc = (bc_hi[1] == FOEXTRAP || bc_hi[1] == EXT_DIR) ? true : false; + bool lo_x_physbc = (bc_lo[0] == amrex::BCType::foextrap || bc_lo[0] == amrex::BCType::ext_dir) ? true : false; + bool hi_x_physbc = (bc_hi[0] == amrex::BCType::foextrap || bc_hi[0] == amrex::BCType::ext_dir) ? true : false; + bool lo_y_physbc = (bc_lo[1] == amrex::BCType::foextrap || bc_lo[1] == amrex::BCType::ext_dir) ? true : false; + bool hi_y_physbc = (bc_hi[1] == amrex::BCType::foextrap || bc_hi[1] == amrex::BCType::ext_dir) ? true : false; // bicubic interpolation to corner points // (i,j,k) refers to lower corner of cell @@ -441,10 +441,10 @@ void BDS_ComputeConc(Box const& bx, Vector bc_hi(AMREX_SPACEDIM); BCPhysToMath(bccomp,bc_lo,bc_hi); - bool lo_x_physbc = (bc_lo[0] == FOEXTRAP || bc_lo[0] == EXT_DIR) ? true : false; - bool hi_x_physbc = (bc_hi[0] == FOEXTRAP || bc_hi[0] == EXT_DIR) ? true : false; - bool lo_y_physbc = (bc_lo[1] == FOEXTRAP || bc_lo[1] == EXT_DIR) ? true : false; - bool hi_y_physbc = (bc_hi[1] == FOEXTRAP || bc_hi[1] == EXT_DIR) ? true : false; + bool lo_x_physbc = (bc_lo[0] == amrex::BCType::foextrap || bc_lo[0] == amrex::BCType::ext_dir) ? true : false; + bool hi_x_physbc = (bc_hi[0] == amrex::BCType::foextrap || bc_hi[0] == amrex::BCType::ext_dir) ? true : false; + bool lo_y_physbc = (bc_lo[1] == amrex::BCType::foextrap || bc_lo[1] == amrex::BCType::ext_dir) ? true : false; + bool hi_y_physbc = (bc_hi[1] == amrex::BCType::foextrap || bc_hi[1] == amrex::BCType::ext_dir) ? true : false; // compute cell-centered ux, vy ParallelFor(gbx, [=] AMREX_GPU_DEVICE (int i, int j, int k){ @@ -913,12 +913,12 @@ void BDS_ComputeSlopes(Box const& bx, Vector bc_hi(AMREX_SPACEDIM); BCPhysToMath(bccomp,bc_lo,bc_hi); - bool lo_x_physbc = (bc_lo[0] == FOEXTRAP || bc_lo[0] == EXT_DIR) ? true : false; - bool hi_x_physbc = (bc_hi[0] == FOEXTRAP || bc_hi[0] == EXT_DIR) ? true : false; - bool lo_y_physbc = (bc_lo[1] == FOEXTRAP || bc_lo[1] == EXT_DIR) ? true : false; - bool hi_y_physbc = (bc_hi[1] == FOEXTRAP || bc_hi[1] == EXT_DIR) ? true : false; - bool lo_z_physbc = (bc_lo[2] == FOEXTRAP || bc_lo[2] == EXT_DIR) ? true : false; - bool hi_z_physbc = (bc_hi[2] == FOEXTRAP || bc_hi[2] == EXT_DIR) ? true : false; + bool lo_x_physbc = (bc_lo[0] == amrex::BCType::foextrap || bc_lo[0] == amrex::BCType::ext_dir) ? true : false; + bool hi_x_physbc = (bc_hi[0] == amrex::BCType::foextrap || bc_hi[0] == amrex::BCType::ext_dir) ? true : false; + bool lo_y_physbc = (bc_lo[1] == amrex::BCType::foextrap || bc_lo[1] == amrex::BCType::ext_dir) ? true : false; + bool hi_y_physbc = (bc_hi[1] == amrex::BCType::foextrap || bc_hi[1] == amrex::BCType::ext_dir) ? true : false; + bool lo_z_physbc = (bc_lo[2] == amrex::BCType::foextrap || bc_lo[2] == amrex::BCType::ext_dir) ? true : false; + bool hi_z_physbc = (bc_hi[2] == amrex::BCType::foextrap || bc_hi[2] == amrex::BCType::ext_dir) ? true : false; // tricubic interpolation to corner points // (i,j,k) refers to lower corner of cell @@ -1368,12 +1368,12 @@ void BDS_ComputeConc(Box const& bx, Vector bc_hi(AMREX_SPACEDIM); BCPhysToMath(bccomp,bc_lo,bc_hi); - bool lo_x_physbc = (bc_lo[0] == FOEXTRAP || bc_lo[0] == EXT_DIR) ? true : false; - bool hi_x_physbc = (bc_hi[0] == FOEXTRAP || bc_hi[0] == EXT_DIR) ? true : false; - bool lo_y_physbc = (bc_lo[1] == FOEXTRAP || bc_lo[1] == EXT_DIR) ? true : false; - bool hi_y_physbc = (bc_hi[1] == FOEXTRAP || bc_hi[1] == EXT_DIR) ? true : false; - bool lo_z_physbc = (bc_lo[2] == FOEXTRAP || bc_lo[2] == EXT_DIR) ? true : false; - bool hi_z_physbc = (bc_hi[2] == FOEXTRAP || bc_hi[2] == EXT_DIR) ? true : false; + bool lo_x_physbc = (bc_lo[0] == amrex::BCType::foextrap || bc_lo[0] == amrex::BCType::ext_dir) ? true : false; + bool hi_x_physbc = (bc_hi[0] == amrex::BCType::foextrap || bc_hi[0] == amrex::BCType::ext_dir) ? true : false; + bool lo_y_physbc = (bc_lo[1] == amrex::BCType::foextrap || bc_lo[1] == amrex::BCType::ext_dir) ? true : false; + bool hi_y_physbc = (bc_hi[1] == amrex::BCType::foextrap || bc_hi[1] == amrex::BCType::ext_dir) ? true : false; + bool lo_z_physbc = (bc_lo[2] == amrex::BCType::foextrap || bc_lo[2] == amrex::BCType::ext_dir) ? true : false; + bool hi_z_physbc = (bc_hi[2] == amrex::BCType::foextrap || bc_hi[2] == amrex::BCType::ext_dir) ? true : false; ParallelFor(gbx, [=] AMREX_GPU_DEVICE (int i, int j, int k){ ux(i,j,k) = (umac(i+1,j,k) - umac(i,j,k)) / hx; diff --git a/src_multispec/DiffusiveMassFluxdiv.cpp b/src_multispec/DiffusiveMassFluxdiv.cpp index 24a7b2098..081b18b3f 100644 --- a/src_multispec/DiffusiveMassFluxdiv.cpp +++ b/src_multispec/DiffusiveMassFluxdiv.cpp @@ -212,7 +212,7 @@ void ComputeHigherOrderTerm(const MultiFab& molarconc, #endif // boundary conditions - if (bc_lo[0] == FOEXTRAP || bc_lo[0] == EXT_DIR) { + if (bc_lo[0] == amrex::BCType::foextrap || bc_lo[0] == amrex::BCType::ext_dir) { if (bx_x.smallEnd(0) <= dom.smallEnd(0)) { int lo = dom.smallEnd(0); amrex::ParallelFor(bx_x, nspecies, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -224,7 +224,7 @@ void ComputeHigherOrderTerm(const MultiFab& molarconc, } } - if (bc_hi[0] == FOEXTRAP || bc_hi[0] == EXT_DIR) { + if (bc_hi[0] == amrex::BCType::foextrap || bc_hi[0] == amrex::BCType::ext_dir) { if (bx_x.bigEnd(0) >= dom.bigEnd(0)+1) { int hi = dom.bigEnd(0)+1; amrex::ParallelFor(bx_x, nspecies, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -236,7 +236,7 @@ void ComputeHigherOrderTerm(const MultiFab& molarconc, } } - if (bc_lo[1] == FOEXTRAP || bc_lo[1] == EXT_DIR) { + if (bc_lo[1] == amrex::BCType::foextrap || bc_lo[1] == amrex::BCType::ext_dir) { if (bx_y.smallEnd(1) <= dom.smallEnd(1)) { int lo = dom.smallEnd(1); amrex::ParallelFor(bx_y, nspecies, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -248,7 +248,7 @@ void ComputeHigherOrderTerm(const MultiFab& molarconc, } } - if (bc_hi[1] == FOEXTRAP || bc_hi[1] == EXT_DIR) { + if (bc_hi[1] == amrex::BCType::foextrap || bc_hi[1] == amrex::BCType::ext_dir) { if (bx_y.bigEnd(1) >= dom.bigEnd(1)+1) { int hi = dom.bigEnd(1)+1; amrex::ParallelFor(bx_y, nspecies, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -261,7 +261,7 @@ void ComputeHigherOrderTerm(const MultiFab& molarconc, } #if (AMREX_SPACEDIM == 3) - if (bc_lo[2] == FOEXTRAP || bc_lo[2] == EXT_DIR) { + if (bc_lo[2] == amrex::BCType::foextrap || bc_lo[2] == amrex::BCType::ext_dir) { if (bx_z.smallEnd(2) <= dom.smallEnd(2)) { int lo = dom.smallEnd(2); amrex::ParallelFor(bx_z, nspecies, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -273,7 +273,7 @@ void ComputeHigherOrderTerm(const MultiFab& molarconc, } } - if (bc_hi[2] == FOEXTRAP || bc_hi[2] == EXT_DIR) { + if (bc_hi[2] == amrex::BCType::foextrap || bc_hi[2] == amrex::BCType::ext_dir) { if (bx_z.bigEnd(2) >= dom.bigEnd(2)+1) { int hi = dom.bigEnd(2)+1; amrex::ParallelFor(bx_z, nspecies, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -449,7 +449,7 @@ void ComputeFHHigherOrderTerm(const MultiFab& molarconc, #endif // boundary conditions - if (bc_lo[0] == FOEXTRAP || bc_lo[0] == EXT_DIR) { + if (bc_lo[0] == amrex::BCType::foextrap || bc_lo[0] == amrex::BCType::ext_dir) { if (bx_x.smallEnd(0) <= dom.smallEnd(0)) { int lo = dom.smallEnd(0); amrex::ParallelFor(bx_x, nspecies, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -461,7 +461,7 @@ void ComputeFHHigherOrderTerm(const MultiFab& molarconc, } } - if (bc_hi[0] == FOEXTRAP || bc_hi[0] == EXT_DIR) { + if (bc_hi[0] == amrex::BCType::foextrap || bc_hi[0] == amrex::BCType::ext_dir) { if (bx_x.bigEnd(0) >= dom.bigEnd(0)+1) { int hi = dom.bigEnd(0)+1; amrex::ParallelFor(bx_x, nspecies, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -473,7 +473,7 @@ void ComputeFHHigherOrderTerm(const MultiFab& molarconc, } } - if (bc_lo[1] == FOEXTRAP || bc_lo[1] == EXT_DIR) { + if (bc_lo[1] == amrex::BCType::foextrap || bc_lo[1] == amrex::BCType::ext_dir) { if (bx_y.smallEnd(1) <= dom.smallEnd(1)) { int lo = dom.smallEnd(1); amrex::ParallelFor(bx_y, nspecies, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -485,7 +485,7 @@ void ComputeFHHigherOrderTerm(const MultiFab& molarconc, } } - if (bc_hi[1] == FOEXTRAP || bc_hi[1] == EXT_DIR) { + if (bc_hi[1] == amrex::BCType::foextrap || bc_hi[1] == amrex::BCType::ext_dir) { if (bx_y.bigEnd(1) >= dom.bigEnd(1)+1) { int hi = dom.bigEnd(1)+1; amrex::ParallelFor(bx_y, nspecies, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -498,7 +498,7 @@ void ComputeFHHigherOrderTerm(const MultiFab& molarconc, } #if (AMREX_SPACEDIM == 3) - if (bc_lo[2] == FOEXTRAP || bc_lo[2] == EXT_DIR) { + if (bc_lo[2] == amrex::BCType::foextrap || bc_lo[2] == amrex::BCType::ext_dir) { if (bx_z.smallEnd(2) <= dom.smallEnd(2)) { int lo = dom.smallEnd(2); amrex::ParallelFor(bx_z, nspecies, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept @@ -510,7 +510,7 @@ void ComputeFHHigherOrderTerm(const MultiFab& molarconc, } } - if (bc_hi[2] == FOEXTRAP || bc_hi[2] == EXT_DIR) { + if (bc_hi[2] == amrex::BCType::foextrap || bc_hi[2] == amrex::BCType::ext_dir) { if (bx_z.bigEnd(2) >= dom.bigEnd(2)+1) { int hi = dom.bigEnd(2)+1; amrex::ParallelFor(bx_z, nspecies, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept diff --git a/src_multispec/RhoUtil.cpp b/src_multispec/RhoUtil.cpp index 00b9356c4..5f99a8523 100644 --- a/src_multispec/RhoUtil.cpp +++ b/src_multispec/RhoUtil.cpp @@ -187,7 +187,7 @@ void FillRhototGhost(MultiFab& rhotot_in, const MultiFab& conc_in, const Geometr int hi = dom.bigEnd(0); if (bx.smallEnd(0) < lo) { - if (bc_lo[0] == FOEXTRAP || bc_lo[0] == EXT_DIR) { + if (bc_lo[0] == amrex::BCType::foextrap || bc_lo[0] == amrex::BCType::ext_dir) { amrex::ParallelFor(bx,[=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept { if (i < lo) { @@ -202,7 +202,7 @@ void FillRhototGhost(MultiFab& rhotot_in, const MultiFab& conc_in, const Geometr } if (bx.bigEnd(0) > hi) { - if (bc_hi[0] == FOEXTRAP || bc_hi[0] == EXT_DIR) { + if (bc_hi[0] == amrex::BCType::foextrap || bc_hi[0] == amrex::BCType::ext_dir) { amrex::ParallelFor(bx,[=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept { if (i > hi) { @@ -224,7 +224,7 @@ void FillRhototGhost(MultiFab& rhotot_in, const MultiFab& conc_in, const Geometr hi = dom.bigEnd(1); if (bx.smallEnd(1) < lo) { - if (bc_lo[1] == FOEXTRAP || bc_lo[1] == EXT_DIR) { + if (bc_lo[1] == amrex::BCType::foextrap || bc_lo[1] == amrex::BCType::ext_dir) { amrex::ParallelFor(bx,[=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept { if (j < lo) { @@ -239,7 +239,7 @@ void FillRhototGhost(MultiFab& rhotot_in, const MultiFab& conc_in, const Geometr } if (bx.bigEnd(1) > hi) { - if (bc_hi[1] == FOEXTRAP || bc_hi[1] == EXT_DIR) { + if (bc_hi[1] == amrex::BCType::foextrap || bc_hi[1] == amrex::BCType::ext_dir) { amrex::ParallelFor(bx,[=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept { if (j > hi) { @@ -262,7 +262,7 @@ void FillRhototGhost(MultiFab& rhotot_in, const MultiFab& conc_in, const Geometr hi = dom.bigEnd(2); if (bx.smallEnd(2) < lo) { - if (bc_lo[2] == FOEXTRAP || bc_lo[2] == EXT_DIR) { + if (bc_lo[2] == amrex::BCType::foextrap || bc_lo[2] == amrex::BCType::ext_dir) { amrex::ParallelFor(bx,[=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept { if (k < lo) { @@ -277,7 +277,7 @@ void FillRhototGhost(MultiFab& rhotot_in, const MultiFab& conc_in, const Geometr } if (bx.bigEnd(2) > hi) { - if (bc_hi[2] == FOEXTRAP || bc_hi[2] == EXT_DIR) { + if (bc_hi[2] == amrex::BCType::foextrap || bc_hi[2] == amrex::BCType::ext_dir) { amrex::ParallelFor(bx,[=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept { if (k > hi) { diff --git a/src_particles/DsmcParticleContainer.cpp b/src_particles/DsmcParticleContainer.cpp index 2eb1def62..69d850c2c 100644 --- a/src_particles/DsmcParticleContainer.cpp +++ b/src_particles/DsmcParticleContainer.cpp @@ -220,7 +220,7 @@ void FhdParticleContainer::MoveParticlesCPP(const Real dt, paramPlane* paramPlan while(runtime > 0) { find_inter_gpu(part, runtime, paramPlaneListPtr, paramPlaneCount, - &intsurf, &inttime, &intside, ZFILL(plo), ZFILL(phi)); + &intsurf, &inttime, &intside, AMREX_ZFILL(plo), AMREX_ZFILL(phi)); for (int d=0; d<(AMREX_SPACEDIM); ++d) { @@ -418,7 +418,7 @@ void FhdParticleContainer::MovePhononsCPP(const Real dt, paramPlane* paramPlaneL // printf("DT: %e\n", dt); // cout << "DT: " << dt << endl; find_inter_gpu(part, runtime, paramPlaneListPtr, paramPlaneCount, - &intsurf, &inttime, &intside, ZFILL(plo), ZFILL(phi)); + &intsurf, &inttime, &intside, AMREX_ZFILL(plo), AMREX_ZFILL(phi)); Real tauImpurityInv = pow(part.rdata(FHD_realData::omega),4)/tau_i_p; Real tauTAInv = part.rdata(FHD_realData::omega)*pow(T_init[0],4)/tau_ta_p; diff --git a/src_particles/DsmcParticleContainer.cpp.old b/src_particles/DsmcParticleContainer.cpp.old index 43e11627a..98c3627c0 100644 --- a/src_particles/DsmcParticleContainer.cpp.old +++ b/src_particles/DsmcParticleContainer.cpp.old @@ -72,7 +72,7 @@ void DsmcParticleContainer::MoveParticlesDSMC(const Real dt, const paramPlane* p m_vector_size[grid_id].dataPtr(), ARLIM_3D(m_vector_ptrs[grid_id].loVect()), ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), - ZFILL(plo),ZFILL(phi),ZFILL(dx), &dt, + AMREX_ZFILL(plo),AMREX_ZFILL(phi),ZFILL(dx), &dt, paramPlaneList, ¶mPlaneCount, &time, flux); lFlux += flux[0]; rFlux += flux[1]; diff --git a/src_particles/FhdParticleContainer.cpp b/src_particles/FhdParticleContainer.cpp index a7d1b9ad8..b8bcc6952 100644 --- a/src_particles/FhdParticleContainer.cpp +++ b/src_particles/FhdParticleContainer.cpp @@ -645,8 +645,8 @@ void FhdParticleContainer::MoveIonsCPP(const Real dt, const Real* dxFluid, const while(runtime > 0) { - //find_inter(&part, &runtime, paramPlaneList, ¶mPlaneCount, &intsurf, &inttime, &intside, ZFILL(plo), ZFILL(phi)); - find_inter_gpu(part, runtime, paramPlaneList, paramPlaneCount, &intsurf, &inttime, &intside, ZFILL(plo), ZFILL(phi)); + //find_inter(&part, &runtime, paramPlaneList, ¶mPlaneCount, &intsurf, &inttime, &intside, AMREX_ZFILL(plo), AMREX_ZFILL(phi)); + find_inter_gpu(part, runtime, paramPlaneList, paramPlaneCount, &intsurf, &inttime, &intside, AMREX_ZFILL(plo), AMREX_ZFILL(phi)); for (int d=0; d 0) { - //find_inter(&part, &runtime, paramPlaneList, ¶mPlaneCount, &intsurf, &inttime, &intside, ZFILL(plo), ZFILL(phi)); - find_inter_gpu(part, runtime, paramPlaneList, paramPlaneCount, &intsurf, &inttime, &intside, ZFILL(plo), ZFILL(phi)); + //find_inter(&part, &runtime, paramPlaneList, ¶mPlaneCount, &intsurf, &inttime, &intside, AMREX_ZFILL(plo), AMREX_ZFILL(phi)); + find_inter_gpu(part, runtime, paramPlaneList, paramPlaneCount, &intsurf, &inttime, &intside, AMREX_ZFILL(plo), AMREX_ZFILL(phi)); //Print() << "PART " << part.id() << ", " << intsurf << "\n"; //cin.get(); @@ -1013,7 +1013,7 @@ void FhdParticleContainer::SpreadIonsGPU(const Real* dxFluid, const Real* dxE, c emf_gpu(particles, efield[0][pti], efield[1][pti], efield[2][pti], - ZFILL(plo), ZFILL(dxE)); + AMREX_ZFILL(plo), AMREX_ZFILL(dxE)); } @@ -1021,8 +1021,8 @@ void FhdParticleContainer::SpreadIonsGPU(const Real* dxFluid, const Real* dxE, c { //spread_ions_fhd_gpu(particles, // sourceTemp[0][pti], sourceTemp[1][pti], sourceTemp[2][pti], - // ZFILL(plo), - // ZFILL(dxFluid)); + // AMREX_ZFILL(plo), + // AMREX_ZFILL(dxFluid)); SpreadMarkersGpu(lev, sourceTemp, coords, dxFluid, 1); } @@ -1089,8 +1089,8 @@ void FhdParticleContainer::SpreadIonsGPU(const Real* dxFluid, const Geometry geo { //spread_ions_fhd_gpu(particles, // sourceTemp[0][pti], sourceTemp[1][pti], sourceTemp[2][pti], - // ZFILL(plo), - // ZFILL(dxFluid)); + // AMREX_ZFILL(plo), + // AMREX_ZFILL(dxFluid)); SpreadMarkersGpu(lev, sourceTemp, coords, dxFluid, 1); } @@ -1814,7 +1814,7 @@ void FhdParticleContainer::collectFieldsGPU(const Real dt, const Real* dxPotenti auto& particles = particle_tile.GetArrayOfStructs(); const int np = particles.numParticles(); - collect_charge_gpu(particles, chargeTemp[pti], ZFILL(geomP.ProbLo()), ZFILL(dxPotential)); + collect_charge_gpu(particles, chargeTemp[pti], AMREX_ZFILL(geomP.ProbLo()), AMREX_ZFILL(dxPotential)); } MultiFabPhysBCCharge(chargeTemp, geomP); diff --git a/src_particles/FhdParticleContainer_WF.cpp b/src_particles/FhdParticleContainer_WF.cpp index 3d8e37969..6babe959a 100644 --- a/src_particles/FhdParticleContainer_WF.cpp +++ b/src_particles/FhdParticleContainer_WF.cpp @@ -343,13 +343,13 @@ void FhdParticleContainer::DoRFD(const Real dt, const Real* dxFluid, const Real* //Print() << "FHD\n"; do_rfd(particles.data(), &np, - ARLIM_3D(tile_box.loVect()), - ARLIM_3D(tile_box.hiVect()), + AMREX_ARLIM_3D(tile_box.loVect()), + AMREX_ARLIM_3D(tile_box.hiVect()), m_vector_ptrs[grid_id].dataPtr(), m_vector_size[grid_id].dataPtr(), - ARLIM_3D(m_vector_ptrs[grid_id].loVect()), - ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), - ZFILL(plo), ZFILL(phi), ZFILL(dx), &dt, ZFILL(geomF.ProbLo()), ZFILL(dxFluid), ZFILL(dxE), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].loVect()), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), + AMREX_ZFILL(plo), AMREX_ZFILL(phi), AMREX_ZFILL(dx), &dt, AMREX_ZFILL(geomF.ProbLo()), AMREX_ZFILL(dxFluid), AMREX_ZFILL(dxE), BL_TO_FORTRAN_3D(umac[0][pti]), BL_TO_FORTRAN_3D(umac[1][pti]), #if (AMREX_SPACEDIM == 3) @@ -421,7 +421,7 @@ void FhdParticleContainer::DoRFD(const Real dt, const Real* dxFluid, const Real* // amrex_compute_p3m_sr_correction_nl(particles.data(), &Np, // neighbors[lev][index].dataPtr(), &Nn, // neighbor_list[lev][index].dataPtr(), &size, &rcount, -// BL_TO_FORTRAN_3D(charge[pti]),BL_TO_FORTRAN_3D(coords[pti]), ARLIM_3D(tile_box.loVect()), ARLIM_3D(tile_box.hiVect()), ZFILL(dx)); } +// BL_TO_FORTRAN_3D(charge[pti]),BL_TO_FORTRAN_3D(coords[pti]), AMREX_ARLIM_3D(tile_box.loVect()), AMREX_ARLIM_3D(tile_box.hiVect()), AMREX_ZFILL(dx)); } // } // if(sr_tog==1) @@ -537,14 +537,14 @@ void FhdParticleContainer::MoveIons(const Real dt, const Real* dxFluid, const Re move_ions_fhd(particles.data(), &np_tile, &rejected_tile, &moves_tile, &maxspeed_tile, &maxdist_tile, &diffinst_tile, - ARLIM_3D(tile_box.loVect()), - ARLIM_3D(tile_box.hiVect()), + AMREX_ARLIM_3D(tile_box.loVect()), + AMREX_ARLIM_3D(tile_box.hiVect()), m_vector_ptrs[grid_id].dataPtr(), m_vector_size[grid_id].dataPtr(), - ARLIM_3D(m_vector_ptrs[grid_id].loVect()), - ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), - ZFILL(plo), ZFILL(phi), ZFILL(dx), &dt, - ZFILL(geomF.ProbLo()), ZFILL(dxFluid), ZFILL(dxE), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].loVect()), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), + AMREX_ZFILL(plo), AMREX_ZFILL(phi), AMREX_ZFILL(dx), &dt, + AMREX_ZFILL(geomF.ProbLo()), AMREX_ZFILL(dxFluid), AMREX_ZFILL(dxE), BL_TO_FORTRAN_3D(umac[0][pti]), BL_TO_FORTRAN_3D(umac[1][pti]), #if (AMREX_SPACEDIM == 3) @@ -707,7 +707,7 @@ void FhdParticleContainer::MoveIonsGPU(const Real dt, const Real* dxFluid, const while(runtime > 0) { printf("delt pre %e\n",inttime); - find_inter_gpu(part, runtime, paramPlaneList, paramPlaneCount, &intsurf, &inttime, &intside, ZFILL(plo), ZFILL(phi)); + find_inter_gpu(part, runtime, paramPlaneList, paramPlaneCount, &intsurf, &inttime, &intside, AMREX_ZFILL(plo), AMREX_ZFILL(phi)); for (int d=0; d 0) { - //find_inter(&part, &runtime, paramPlaneList, ¶mPlaneCount, &intsurf, &inttime, &intside, ZFILL(plo), ZFILL(phi)); - find_inter_gpu(part, runtime, paramPlaneList, paramPlaneCount, &intsurf, &inttime, &intside, ZFILL(plo), ZFILL(phi)); + //find_inter(&part, &runtime, paramPlaneList, ¶mPlaneCount, &intsurf, &inttime, &intside, AMREX_ZFILL(plo), AMREX_ZFILL(phi)); + find_inter_gpu(part, runtime, paramPlaneList, paramPlaneCount, &intsurf, &inttime, &intside, AMREX_ZFILL(plo), AMREX_ZFILL(phi)); //Print() << "PART " << part.id() << ", " << intsurf << "\n"; //cin.get(); @@ -1170,8 +1170,8 @@ void FhdParticleContainer::MoveIonsCPP(const Real dt, const Real* dxFluid, const while(runtime > 0) { - //find_inter(&part, &runtime, paramPlaneList, ¶mPlaneCount, &intsurf, &inttime, &intside, ZFILL(plo), ZFILL(phi)); - find_inter_gpu(part, runtime, paramPlaneList, paramPlaneCount, &intsurf, &inttime, &intside, ZFILL(plo), ZFILL(phi)); + //find_inter(&part, &runtime, paramPlaneList, ¶mPlaneCount, &intsurf, &inttime, &intside, AMREX_ZFILL(plo), AMREX_ZFILL(phi)); + find_inter_gpu(part, runtime, paramPlaneList, paramPlaneCount, &intsurf, &inttime, &intside, AMREX_ZFILL(plo), AMREX_ZFILL(phi)); for (int d=0; d 0) { - //find_inter(&part, &runtime, paramPlaneList, ¶mPlaneCount, &intsurf, &inttime, &intside, ZFILL(plo), ZFILL(phi)); - find_inter_gpu(part, runtime, paramPlaneList, paramPlaneCount, &intsurf, &inttime, &intside, ZFILL(plo), ZFILL(phi)); + //find_inter(&part, &runtime, paramPlaneList, ¶mPlaneCount, &intsurf, &inttime, &intside, AMREX_ZFILL(plo), AMREX_ZFILL(phi)); + find_inter_gpu(part, runtime, paramPlaneList, paramPlaneCount, &intsurf, &inttime, &intside, AMREX_ZFILL(plo), AMREX_ZFILL(phi)); //Print() << "PART " << part.id() << ", " << intsurf << "\n"; //cin.get(); @@ -1607,13 +1607,13 @@ void FhdParticleContainer::SpreadIons(const Real dt, const Real* dxFluid, const //Print() << "FHD\n"; spread_ions_fhd(particles.data(), &np, - ARLIM_3D(tile_box.loVect()), - ARLIM_3D(tile_box.hiVect()), + AMREX_ARLIM_3D(tile_box.loVect()), + AMREX_ARLIM_3D(tile_box.hiVect()), m_vector_ptrs[grid_id].dataPtr(), m_vector_size[grid_id].dataPtr(), - ARLIM_3D(m_vector_ptrs[grid_id].loVect()), - ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), - ZFILL(plo), ZFILL(phi), ZFILL(dx), &dt, ZFILL(geomF.ProbLo()), ZFILL(dxFluid), ZFILL(dxE), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].loVect()), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), + AMREX_ZFILL(plo), AMREX_ZFILL(phi), AMREX_ZFILL(dx), &dt, AMREX_ZFILL(geomF.ProbLo()), AMREX_ZFILL(dxFluid), AMREX_ZFILL(dxE), BL_TO_FORTRAN_3D(umac[0][pti]), BL_TO_FORTRAN_3D(umac[1][pti]), #if (AMREX_SPACEDIM == 3) @@ -1698,13 +1698,13 @@ void FhdParticleContainer::SpreadIonsGPU(const Real* dxFluid, const Real* dxE, c emf_gpu(particles, efield[0][pti], efield[1][pti], efield[2][pti], - ZFILL(plo), ZFILL(dxE)); + AMREX_ZFILL(plo), AMREX_ZFILL(dxE)); if(fluid_tog != 0) { spread_ions_fhd_gpu(particles, sourceTemp[0][pti], sourceTemp[1][pti], sourceTemp[2][pti], - ZFILL(plo), - ZFILL(dxFluid)); + AMREX_ZFILL(plo), + AMREX_ZFILL(dxFluid)); } } @@ -1770,8 +1770,8 @@ void FhdParticleContainer::SpreadIonsGPU(const Real* dxFluid, const Geometry geo { spread_ions_fhd_gpu(particles, sourceTemp[0][pti], sourceTemp[1][pti], sourceTemp[2][pti], - ZFILL(plo), - ZFILL(dxFluid)); + AMREX_ZFILL(plo), + AMREX_ZFILL(dxFluid)); } } @@ -1839,13 +1839,13 @@ void FhdParticleContainer::SpreadIonsGPU(const Real* dxFluid, const Geometry geo // emf_gpu(particles, // efield[0][pti], efield[1][pti], efield[2][pti], -// ZFILL(plo), ZFILL(dxE)); +// AMREX_ZFILL(plo), AMREX_ZFILL(dxE)); // if(fluid_tog != 0) // { // spread_ions_fhd_gpu(particles, // sourceTemp[0][pti], sourceTemp[1][pti], sourceTemp[2][pti], -// ZFILL(plo), -// ZFILL(dxFluid)); +// AMREX_ZFILL(plo), +// AMREX_ZFILL(dxFluid)); // } // } @@ -2647,13 +2647,13 @@ void FhdParticleContainer::collectFields(const Real dt, const Real* dxPotential, const int np = particles.numParticles(); collect_charge(particles.data(), &np, - ARLIM_3D(tile_box.loVect()), - ARLIM_3D(tile_box.hiVect()), + AMREX_ARLIM_3D(tile_box.loVect()), + AMREX_ARLIM_3D(tile_box.hiVect()), m_vector_ptrs[grid_id].dataPtr(), m_vector_size[grid_id].dataPtr(), - ARLIM_3D(m_vector_ptrs[grid_id].loVect()), - ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), - ZFILL(plo), ZFILL(phi), ZFILL(dx), &dt, ZFILL(geomP.ProbLo()), ZFILL(dxPotential), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].loVect()), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), + AMREX_ZFILL(plo), AMREX_ZFILL(phi), AMREX_ZFILL(dx), &dt, AMREX_ZFILL(geomP.ProbLo()), AMREX_ZFILL(dxPotential), BL_TO_FORTRAN_3D(RealCenterCoords[pti]), BL_TO_FORTRAN_3D(chargeTemp[pti])); @@ -2701,7 +2701,7 @@ void FhdParticleContainer::collectFieldsGPU(const Real dt, const Real* dxPotenti auto& particles = particle_tile.GetArrayOfStructs(); const int np = particles.numParticles(); - collect_charge_gpu(particles, chargeTemp[pti], ZFILL(geomP.ProbLo()), ZFILL(dxPotential)); + collect_charge_gpu(particles, chargeTemp[pti], AMREX_ZFILL(geomP.ProbLo()), AMREX_ZFILL(dxPotential)); } MultiFabPhysBCCharge(chargeTemp, geomP); @@ -2737,12 +2737,12 @@ void FhdParticleContainer::InitCollisionCells(MultiFab& collisionPairs, const int Np = particles.numParticles(); init_cells(particles.data(), - ARLIM_3D(tile_box.loVect()), - ARLIM_3D(tile_box.hiVect()), + AMREX_ARLIM_3D(tile_box.loVect()), + AMREX_ARLIM_3D(tile_box.hiVect()), m_vector_ptrs[grid_id].dataPtr(), m_vector_size[grid_id].dataPtr(), - ARLIM_3D(m_vector_ptrs[grid_id].loVect()), - ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].loVect()), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), BL_TO_FORTRAN_3D(collisionPairs[pti]), BL_TO_FORTRAN_3D(collisionFactor[pti]), BL_TO_FORTRAN_3D(cellVols[pti]),&Np,&particleInfo.Neff,&particleInfo.cp,&particleInfo.d,&delt @@ -2769,12 +2769,12 @@ void FhdParticleContainer::CollideParticles(MultiFab& collisionPairs, const int Np = particles.numParticles(); collide_cells(particles.data(), - ARLIM_3D(tile_box.loVect()), - ARLIM_3D(tile_box.hiVect()), + AMREX_ARLIM_3D(tile_box.loVect()), + AMREX_ARLIM_3D(tile_box.hiVect()), m_vector_ptrs[grid_id].dataPtr(), m_vector_size[grid_id].dataPtr(), - ARLIM_3D(m_vector_ptrs[grid_id].loVect()), - ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].loVect()), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), BL_TO_FORTRAN_3D(collisionPairs[pti]), BL_TO_FORTRAN_3D(collisionFactor[pti]), BL_TO_FORTRAN_3D(cellVols[pti]),&Np,&particleInfo.Neff,&particleInfo.cp,&particleInfo.d,&delt @@ -2801,12 +2801,12 @@ void FhdParticleContainer::InitializeFields(MultiFab& particleInstant, const int Np = parts.numParticles(); initialize_fields(parts.data(), - ARLIM_3D(tile_box.loVect()), - ARLIM_3D(tile_box.hiVect()), + AMREX_ARLIM_3D(tile_box.loVect()), + AMREX_ARLIM_3D(tile_box.hiVect()), m_vector_ptrs[grid_id].dataPtr(), m_vector_size[grid_id].dataPtr(), - ARLIM_3D(m_vector_ptrs[grid_id].loVect()), - ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].loVect()), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), BL_TO_FORTRAN_3D(particleInstant[pti]), BL_TO_FORTRAN_3D(cellVols[pti]),&particleInfo.Neff, &Np, &particleInfo.R, &particleInfo.T ); @@ -2861,12 +2861,12 @@ void FhdParticleContainer::EvaluateStats(MultiFab& particleInstant, tp = tp + Np; evaluate_fields_pp(parts.data(), - ARLIM_3D(tile_box.loVect()), - ARLIM_3D(tile_box.hiVect()), + AMREX_ARLIM_3D(tile_box.loVect()), + AMREX_ARLIM_3D(tile_box.hiVect()), m_vector_ptrs[grid_id].dataPtr(), m_vector_size[grid_id].dataPtr(), - ARLIM_3D(m_vector_ptrs[grid_id].loVect()), - ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].loVect()), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), BL_TO_FORTRAN_3D(particleInstant[pti]), BL_TO_FORTRAN_3D(cellVols[pti]),&Neff, &Np, dx ); @@ -2877,8 +2877,8 @@ void FhdParticleContainer::EvaluateStats(MultiFab& particleInstant, { const Box& tile_box = mfi.tilebox(); - evaluate_means(ARLIM_3D(tile_box.loVect()), - ARLIM_3D(tile_box.hiVect()), + evaluate_means(AMREX_ARLIM_3D(tile_box.loVect()), + AMREX_ARLIM_3D(tile_box.hiVect()), BL_TO_FORTRAN_3D(particleInstant[mfi]), BL_TO_FORTRAN_3D(particleMeans[mfi]), BL_TO_FORTRAN_3D(particleVars[mfi]), @@ -2907,12 +2907,12 @@ void FhdParticleContainer::EvaluateStats(MultiFab& particleInstant, const int Np = parts.numParticles(); evaluate_corrs(parts.data(), - ARLIM_3D(tile_box.loVect()), - ARLIM_3D(tile_box.hiVect()), + AMREX_ARLIM_3D(tile_box.loVect()), + AMREX_ARLIM_3D(tile_box.hiVect()), m_vector_ptrs[grid_id].dataPtr(), m_vector_size[grid_id].dataPtr(), - ARLIM_3D(m_vector_ptrs[grid_id].loVect()), - ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].loVect()), + AMREX_ARLIM_3D(m_vector_ptrs[grid_id].hiVect()), BL_TO_FORTRAN_3D(particleInstant[pti]), BL_TO_FORTRAN_3D(particleMeans[pti]), BL_TO_FORTRAN_3D(particleVars[pti]), diff --git a/src_particles/particle_mobility.cpp b/src_particles/particle_mobility.cpp index 965285f7c..0f307ee91 100644 --- a/src_particles/particle_mobility.cpp +++ b/src_particles/particle_mobility.cpp @@ -12,7 +12,7 @@ void ComputeDryMobility(MultiFab & dryMobility, species* particleInfo, const Geo for ( MFIter mfi(dryMobility); mfi.isValid(); ++mfi ) { const Box& bx = mfi.validbox(); - compute_dry_mobility(ARLIM_3D(bx.loVect()), ARLIM_3D(bx.hiVect()), BL_TO_FORTRAN_3D(dryMobility[mfi]), ZFILL(dx), ZFILL(plo), ZFILL(phi), &ngc, particleInfo); + compute_dry_mobility(AMREX_ARLIM_3D(bx.loVect()), AMREX_ARLIM_3D(bx.hiVect()), BL_TO_FORTRAN_3D(dryMobility[mfi]), AMREX_ZFILL(dx), AMREX_ZFILL(plo), AMREX_ZFILL(phi), &ngc, particleInfo); } } diff --git a/unmaintained/src_chem/AmrCoreAdv.cpp b/unmaintained/src_chem/AmrCoreAdv.cpp index 5e6d27894..7685e0c4c 100644 --- a/unmaintained/src_chem/AmrCoreAdv.cpp +++ b/unmaintained/src_chem/AmrCoreAdv.cpp @@ -57,8 +57,8 @@ void AmrCoreAdv::Initialize( ) /* // walls (Neumann) - int bc_con_lo[] = {FOEXTRAP, FOEXTRAP, FOEXTRAP}; - int bc_con_hi[] = {FOEXTRAP, FOEXTRAP, FOEXTRAP}; + int bc_con_lo[] = {amrex::BCType::foextrap, amrex::BCType::foextrap, amrex::BCType::foextrap}; + int bc_con_hi[] = {amrex::BCType::foextrap, amrex::BCType::foextrap, amrex::BCType::foextrap}; */ // bcs.resize(1); for (int idim = 0; idim < AMREX_SPACEDIM; ++idim)