diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2012-09-16 20:26:52 -0400 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2012-09-16 20:26:52 -0400 |
| commit | 18ca797780f241bcf6705122fa757a7d3ae1100e (patch) | |
| tree | ac1f8c7b7bea042579ec78e94e948425046b3e2e | |
| parent | 1a1b5640c1bd35189622b1b242f8c5a0cddd471a (diff) | |
Carpet: Disable storage for point_classification
Disable storage for point_classifiation; this feature is incomplete and unused.
| -rw-r--r-- | Carpet/Carpet/schedule.ccl | 3 | ||||
| -rw-r--r-- | Carpet/Carpet/src/Recompose.cc | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Carpet/Carpet/schedule.ccl b/Carpet/Carpet/schedule.ccl index 215bcde7a..410a6bbc9 100644 --- a/Carpet/Carpet/schedule.ccl +++ b/Carpet/Carpet/schedule.ccl @@ -1,6 +1,7 @@ # Schedule definitions for thorn Carpet -storage: point_classification +# This is disabled because its implementation is not complete +#storage: point_classification storage: timing timing_procs timing_levels schedule CarpetMultiModelStartup at STARTUP as MultiModel_Startup before Driver_Startup diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc index 030ae6f76..23f4676f7 100644 --- a/Carpet/Carpet/src/Recompose.cc +++ b/Carpet/Carpet/src/Recompose.cc @@ -2065,11 +2065,13 @@ namespace Carpet { BEGIN_LOCAL_MAP_LOOP(cctkGH, CCTK_GF) { BEGIN_LOCAL_COMPONENT_LOOP(cctkGH, CCTK_GF) { DECLARE_CCTK_ARGUMENTS; + if (point_class) { #pragma omp parallel - CCTK_LOOP3_ALL(CarpetClassifyPoints, cctkGH, i,j,k) { - int const ind = CCTK_GFINDEX3D (cctkGH, i, j, k); - point_class[ind] = 1; - } CCTK_ENDLOOP3_ALL(CarpetClassifyPoints); + CCTK_LOOP3_ALL(CarpetClassifyPoints, cctkGH, i,j,k) { + int const ind = CCTK_GFINDEX3D (cctkGH, i, j, k); + point_class[ind] = 1; + } CCTK_ENDLOOP3_ALL(CarpetClassifyPoints); + } } END_LOCAL_COMPONENT_LOOP; } END_LOCAL_MAP_LOOP; } LEAVE_LEVEL_MODE; |