diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-04-27 09:32:05 -0500 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 16:45:42 +0000 |
| commit | bfac8777f3d0d136d035ca4b32d264a2621df436 (patch) | |
| tree | 73f3bbd0dec9176dbdc2e888b1122dc39ce86906 /Carpet/CarpetIOHDF5 | |
| parent | 00fc02adb64ba7e69f4b32a33c175db49d1b6e86 (diff) | |
CarpetIOHDF5: Remove explicit bboxset normalizations
Diffstat (limited to 'Carpet/CarpetIOHDF5')
| -rw-r--r-- | Carpet/CarpetIOHDF5/src/Input.cc | 6 | ||||
| -rw-r--r-- | Carpet/CarpetIOHDF5/src/Output.cc | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/Carpet/CarpetIOHDF5/src/Input.cc b/Carpet/CarpetIOHDF5/src/Input.cc index 3fbf02192..11e77061f 100644 --- a/Carpet/CarpetIOHDF5/src/Input.cc +++ b/Carpet/CarpetIOHDF5/src/Input.cc @@ -433,7 +433,6 @@ int Recover (cGH* cctkGH, const char *basefilename, int called_from) group_bboxes[gindex][m] |= data.dd->boxes.at(mglevel).at(reflevel).at(c).exterior; } - group_bboxes[gindex][m].normalize(); } } else { if (mglevel==0 and reflevel==0) { @@ -441,8 +440,7 @@ int Recover (cGH* cctkGH, const char *basefilename, int called_from) struct arrdesc& data = arrdata.at(gindex).at(m); int const c=dist::rank(); group_bboxes[gindex][m] |= - data.dd->boxes.at(mglevel).at(reflevel).at(c).exterior; - group_bboxes[gindex][m].normalize(); + data.dd->light_boxes.at(mglevel).at(reflevel).at(c).exterior; } } } @@ -658,7 +656,6 @@ int Recover (cGH* cctkGH, const char *basefilename, int called_from) "variable '%s' timelevel %d has been read only partially", fullname, tl); // for (int m = 0; m < maps; m++) { - // bboxes_read[vindex][tl][m].normalize(); // const int gindex = CCTK_GroupIndexFromVarI (vindex); // cout << "Need: " << group_bboxes[gindex][m] << endl; // cout << "Read: " << bboxes_read[vindex][tl][m] << endl; @@ -1193,7 +1190,6 @@ static int ReadVar (const cGH* const cctkGH, const ibbox overlap = membox & filebox; // cout << "Overlap: " << overlap << endl; bboxes_read.at(Carpet::map) |= overlap; - bboxes_read.at(Carpet::map).normalize(); // cout << "New read: " << bboxes_read.at(Carpet::map) << endl; // calculate hyperslab selection parameters diff --git a/Carpet/CarpetIOHDF5/src/Output.cc b/Carpet/CarpetIOHDF5/src/Output.cc index 70aa35af9..bca3051b0 100644 --- a/Carpet/CarpetIOHDF5/src/Output.cc +++ b/Carpet/CarpetIOHDF5/src/Output.cc @@ -83,9 +83,6 @@ int WriteVarUnchunked (const cGH* const cctkGH, boxes.at(mglevel).at(refinementlevel).at(c).exterior; } - // Normalise the set, i.e., try to represent the set with fewer bboxes. - bboxes.normalize(); - #if 0 // According to Cactus conventions, DISTRIB=CONSTANT arrays // (including grid scalars) are assumed to be the same on all |