Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
79 changes: 31 additions & 48 deletions Src/LinearSolvers/MLMG/AMReX_MLEBABecLap_2D_K.H
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ void mlebabeclap_adotx_centroid (Box const& box, Array4<Real> const& y,
GpuArray<Real,AMREX_SPACEDIM> const& dxinv,
Real alpha, Real beta, int ncomp) noexcept
{
amrex::ignore_unused(ba);

Real dhx = beta*dxinv[0]*dxinv[0];
Real dhy = beta*dxinv[1]*dxinv[1];
Real dh = beta*dxinv[0]*dxinv[1];

amrex::Loop(box, ncomp, [=] (int i, int j, int k, int n) noexcept
{
Expand Down Expand Up @@ -139,25 +140,20 @@ void mlebabeclap_adotx_centroid (Box const& box, Array4<Real> const& y,
Real feb = Real(0.0);
if (is_eb_dirichlet && flag(i,j,k).isSingleValued())
{
Real dapx = (apxm-apxp)/dxinv[1];
Real dapy = (apym-apyp)/dxinv[0];
Real anorm = std::hypot(dapx,dapy);
Real anorminv = Real(1.0)/anorm;
Real anrmx = dapx * anorminv;
Real anrmy = dapy * anorminv;

Real anrmx = (apxm-apxp) * dhx;
Real anrmy = (apym-apyp) * dhy;

feb = grad_eb_of_phi_on_centroids_extdir(i,j,k,n,x,phieb,flag,ccent,bcent,vfrc,
anrmx,anrmy,is_eb_inhomog,
on_x_face, domlo_x, domhi_x,
on_y_face, domlo_y, domhi_y);

feb *= ba(i,j,k) * beb(i,j,k,n);
feb *= beb(i,j,k,n);
}


y(i,j,k,n) = alpha*a(i,j,k)*x(i,j,k,n) + (Real(1.0)/kappa) *
(dhx*(apxm*fxm-apxp*fxp) + dhy*(apym*fym-apyp*fyp) - dh*feb);
(dhx*(apxm*fxm-apxp*fxp) + dhy*(apym*fym-apyp*fyp) - feb);
}
});
}
Expand All @@ -176,10 +172,10 @@ void mlebabeclap_adotx (Box const& box, Array4<Real> const& y,
Real alpha, Real beta, int ncomp,
bool beta_on_centroid, bool phi_on_centroid) noexcept
{
amrex::ignore_unused(ba);

Real dhx = beta*dxinv[0]*dxinv[0];
Real dhy = beta*dxinv[1]*dxinv[1];
Real dh = beta*dxinv[0]*dxinv[1];


bool beta_on_center = !(beta_on_centroid);
bool phi_on_center = !( phi_on_centroid);
Expand Down Expand Up @@ -256,12 +252,8 @@ void mlebabeclap_adotx (Box const& box, Array4<Real> const& y,

Real feb = Real(0.0);
if (is_dirichlet) {
Real dapx = (apxm-apxp)/dxinv[1];
Real dapy = (apym-apyp)/dxinv[0];
Real anorm = std::hypot(dapx,dapy);
Real anorminv = Real(1.0)/anorm;
Real anrmx = dapx * anorminv;
Real anrmy = dapy * anorminv;
Real anrmx = (apxm-apxp) * dhx;
Real anrmy = (apym-apyp) * dhy;

Real phib = is_inhomog ? phieb(i,j,k,n) : Real(0.0);

Expand Down Expand Up @@ -290,12 +282,12 @@ void mlebabeclap_adotx (Box const& box, Array4<Real> const& y,

Real dphidn = (phib-phig) / dg;

feb = dphidn * ba(i,j,k) * beb(i,j,k,n);
feb = dphidn * beb(i,j,k,n);
}

y(i,j,k,n) = alpha*a(i,j,k)*x(i,j,k,n) + (Real(1.0)/kappa) *
(dhx*(apxm*fxm-apxp*fxp) +
dhy*(apym*fym-apyp*fyp) - dh*feb);
dhy*(apym*fym-apyp*fyp) - feb);
}
});
}
Expand Down Expand Up @@ -327,15 +319,12 @@ void mlebabeclap_ebflux (int i, int j, int k, int n,
Real apym = apy(i,j,k);
Real apyp = apy(i,j+1,k);

Real dapx = (apxm-apxp)/dxinv[1];
Real dapy = (apym-apyp)/dxinv[0];
Real dapx = (apxm-apxp)*dxinv[0];
Real dapy = (apym-apyp)*dxinv[1];
Real anorm = std::hypot(dapx,dapy);
Real anorminv = Real(1.0)/anorm;
Real anrmx = dapx * anorminv;
Real anrmy = dapy * anorminv;
const Real bareascaling = std::sqrt( (anrmx/dxinv[0])*(anrmx/dxinv[0]) +
(anrmy/dxinv[1])*(anrmy/dxinv[1]) );

Real anrmx = dapx * anorminv * dxinv[0];
Real anrmy = dapy * anorminv * dxinv[1];

Real phib = is_inhomog ? phieb(i,j,k,n) : Real(0.0);

Expand All @@ -362,7 +351,7 @@ void mlebabeclap_ebflux (int i, int j, int k, int n,
+ ( - gy*sy - gx*gy*sx*sy) * x(i ,jj,k,n)
+ ( + gx*gy*sx*sy) * x(ii,jj,k,n) ;

Real dphidn = (phib-phig)/(dg * bareascaling);
Real dphidn = (phib-phig)/dg;
feb(i,j,k,n) = -beb(i,j,k,n) * dphidn;
}
}
Expand All @@ -383,6 +372,8 @@ void mlebabeclap_gsrb (Box const& box,
bool is_dirichlet, bool beta_on_centroid, bool phi_on_centroid,
Box const& vbox, int redblack, int ncomp) noexcept
{
amrex::ignore_unused(dh, dx);

const auto vlo = amrex::lbound(vbox);
const auto vhi = amrex::ubound(vbox);

Expand Down Expand Up @@ -533,12 +524,8 @@ void mlebabeclap_gsrb (Box const& box,
dhy*(apym*oym-apyp*oyp));

if (is_dirichlet) {
Real dapx = (apxm-apxp)*dx[1];
Real dapy = (apym-apyp)*dx[0];
Real anorm = std::hypot(dapx,dapy);
Real anorminv = Real(1.0)/anorm;
Real anrmx = dapx * anorminv;
Real anrmy = dapy * anorminv;
Real anrmx = (apxm-apxp) * dhx;
Real anrmy = (apym-apyp) * dhy;

Real bctx = ebdata.get<EBData_t::bndrycent>(i,j,k,0);
Real bcty = ebdata.get<EBData_t::bndrycent>(i,j,k,1);
Expand Down Expand Up @@ -566,13 +553,11 @@ void mlebabeclap_gsrb (Box const& box,
// In gsrb we are always in residual-correction form so phib = 0
Real dphidn = ( -phig)/dg;

Real ba = ebdata.get<EBData_t::bndryarea>(i,j,k);
Real feb = dphidn * beb(i,j,k,n);
rho += vfrcinv*feb;

Real feb = dphidn * ba * beb(i,j,k,n);
rho += -vfrcinv*(-dh)*feb;

Real feb_gamma = -phig_gamma/dg * ba * beb(i,j,k,n);
gamma += vfrcinv*(-dh)*feb_gamma;
Real feb_gamma = -phig_gamma/dg * beb(i,j,k,n);
gamma += -vfrcinv*feb_gamma;
}

Real res = rhs(i,j,k,n) - (gamma*phi(i,j,k,n) - rho);
Expand Down Expand Up @@ -777,6 +762,8 @@ void mlebabeclap_normalize (Box const& box, Array4<Real> const& phi,
Array4<Real const> const& beb,
bool is_dirichlet, bool beta_on_centroid, int ncomp) noexcept
{
amrex::ignore_unused(dh, ba, dx);

amrex::Loop(box, ncomp, [=] (int i, int j, int k, int n) noexcept
{
if (flag(i,j,k).isRegular())
Expand Down Expand Up @@ -830,12 +817,8 @@ void mlebabeclap_normalize (Box const& box, Array4<Real> const& phi,
dhy*(apym*sym-apyp*syp));

if (is_dirichlet) {
Real dapx = (apxm-apxp)*dx[1];
Real dapy = (apym-apyp)*dx[0];
Real anorm = std::hypot(dapx,dapy);
Real anorminv = Real(1.0)/anorm;
Real anrmx = dapx * anorminv;
Real anrmy = dapy * anorminv;
Real anrmx = (apxm-apxp)*dhx;
Real anrmy = (apym-apyp)*dhy;

Real bctx = bc(i,j,k,0);
Real bcty = bc(i,j,k,1);
Expand All @@ -853,8 +836,8 @@ void mlebabeclap_normalize (Box const& box, Array4<Real> const& phi,
sy = std::copysign(Real(1.0),anrmy);

Real phig_gamma = (Real(1.0) + gx*sx + gy*sy + gx*gy*sx*sy);
Real feb_gamma = -phig_gamma/dg * ba(i,j,k) * beb(i,j,k,n);
gamma += vfrcinv*(-dh)*feb_gamma;
Real feb_gamma = -phig_gamma/dg * beb(i,j,k,n);
gamma += -vfrcinv * feb_gamma;
}

phi(i,j,k,n) /= gamma;
Expand Down
75 changes: 35 additions & 40 deletions Src/LinearSolvers/MLMG/AMReX_MLEBABecLap_3D_K.H
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ void mlebabeclap_adotx_centroid (Box const& box, Array4<Real> const& y,
GpuArray<Real,AMREX_SPACEDIM> const& dxinv,
Real alpha, Real beta, int ncomp) noexcept
{
amrex::ignore_unused(ba);

Real dhx = beta*dxinv[0]*dxinv[0];
Real dhy = beta*dxinv[1]*dxinv[1];
Real dhz = beta*dxinv[2]*dxinv[2];
Expand Down Expand Up @@ -190,24 +192,22 @@ void mlebabeclap_adotx_centroid (Box const& box, Array4<Real> const& y,
Real dapx = apxm-apxp;
Real dapy = apym-apyp;
Real dapz = apzm-apzp;
Real anorm = std::sqrt(dapx*dapx+dapy*dapy+dapz*dapz);
Real anorminv = Real(1.0)/anorm;
Real anrmx = dapx * anorminv;
Real anrmy = dapy * anorminv;
Real anrmz = dapz * anorminv;
Real anrmx = dapx * dhx;
Real anrmy = dapy * dhy;
Real anrmz = dapz * dhz;

feb = grad_eb_of_phi_on_centroids_extdir(i,j,k,n,x,phieb,flag,ccent,bcent,vfrc,
anrmx,anrmy,anrmz,is_eb_inhomog,
on_x_face,domlo_x,domhi_x,
on_y_face,domlo_y,domhi_y,
on_z_face,domlo_z,domhi_z);
feb *= ba(i,j,k) * beb(i,j,k,n);
feb *= beb(i,j,k,n);
}

y(i,j,k,n) = alpha*a(i,j,k)*x(i,j,k,n) + (Real(1.0)/kappa) *
(dhx*(apxm*fxm - apxp*fxp) +
dhy*(apym*fym - apyp*fyp) +
dhz*(apzm*fzm - apzp*fzp) - dhx*feb);
dhz*(apzm*fzm - apzp*fzp) - feb);
}
});
}
Expand All @@ -228,6 +228,8 @@ void mlebabeclap_adotx (Box const& box, Array4<Real> const& y,
Real alpha, Real beta, int ncomp,
bool beta_on_centroid, bool phi_on_centroid) noexcept
{
amrex::ignore_unused(ba);

Real dhx = beta*dxinv[0]*dxinv[0];
Real dhy = beta*dxinv[1]*dxinv[1];
Real dhz = beta*dxinv[2]*dxinv[2];
Expand Down Expand Up @@ -409,11 +411,9 @@ void mlebabeclap_adotx (Box const& box, Array4<Real> const& y,
Real dapx = apxm-apxp;
Real dapy = apym-apyp;
Real dapz = apzm-apzp;
Real anorm = std::sqrt(dapx*dapx+dapy*dapy+dapz*dapz);
Real anorminv = Real(1.0)/anorm;
Real anrmx = dapx * anorminv;
Real anrmy = dapy * anorminv;
Real anrmz = dapz * anorminv;
Real anrmx = dapx * dhx;
Real anrmy = dapy * dhy;
Real anrmz = dapz * dhz;

Real phib = is_inhomog ? phieb(i,j,k,n) : Real(0.0);

Expand Down Expand Up @@ -452,13 +452,13 @@ void mlebabeclap_adotx (Box const& box, Array4<Real> const& y,

Real dphidn = (phib-phig)/dg;

feb = dphidn * ba(i,j,k) * beb(i,j,k,n);
feb = dphidn * beb(i,j,k,n);
}

y(i,j,k,n) = alpha*a(i,j,k)*x(i,j,k,n) + (Real(1.0)/kappa) *
(dhx*(apxm*fxm - apxp*fxp) +
dhy*(apym*fym - apyp*fyp) +
dhz*(apzm*fzm - apzp*fzp) - dhx*feb);
dhz*(apzm*fzm - apzp*fzp) - feb);
}
});
}
Expand All @@ -478,7 +478,6 @@ void mlebabeclap_ebflux (int i, int j, int k, int n,
bool is_inhomog,
GpuArray<Real,AMREX_SPACEDIM> const& dxinv) noexcept
{
Real dhx = dxinv[0];

if (!flag(i,j,k).isSingleValued())
{
Expand All @@ -494,14 +493,14 @@ void mlebabeclap_ebflux (int i, int j, int k, int n,
Real apzm = apz(i,j,k);
Real apzp = apz(i,j,k+1);

Real dapx = apxm-apxp;
Real dapy = apym-apyp;
Real dapz = apzm-apzp;
Real dapx = (apxm-apxp)*dxinv[0];
Real dapy = (apym-apyp)*dxinv[1];
Real dapz = (apzm-apzp)*dxinv[2];
Real anorm = std::sqrt(dapx*dapx+dapy*dapy+dapz*dapz);
Real anorminv = Real(1.0)/anorm;
Real anrmx = dapx * anorminv;
Real anrmy = dapy * anorminv;
Real anrmz = dapz * anorminv;
Real anrmx = dapx * anorminv * dxinv[0];
Real anrmy = dapy * anorminv * dxinv[1];
Real anrmz = dapz * anorminv * dxinv[2];

Real phib = is_inhomog ? phieb(i,j,k,n) : Real(0.0);

Expand Down Expand Up @@ -537,7 +536,7 @@ void mlebabeclap_ebflux (int i, int j, int k, int n,
+ (gxy + gxyz) * x(ii,jj,k ,n)
+ (-gxyz) * x(ii,jj,kk,n);

Real dphidn = dhx*(phib-phig)/dg;
Real dphidn = (phib-phig)/dg;
feb(i,j,k,n) = -beb(i,j,k,n) * dphidn;
}
}
Expand Down Expand Up @@ -842,11 +841,9 @@ void mlebabeclap_gsrb (Box const& box,
Real dapx = apxm-apxp;
Real dapy = apym-apyp;
Real dapz = apzm-apzp;
Real anorm = std::sqrt(dapx*dapx+dapy*dapy+dapz*dapz);
Real anorminv = Real(1.0)/anorm;
Real anrmx = dapx * anorminv;
Real anrmy = dapy * anorminv;
Real anrmz = dapz * anorminv;
Real anrmx = dapx * dhx;
Real anrmy = dapy * dhy;
Real anrmz = dapz * dhz;
Real bctx = ebdata.get<EBData_t::bndrycent>(i,j,k,0);
Real bcty = ebdata.get<EBData_t::bndrycent>(i,j,k,1);
Real bctz = ebdata.get<EBData_t::bndrycent>(i,j,k,2);
Expand Down Expand Up @@ -881,13 +878,11 @@ void mlebabeclap_gsrb (Box const& box,
+ (gxy + gxyz) * phi(ii,jj,k,n)
+ (-gxyz) * phi(ii,jj,kk,n);

Real ba = ebdata.get<EBData_t::bndryarea>(i,j,k);

Real dphidn = ( -phig)/dg;
Real feb_gamma = -phig_gamma/dg * ba * beb(i,j,k,n);
gamma += vfrcinv*(-dhx)*feb_gamma;
Real feb = dphidn * ba * beb(i,j,k,n);
rho += -vfrcinv*(-dhx)*feb;
Real feb_gamma = -phig_gamma/dg * beb(i,j,k,n);
gamma += -vfrcinv * feb_gamma;
Real feb = dphidn * beb(i,j,k,n);
rho += vfrcinv * feb;
}

Real res = rhs(i,j,k,n) - (gamma*phi(i,j,k,n) - rho);
Expand Down Expand Up @@ -1237,6 +1232,8 @@ void mlebabeclap_normalize (Box const& box, Array4<Real> const& phi,
Array4<Real const> const& beb,
bool is_dirichlet, bool beta_on_centroid, int ncomp) noexcept
{
amrex::ignore_unused(ba);

amrex::Loop(box, ncomp, [=] (int i, int j, int k, int n) noexcept
{
if (flag(i,j,k).isRegular())
Expand Down Expand Up @@ -1331,11 +1328,9 @@ void mlebabeclap_normalize (Box const& box, Array4<Real> const& phi,
Real dapx = apxm-apxp;
Real dapy = apym-apyp;
Real dapz = apzm-apzp;
Real anorm = std::sqrt(dapx*dapx+dapy*dapy+dapz*dapz);
Real anorminv = Real(1.0)/anorm;
Real anrmx = dapx * anorminv;
Real anrmy = dapy * anorminv;
Real anrmz = dapz * anorminv;
Real anrmx = dapx * dhx;
Real anrmy = dapy * dhy;
Real anrmz = dapz * dhz;
Real bctx = bc(i,j,k,0);
Real bcty = bc(i,j,k,1);
Real bctz = bc(i,j,k,2);
Expand All @@ -1359,8 +1354,8 @@ void mlebabeclap_normalize (Box const& box, Array4<Real> const& phi,
Real gyz = gy*gz;
Real gxyz = gx*gy*gz;
Real phig_gamma = (Real(1.0)+gx+gy+gz+gxy+gxz+gyz+gxyz);
Real feb_gamma = -phig_gamma/dg * ba(i,j,k) * beb(i,j,k,n);
gamma += vfrcinv*(-dhx)*feb_gamma;
Real feb_gamma = -phig_gamma/dg * beb(i,j,k,n);
gamma += -vfrcinv * feb_gamma;
}

phi(i,j,k,n) /= gamma;
Expand Down
Loading