diff options
author | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-04-27 10:09:58 -0500 |
---|---|---|
committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 16:45:45 +0000 |
commit | c857fdcfb65c7ba1053ae3dc41fa999008f041c8 (patch) | |
tree | 1bbbb4279e8f81e875e8f21c16555aa9a3b9d87b | |
parent | 7fda72f20fd75fd67d146601bf9c9eab840c8d62 (diff) |
CarpetIOHDF5: Update to new dh classes
-rw-r--r-- | Carpet/CarpetIOHDF5/src/Input.cc | 6 | ||||
-rw-r--r-- | Carpet/CarpetIOHDF5/src/Output.cc | 16 | ||||
-rw-r--r-- | Carpet/CarpetIOHDF5/src/OutputSlice.cc | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Carpet/CarpetIOHDF5/src/Input.cc b/Carpet/CarpetIOHDF5/src/Input.cc index 11e77061f..10e71036f 100644 --- a/Carpet/CarpetIOHDF5/src/Input.cc +++ b/Carpet/CarpetIOHDF5/src/Input.cc @@ -431,7 +431,7 @@ int Recover (cGH* cctkGH, const char *basefilename, int called_from) for (int lc=0; lc<data.hh->local_components(reflevel); ++lc) { int const c = data.hh->get_component(reflevel,lc); group_bboxes[gindex][m] |= - data.dd->boxes.at(mglevel).at(reflevel).at(c).exterior; + data.dd->light_boxes.at(mglevel).at(reflevel).at(c).exterior; } } } else { @@ -1165,7 +1165,7 @@ static int ReadVar (const cGH* const cctkGH, } #endif const ibbox& exterior_membox = - data.dd->boxes.at(mglevel).at(reflevel).at(component).exterior; + data.dd->light_boxes.at(mglevel).at(reflevel).at(component).exterior; // skip this dataset if it doesn't overlap with this component's // exterior, or if it only reads what has already been read @@ -1186,7 +1186,7 @@ static int ReadVar (const cGH* const cctkGH, // get the overlap with this component's exterior const ibbox& membox = - data.dd->boxes.at(mglevel).at(reflevel).at(component).exterior; + data.dd->light_boxes.at(mglevel).at(reflevel).at(component).exterior; const ibbox overlap = membox & filebox; // cout << "Overlap: " << overlap << endl; bboxes_read.at(Carpet::map) |= overlap; diff --git a/Carpet/CarpetIOHDF5/src/Output.cc b/Carpet/CarpetIOHDF5/src/Output.cc index bca3051b0..28516b76b 100644 --- a/Carpet/CarpetIOHDF5/src/Output.cc +++ b/Carpet/CarpetIOHDF5/src/Output.cc @@ -77,10 +77,10 @@ int WriteVarUnchunked (const cGH* const cctkGH, // Using "interior" removes ghost zones and refinement boundaries. #if 0 bboxes += arrdata.at(gindex).at(Carpet::map).dd-> - boxes.at(mglevel).at(refinementlevel).at(c).interior; + light_boxes.at(mglevel).at(refinementlevel).at(c).interior; #endif bboxes += arrdata.at(gindex).at(Carpet::map).dd-> - boxes.at(mglevel).at(refinementlevel).at(c).exterior; + light_boxes.at(mglevel).at(refinementlevel).at(c).exterior; } #if 0 @@ -174,10 +174,10 @@ int WriteVarUnchunked (const cGH* const cctkGH, dh const * const dd = arrdata.at(gindex).at(Carpet::map).dd; #if 0 ibbox const overlap = *bbox & - dd->boxes.at(mglevel).at(refinementlevel).at(component).interior; + dd->light_boxes.at(mglevel).at(refinementlevel).at(component).interior; #endif ibbox const overlap = *bbox & - dd->boxes.at(mglevel).at(refinementlevel).at(component).exterior; + dd->light_boxes.at(mglevel).at(refinementlevel).at(component).exterior; // Continue if this component is not part of this combination if (overlap.empty()) continue; @@ -338,7 +338,7 @@ int WriteVarChunkedSequential (const cGH* const cctkGH, gh const * const hh = arrdata.at(gindex).at(Carpet::map).hh; dh const * const dd = arrdata.at(gindex).at(Carpet::map).dd; ibbox const& bbox = - dd->boxes.at(mglevel).at(refinementlevel).at(component).exterior; + dd->light_boxes.at(mglevel).at(refinementlevel).at(component).exterior; // Get the shape of the HDF5 dataset (in Fortran index order) hsize_t shape[dim]; @@ -402,7 +402,7 @@ int WriteVarChunkedSequential (const cGH* const cctkGH, datasetname << " rl=" << refinementlevel; } if (arrdata.at(gindex).at(Carpet::map).dd-> - boxes.at(mglevel).at(refinementlevel).size () > 1 and + light_boxes.at(mglevel).at(refinementlevel).size () > 1 and group.disttype != CCTK_DISTRIB_CONSTANT) { datasetname << " c=" << component; } @@ -514,7 +514,7 @@ int WriteVarChunkedParallel (const cGH* const cctkGH, // 0 : component, mglevel)->extent(); const dh* dd = arrdata.at(gindex).at(Carpet::map).dd; const ibbox& bbox = - dd->boxes.AT(mglevel).AT(refinementlevel) + dd->light_boxes.AT(mglevel).AT(refinementlevel) .AT(group.disttype == CCTK_DISTRIB_CONSTANT ? 0 : component).exterior; // Don't create zero-sized components @@ -563,7 +563,7 @@ int WriteVarChunkedParallel (const cGH* const cctkGH, datasetname << " rl=" << refinementlevel; } if (arrdata.at(gindex).at(Carpet::map).dd-> - boxes.at(mglevel).at(refinementlevel).size () > 1 and + light_boxes.at(mglevel).at(refinementlevel).size () > 1 and group.disttype != CCTK_DISTRIB_CONSTANT) { datasetname << " c=" << component; } diff --git a/Carpet/CarpetIOHDF5/src/OutputSlice.cc b/Carpet/CarpetIOHDF5/src/OutputSlice.cc index 49e75d7c7..d6459c094 100644 --- a/Carpet/CarpetIOHDF5/src/OutputSlice.cc +++ b/Carpet/CarpetIOHDF5/src/OutputSlice.cc @@ -556,7 +556,7 @@ namespace CarpetIOHDF5 { int const proc = hh->processor(rl,c); if (dist::rank() == proc or dist::rank() == ioproc) { - const ibbox& data_ext = dd->boxes.at(ml).at(rl).at(c).exterior; + const ibbox& data_ext = dd->light_boxes.at(ml).at(rl).at(c).exterior; const ibbox ext = GetOutputBBox (cctkGH, group, rl, m, c, data_ext); CCTK_REAL coord_time; |