diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-12-01 18:31:10 -0500 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 18:25:39 +0000 |
| commit | 5899becc5a72e3b36242bc91fcc1d723ce3a4609 (patch) | |
| tree | fc859c74583c699ec7ca97befd303a04a9e7e47e /Carpet/CarpetMask | |
| parent | 41e0e6369abdf4156560e0d5f268bc5a83b078e7 (diff) | |
CarpetMask: Make LoopControl optional
Use CCTK_LOOP instead of LC_LOOP.
Make LoopControl optional.
Diffstat (limited to 'Carpet/CarpetMask')
| -rw-r--r-- | Carpet/CarpetMask/configuration.ccl | 6 | ||||
| -rw-r--r-- | Carpet/CarpetMask/src/mask_excluded.cc | 8 | ||||
| -rw-r--r-- | Carpet/CarpetMask/src/mask_surface.cc | 8 |
3 files changed, 7 insertions, 15 deletions
diff --git a/Carpet/CarpetMask/configuration.ccl b/Carpet/CarpetMask/configuration.ccl index 505f2b2b9..4d391cd01 100644 --- a/Carpet/CarpetMask/configuration.ccl +++ b/Carpet/CarpetMask/configuration.ccl @@ -1,5 +1,5 @@ # Configuration definitions for thorn CarpetMask -REQUIRES LoopControl - -REQUIRES THORNS: LoopControl +OPTIONAL LoopControl +{ +} diff --git a/Carpet/CarpetMask/src/mask_excluded.cc b/Carpet/CarpetMask/src/mask_excluded.cc index e179bc268..6016c26b5 100644 --- a/Carpet/CarpetMask/src/mask_excluded.cc +++ b/Carpet/CarpetMask/src/mask_excluded.cc @@ -49,11 +49,7 @@ namespace CarpetMask { bool const exterior = exclude_exterior[n]; #pragma omp parallel - LC_LOOP3(CarpetExcludedSetup, - i,j,k, - 0,0,0, cctk_lsh[0],cctk_lsh[1],cctk_lsh[2], - cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]) - { + CCTK_LOOP3_ALL(CarpetExcludedSetup, cctkGH, i,j,k) { int const ind = CCTK_GFINDEX3D (cctkGH, i, j, k); CCTK_REAL const dx2 = pow (x[ind] - x0, 2); @@ -67,7 +63,7 @@ namespace CarpetMask { weight[ind] = 0.0; } - } LC_ENDLOOP3(CarpetExcludedSetup); + } CCTK_ENDLOOP3_ALL(CarpetExcludedSetup); } // if r>=0 } // for n diff --git a/Carpet/CarpetMask/src/mask_surface.cc b/Carpet/CarpetMask/src/mask_surface.cc index b08de8cf8..2964240e8 100644 --- a/Carpet/CarpetMask/src/mask_surface.cc +++ b/Carpet/CarpetMask/src/mask_surface.cc @@ -116,11 +116,7 @@ namespace CarpetMask { } #pragma omp parallel - LC_LOOP3(CarpetSurfaceSetup, - i,j,k, - 0,0,0, cctk_lsh[0],cctk_lsh[1],cctk_lsh[2], - cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]) - { + CCTK_LOOP3_ALL(CarpetSurfaceSetup, cctkGH, i,j,k) { int const ind = CCTK_GFINDEX3D (cctkGH, i, j, k); CCTK_REAL const dx = x[ind] - x0; @@ -178,7 +174,7 @@ namespace CarpetMask { weight[ind] = 0.0; } } - } LC_ENDLOOP3(CarpetSurfaceSetup); + } CCTK_ENDLOOP3_ALL(CarpetSurfaceSetup); } else { |