Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert hbflx3 to C++ #2590

Merged
merged 12 commits into from
Oct 9, 2023
Merged

Convert hbflx3 to C++ #2590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5914ac8
Convert hbflx3 to C++
maxpkatz Oct 1, 2023
91321c9
Merge branch 'development' into cxx-hbflx3
maxpkatz Oct 1, 2023
9781e6b
Fix indexing error
maxpkatz Oct 2, 2023
ee68667
Merge branch 'development' into cxx-hbflx3
maxpkatz Oct 6, 2023
ba826b8
Fix 1D and 2D
maxpkatz Oct 6, 2023
301cf20
Merge branch 'development' into cxx-hbflx3
zingale Oct 7, 2023
c52fae8
Simplify
maxpkatz Oct 8, 2023
10ec7de
LoopOnCpu
maxpkatz Oct 8, 2023
620528a
Merge branch 'development' into cxx-hbflx3
maxpkatz Oct 8, 2023
54f1d93
Fix left/right edge asymmetry
maxpkatz Oct 9, 2023
4754459
Symmetrize
maxpkatz Oct 9, 2023
ec4fdbe
Fix sign
maxpkatz Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
185 changes: 177 additions & 8 deletions Source/radiation/HABEC.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include <AMReX_Array4.H>
#include <AMReX_REAL.H>

#include <rad_util.H>

using namespace amrex;

namespace HABEC
Expand Down Expand Up @@ -35,37 +37,37 @@ namespace HABEC
#if AMREX_SPACEDIM == 1
if (cdir == 0) {
h = dx[0];
x_left= true;
x_left = true;
}
else if (cdir == 1) {
h = dx[0];
x_right= true;
x_right = true;
}
#elif AMREX_SPACEDIM == 2
if (cdir == 0) {
h = dx[0];
x_left= true;
x_left = true;
}
else if (cdir == 2) {
h = dx[0];
x_right= true;
x_right = true;
}
else if (cdir == 1) {
h = dx[1];
y_left= true;
y_left = true;
}
else if (cdir == 3) {
h = dx[1];
y_right= true;
y_right = true;
}
#else
if (cdir == 0) {
h = dx[0];
x_left= true;
x_left = true;
}
else if (cdir == 3) {
h = dx[0];
x_right= true;
x_right = true;
}
else if (cdir == 1) {
h = dx[1];
Expand Down Expand Up @@ -198,6 +200,173 @@ namespace HABEC
}
}

AMREX_INLINE
void hbflx3 (Array4<Real> const flux,
Array4<Real const> const er,
const Box& reg,
int cdir, int bctype,
Array4<int const> const tf,
int bho, Real bcl,
Array4<Real const> const bcval,
Array4<int const> const mask,
Array4<Real const> const b,
Real beta, const Real* const dx, Real c,
const Orientation& ori,
const GeometryData& geomdata, int inhom,
Array4<Real const> const spa)
{
Real h;

// Index shift for whichever edge we're checking.
// Negative means we're looking at the lo edge,
// positive means we're looking at the hi edge.
// The first group is for cell centers, the second
// group is for cell edges.

int icp = 0;
int jcp = 0;
int kcp = 0;

int iep = 0;
int jep = 0;
int kep = 0;

#if AMREX_SPACEDIM == 1
if (cdir == 0) {
h = dx[0];
icp = -1;
}
else if (cdir == 1) {
h = dx[0];
icp = 1;
iep = 1;
}
#elif AMREX_SPACEDIM == 2
if (cdir == 0) {
h = dx[0];
icp = -1;
}
else if (cdir == 2) {
h = dx[0];
icp = 1;
iep = 1;
}
else if (cdir == 1) {
h = dx[1];
jcp = -1;
}
else if (cdir == 3) {
h = dx[1];
jcp = 1;
jep = 1;
}
#else
if (cdir == 0) {
h = dx[0];
icp = -1;
}
else if (cdir == 3) {
h = dx[0];
icp = 1;
iep = 1;
}
else if (cdir == 1) {
h = dx[1];
jcp = -1;
}
else if (cdir == 4) {
h = dx[1];
jcp = 1;
jep = 1;
}
else if (cdir == 2) {
h = dx[2];
kcp = -1;
}
else if (cdir == 5) {
h = dx[2];
kcp = 1;
kep = 1;
}
#endif

amrex::LoopOnCpu(reg, [=] (int i, int j, int k) noexcept
{
Real r;
face_metric(i, j, k, reg.loVect()[0], reg.hiVect()[0], geomdata, ori.coordDir(), ori.isLow(), r);

Real bfv, bfm, bfm2, h2, th2;
int bct;

if (mask.contains(i+icp,j+jcp,k+kcp)) {
if (mask(i+icp,j+jcp,k+kcp) > 0) {
if (bctype == -1) {
bct = tf(i+icp,j+jcp,k+kcp);
}
else {
bct = bctype;
}
if (bct == LO_DIRICHLET) {
if (bho >= 1) {
h2 = 0.5e0_rt * h;
th2 = 3.e0_rt * h2;
bfv = 2.e0_rt * beta * h / ((bcl + h2) * (bcl + th2)) * b(i,j,k);
bfm = (beta / h) * (th2 - bcl) / (bcl + h2) * b(i,j,k);
bfm2 = (beta / h) * (bcl - h2) / (bcl + th2) * b(i,j,k);
}
else {
bfv = beta / (0.5e0_rt * h + bcl) * b(i,j,k);
bfm = bfv;
}
}
else if (bct == LO_NEUMANN) {
bfv = beta * r;
bfm = 0.e0_rt;
bfm2 = 0.e0_rt;
}
else if (bct == LO_MARSHAK) {
bfv = 2.e0_rt * beta * r;
if (bho >= 1) {
bfm = 0.375e0_rt * c * bfv;
bfm2 = -0.125e0_rt * c * bfv;
}
else {
bfm = 0.25e0_rt * c * bfv;
}
}
else if (bct == LO_SANCHEZ_POMRANING) {
bfv = 2.e0_rt * beta * r;
if (bho >= 1) {
bfm = 1.5e0_rt * spa(i,j,k) * c * bfv;
bfm2 = -0.5e0_rt * spa(i,j,k) * c * bfv;
}
else {
bfm = spa(i,j,k) * c * bfv;
}
}
else {
amrex::Error("hbflx3: unsupported boundary type");
}
if (inhom == 0) {
bfv = 0.e0_rt;
}

Real flux_sign = 1.0_rt;
if (iep != 0 || jep != 0 || kep != 0) {
// right edge
flux_sign = -1.0_rt;
}

flux(i+iep,j+jep,k+kep) = flux_sign * (bfv * bcval(i+icp,j+jcp,k+kcp) - bfm * er(i,j,k));

if (bho >= 1) {
Real df = -bfm2 * er(i-icp,j-jcp,k-kcp);
flux(i+iep,j+jep,k+kep) -= flux_sign * df;
}
}
}
});
}
} // namespace HABEC

#endif
144 changes: 0 additions & 144 deletions Source/radiation/HABEC_1D.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,150 +13,6 @@ module habec_module

contains

subroutine hbflx3(flux, &
DIMS(fbox), &
er, DIMS(ebox), &
DIMS(reg), &
cdir, bctype, tf, bho, bcl, &
bcval, DIMS(bcv), &
mask, DIMS(msk), &
b, DIMS(bbox), &
beta, dx, c, r, inhom, &
spa, DIMS(spabox)) bind(C, name="hbflx3")

use amrex_fort_module, only : rt => amrex_real
integer :: DIMDEC(fbox)
integer :: DIMDEC(ebox)
integer :: DIMDEC(reg)
integer :: DIMDEC(bcv)
integer :: DIMDEC(msk)
integer :: DIMDEC(bbox)
integer :: DIMDEC(spabox)
integer :: cdir, bctype, tf(DIMV(bcv)), bho, inhom
real(rt) :: bcl, beta, dx(1), c
real(rt) :: flux(DIMV(fbox))
real(rt) :: er(DIMV(ebox))
real(rt) :: bcval(DIMV(bcv))
integer :: mask(DIMV(msk))
real(rt) :: b(DIMV(bbox))
real(rt) :: spa(DIMV(spabox))
real(rt) :: r(1)
real(rt) :: h, bfm, bfv, r0
real(rt) :: bfm2, h2, th2
integer :: i, bct
h = dx(1)
! r is passed as an array but actually has only one element, which is
! appropriate for the face we are doing here.
r0 = r(1)
if (cdir == 0) then
! Left face of grid
i = reg_l1
if (mask(i-1) > 0) then
if (bctype == -1) then
bct = tf(i-1)
else
bct = bctype
endif
if (bct == LO_DIRICHLET) then
if (bho >= 1) then
h2 = 0.5e0_rt * h
th2 = 3.e0_rt * h2
bfv = 2.e0_rt * beta * h / ((bcl + h2) * (bcl + th2)) * b(i)
bfm = (beta / h) * (th2 - bcl) / (bcl + h2) * b(i)
bfm2 = (beta / h) * (bcl - h2) / (bcl + th2) * b(i)
else
bfv = beta / (0.5e0_rt * h + bcl) * b(i)
bfm = bfv
endif
else if (bct == LO_NEUMANN) then
bfv = beta * r0
bfm = 0.e0_rt
bfm2 = 0.e0_rt
else if (bct == LO_MARSHAK) then
bfv = 2.e0_rt * beta * r0
if (bho >= 1) then
bfm = 0.375e0_rt * c * bfv
bfm2 = -0.125e0_rt * c * bfv
else
bfm = 0.25e0_rt * c * bfv
endif
else if (bct == LO_SANCHEZ_POMRANING) then
bfv = 2.e0_rt * beta * r0
if (bho >= 1) then
bfm = 1.5e0_rt * spa(i) * c * bfv
bfm2 = -0.5e0_rt * spa(i) * c * bfv
else
bfm = spa(i) * c * bfv
endif
else
print *, "hbflx3: unsupported boundary type"
stop
endif
if (inhom == 0) then
bfv = 0.e0_rt
endif
flux(i) = (bfv * bcval(i-1) - bfm * er(i))
if (bho >= 1) then
flux(i) = flux(i) - bfm2 * er(i+1)
endif
endif
else if (cdir == 1) then
! Right face of grid
i = reg_h1
if (mask(i+1) > 0) then
if (bctype == -1) then
bct = tf(i+1)
else
bct = bctype
endif
if (bct == LO_DIRICHLET) then
if (bho >= 1) then
h2 = 0.5e0_rt * h
th2 = 3.e0_rt * h2
bfv = 2.e0_rt * beta * h / ((bcl + h2) * (bcl + th2)) * b(i+1)
bfm = (beta / h) * (th2 - bcl) / (bcl + h2) * b(i+1)
bfm2 = (beta / h) * (bcl - h2) / (bcl + th2) * b(i+1)
else
bfv = beta / (0.5e0_rt * h + bcl) * b(i+1)
bfm = bfv
endif
else if (bct == LO_NEUMANN) then
bfv = beta * r0
bfm = 0.e0_rt
bfm2 = 0.e0_rt
else if (bct == LO_MARSHAK) then
bfv = 2.e0_rt * beta * r0
if (bho >= 1) then
bfm = 0.375e0_rt * c * bfv
bfm2 = -0.125e0_rt * c * bfv
else
bfm = 0.25e0_rt * c * bfv
endif
else if (bct == LO_SANCHEZ_POMRANING) then
bfv = 2.e0_rt * beta * r0
if (bho >= 1) then
bfm = 1.5e0_rt * spa(i) * c * bfv
bfm2 = -0.5e0_rt * spa(i) * c * bfv
else
bfm = spa(i) * c * bfv
endif
else
print *, "hbflx3: unsupported boundary type"
stop
endif
if (inhom == 0) then
bfv = 0.e0_rt
endif
flux(i+1) = -(bfv * bcval(i+1) - bfm * er(i))
if (bho >= 1) then
flux(i+1) = flux(i+1) + bfm2 * er(i-1)
endif
endif
else
print *, "hbflx3: impossible face orientation"
endif
end subroutine hbflx3

subroutine hdterm(dterm, &
DIMS(dtbox), &
er, DIMS(ebox), &
Expand Down
Loading