diff --git a/Source/BCfill.cpp b/Source/BCfill.cpp index 0b3b90101..76e51c2ab 100644 --- a/Source/BCfill.cpp +++ b/Source/BCfill.cpp @@ -164,7 +164,7 @@ pc_bcfill_hyp( if (PeleC::turb_inflow.is_initialized()) { for (int dir = 0; dir < AMREX_SPACEDIM; ++dir) { auto bndryBoxLO = amrex::Box(amrex::adjCellLo(geom.Domain(), dir) & bx); - if (bcr[1].lo()[dir] == EXT_DIR && bndryBoxLO.ok()) { + if (bcr[1].lo()[dir] == amrex::BCType::ext_dir && bndryBoxLO.ok()) { // Create box with ghost cells and set them to zero amrex::IntVect growVect(PeleC::numGrow()); growVect[dir] = 0; @@ -179,7 +179,7 @@ pc_bcfill_hyp( } auto bndryBoxHI = amrex::Box(amrex::adjCellHi(geom.Domain(), dir) & bx); - if (bcr[1].hi()[dir] == EXT_DIR && bndryBoxHI.ok()) { + if (bcr[1].hi()[dir] == amrex::BCType::ext_dir && bndryBoxHI.ok()) { // Create box with ghost cells and set them to zero amrex::IntVect growVect(PeleC::numGrow()); growVect[dir] = 0; diff --git a/Source/Godunov.H b/Source/Godunov.H index 3e0592709..2432770a0 100644 --- a/Source/Godunov.H +++ b/Source/Godunov.H @@ -1127,13 +1127,17 @@ pc_artif_visc( divu(iv), 0.5 * (divu(iv) + divu(ivpj)), 0.25 * (divu(iv) + divu(ivpj) + divu(ivpk) + divu(ivpp)))); - bool at_bndry = ((dir == 0) && (i == domlo) && (bclo == NoSlipWall)) || - ((dir == 0) && (i == domhi + 1) && (bchi == NoSlipWall)) || - ((dir == 1) && (j == domlo) && (bclo == NoSlipWall)) || - ((dir == 1) && (j == domhi + 1) && (bchi == NoSlipWall)); + bool at_bndry = + ((dir == 0) && (i == domlo) && (bclo == amrex::PhysBCType::noslipwall)) || + ((dir == 0) && (i == domhi + 1) && + (bchi == amrex::PhysBCType::noslipwall)) || + ((dir == 1) && (j == domlo) && (bclo == amrex::PhysBCType::noslipwall)) || + ((dir == 1) && (j == domhi + 1) && (bchi == amrex::PhysBCType::noslipwall)); #if (AMREX_SPACEDIM == 3) - at_bndry = at_bndry || ((dir == 2) && (k == domlo) && (bclo == NoSlipWall)) || - ((dir == 2) && (k == domhi + 1) && (bchi == NoSlipWall)); + at_bndry = + at_bndry || + ((dir == 2) && (k == domlo) && (bclo == amrex::PhysBCType::noslipwall)) || + ((dir == 2) && (k == domhi + 1) && (bchi == amrex::PhysBCType::noslipwall)); #endif for (int n = 0; n < NVAR; ++n) { diff --git a/Source/Hydro.cpp b/Source/Hydro.cpp index fc61b591c..7de41e573 100644 --- a/Source/Hydro.cpp +++ b/Source/Hydro.cpp @@ -126,7 +126,8 @@ PeleC::construct_hydro_source( // // The user should provide a bcnormal routine in bc_fill_module with // additional optional arguments to temporary fill ghost-cells for - // EXT_DIR and to provide target BC values. See the examples. + // amrex::BCType::ext_dir and to provide target BC values. See the + // examples. // Allocate fabs for bcMask. Note that we grow in the opposite direction // because the Riemann solver wants a face value in a ghost-cell diff --git a/Source/InitEB.cpp b/Source/InitEB.cpp index 91919a2b8..77a65d0a7 100644 --- a/Source/InitEB.cpp +++ b/Source/InitEB.cpp @@ -444,8 +444,8 @@ PeleC::eb_distance(const int lev, amrex::MultiFab& signDistLev) // dummy bcs amrex::Vector bcrec_dummy(1); for (int dir = 0; dir < AMREX_SPACEDIM; dir++) { - bcrec_dummy[0].setLo(dir, INT_DIR); - bcrec_dummy[0].setHi(dir, INT_DIR); + bcrec_dummy[0].setLo(dir, amrex::BCType::int_dir); + bcrec_dummy[0].setHi(dir, amrex::BCType::int_dir); } // Interpolate on successive levels up to lev diff --git a/Source/PeleC.cpp b/Source/PeleC.cpp index 8231eec95..649734104 100644 --- a/Source/PeleC.cpp +++ b/Source/PeleC.cpp @@ -642,8 +642,8 @@ PeleC::setGridInfo() const int* domhi_coarse = geom.Domain().hiVect(); for (int dir = 0; dir < 3; dir++) { - domlo_level[dir] = (ARLIM_3D(domlo_coarse))[dir]; - domhi_level[dir] = (ARLIM_3D(domhi_coarse))[dir]; + domlo_level[dir] = (AMREX_ARLIM_3D(domlo_coarse))[dir]; + domhi_level[dir] = (AMREX_ARLIM_3D(domhi_coarse))[dir]; } for (int lev = 1; lev <= max_level; lev++) { diff --git a/Source/Setup.cpp b/Source/Setup.cpp index 6aa7abe1d..ae82a2331 100644 --- a/Source/Setup.cpp +++ b/Source/Setup.cpp @@ -32,18 +32,29 @@ SootModel PeleC::soot_model; // Components are defined in PCPhysBCType enum in PeleC.H: // Interior, Inflow, Outflow, Symmetry, SlipWall, NoSlipWall, UserBC -static int scalar_bc[] = {INT_DIR, EXT_DIR, FOEXTRAP, REFLECT_EVEN, - REFLECT_EVEN, REFLECT_EVEN, EXT_DIR}; - -static int norm_vel_bc[] = {INT_DIR, EXT_DIR, FOEXTRAP, REFLECT_ODD, - REFLECT_ODD, REFLECT_ODD, EXT_DIR}; - -static int tang_vel_bc[] = {INT_DIR, EXT_DIR, FOEXTRAP, REFLECT_EVEN, - REFLECT_EVEN, REFLECT_ODD, EXT_DIR}; - -static int react_src_bc[] = {INT_DIR, REFLECT_EVEN, REFLECT_EVEN, - REFLECT_EVEN, REFLECT_EVEN, REFLECT_EVEN, - REFLECT_EVEN}; +static int scalar_bc[] = { + amrex::BCType::int_dir, amrex::BCType::ext_dir, + amrex::BCType::foextrap, amrex::BCType::reflect_even, + amrex::BCType::reflect_even, amrex::BCType::reflect_even, + amrex::BCType::ext_dir}; + +static int norm_vel_bc[] = { + amrex::BCType::int_dir, amrex::BCType::ext_dir, + amrex::BCType::foextrap, amrex::BCType::reflect_odd, + amrex::BCType::reflect_odd, amrex::BCType::reflect_odd, + amrex::BCType::ext_dir}; + +static int tang_vel_bc[] = { + amrex::BCType::int_dir, amrex::BCType::ext_dir, + amrex::BCType::foextrap, amrex::BCType::reflect_even, + amrex::BCType::reflect_even, amrex::BCType::reflect_odd, + amrex::BCType::ext_dir}; + +static int react_src_bc[] = { + amrex::BCType::int_dir, amrex::BCType::reflect_even, + amrex::BCType::reflect_even, amrex::BCType::reflect_even, + amrex::BCType::reflect_even, amrex::BCType::reflect_even, + amrex::BCType::reflect_even}; static void set_scalar_bc(amrex::BCRec& bc, const amrex::BCRec& phys_bc) diff --git a/Submodules/PelePhysics b/Submodules/PelePhysics index e3f207761..c125141b0 160000 --- a/Submodules/PelePhysics +++ b/Submodules/PelePhysics @@ -1 +1 @@ -Subproject commit e3f207761de72b799f7023014f06e17650bc4b20 +Subproject commit c125141b0d551d50348604c3db5824d22980da83