diff options
author | Erik Schnetter <schnetter@gmail.com> | 2013-01-20 17:13:58 -0500 |
---|---|---|
committer | Erik Schnetter <schnetter@gmail.com> | 2013-01-20 17:13:58 -0500 |
commit | da0df590c04ede3b6e8e43ecee1b2526cc40a1db (patch) | |
tree | 256489cd07743f13a5877b458af7742cd9ee5444 /Carpet | |
parent | 2acad47b1161286012b852a0b83f880c1fb5efb8 (diff) |
Carpet: Use cctk_ash where necessary in poisoning and checksumming
Diffstat (limited to 'Carpet')
-rw-r--r-- | Carpet/Carpet/src/Poison.cc | 7 | ||||
-rw-r--r-- | Carpet/Carpet/src/UnusedMask.cc | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Carpet/Carpet/src/Poison.cc b/Carpet/Carpet/src/Poison.cc index 1846253f1..19c51d363 100644 --- a/Carpet/Carpet/src/Poison.cc +++ b/Carpet/Carpet/src/Poison.cc @@ -122,7 +122,7 @@ namespace Carpet { ivect size(1); int const gpdim = groupdata.AT(group).info.dim; for (int d=0; d<gpdim; ++d) { - size[d] = groupdata.AT(group).info.lsh[d]; + size[d] = groupdata.AT(group).info.ash[d]; } int const np = prod(size); @@ -193,9 +193,10 @@ namespace Carpet { BEGIN_LOCAL_MAP_LOOP(cctkGH, grouptype) { BEGIN_LOCAL_COMPONENT_LOOP(cctkGH, grouptype) { - ivect size(1); + ivect size(1), asize(1); for (int d=0; d<gpdim; ++d) { size[d] = groupdata.AT(group).info.lsh[d]; + asize[d] = groupdata.AT(group).info.ash[d]; } int const np = prod(size); @@ -209,7 +210,7 @@ namespace Carpet { for (int k=0; k<size[2]; ++k) { for (int j=0; j<size[1]; ++j) { for (int i=0; i<size[0]; ++i) { - int const idx = i + size[0] * (j + size[1] * k); + int const idx = i + asize[0] * (j + asize[1] * k); bool poisoned=false; switch (specific_cactus_type(tp)) { #define TYPECASE(N,T) \ diff --git a/Carpet/Carpet/src/UnusedMask.cc b/Carpet/Carpet/src/UnusedMask.cc index 8844464c0..d46b93cf1 100644 --- a/Carpet/Carpet/src/UnusedMask.cc +++ b/Carpet/Carpet/src/UnusedMask.cc @@ -26,7 +26,7 @@ namespace Carpet { #pragma omp parallel CCTK_LOOP3(unused_mask_zero, i, j, k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2], - cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]) + cctk_ash[0],cctk_ash[1],cctk_ash[2]) { CCTK_INT i3D = CCTK_GFINDEX3D(cctkGH, i, j, k); carpet_unusedpoints_mask[i3D] = 0; @@ -38,7 +38,7 @@ namespace Carpet { #pragma omp parallel CCTK_LOOP3(unused_mask_set, i, j, k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2], - cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]) + cctk_ash[0],cctk_ash[1],cctk_ash[2]) { CCTK_INT i3D = CCTK_GFINDEX3D(cctkGH, i, j, k); carpet_unusedpoints_mask[i3D] = 1; |