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

Jump to bottom

Fix Bug in FaceLinear Interpolater #3483

Merged
merged 5 commits into from
Aug 23, 2023
Merged

Fix Bug in FaceLinear Interpolater #3483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10d2a96
Fix Bug in FaceLinear Interpolater
WeiqunZhang Aug 6, 2023
8c95bee
Merge branch 'development' into fix_interpface
WeiqunZhang Aug 7, 2023
632d503
Merge branch 'development' into fix_interpface
asalmgren Aug 22, 2023
4106c9b
Merge branch 'development' into fix_interpface
asalmgren Aug 22, 2023
0c0f15b
Merge branch 'development' into fix_interpface
asalmgren Aug 23, 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
30 changes: 30 additions & 0 deletions Src/AmrCore/AMReX_Interp_2D_C.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,36 @@ facediv_int (int ci, int cj, int /*ck*/, int nf,

}

template<typename T>
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void
face_linear_interp_x (int i, int j, int /*k*/, int n, Array4<T> const& fine,
Array4<T const> const& crse, IntVect const& ratio) noexcept
{
const int ii = amrex::coarsen(i,ratio[0]);
const int jj = amrex::coarsen(j,ratio[1]);
if (i-ii*ratio[0] == 0) {
fine(i,j,0,n) = crse(ii,jj,0,n);
} else {
Real const w = static_cast<Real>(i-ii*ratio[0]) * (Real(1.)/Real(ratio[0]));
fine(i,j,0,n) = (Real(1.)-w) * crse(ii,jj,0,n) + w * crse(ii+1,jj,0,n);
}
}

template<typename T>
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void
face_linear_interp_y (int i, int j, int /*k*/, int n, Array4<T> const& fine,
Array4<T const> const& crse, IntVect const& ratio) noexcept
{
const int ii = amrex::coarsen(i,ratio[0]);
const int jj = amrex::coarsen(j,ratio[1]);
if (j-jj*ratio[1] == 0) {
fine(i,j,0,n) = crse(ii,jj,0,n);
} else {
Real const w = static_cast<Real>(j-jj*ratio[1]) * (Real(1.)/Real(ratio[1]));
fine(i,j,0,n) = (Real(1.)-w) * crse(ii,jj,0,n) + w * crse(ii,jj+1,0,n);
}
}

template <typename T>
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
void ccprotect_2d (int ic, int jc, int /*kc*/, int nvar,
Expand Down
48 changes: 48 additions & 0 deletions Src/AmrCore/AMReX_Interp_3D_C.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,54 @@ facediv_int (int ci, int cj, int ck, int nf,
+ dz3/(8*dy*zspxs)*(v000+v021-v001-v020);
}

template<typename T>
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void
face_linear_interp_x (int i, int j, int k, int n, Array4<T> const& fine,
Array4<T const> const& crse, IntVect const& ratio) noexcept
{
const int ii = amrex::coarsen(i,ratio[0]);
const int jj = amrex::coarsen(j,ratio[1]);
const int kk = amrex::coarsen(k,ratio[2]);
if (i-ii*ratio[0] == 0) {
fine(i,j,k,n) = crse(ii,jj,kk,n);
} else {
Real const w = static_cast<Real>(i-ii*ratio[0]) * (Real(1.)/Real(ratio[0]));
fine(i,j,k,n) = (Real(1.)-w) * crse(ii,jj,kk,n) + w * crse(ii+1,jj,kk,n);
}
}

template<typename T>
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void
face_linear_interp_y (int i, int j, int k, int n, Array4<T> const& fine,
Array4<T const> const& crse, IntVect const& ratio) noexcept
{
const int ii = amrex::coarsen(i,ratio[0]);
const int jj = amrex::coarsen(j,ratio[1]);
const int kk = amrex::coarsen(k,ratio[2]);
if (j-jj*ratio[1] == 0) {
fine(i,j,k,n) = crse(ii,jj,kk,n);
} else {
Real const w = static_cast<Real>(j-jj*ratio[1]) * (Real(1.)/Real(ratio[1]));
fine(i,j,k,n) = (Real(1.)-w) * crse(ii,jj,kk,n) + w * crse(ii,jj+1,kk,n);
}
}

template<typename T>
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void
face_linear_interp_z (int i, int j, int k, int n, Array4<T> const& fine,
Array4<T const> const& crse, IntVect const& ratio) noexcept
{
const int ii = amrex::coarsen(i,ratio[0]);
const int jj = amrex::coarsen(j,ratio[1]);
const int kk = amrex::coarsen(k,ratio[2]);
if (k-kk*ratio[2] == 0) {
fine(i,j,k,n) = crse(ii,jj,kk,n);
} else {
Real const w = static_cast<Real>(k-kk*ratio[2]) * (Real(1.)/Real(ratio[2]));
fine(i,j,k,n) = (Real(1.)-w) * crse(ii,jj,kk,n) + w * crse(ii,jj,kk+1,n);
}
}

template <typename T>
AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
void ccprotect_3d (int ic, int jc, int kc, int nvar,
Expand Down
41 changes: 34 additions & 7 deletions Src/AmrCore/AMReX_Interpolater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ FaceLinear::interp (const FArrayBox& crse,
int ncomp,
const Box& fine_region,
const IntVect& ratio,
const Geometry& crse_geom ,
const Geometry& fine_geom ,
Vector<BCRec> const& bcr,
int actual_comp,
const Geometry& /* crse_geom */,
const Geometry& /* fine_geom */,
Vector<BCRec> const& /*bcr*/,
int /* actual_comp*/,
int /*actual_state*/,
RunOn runon)
{
Expand All @@ -146,9 +146,36 @@ FaceLinear::interp (const FArrayBox& crse,
//
BL_PROFILE("FaceLinear::interp()");

// pass unallocated IArrayBox for solve_mask, so all fine values get filled.
interp_face(crse, crse_comp, fine, fine_comp, ncomp, fine_region,
ratio, IArrayBox(), crse_geom, fine_geom, bcr, actual_comp, runon);
AMREX_ASSERT(AMREX_D_TERM(fine_region.type(0),+fine_region.type(1),+fine_region.type(2)) == 1);

Array4<Real> const& fine_arr = fine.array(fine_comp);
Array4<Real const> const& crse_arr = crse.const_array(crse_comp);

if (fine_region.type(0) == IndexType::NODE)
{
AMREX_HOST_DEVICE_PARALLEL_FOR_4D_FLAG(runon,fine_region,ncomp,i,j,k,n,
{
face_linear_interp_x(i,j,k,n,fine_arr,crse_arr,ratio);
});
}
#if (AMREX_SPACEDIM >= 2)
else if (fine_region.type(1) == IndexType::NODE)
{
AMREX_HOST_DEVICE_PARALLEL_FOR_4D_FLAG(runon,fine_region,ncomp,i,j,k,n,
{
face_linear_interp_y(i,j,k,n,fine_arr,crse_arr,ratio);
});
}
#if (AMREX_SPACEDIM == 3)
else
{
AMREX_HOST_DEVICE_PARALLEL_FOR_4D_FLAG(runon,fine_region,ncomp,i,j,k,n,
{
face_linear_interp_z(i,j,k,n,fine_arr,crse_arr,ratio);
});
}
#endif
#endif
}

void
Expand Down
Loading