From 0914bc88c7aea61eedf470a903c8fa252bdc97dd Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Tue, 1 Feb 2005 22:58:00 +0000 Subject: global: Change the way in which the grid hierarchy is stored Change the way in which the grid hierarchy is stored. The new hierarchy is map mglevel reflevel component timelevel i.e., mglevel moved from the bottom to almost the top. This is because mglevel used to be a true multigrid level, but is now meant to be a convergence level. Do not allocate all storage all the time. Allow storage to be switched on an off per refinement level (and for a single mglevel, which prompted the change above). Handle storage management with CCTK_{In,De}creaseGroupStorage instead of CCTK_{En,Dis}ableGroupStorage. darcs-hash:20050201225827-891bb-eae3b6bd092ae8d6b5e49be84c6f09f0e882933e.gz --- Carpet/CarpetSlab/src/GetHyperslab.cc | 4 ++-- Carpet/CarpetSlab/src/slab.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Carpet/CarpetSlab') diff --git a/Carpet/CarpetSlab/src/GetHyperslab.cc b/Carpet/CarpetSlab/src/GetHyperslab.cc index c22e0b1b4..1c9e687cc 100644 --- a/Carpet/CarpetSlab/src/GetHyperslab.cc +++ b/Carpet/CarpetSlab/src/GetHyperslab.cc @@ -187,8 +187,8 @@ namespace CarpetSlab { // Calculate overlapping extents const bboxset myextents - = ((mydd->boxes.at(rl).at(component).at(mglevel).sync_not - | mydd->boxes.at(rl).at(component).at(mglevel).interior) + = ((mydd->boxes.at(mglevel).at(rl).at(component).sync_not + | mydd->boxes.at(mglevel).at(rl).at(component).interior) & hextent); // Loop over overlapping extents diff --git a/Carpet/CarpetSlab/src/slab.cc b/Carpet/CarpetSlab/src/slab.cc index 9ca04ae6a..ac8ea0ef9 100644 --- a/Carpet/CarpetSlab/src/slab.cc +++ b/Carpet/CarpetSlab/src/slab.cc @@ -219,8 +219,8 @@ namespace CarpetSlab { // Calculate overlapping extents const bboxset myextents - = ((mydd->boxes.at(rl).at(component).at(mglevel).sync_not - | mydd->boxes.at(rl).at(component).at(mglevel).interior) + = ((mydd->boxes.at(mglevel).at(rl).at(component).sync_not + | mydd->boxes.at(mglevel).at(rl).at(component).interior) & hextent); // Loop over overlapping extents -- cgit v1.2.3