diff --git a/Carpet/Carpet/param.ccl b/Carpet/Carpet/param.ccl index d4887ce..e9fa540 100644 --- a/Carpet/Carpet/param.ccl +++ b/Carpet/Carpet/param.ccl @@ -450,6 +450,7 @@ CCTK_INT min_points_per_proc "Minimum number of grid points per processor" STEER CCTK_INT num_threads "Number of threads per process" STEERABLE=recover { + -2 :: "use one thread of OMP_NUM_THREADS is not set; otherwise, use the system devault" -1 :: "use system default, probably influenced by OMP_NUM_THREADS" 1:* :: "use this many threads" } -1 diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc index eb2fb46..a02d747 100644 --- a/Carpet/Carpet/src/Recompose.cc +++ b/Carpet/Carpet/src/Recompose.cc @@ -838,7 +838,7 @@ namespace Carpet { // Output CCTK_VInfo (CCTK_THORNSTRING, - "Grid structure statistics:"); + "Global grid structure statistics:"); CCTK_VInfo (CCTK_THORNSTRING, "GF: rhs: %.0fk active, %.0fk owned (+%.0f%%), %.0fk total (+%.0f%%), %.3g steps/time", double (num_active_cpu_points / 1000),