From e2a264338d5929e4a17e00a07ff4784a230382da Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Sun, 21 Jan 2024 10:06:51 -0500 Subject: [PATCH] linear op parameters --- Source/radiation/HABEC.H | 16 ++--- Source/radiation/HypreABec.cpp | 92 +++++++++++++------------- Source/radiation/HypreExtMultiABec.cpp | 12 ++-- Source/radiation/HypreMultiABec.cpp | 54 +++++++-------- Source/radiation/MGFLDRadSolver.cpp | 4 +- Source/radiation/MGRadBndry.cpp | 16 ++--- Source/radiation/RadBndry.cpp | 14 ++-- Source/radiation/RadSolve.cpp | 4 +- Source/radiation/SGRadSolver.cpp | 4 +- 9 files changed, 108 insertions(+), 108 deletions(-) diff --git a/Source/radiation/HABEC.H b/Source/radiation/HABEC.H index 3039e759d3..66f6b32636 100644 --- a/Source/radiation/HABEC.H +++ b/Source/radiation/HABEC.H @@ -89,7 +89,7 @@ namespace HABEC Real bfv, bfm, bfm2; - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { Real h2 = 0.5e0_rt * h; Real th2 = 3.e0_rt * h2; @@ -306,7 +306,7 @@ namespace HABEC else { bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { h2 = 0.5e0_rt * h; th2 = 3.e0_rt * h2; @@ -319,12 +319,12 @@ namespace HABEC bfm = bfv; } } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfv = beta * r; bfm = 0.e0_rt; bfm2 = 0.e0_rt; } - else if (bct == LO_MARSHAK) { + else if (bct == amrex::LinOpBCType::Marshak) { bfv = 2.e0_rt * beta * r; if (bho >= 1) { bfm = 0.375e0_rt * c * bfv; @@ -334,7 +334,7 @@ namespace HABEC bfm = 0.25e0_rt * c * bfv; } } - else if (bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * beta * r; if (bho >= 1) { bfm = 1.5e0_rt * spa(i,j,k) * c * bfv; @@ -457,7 +457,7 @@ namespace HABEC { if (mask.contains(i+icp,j+jcp,k+kcp)) { if (mask(i+icp,j+jcp,k+kcp) > 0) { - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { Real d_sign = 1.0_rt; if (iep != 0 || jep != 0 || kep != 0) { // right edge @@ -568,7 +568,7 @@ namespace HABEC else { bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { Real d_sign = 1.0_rt; if (iep != 0 || jep != 0 || kep != 0) { // right edge @@ -576,7 +576,7 @@ namespace HABEC } dterm(i+iep,j+jep,k+kep) = d(i+iep,j+jep,k+kep) * d_sign * (er(i,j,k) - bcval(i+icp,j+jcp,k+kcp)) / (0.5_rt * h + bcl); } - else if (bct == LO_NEUMANN && bcval(i+icp,j+jcp,k+kcp) == 0.0_rt) { + else if (bct == amrex::LinOpBCType::Neumann && bcval(i+icp,j+jcp,k+kcp) == 0.0_rt) { dterm(i+iep,j+jep,k+kep) = 0.0_rt; } } diff --git a/Source/radiation/HypreABec.cpp b/Source/radiation/HypreABec.cpp index 638d4715bb..6b5fefd6ee 100644 --- a/Source/radiation/HypreABec.cpp +++ b/Source/radiation/HypreABec.cpp @@ -507,11 +507,11 @@ void HypreABec::hbmat (const Box& bx, Real bfv, bfm; - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { bfv = fac * h / (0.5e0_rt * h + bcl); bfm = bfv - fac; } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfv = beta / h; bfm = -fac; } @@ -691,18 +691,18 @@ void HypreABec::hbmat3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { bfv = fac * h / (0.5e0_rt * h + bcl); bfm = bfv * b(i,j,k); } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfm = 0.e0_rt; } - else if (bct == LO_MARSHAK) { + else if (bct == amrex::LinOpBCType::Marshak) { bfv = 2.e0_rt * beta * r / h; bfm = 0.25e0_rt * c * bfv; } - else if (bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * beta * r / h; bfm = spa(i,j,k) * c * bfv; } @@ -729,18 +729,18 @@ void HypreABec::hbmat3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { bfv = fac * h / (0.5e0_rt * h + bcl); bfm = bfv * b(i+1,j,k); } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfm = 0.e0_rt; } - else if (bct == LO_MARSHAK) { + else if (bct == amrex::LinOpBCType::Marshak) { bfv = 2.e0_rt * beta * r / h; bfm = 0.25e0_rt * c * bfv; } - else if (bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * beta * r / h; bfm = spa(i,j,k) * c * bfv; } @@ -766,18 +766,18 @@ void HypreABec::hbmat3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { bfv = fac * h / (0.5e0_rt * h + bcl); bfm = bfv * b(i,j,k); } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfm = 0.e0_rt; } - else if (bct == LO_MARSHAK) { + else if (bct == amrex::LinOpBCType::Marshak) { bfv = 2.e0_rt * beta * r / h; bfm = 0.25e0_rt * c * bfv; } - else if (bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * beta * r / h; bfm = spa(i,j,k) * c * bfv; } @@ -804,18 +804,18 @@ void HypreABec::hbmat3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { bfv = fac * h / (0.5e0_rt * h + bcl); bfm = bfv * b(i,j+1,k); } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfm = 0.e0_rt; } - else if (bct == LO_MARSHAK) { + else if (bct == amrex::LinOpBCType::Marshak) { bfv = 2.e0_rt * beta * r / h; bfm = 0.25e0_rt * c * bfv; } - else if (bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * beta * r / h; bfm = spa(i,j,k) * c * bfv; } @@ -842,18 +842,18 @@ void HypreABec::hbmat3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { bfv = fac * h / (0.5e0_rt * h + bcl); bfm = bfv * b(i,j,k); } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfm = 0.e0_rt; } - else if (bct == LO_MARSHAK) { + else if (bct == amrex::LinOpBCType::Marshak) { bfv = 2.e0_rt * beta * r / h; bfm = 0.25e0_rt * c * bfv; } - else if (bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * beta * r / h; bfm = spa(i,j,k) * c * bfv; } @@ -880,18 +880,18 @@ void HypreABec::hbmat3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { bfv = fac * h / (0.5e0_rt * h + bcl); bfm = bfv * b(i,j,k+1); } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfm = 0.e0_rt; } - else if (bct == LO_MARSHAK) { + else if (bct == amrex::LinOpBCType::Marshak) { bfv = 2.e0_rt * beta * r / h; bfm = 0.25e0_rt * c * bfv; } - else if (bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * beta * r / h; bfm = spa(i,j,k) * c * bfv; } @@ -1275,7 +1275,7 @@ void HypreABec::hbvec3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { h2 = 0.5e0_rt * h; th2 = 3.e0_rt * h2; @@ -1287,10 +1287,10 @@ void HypreABec::hbvec3 (const Box& bx, bfv = bfv * b(i,j,k); } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfv = beta * r / h; } - else if (bct == LO_MARSHAK || bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::Marshak || bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * beta * r / h; } #ifndef AMREX_USE_GPU @@ -1315,7 +1315,7 @@ void HypreABec::hbvec3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { h2 = 0.5e0_rt * h; th2 = 3.e0_rt * h2; @@ -1327,10 +1327,10 @@ void HypreABec::hbvec3 (const Box& bx, bfv = bfv * b(i+1,j,k); } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfv = beta * r / h; } - else if (bct == LO_MARSHAK || bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::Marshak || bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * beta * r / h; } #ifndef AMREX_USE_GPU @@ -1355,7 +1355,7 @@ void HypreABec::hbvec3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { h2 = 0.5e0_rt * h; th2 = 3.e0_rt * h2; @@ -1367,10 +1367,10 @@ void HypreABec::hbvec3 (const Box& bx, bfv = bfv * b(i,j,k); } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfv = beta * r / h; } - else if (bct == LO_MARSHAK || bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::Marshak || bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * beta * r / h; } #ifndef AMREX_USE_GPU @@ -1395,7 +1395,7 @@ void HypreABec::hbvec3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { h2 = 0.5e0_rt * h; th2 = 3.e0_rt * h2; @@ -1407,10 +1407,10 @@ void HypreABec::hbvec3 (const Box& bx, bfv = bfv * b(i,j+1,k); } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfv = beta * r / h; } - else if (bct == LO_MARSHAK || bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::Marshak || bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * beta * r / h; } #ifndef AMREX_USE_GPU @@ -1435,7 +1435,7 @@ void HypreABec::hbvec3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { h2 = 0.5e0_rt * h; th2 = 3.e0_rt * h2; @@ -1447,10 +1447,10 @@ void HypreABec::hbvec3 (const Box& bx, bfv = bfv * b(i,j,k); } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfv = beta * r / h; } - else if (bct == LO_MARSHAK || bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::Marshak || bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * beta * r / h; } #ifndef AMREX_USE_GPU @@ -1475,7 +1475,7 @@ void HypreABec::hbvec3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { h2 = 0.5e0_rt * h; th2 = 3.e0_rt * h2; @@ -1487,10 +1487,10 @@ void HypreABec::hbvec3 (const Box& bx, bfv = bfv * b(i,j,k+1); } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfv = beta * r / h; } - else if (bct == LO_MARSHAK || bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::Marshak || bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * beta * r / h; } #ifndef AMREX_USE_GPU @@ -1591,7 +1591,7 @@ void HypreABec::hbvec (const Box& bx, } } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { h2 = 0.5e0_rt * h; th2 = 3.e0_rt * h2; @@ -1601,7 +1601,7 @@ void HypreABec::hbvec (const Box& bx, bfv = (beta / h) / (0.5e0_rt * h + bcl); } } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfv = beta / h; } else { diff --git a/Source/radiation/HypreExtMultiABec.cpp b/Source/radiation/HypreExtMultiABec.cpp index a65292751a..3357e02465 100644 --- a/Source/radiation/HypreExtMultiABec.cpp +++ b/Source/radiation/HypreExtMultiABec.cpp @@ -423,7 +423,7 @@ void HypreExtMultiABec::loadMatrix() if (reg[ori] == domain[ori] && bd[level]->mixedBndry(ori)) { bct = (*(bd[level]->bndryTypes(ori)[i]))(v+vin); } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho == 1) { evalue(ori,i)(v+vin).push(level, v, (bcl * th2) / (h * (bcl + h2))); @@ -478,10 +478,10 @@ void HypreExtMultiABec::loadMatrix() entry(ori,i)(v).push(&(*ederiv[level])(ori,i)(v+vin), fac); } } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { // no more action required here } - else if (bct == LO_MARSHAK || bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::Marshak || bct == amrex::LinOpBCType::SanchezPomraning) { if (bho == 1) { evalue(ori,i)(v+vin).push(level, v, 1.5); evalue(ori,i)(v+vin).push(level, v-vin, -0.5); @@ -937,7 +937,7 @@ void HypreExtMultiABec::loadLevelVectorB(int level, if (reg[ori] == domain[ori] && bd[level]->mixedBndry(ori)) { bct = (*(bd[level]->bndryTypes(ori)[i]))(v+vin); } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { Real dfac, vfac; if (bho == 1) { dfac = 1.0 / ((bcl + h2) * (bcl + th2)); @@ -991,7 +991,7 @@ void HypreExtMultiABec::loadLevelVectorB(int level, HYPRE_SStructVectorAddToValues(b, part, getV1(v), 0, &tmp); } } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { // cmult should be c for photons, 1 for neutrinos Real cmult = 1.0; Real xi = 0.0; // xi should be passed in through RadBndry? @@ -1000,7 +1000,7 @@ void HypreExtMultiABec::loadLevelVectorB(int level, cmult * fs(v+vin,bdcomp)); HYPRE_SStructVectorAddToValues(b, part, getV1(v), 0, &tmp); } - else if (bct == LO_MARSHAK || bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::Marshak || bct == amrex::LinOpBCType::SanchezPomraning) { // cmult should be c for photons, 1 for neutrinos Real cmult = 1.0; Real xi = 0.0; // xi should be passed in through RadBndry? diff --git a/Source/radiation/HypreMultiABec.cpp b/Source/radiation/HypreMultiABec.cpp index df8ed2e6d8..58c27b3d4c 100644 --- a/Source/radiation/HypreMultiABec.cpp +++ b/Source/radiation/HypreMultiABec.cpp @@ -1502,7 +1502,7 @@ HypreMultiABec::hmmat (const Box& bx, Real bfm, bfv; Real bfm2, h2, th2; - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { @@ -1520,7 +1520,7 @@ HypreMultiABec::hmmat (const Box& bx, } } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfm = -fac; bfm2 = 0.e0_rt; @@ -1739,7 +1739,7 @@ HypreMultiABec::hmmat3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { h2 = 0.5e0_rt * h; @@ -1753,13 +1753,13 @@ HypreMultiABec::hmmat3 (const Box& bx, } } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfm = 0.e0_rt; bfm2 = 0.e0_rt; } - else if (bct == LO_MARSHAK) { + else if (bct == amrex::LinOpBCType::Marshak) { bfv = 2.e0_rt * c * beta * r / h; @@ -1772,7 +1772,7 @@ HypreMultiABec::hmmat3 (const Box& bx, } } - else if (bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * c * beta * r / h; @@ -1813,7 +1813,7 @@ HypreMultiABec::hmmat3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { h2 = 0.5e0_rt * h; @@ -1827,13 +1827,13 @@ HypreMultiABec::hmmat3 (const Box& bx, } } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfm = 0.e0_rt; bfm2 = 0.e0_rt; } - else if (bct == LO_MARSHAK) { + else if (bct == amrex::LinOpBCType::Marshak) { bfv = 2.e0_rt * c * beta * r / h; @@ -1846,7 +1846,7 @@ HypreMultiABec::hmmat3 (const Box& bx, } } - else if (bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * c * beta * r / h; @@ -1887,7 +1887,7 @@ HypreMultiABec::hmmat3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { h2 = 0.5e0_rt * h; @@ -1901,13 +1901,13 @@ HypreMultiABec::hmmat3 (const Box& bx, } } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfm = 0.e0_rt; bfm2 = 0.e0_rt; } - else if (bct == LO_MARSHAK) { + else if (bct == amrex::LinOpBCType::Marshak) { bfv = 2.e0_rt * c * beta * r / h; @@ -1920,7 +1920,7 @@ HypreMultiABec::hmmat3 (const Box& bx, } } - else if (bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * c * beta * r / h; @@ -1961,7 +1961,7 @@ HypreMultiABec::hmmat3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { h2 = 0.5e0_rt * h; @@ -1975,13 +1975,13 @@ HypreMultiABec::hmmat3 (const Box& bx, } } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfm = 0.e0_rt; bfm2 = 0.e0_rt; } - else if (bct == LO_MARSHAK) { + else if (bct == amrex::LinOpBCType::Marshak) { bfv = 2.e0_rt * c * beta * r / h; @@ -1994,7 +1994,7 @@ HypreMultiABec::hmmat3 (const Box& bx, } } - else if (bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * c * beta * r / h; @@ -2035,7 +2035,7 @@ HypreMultiABec::hmmat3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { h2 = 0.5e0_rt * h; @@ -2049,13 +2049,13 @@ HypreMultiABec::hmmat3 (const Box& bx, } } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfm = 0.e0_rt; bfm2 = 0.e0_rt; } - else if (bct == LO_MARSHAK) { + else if (bct == amrex::LinOpBCType::Marshak) { bfv = 2.e0_rt * c * beta * r / h; @@ -2068,7 +2068,7 @@ HypreMultiABec::hmmat3 (const Box& bx, } } - else if (bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * c * beta * r / h; @@ -2109,7 +2109,7 @@ HypreMultiABec::hmmat3 (const Box& bx, bct = bctype; } - if (bct == LO_DIRICHLET) { + if (bct == amrex::LinOpBCType::Dirichlet) { if (bho >= 1) { h2 = 0.5e0_rt * h; @@ -2123,13 +2123,13 @@ HypreMultiABec::hmmat3 (const Box& bx, } } - else if (bct == LO_NEUMANN) { + else if (bct == amrex::LinOpBCType::Neumann) { bfm = 0.e0_rt; bfm2 = 0.e0_rt; } - else if (bct == LO_MARSHAK) { + else if (bct == amrex::LinOpBCType::Marshak) { bfv = 2.e0_rt * c * beta * r / h; @@ -2142,7 +2142,7 @@ HypreMultiABec::hmmat3 (const Box& bx, } } - else if (bct == LO_SANCHEZ_POMRANING) { + else if (bct == amrex::LinOpBCType::SanchezPomraning) { bfv = 2.e0_rt * c * beta * r / h; @@ -2286,7 +2286,7 @@ void HypreMultiABec::loadMatrix() // level in the current linear system. Zero out the interior // stencil using Neumann BC: - const RadBoundCond bct_coarse = LO_NEUMANN; + const RadBoundCond bct_coarse = amrex::LinOpBCType::Neumann; hmmat(reg, matfab.array(), cdir, bct_coarse, bho, bcl, msk.array(), (*bcoefs[level])[idim][mfi].array(), beta, geom[level].CellSize()); diff --git a/Source/radiation/MGFLDRadSolver.cpp b/Source/radiation/MGFLDRadSolver.cpp index 250de9b1ae..40206aa0df 100644 --- a/Source/radiation/MGFLDRadSolver.cpp +++ b/Source/radiation/MGFLDRadSolver.cpp @@ -147,8 +147,8 @@ void Radiation::MGFLD_implicit_update(int level, int iteration, int ncycle) for (int idim=0; idim(value_nu[igroup], igroup); } diff --git a/Source/radiation/RadBndry.cpp b/Source/radiation/RadBndry.cpp index aa742febef..e65b2bdac0 100644 --- a/Source/radiation/RadBndry.cpp +++ b/Source/radiation/RadBndry.cpp @@ -148,7 +148,7 @@ void RadBndry::setBndryConds(const BCRec& bc, bloc[i] = 0.; } else if (p_bc == EXTRAP || p_bc == HOEXTRAP || p_bc == REFLECT_EVEN) { - bctag[i] = LO_NEUMANN; + bctag[i] = amrex::LinOpBCType::Neumann; bloc[i] = 0.; } else if (p_bc == REFLECT_ODD) { @@ -156,12 +156,12 @@ void RadBndry::setBndryConds(const BCRec& bc, bloc[i] = 0.; } */ - if (p_bc == LO_DIRICHLET || p_bc == LO_NEUMANN || - p_bc == LO_REFLECT_ODD) { + if (p_bc == amrex::LinOpBCType::Dirichlet || p_bc == amrex::LinOpBCType::Neumann || + p_bc == amrex::LinOpBCType::reflect_odd) { bctag[i] = p_bc; bloc[i] = 0.; } - else if (p_bc == LO_MARSHAK || p_bc == LO_SANCHEZ_POMRANING) { + else if (p_bc == amrex::LinOpBCType::Marshak || p_bc == amrex::LinOpBCType::SanchezPomraning) { bctag[i] = p_bc; //gives asymmetric, second-order version of Marshak b.c. // (worked for bbmg, works with nonsymmetric hypre solvers): @@ -177,7 +177,7 @@ void RadBndry::setBndryConds(const BCRec& bc, } else { // internal bndry - bctag[i] = LO_DIRICHLET; + bctag[i] = amrex::LinOpBCType::Dirichlet; bloc[i] = 0.5*delta; } } @@ -211,8 +211,8 @@ void RadBndry::setBndryFluxConds(const BCRec& bc, const BC_Mode phys_bc_mode) if (domain[face] == grd[face] && !geom.isPeriodic(dir)) { if (bcflag[face] <= 1) { - if (p_bc == LO_MARSHAK || p_bc == LO_SANCHEZ_POMRANING || - p_bc == LO_DIRICHLET || p_bc == LO_NEUMANN) { + if (p_bc == amrex::LinOpBCType::Marshak || p_bc == amrex::LinOpBCType::SanchezPomraning || + p_bc == amrex::LinOpBCType::Dirichlet || p_bc == amrex::LinOpBCType::Neumann) { setValue(face, i, value); } } diff --git a/Source/radiation/RadSolve.cpp b/Source/radiation/RadSolve.cpp index 372384d415..cc2687667f 100644 --- a/Source/radiation/RadSolve.cpp +++ b/Source/radiation/RadSolve.cpp @@ -261,12 +261,12 @@ void RadSolve::levelSPas(int level, Array& lambda, int bool nexttoboundary=false; for (int idim=0; idim