Skip to content

Commit

Permalink
more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@zingale
zingale committed Jan 21, 2024
1 parent b4163cc commit 25c702e
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions Exec/gravity_tests/DustCollapse/problem_bc_fill.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<Real>(ic) + 0.5_rt) * dx[0] - problem::center[0];
Expand All @@ -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<Real>(ic) + 0.5_rt) * dx[0] - problem::center[0];
Expand All @@ -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<Real>(jc) + 0.5_rt) * dx[1] - problem::center[1];
Expand All @@ -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<Real>(jc) + 0.5_rt) * dx[1] - problem::center[1];
Expand All @@ -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<Real>(kc) + 0.5_rt) * dx[2] - problem::center[2];
Expand All @@ -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<Real>(kc) + 0.5_rt) * dx[2] - problem::center[2];
Expand Down
6 changes: 3 additions & 3 deletions Exec/gravity_tests/hydrostatic_adjust/problem_bc_fill.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions Exec/hydro_tests/double_mach_reflection/problem_bc_fill.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -43,7 +43,7 @@ void problem_bc_fill(int i, int j, int k,
Real y = problo[1] + dx[1] * (static_cast<Real>(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;
Expand Down Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions Exec/radiation_tests/Rad2Tshock/problem_bc_fill.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 25c702e

Please sign in to comment.