diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2006-10-03 23:40:00 +0000 |
|---|---|---|
| committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2006-10-03 23:40:00 +0000 |
| commit | 96487f1f1fd1884986a50030f0ed6f9a14ca5b97 (patch) | |
| tree | b6a368eec31a16ec45c5a1303f6d3c7c41ee88d8 /Carpet/CarpetReduce | |
| parent | 630bfcfd2b7001b0b7312a3988cb3cba369e8ebc (diff) | |
CarpetReduce: Add grouptype argument when calling mode handling functions
darcs-hash:20061003234056-dae7b-c72aaf74712cba7006df16c3382a6ba54e0dad5a.gz
Diffstat (limited to 'Carpet/CarpetReduce')
| -rw-r--r-- | Carpet/CarpetReduce/src/mask_carpet.cc | 5 | ||||
| -rw-r--r-- | Carpet/CarpetReduce/src/reduce.cc | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Carpet/CarpetReduce/src/mask_carpet.cc b/Carpet/CarpetReduce/src/mask_carpet.cc index 31250ce4b..b1cd753a1 100644 --- a/Carpet/CarpetReduce/src/mask_carpet.cc +++ b/Carpet/CarpetReduce/src/mask_carpet.cc @@ -155,11 +155,12 @@ namespace CarpetMask { // Set restriction region on next coarser level { int const oldreflevel = reflevel; + int const oldgrouptype = mc_grouptype; int const oldmap = Carpet::map; leave_singlemap_mode (cctkGH); leave_level_mode (cctkGH); enter_level_mode (cctkGH, oldreflevel-1); - enter_singlemap_mode (cctkGH, oldmap); + enter_singlemap_mode (cctkGH, oldmap, oldgrouptype); BEGIN_LOCAL_COMPONENT_LOOP (cctkGH, CCTK_GF) { @@ -281,7 +282,7 @@ namespace CarpetMask { leave_singlemap_mode (cctkGH); leave_level_mode (cctkGH); enter_level_mode (cctkGH, oldreflevel); - enter_singlemap_mode (cctkGH, oldmap); + enter_singlemap_mode (cctkGH, oldmap, oldgrouptype); } } // if reflevel>0 diff --git a/Carpet/CarpetReduce/src/reduce.cc b/Carpet/CarpetReduce/src/reduce.cc index 41be0b07b..29198cb86 100644 --- a/Carpet/CarpetReduce/src/reduce.cc +++ b/Carpet/CarpetReduce/src/reduce.cc @@ -1084,9 +1084,10 @@ namespace CarpetReduce { + int const grouptype = reduce_arrays ? CCTK_ARRAY : CCTK_GF; for (int m=minm; m<maxm; ++m) { - ENTER_SINGLEMAP_MODE(cgh, m) { - BEGIN_LOCAL_COMPONENT_LOOP(cgh, reduce_arrays ? CCTK_ARRAY : CCTK_GF) { + ENTER_SINGLEMAP_MODE(cgh, m, grouptype) { + BEGIN_LOCAL_COMPONENT_LOOP(cgh, grouptype) { |