From b13c69008fd5d9b0d04f417cec3c21f507e3a6f4 Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Tue, 15 Oct 2013 17:38:36 +0200 Subject: Rename new max_time_levels parameter as max_timelevels to be consistent with other uses of "timelevels" in parameter names in Carpet --- Carpet/Carpet/param.ccl | 2 +- Carpet/Carpet/src/SetupGH.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Carpet/Carpet/param.ccl b/Carpet/Carpet/param.ccl index 6e24a05da..9f6e0a250 100644 --- a/Carpet/Carpet/param.ccl +++ b/Carpet/Carpet/param.ccl @@ -131,7 +131,7 @@ CCTK_INT max_refinement_levels "Maximum number of refinement levels (including t 1:* :: "must be positive" } 1 -CCTK_INT max_time_levels "Maximum number of time levels (including the current time level)" +CCTK_INT max_timelevels "Maximum number of time levels (including the current time level)" { -1 :: "Set automatically to prolonation_order_time+1" 1:* :: "Set this explicitly" diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc index ee114d982..f88abdb51 100644 --- a/Carpet/Carpet/src/SetupGH.cc +++ b/Carpet/Carpet/src/SetupGH.cc @@ -726,16 +726,16 @@ namespace Carpet { DECLARE_CCTK_PARAMETERS; // Set maximum number of time levels - if (max_time_levels < 0) { + if (max_timelevels < 0) { // Set automatically (backward compatibility) maxtimelevels = prolongation_order_time + 1; } else { - maxtimelevels = max_time_levels; + maxtimelevels = max_timelevels; } if (maxtimelevels < prolongation_order_time + 1) { CCTK_VError (__LINE__, __FILE__, CCTK_THORNSTRING, - "There are not enough time levels for this time prolongation order: max_time_levels=%d, prolongation_order_time=%d", - int(max_time_levels), int(prolongation_order_time)); + "There are not enough time levels for this time prolongation order: max_timelevels=%d, prolongation_order_time=%d", + int(max_timelevels), int(prolongation_order_time)); } } -- cgit v1.2.3