Parameter names changes as announced in today's mail to users@cactuscode.org.

You must also update thorn IOUtil now.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOFlexIO/trunk@241 ebee0441-1374-4afa-a3b5-247f3ba15b9a

1 files changed, 57 insertions, 52 deletions

diff --git a/param.ccl b/param.ccl
index 7db18a0..9b03ef5 100644
--- a/param.ccl
+++ b/param.ccl
@@ -1,4 +1,5 @@
 # Parameter definitions for thorn IOFlexIO
+# $Header$
 
 #############################################################################
 ### declare IOFlexIO parameters
@@ -9,29 +10,48 @@ private:
 ########################
 # How often to do output
 ########################
-INT out2D_every "How often to do 2D output, overrides out_every" STEERABLE = ALWAYS
+INT out2D_every "How often to do 2D IOFlexIO output, overrides IO::out_every" STEERABLE = ALWAYS
 {
-  -1   :: "Never"
-   1:* :: "Every so many iterations"	
+   1:* :: "Every so many iterations"
+   0:  :: "Disable 2D IOFlexIO output"
+  -1:  :: "Default to IO::out_every"
 } -1
-
-INT out3D_every "How often to do 3D output, overrides out_every" STEERABLE = ALWAYS
+INT out_every "How often to do IOFlexIO output, overrides IO::out_every" STEERABLE = ALWAYS
+{
+   1:* :: "Every so many iterations"
+   0:  :: "Disable IOFlexIO output"
+  -1:  :: "Default to IO::out_every"
+} -1
+INT out3D_every "How often to do IOFlexIO output, overrides IO::out_every (DEPRECATED IN BETA12)" STEERABLE = ALWAYS
 {
-  -1   :: "Never"
-   1:* :: "Every so many iterations"	
+   1:* :: "Every so many iterations"
+   0:  :: "Disable IOFlexIO output"
+  -1:  :: "Default to IO::out_every"
 } -1
 
 
 ####################
 # Output directories
 ####################
-STRING outdir2D "Name of IO 2D output directory, overrides IO::outdir"
+STRING out2D_dir "Output directory for 2D IOFlexIO files, overrides IO::out_dir" STEERABLE = RECOVER
 {
-  .* :: "Any valid directory name, an empty string defaults to outdir"
-} "" 
-STRING outdir3D "Name of IO 3D output directory, overrides IO::outdir"
+  ".+" :: "A valid directory name"
+  "^$" :: "An empty string to choose the default from IO::out_dir"
+} ""
+STRING out_dir "Output directory for IOFlexIO files, overrides IO::out_dir" STEERABLE = RECOVER
+{
+  ".+" :: "A valid directory name"
+  "^$" :: "An empty string to choose the default from IO::out_dir"
+} ""
+STRING outdir2D "Output directory for 2D IOFlexIO files, overrides IO::out_dir (DEPRECATED IN BETA13)" STEERABLE = RECOVER
 {
-  .* :: "Any valid directory name, an empty string defaults to outdir"
+  ".+" :: "A valid directory name"
+  "^$" :: "An empty string to choose the default from IO::out_dir"
+} ""
+STRING outdir3D "Output directory for IOFlexIO files, overrides IO::out_dir (DEPRECATED IN BETA13)" STEERABLE = RECOVER
+{
+  ".+" :: "A valid directory name"
+  "^$" :: "An empty string to choose the default from IO::out_dir"
 } ""
 
 
@@ -40,11 +60,18 @@ STRING outdir3D "Name of IO 3D output directory, overrides IO::outdir"
 ##########################
 STRING out2D_vars "Variables to output in 2D FlexIO file format" STEERABLE = ALWAYS
 {
-  .* :: "A regex which matches everything"
+  ".+" :: "Space-separated list of fully qualified variable/group names"
+  "^$" :: "An empty string to output nothing"
 } ""
-STRING out3D_vars "Variables to output in 3D FlexIO file format" STEERABLE = ALWAYS
+STRING out_vars "Variables to output in FlexIO file format" STEERABLE = ALWAYS
 {
-  .* :: "A regex which matches everything"
+  ".+" :: "Space-separated list of fully qualified variable/group names"
+  "^$" :: "An empty string to output nothing"
+} ""
+STRING out3D_vars "Variables to output in FlexIO file format (DEPRECATED IN BETA12)" STEERABLE = ALWAYS
+{
+  ".+" :: "Space-separated list of fully qualified variable/group names"
+  "^$" :: "An empty string to output nothing"
 } ""
 
 
@@ -97,50 +124,28 @@ CCTK_INT out2D_yzplane_xi "x-index (from 0) for 2D planes in yz"
 #############################################################################
 shares: IO
 
-####################
-# Output directories
-####################
-USES STRING outdir 
-
-########################
-# How often to do output
-########################
-USES INT out_every 
+# FIXME: want USES STRING out_dir AS default_out_dir
+# FIXME: want USES INT out_every AS default_out_every
 
-###########################
-# Which 2D slices to output
-###########################
-USES CCTK_REAL out_yzplane_x 
-USES CCTK_REAL out_xzplane_y 
+USES CCTK_REAL out_yzplane_x
+USES CCTK_REAL out_xzplane_y
 USES CCTK_REAL out_xyplane_z
-USES CCTK_INT out_xyplane_zi
-USES CCTK_INT out_xzplane_yi
-USES CCTK_INT out_yzplane_xi
+USES CCTK_INT  out_xyplane_zi
+USES CCTK_INT  out_xzplane_yi
+USES CCTK_INT  out_yzplane_xi
 
-################
-# various things
-################
-USES BOOLEAN verbose
-USES BOOLEAN newverbose
-USES BOOLEAN out3D_parameters
+USES KEYWORD verbose
 USES BOOLEAN print_timing_info
-USES KEYWORD out_fileinfo
-
-#######################
-# Specific to 3D output
-#######################
-USES KEYWORD out3D_mode
-USES BOOLEAN out3D_septimefiles
 
+USES KEYWORD out_mode
+USES KEYWORD out_fileinfo
+USES KEYWORD out_save_parameters
+USES INT     out_timesteps_per_file
 
-###################################
-# Checkpointing/recovery parameters
-###################################
+USES INT     checkpoint_every
+USES INT     checkpoint_keep
 USES BOOLEAN checkpoint_ID
-USES BOOLEAN checkpoint_keep_all
 USES BOOLEAN recover_and_remove
-USES INT checkpoint_every
 USES BOOLEAN checkpoint_on_terminate
-USES INT checkpoint_keep
 USES KEYWORD recover
-USES STRING recover_file
+USES STRING  recover_file