diff options
author | swhite <schnetter@cct.lsu.edu> | 2004-12-10 13:14:00 +0000 |
---|---|---|
committer | swhite <schnetter@cct.lsu.edu> | 2004-12-10 13:14:00 +0000 |
commit | 12fcc775ea386198b9d0f1c55f8e8b2be520dfac (patch) | |
tree | d8653c002cd40f07adf68a6623e10e230333072b /Carpet/CarpetInterp/src | |
parent | 676fe3f15cb5f4c3c03467308504530beb876da3 (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/CarpetInterp/src')
-rw-r--r-- | Carpet/CarpetInterp/src/interp.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Carpet/CarpetInterp/src/interp.cc b/Carpet/CarpetInterp/src/interp.cc index c5b90a410..ba9b01873 100644 --- a/Carpet/CarpetInterp/src/interp.cc +++ b/Carpet/CarpetInterp/src/interp.cc @@ -279,11 +279,11 @@ namespace CarpetInterp { int const fact = maxreflevelfact / ipow(reffact, rl) * ipow(mgfact, mglevel); ivect const ipos = ivect(floor((pos - lower) / (delta * fact) + 0.5)) * fact; - assert (all(ipos % vhh.at(m)->bases.at(rl).at(ml).stride() == 0)); + assert (all(ipos % vhh.at(m)->bases().at(rl).at(ml).stride() == 0)); // TODO: use something faster than a linear search for (int c=0; c<vhh.at(m)->components(rl); ++c) { - if (vhh.at(m)->extents.at(rl).at(c).at(ml).contains(ipos)) { + if (vhh.at(m)->extents().at(rl).at(c).at(ml).contains(ipos)) { rlev.at(n) = rl; home.at(n) = c; goto found; @@ -360,7 +360,7 @@ namespace CarpetInterp { for (int rl=minrl; rl<maxrl; ++rl) { for (int c=0; c<vhh.at(m)->components(rl); ++c) { allcoords.at(ind_prc(p,m,rl,c)).change_processor - (state, vhh.at(m)->processors.at(rl).at(c)); + (state, vhh.at(m)->processors().at(rl).at(c)); } } } @@ -383,7 +383,7 @@ namespace CarpetInterp { ivect const str (1); ibbox const extent (lo, up-str, str); alloutputs.at(ind_prc(p,m,rl,c)).allocate - (extent, vhh.at(m)->processors.at(rl).at(c)); + (extent, vhh.at(m)->processors().at(rl).at(c)); ivect const slo (0); ivect sup (1); @@ -391,7 +391,7 @@ namespace CarpetInterp { ivect const sstr (1); ibbox const sextent (lo, up-str, str); allstatuses.at(ind_prc(p,m,rl,c)).allocate - (sextent, vhh.at(m)->processors.at(rl).at(c)); + (sextent, vhh.at(m)->processors().at(rl).at(c)); } } } |