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

Bounded sampling #4195

Merged
merged 6 commits into from
Oct 21, 2024
Merged

Bounded sampling #4195

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
851c49a
Bounded sampling tested with ERF.
AMLattanzi Oct 17, 2024
b72bca8
Add braces to single line if.
AMLattanzi Oct 18, 2024
b39f10d
missed braces.
AMLattanzi Oct 18, 2024
5173dc9
Change to const& in call signature.
AMLattanzi Oct 21, 2024
72c2235
Add Weiqun's edits to get_line_data for clarity and efficiency.
AMLattanzi Oct 21, 2024
97e231e
Fix typo.
AMLattanzi Oct 21, 2024
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
48 changes: 34 additions & 14 deletions Src/Base/AMReX_MultiFabUtil.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@ namespace amrex
std::unique_ptr<MultiFab> get_slice_data(int dir, Real coord,
const MultiFab& cc,
const Geometry& geom, int start_comp, int ncomp,
bool interpolate=false);
bool interpolate=false,
RealBox bnd_rbx = RealBox());

/**
* \brief Get data in a cell of MultiFab/FabArray
Expand All @@ -188,7 +189,7 @@ namespace amrex
* specified by a direction and a cell.
*/
template <typename MF, std::enable_if_t<IsFabArray<MF>::value,int> FOO = 0>
MF get_line_data (MF const& mf, int dir, IntVect const& cell);
MF get_line_data (MF const& mf, int dir, IntVect const& cell, Box bnd_bx = Box());

//! Return an iMultiFab that has the same BoxArray and DistributionMapping
//! as the coarse MultiFab cmf. Cells covered by the coarsened fine grids
Expand Down Expand Up @@ -996,26 +997,45 @@ Vector<typename MF::value_type> get_cell_data (MF const& mf, IntVect const& cell
}

template <typename MF, std::enable_if_t<IsFabArray<MF>::value,int> FOO>
MF get_line_data (MF const& mf, int dir, IntVect const& cell)
MF get_line_data (MF const& mf, int dir, IntVect const& cell, Box bnd_bx)
AMLattanzi marked this conversation as resolved.
Show resolved Hide resolved
{
bool do_bnd = (!bnd_bx.isEmpty());

BoxArray const& ba = mf.boxArray();
DistributionMapping const& dm = mf.DistributionMap();
const auto nboxes = static_cast<int>(ba.size());

BoxList bl(ba.ixType());
Vector<int> procmap;
Vector<int> index_map;
for (int i = 0; i < nboxes; ++i) {
Box const& b = ba[i];
IntVect lo = cell;
lo[dir] = b.smallEnd(dir);
if (b.contains(lo)) {
IntVect hi = lo;
hi[dir] = b.bigEnd(dir);
Box b1d(lo,hi,b.ixType());
bl.push_back(b1d);
procmap.push_back(dm[i]);
index_map.push_back(i);
if (!do_bnd) {
for (int i = 0; i < nboxes; ++i) {
Box const& b = ba[i];
IntVect lo = cell;
lo[dir] = b.smallEnd(dir);
if (b.contains(lo)) {
IntVect hi = lo;
hi[dir] = b.bigEnd(dir);
Box b1d(lo,hi,b.ixType());
bl.push_back(b1d);
procmap.push_back(dm[i]);
index_map.push_back(i);
}
}
} else {
for (int i = 0; i < nboxes; ++i) {
Box const& b = ba[i];
IntVect lo = bnd_bx.smallEnd();
IntVect hi = bnd_bx.bigEnd();
if (!b.contains(lo)) { lo[dir] = b.smallEnd(dir); }
AMLattanzi marked this conversation as resolved.
Show resolved Hide resolved
if (b.contains(lo)) {
if (!b.contains(hi)) { hi[dir] = b.bigEnd(dir); }
if (!bnd_bx.contains(hi)) { continue; }
Box b1d(lo,hi,b.ixType());
bl.push_back(b1d);
procmap.push_back(dm[i]);
index_map.push_back(i);
}
AMLattanzi marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
19 changes: 12 additions & 7 deletions Src/Base/AMReX_MultiFabUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace {
using namespace amrex;

Box
getIndexBox(const RealBox& real_box, const Geometry& geom) {
getIndexBox (const RealBox& real_box, const Geometry& geom) {
IntVect slice_lo, slice_hi;

AMREX_D_TERM(slice_lo[0]=static_cast<int>(std::floor((real_box.lo(0) - geom.ProbLo(0))/geom.CellSize(0)));,
Expand All @@ -24,12 +24,11 @@ namespace {
}


std::unique_ptr<MultiFab> allocateSlice(int dir, const MultiFab& cell_centered_data,
int ncomp, const Geometry& geom, Real dir_coord,
Vector<int>& slice_to_full_ba_map) {
std::unique_ptr<MultiFab> allocateSlice (int dir, const MultiFab& cell_centered_data,
int ncomp, const Geometry& geom, Real dir_coord,
Vector<int>& slice_to_full_ba_map, RealBox real_slice) {
AMLattanzi marked this conversation as resolved.
Show resolved Hide resolved

// Get our slice and convert to index space
RealBox real_slice = geom.ProbDomain();
real_slice.setLo(dir, dir_coord);
real_slice.setHi(dir, dir_coord);
Box slice_box = getIndexBox(real_slice, geom);
Expand Down Expand Up @@ -550,7 +549,7 @@ namespace amrex
return amrex::cast<FabArray<BaseFab<Long> > > (imf);
}

std::unique_ptr<MultiFab> get_slice_data(int dir, Real coord, const MultiFab& cc, const Geometry& geom, int start_comp, int ncomp, bool interpolate) {
std::unique_ptr<MultiFab> get_slice_data(int dir, Real coord, const MultiFab& cc, const Geometry& geom, int start_comp, int ncomp, bool interpolate, RealBox bnd_rbx) {

BL_PROFILE("amrex::get_slice_data");

Expand All @@ -559,9 +558,15 @@ namespace amrex
}

const auto geomdata = geom.data();
RealBox real_slice;
if (bnd_rbx.ok()) {
real_slice = bnd_rbx;
} else {
real_slice = geom.ProbDomain();
}

Vector<int> slice_to_full_ba_map;
std::unique_ptr<MultiFab> slice = allocateSlice(dir, cc, ncomp, geom, coord, slice_to_full_ba_map);
std::unique_ptr<MultiFab> slice = allocateSlice(dir, cc, ncomp, geom, coord, slice_to_full_ba_map, real_slice);

if (!slice) {
return nullptr;
Expand Down
Loading