From 25c702ed91b1e468af86828b87750d4fdc493272 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Sun, 21 Jan 2024 09:40:57 -0500 Subject: [PATCH] more fixes --- Exec/gravity_tests/DustCollapse/problem_bc_fill.H | 12 ++++++------ .../hydrostatic_adjust/problem_bc_fill.H | 6 +++--- .../double_mach_reflection/problem_bc_fill.H | 6 +++--- Exec/radiation_tests/Rad2Tshock/problem_bc_fill.H | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Exec/gravity_tests/DustCollapse/problem_bc_fill.H b/Exec/gravity_tests/DustCollapse/problem_bc_fill.H index 2a8df96b84..f716888a93 100644 --- a/Exec/gravity_tests/DustCollapse/problem_bc_fill.H +++ b/Exec/gravity_tests/DustCollapse/problem_bc_fill.H @@ -30,7 +30,7 @@ void problem_bc_fill(int i, int j, int k, Real r = std::sqrt(x * x + y * y + z * z); // XLO - if (bcs(0).lo(0) == FOEXTRAP && i < domlo[0]) { + if (bcs(0).lo(0) == amrex::BCType::foextrap && i < domlo[0]) { int ic = domlo[0]; Real xc = problo[0] + (static_cast(ic) + 0.5_rt) * dx[0] - problem::center[0]; @@ -50,7 +50,7 @@ void problem_bc_fill(int i, int j, int k, } // XHI - if (bcs(0).hi(0) == FOEXTRAP && i > domhi[0]) { + if (bcs(0).hi(0) == amrex::BCType::foextrap && i > domhi[0]) { int ic = domhi[0]; Real xc = problo[0] + (static_cast(ic) + 0.5_rt) * dx[0] - problem::center[0]; @@ -71,7 +71,7 @@ void problem_bc_fill(int i, int j, int k, #if AMREX_SPACEDIM >= 2 // YLO - if (bcs(0).lo(1) == FOEXTRAP && j < domlo[1]) { + if (bcs(0).lo(1) == amrex::BCType::foextrap && j < domlo[1]) { int jc = domlo[1]; Real yc = problo[1] + (static_cast(jc) + 0.5_rt) * dx[1] - problem::center[1]; @@ -91,7 +91,7 @@ void problem_bc_fill(int i, int j, int k, } // YHI - if (bcs(0).hi(1) == FOEXTRAP && j > domhi[1]) { + if (bcs(0).hi(1) == amrex::BCType::foextrap && j > domhi[1]) { int jc = domhi[1]; Real yc = problo[1] + (static_cast(jc) + 0.5_rt) * dx[1] - problem::center[1]; @@ -112,7 +112,7 @@ void problem_bc_fill(int i, int j, int k, #if AMREX_SPACEDIM == 3 // ZLO - if (bcs(0).lo(2) == FOEXTRAP && k < domlo[2]) { + if (bcs(0).lo(2) == amrex::BCType::foextrap && k < domlo[2]) { int kc = domlo[2]; Real zc = problo[2] + (static_cast(kc) + 0.5_rt) * dx[2] - problem::center[2]; @@ -132,7 +132,7 @@ void problem_bc_fill(int i, int j, int k, } // ZHI - if (bcs(0).hi(2) == FOEXTRAP && k > domhi[2]) { + if (bcs(0).hi(2) == amrex::BCType::foextrap && k > domhi[2]) { int kc = domhi[2]; Real zc = problo[2] + (static_cast(kc) + 0.5_rt) * dx[2] - problem::center[2]; diff --git a/Exec/gravity_tests/hydrostatic_adjust/problem_bc_fill.H b/Exec/gravity_tests/hydrostatic_adjust/problem_bc_fill.H index 96ab44b365..fdd937e98e 100644 --- a/Exec/gravity_tests/hydrostatic_adjust/problem_bc_fill.H +++ b/Exec/gravity_tests/hydrostatic_adjust/problem_bc_fill.H @@ -14,7 +14,7 @@ void problem_bc_fill(int i, int j, int k, if (AMREX_SPACEDIM == 1) { - if (bcs(UMX).hi(0) == FOEXTRAP && i > domhi[0]) { + if (bcs(UMX).hi(0) == amrex::BCType::foextrap && i > domhi[0]) { Real vel = amrex::max(state(i,j,k,UMX) / state(i,j,k,URHO), 0.0); state(i,j,k,URHO) = problem::hse_rho_top; @@ -36,7 +36,7 @@ void problem_bc_fill(int i, int j, int k, } else if (AMREX_SPACEDIM == 2) { - if (bcs(UMY).hi(1) == FOEXTRAP && j > domhi[1]) { + if (bcs(UMY).hi(1) == amrex::BCType::foextrap && j > domhi[1]) { Real vel = amrex::max(state(i,j,k,UMY) / state(i,j,k,URHO), 0.0); state(i,j,k,URHO) = problem::hse_rho_top; @@ -58,7 +58,7 @@ void problem_bc_fill(int i, int j, int k, } else { - if (bcs(UMZ).hi(2) == FOEXTRAP && k > domhi[2]) { + if (bcs(UMZ).hi(2) == amrex::BCType::foextrap && k > domhi[2]) { Real vel = amrex::max(state(i,j,k,UMZ) / state(i,j,k,URHO), 0.0); state(i,j,k,URHO) = problem::hse_rho_top; diff --git a/Exec/hydro_tests/double_mach_reflection/problem_bc_fill.H b/Exec/hydro_tests/double_mach_reflection/problem_bc_fill.H index c1edfe36c7..63f63d8f48 100644 --- a/Exec/hydro_tests/double_mach_reflection/problem_bc_fill.H +++ b/Exec/hydro_tests/double_mach_reflection/problem_bc_fill.H @@ -18,7 +18,7 @@ void problem_bc_fill(int i, int j, int k, // x boundaries //------------------------------------------------------------------------- - if ((bcs(URHO).lo(0) == EXT_DIR || bcs(URHO).lo(0) == FOEXTRAP) && i < domlo[0]) { + if ((bcs(URHO).lo(0) == amrex::BCType::ext_dir || bcs(URHO).lo(0) == amrex::BCType::foextrap) && i < domlo[0]) { state(i,j,k,URHO) = problem::rho_l; state(i,j,k,UMX) = problem::rho_l * problem::u_l; state(i,j,k,UMY) = problem::rho_l * problem::v_l; @@ -43,7 +43,7 @@ void problem_bc_fill(int i, int j, int k, Real y = problo[1] + dx[1] * (static_cast(j) + 0.5e0_rt); // YLO - if ((bcs(URHO).lo(1) == EXT_DIR || bcs(URHO).lo(1) == FOEXTRAP) && j < domlo[1]) { + if ((bcs(URHO).lo(1) == amrex::BCType::ext_dir || bcs(URHO).lo(1) == amrex::BCType::foextrap) && j < domlo[1]) { if (x < 1.e0_rt / 6.e0_rt) { // ICs state(i,j,k,URHO) = problem::rho_l; @@ -71,7 +71,7 @@ void problem_bc_fill(int i, int j, int k, } // YHI - if ((bcs(URHO).hi(2) == EXT_DIR || bcs(URHO).hi(2) == FOEXTRAP) && j > domhi[1]) { + if ((bcs(URHO).hi(2) == amrex::BCType::ext_dir || bcs(URHO).hi(2) == amrex::BCType::foextrap) && j > domhi[1]) { state(i,j,k,URHO ) = 0.e0_rt; state(i,j,k,UMX ) = 0.e0_rt; state(i,j,k,UMY ) = 0.e0_rt; diff --git a/Exec/radiation_tests/Rad2Tshock/problem_bc_fill.H b/Exec/radiation_tests/Rad2Tshock/problem_bc_fill.H index bb2f45ce6d..04c7b784ef 100644 --- a/Exec/radiation_tests/Rad2Tshock/problem_bc_fill.H +++ b/Exec/radiation_tests/Rad2Tshock/problem_bc_fill.H @@ -18,7 +18,7 @@ void problem_bc_fill(int i, int j, int k, if (problem::idir == 1) { // XLO - if ((bcs(URHO).lo(0) == EXT_DIR || bcs(URHO).lo(0) == FOEXTRAP) && i < domlo[0]) { + if ((bcs(URHO).lo(0) == amrex::BCType::ext_dir || bcs(URHO).lo(0) == amrex::BCType::foextrap) && i < domlo[0]) { state(i,j,k,URHO) = problem::rho0; state(i,j,k,UMX) = problem::rho0 * problem::v0; state(i,j,k,UMY) = 0.e0_rt; @@ -33,7 +33,7 @@ void problem_bc_fill(int i, int j, int k, } // XHI - if ((bcs(URHO).hi(0) == EXT_DIR || bcs(URHO).hi(0) == FOEXTRAP) && i > domhi[0]) { + if ((bcs(URHO).hi(0) == amrex::BCType::ext_dir || bcs(URHO).hi(0) == amrex::BCType::foextrap) && i > domhi[0]) { state(i,j,k,URHO) = problem::rho1; state(i,j,k,UMX) = problem::rho1 * problem::v1; state(i,j,k,UMY) = 0.e0_rt; @@ -51,7 +51,7 @@ void problem_bc_fill(int i, int j, int k, else if (problem::idir == 2) { // YLO - if ((bcs(URHO).lo(1) == EXT_DIR || bcs(URHO).lo(1) == FOEXTRAP) && j < domlo[1]) { + if ((bcs(URHO).lo(1) == amrex::BCType::ext_dir || bcs(URHO).lo(1) == amrex::BCType::foextrap) && j < domlo[1]) { state(i,j,k,URHO) = problem::rho0; state(i,j,k,UMX) = 0.e0_rt; state(i,j,k,UMY) = problem::rho0 * problem::v0; @@ -66,7 +66,7 @@ void problem_bc_fill(int i, int j, int k, } // YHI - if ((bcs(URHO).hi(1) == EXT_DIR || bcs(URHO).hi(1) == FOEXTRAP) && j > domhi[1]) { + if ((bcs(URHO).hi(1) == amrex::BCType::ext_dir || bcs(URHO).hi(1) == amrex::BCType::foextrap) && j > domhi[1]) { state(i,j,k,URHO) = problem::rho1; state(i,j,k,UMX) = 0.e0_rt; state(i,j,k,UMY) = problem::rho1 * problem::v1; @@ -84,7 +84,7 @@ void problem_bc_fill(int i, int j, int k, else if (problem::idir == 3) { // ZLO - if ((bcs(URHO).lo(2) == EXT_DIR || bcs(URHO).lo(2) == FOEXTRAP) && k < domlo[2]) { + if ((bcs(URHO).lo(2) == amrex::BCType::ext_dir || bcs(URHO).lo(2) == amrex::BCType::foextrap) && k < domlo[2]) { state(i,j,k,URHO) = problem::rho0; state(i,j,k,UMX) = 0.e0_rt; state(i,j,k,UMY) = 0.e0_rt; @@ -99,7 +99,7 @@ void problem_bc_fill(int i, int j, int k, } // ZHI - if ((bcs(URHO).hi(2) == EXT_DIR || bcs(URHO).hi(2) == FOEXTRAP) && k > domhi[2]) { + if ((bcs(URHO).hi(2) == amrex::BCType::ext_dir || bcs(URHO).hi(2) == amrex::BCType::foextrap) && k > domhi[2]) { state(i,j,k,URHO) = problem::rho1; state(i,j,k,UMX) = 0.e0_rt; state(i,j,k,UMY) = 0.e0_rt;