diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-12-01 16:40:26 -0500 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 18:25:38 +0000 |
| commit | eb6f949dec570d440ffffe8429d5213675c697e4 (patch) | |
| tree | 30020dd4710262d6817f8fc4d28fb6cf9d598463 /CarpetDev | |
| parent | 7b8bb5256be12e895ef20bc8ce4d5a71085e30da (diff) | |
CarpetIOF5: Make LoopControl optional
Diffstat (limited to 'CarpetDev')
| -rw-r--r-- | CarpetDev/CarpetIOF5/configuration.ccl | 5 | ||||
| -rw-r--r-- | CarpetDev/CarpetIOF5/src/poison.cc | 14 |
2 files changed, 8 insertions, 11 deletions
diff --git a/CarpetDev/CarpetIOF5/configuration.ccl b/CarpetDev/CarpetIOF5/configuration.ccl index 155a0c55b..09fb32efd 100644 --- a/CarpetDev/CarpetIOF5/configuration.ccl +++ b/CarpetDev/CarpetIOF5/configuration.ccl @@ -1,3 +1,6 @@ # Configuration definition for thorn CarpetIOF5 -REQUIRES Carpet CarpetLib F5 HDF5 LoopControl +REQUIRES Carpet CarpetLib F5 HDF5 +OPTIONAL LoopControl +{ +} diff --git a/CarpetDev/CarpetIOF5/src/poison.cc b/CarpetDev/CarpetIOF5/src/poison.cc index 6029b55a8..2305958e1 100644 --- a/CarpetDev/CarpetIOF5/src/poison.cc +++ b/CarpetDev/CarpetIOF5/src/poison.cc @@ -29,16 +29,13 @@ namespace CarpetIOF5 { BEGIN_LOCAL_MAP_LOOP(cctkGH, CCTK_GF) { BEGIN_LOCAL_COMPONENT_LOOP(cctkGH, CCTK_GF) { DECLARE_CCTK_ARGUMENTS; - LC_LOOP3(F5_Poison, 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(F5_Poison, cctkGH, i,j,k) { int const ind3d = CCTK_GFINDEX3D(cctkGH, i,j,k); x[ind3d] = nan; y[ind3d] = nan; z[ind3d] = nan; r[ind3d] = nan; - } LC_ENDLOOP3(F5_Poison); + } CCTK_ENDLOOP3_ALL(F5_Poison); } END_LOCAL_COMPONENT_LOOP; } END_LOCAL_MAP_LOOP; } END_REFLEVEL_LOOP; @@ -59,16 +56,13 @@ namespace CarpetIOF5 { BEGIN_LOCAL_MAP_LOOP(cctkGH, CCTK_GF) { BEGIN_LOCAL_COMPONENT_LOOP(cctkGH, CCTK_GF) { DECLARE_CCTK_ARGUMENTS; - LC_LOOP3(F5_Check, 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(F5_Check, cctkGH, i,j,k) { int const ind3d = CCTK_GFINDEX3D(cctkGH, i,j,k); assert (not isnan(x[ind3d])); assert (not isnan(y[ind3d])); assert (not isnan(z[ind3d])); assert (not isnan(r[ind3d])); - } LC_ENDLOOP3(F5_Check); + } CCTK_ENDLOOP3_ALL(F5_Check); } END_LOCAL_COMPONENT_LOOP; } END_LOCAL_MAP_LOOP; } END_REFLEVEL_LOOP; |