diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-12-01 18:36:30 -0500 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 18:25:40 +0000 |
| commit | 92f0151651acfbbf182e4e07c40f3551000215d7 (patch) | |
| tree | e6681ad54ddc1e058f3d6ab54331dfc39ff0d213 /Carpet/Carpet/src/UnusedMask.cc | |
| parent | 5899becc5a72e3b36242bc91fcc1d723ce3a4609 (diff) | |
Carpet: Make dependency on LoopControl optional
Use CCTK_LOOP instead of LC_LOOP.
Diffstat (limited to 'Carpet/Carpet/src/UnusedMask.cc')
| -rw-r--r-- | Carpet/Carpet/src/UnusedMask.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Carpet/Carpet/src/UnusedMask.cc b/Carpet/Carpet/src/UnusedMask.cc index 6cf71caea..8844464c0 100644 --- a/Carpet/Carpet/src/UnusedMask.cc +++ b/Carpet/Carpet/src/UnusedMask.cc @@ -24,21 +24,25 @@ namespace Carpet { // Zero out LOOP_OVER_BSET (cctkGH, ext, box, imin, imax) { #pragma omp parallel - LC_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_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_INT i3D = CCTK_GFINDEX3D(cctkGH, i, j, k); carpet_unusedpoints_mask[i3D] = 0; - } LC_ENDLOOP3(unused_mask_zero); + } CCTK_ENDLOOP3(unused_mask_zero); } END_LOOP_OVER_BSET; // Set it where unused LOOP_OVER_BSET (cctkGH, unused_region, box, imin, imax) { #pragma omp parallel - LC_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_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_INT i3D = CCTK_GFINDEX3D(cctkGH, i, j, k); carpet_unusedpoints_mask[i3D] = 1; - } LC_ENDLOOP3(unused_mask_set); + } CCTK_ENDLOOP3(unused_mask_set); } END_LOOP_OVER_BSET; } // CarpetUnusedMask |