Skip to content

Commit

Permalink
linear op parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
@zingale
zingale committed Jan 21, 2024
1 parent 25c702e commit e2a2643
Show file tree
Hide file tree
Showing 9 changed files with 108 additions and 108 deletions.
16 changes: 8 additions & 8 deletions Source/radiation/HABEC.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -568,15 +568,15 @@ 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
d_sign = -1.0_rt;
}
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;
}
}
Expand Down
92 changes: 46 additions & 46 deletions Source/radiation/HypreABec.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand Down Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -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;
Expand All @@ -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
Expand All @@ -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;
Expand All @@ -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
Expand All @@ -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;
Expand All @@ -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
Expand All @@ -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;
Expand All @@ -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
Expand All @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
Loading

0 comments on commit e2a2643

Please sign in to comment.