aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetReduce
diff options
context:
space:
mode:
authorswhite <schnetter@cct.lsu.edu>2004-12-10 13:14:00 +0000
committerswhite <schnetter@cct.lsu.edu>2004-12-10 13:14:00 +0000
commit12fcc775ea386198b9d0f1c55f8e8b2be520dfac (patch)
treed8653c002cd40f07adf68a6623e10e230333072b /Carpet/CarpetReduce
parent676fe3f15cb5f4c3c03467308504530beb876da3 (diff)
CarpetLib:gh exposed data clamp-down
Made all variables in CarpetLib:gh to be const or non-public, to avoid confusion and insanity. Toward this end, created four member accessors for gh: const rexts & extents() const const rbnds & outer_boundaries() const const rprocs & processors() const const vector<vector<ibbox> > & bases() const This involved a few changes in several files throughout the repository: M ./Carpet/Carpet/src/Initialise.cc -2 +2 M ./Carpet/Carpet/src/Recompose.cc -8 +8 M ./Carpet/Carpet/src/SetupGH.cc -2 +2 M ./Carpet/Carpet/src/modes.cc -3 +3 M ./Carpet/CarpetIOHDF5/src/Recover.cc -4 +4 M ./Carpet/CarpetInterp/src/interp.cc -5 +5 M ./Carpet/CarpetLib/src/dh.cc -3 +3 M ./Carpet/CarpetLib/src/gh.cc -33 +33 M ./Carpet/CarpetLib/src/gh.hh -10 +28 M ./Carpet/CarpetReduce/src/mask_carpet.cc -4 +4 M ./Carpet/CarpetRegrid/src/automatic.cc -2 +2 darcs-hash:20041210131459-32473-ff0835ff0e57f6693fbe1ec23b350d1b1d18e3bc.gz
Diffstat (limited to 'Carpet/CarpetReduce')
-rw-r--r--Carpet/CarpetReduce/src/mask_carpet.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/Carpet/CarpetReduce/src/mask_carpet.cc b/Carpet/CarpetReduce/src/mask_carpet.cc
index 7a223d693..912fbda8a 100644
--- a/Carpet/CarpetReduce/src/mask_carpet.cc
+++ b/Carpet/CarpetReduce/src/mask_carpet.cc
@@ -50,22 +50,22 @@ namespace CarpetMask {
gh<dim> const & hh = *vhh.at(Carpet::map);
dh<dim> const & dd = *vdd.at(Carpet::map);
- ibbox const & base = hh.bases.at(reflevel).at(mglevel);
+ ibbox const & base = hh.bases().at(reflevel).at(mglevel);
// Calculate the union of all refined regions
ibset refined;
for (int c=0; c<hh.components(reflevel); ++c) {
- refined |= hh.extents.at(reflevel).at(c).at(mglevel);
+ refined |= hh.extents().at(reflevel).at(c).at(mglevel);
}
refined.normalize();
// Calculate the union of all coarse regions
ibset parent;
for (int c=0; c<hh.components(reflevel-1); ++c) {
-// parent |= hh.extents.at(reflevel-1).at(c).at(mglevel).expanded_for(base);
- parent |= hh.extents.at(reflevel-1).at(c).at(mglevel).expand(ivect(reffact-1),ivect(reffact-1)).contracted_for(base);
+// parent |= hh.extents().at(reflevel-1).at(c).at(mglevel).expanded_for(base);
+ parent |= hh.extents().at(reflevel-1).at(c).at(mglevel).expand(ivect(reffact-1),ivect(reffact-1)).contracted_for(base);
}
parent.normalize();