1 files changed, 53 insertions, 25 deletions
diff --git a/Carpet/Carpet/param.ccl b/Carpet/Carpet/param.ccl
index 4c226ed5b..8897b5a31 100644
--- a/Carpet/Carpet/param.ccl
+++ b/Carpet/Carpet/param.ccl
@@ -1,5 +1,5 @@
 # Parameter definitions for thorn Carpet
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/param.ccl,v 1.34 2003/11/05 16:18:37 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/param.ccl,v 1.35 2004/01/25 14:57:27 schnetter Exp $
 
 shares: Cactus
 
@@ -18,6 +18,12 @@ USES STRING out_dir
 
 
 
+private:
+
+BOOLEAN domain_from_coordbase "Use the domain description from CoordBase"
+{
+} "no"
+
 restricted:
 
 CCTK_INT global_nx "Grid size in x direction"
@@ -64,6 +70,22 @@ CCTK_INT ghost_size "Ghost zones in each spatial direction"
   -1  :: "use the per-dimension parameters"
 } -1
 
+BOOLEAN periodic "do not use this parameter"
+{
+} "no"
+
+BOOLEAN periodic_x "do not use this parameter"
+{
+} "no"
+
+BOOLEAN periodic_y "do not use this parameter"
+{
+} "no"
+
+BOOLEAN periodic_z "do not use this parameter"
+{
+} "no"
+
 
 
 private:
@@ -78,16 +100,32 @@ CCTK_INT refinement_factor "Refinement factor"
   1:* :: "must be positive"
 } 2
 
-CCTK_INT multigrid_levels "Number of multigrid levels (including the base level)"
+
+
+CCTK_INT convergence_level "Convergence level"
+{
+  *:* :: "negative for finer, positive for coarser resolutions"
+} 0
+
+CCTK_INT num_convergence_levels "Number of convergence levels (including the base level)"
 {
   1:* :: "must be positive"
 } 1
 
-CCTK_INT multigrid_factor "Multigrid factor"
+CCTK_INT convergence_factor "Multigrid factor"
 {
   1:* :: "must be positive"
 } 2
 
+
+
+CCTK_INT num_maps "Number of maps"
+{
+  1:* :: ""
+} 1
+
+
+
 CCTK_INT prolongation_order_space "Order of prolongation operator in space"
 {
   1 :: "first order (linear)"
@@ -102,6 +140,8 @@ CCTK_INT prolongation_order_time "Order of prolongation operator in time"
   2 :: "second order (quadratic)"
 } 1
 
+
+
 CCTK_INT buffer_width "Width of the buffer zone inside the fine grid"
 {
   0:* :: "Should be the radius of the numerical domain of dependence of the time integrator, minus the number of ghost zones"
@@ -176,6 +216,12 @@ BOOLEAN checksum_timelevels "Try to catch unintentionally changed timelevels by
 
 
 
+BOOLEAN suppress_restriction "Suppress the restriction operations.  This makes the coarser refinement levels independent of the finer ones."
+{
+} "no"
+
+
+
 BOOLEAN verbose "Display info on the screen"
 {
 } "no"
@@ -227,36 +273,18 @@ STRING grid_structure_filename "File name to output grid structure to (empty = n
 
 
 
-# These parameters are here for historic reasons only.
-# They will go away in the future.  Do not use them.
-
-restricted:
-
-BOOLEAN periodic "do not use this parameter"
-{
-} "no"
-BOOLEAN periodic_x "do not use this parameter"
-{
-} "yes"
-BOOLEAN periodic_y "do not use this parameter"
-{
-} "yes"
-BOOLEAN periodic_z "do not use this parameter"
-{
-} "yes"
-
-
-
 private:
 
 BOOLEAN init_each_timelevel "Call initial data routines once for each timelevel"
 {
 } "no"
 
-BOOLEAN init_3_timelevels "Set up 3 timelevels of initial data"
+BOOLEAN prolongate_initial_data "Prolongate the refined regions during initial data generation"
 {
 } "no"
 
-BOOLEAN prolongate_initial_data "Prolongate the refined regions during initial data generation"
+
+
+BOOLEAN init_3_timelevels "Set up 3 timelevels of initial data"
 {
 } "no"