Bringing IOPanda to a more up-to-date state.

Still developmental.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOPanda/trunk@7 38c3d835-c875-442e-b0fe-21c19ce1d001

1 files changed, 27 insertions, 103 deletions

diff --git a/param.ccl b/param.ccl
index 89690e3..4e88262 100644
--- a/param.ccl
+++ b/param.ccl
@@ -1,8 +1,8 @@
-# Parameter definitions for thorn IOFlexIO
+# Parameter definitions for thorn IOPanda
 
 
 #############################################################################
-### declare IOFlexIO parameters
+### declare IOPanda parameters
 #############################################################################
 private:
 
@@ -10,10 +10,6 @@ private:
 ########################
 # How often to do output
 ########################
-INT out2D_every "How often to do 2D output, overrides out_every"
-{
-  -1:* ::		
-} -1
 INT out3D_every "How often to do 3D output, overrides out_every"
 {
   -1:* ::
@@ -23,36 +19,19 @@ INT out3D_every "How often to do 3D output, overrides out_every"
 ####################
 # Output directories
 ####################
-STRING outdir2D "Name of IO 2D output directory, overrides outdir"
-{
-  .* :: A regex which matces everything
-} "outdir" 
 STRING outdir3D "Name of IO 3D output directory, overrides outdir"
 {
   .* :: A regex which matces everything
-} "outdir"
+} "."
 
 
 ##########################
 # What variables to output
 ##########################
-STRING out2D_vars "Variables to output in 2D FlexIO file format"
+STRING out3D_vars "Variables to output in 3D Panda file format"
 {
-  .* :: A regex which matces everything
-} ""
-STRING out3D_vars "Variables to output in 3D FlexIO file format"
-{
-  .* :: A regex which matces everything
+  .* :: A regex which matches everything
 } ""
-################
-# Various things
-################
-LOGICAL checkpoint "Do checkpointing with IOFlexIO"
-{
-} "no"
-LOGICAL out3d_reuse_filehandles "Reuse file handles by closing files after each write operation."
-{
-} "no"
 
 
 #############################################################################
@@ -63,111 +42,56 @@ shares: IO
 ####################
 # Output directories
 ####################
-EXTEND STRING outdir "Name of IO output directory"
+USES STRING outdir ""
 {
-} "."
+}
 
 
 ########################
 # How often to do output
 ########################
-EXTEND INT out_every "How often to do IO output"
+USES INT out_every ""
 {
-  -1:* ::
-} -1
+  : ::
+}
 
 
 ################
 # various things
 ################
-EXTEND LOGICAL verbose "Give extended screen output in IO?"
+USES LOGICAL verbose ""
 {
-} "no"
-EXTEND LOGICAL out3D_datestamp "Write date as attribute to IO 3D output file?"
+}
+USES LOGICAL out3D_datestamp ""
 {
-} "yes"
-EXTEND LOGICAL out3D_parameters "Write parameters to IO 3D output file?"
+}
+USES LOGICAL out3D_parameters ""
 {
-} "yes"
-EXTEND LOGICAL out3D_structures "Write structures to IO 3D output file?"
-{
-} "yes"
+}
 
 
 #######################
 # Specific to 3D output
 #######################
-EXTEND KEYWORD out3D_mode "Which mode for 3D IO"
+USES KEYWORD out3D_mode ""
 {
-  "proc"    :: "every processor writes its share of data into a separate file"
-  "np"      :: "data is collected and written by every N'th processor into a separate file, where N is specified by the parameter ioproc_every"
-  "onefile" :: "all output is written into a single file by processor 0"
-} "proc"
+}
 
-EXTEND INT out3D_procs "Do IO on every N processors."
+USES INT out3D_procs ""
 {
-  1:*       :: "Must be a positive integer"
-} 8
-EXTEND LOGICAL out3D_septimefiles "Write one file per time slice, as opposed to all data in one file"
+  : ::
+}
+USES LOGICAL out3D_septimefiles ""
 {
-} "no"
-EXTEND LOGICAL out3D_unchunked "Don't write data in chunks."
+}
+USES LOGICAL out3D_unchunked ""
 {
-} "no"
+}
 
 
 ##############################################
 # Downsampling parameters (only for 3D output)
 ##############################################
-EXTEND INT out3D_downsample_x "Factor by which to downsample output in x direction. Point (0,0,0) is always included."
-{
-  1:*       :: "Must be a positive integer"
-} 1
-EXTEND INT out3D_downsample_y "Factor by which to downsample output in y direction. Point (0,0,0) is always included."
+USES LOGICAL out3D_single ""
 {
-  1:*       :: "Must be a positive integer"
-} 1
-EXTEND INT out3D_downsample_z "Factor by which to downsample output in z direction. Point (0,0,0) is always included."
-{
-  1:*       :: "Must be a positive integer"
-} 1
-EXTEND LOGICAL out3D_single "Output 3D data in single precision ? This parameter is ignored for Cactus compiled with single precision"
-{
-} "no"
-
-
-###################################
-# Checkpointing/recovery parameters
-###################################
-EXTEND LOGICAL checkpoint_ID "Checkpoint initial data ?"
-{
-} "no"
-EXTEND LOGICAL checkpoint_keep_all "Keep all checkpoint files ?"
-{
-} "no"
-EXTEND LOGICAL recover "Recover from a checkpoint file ?"
-{
-} "no"
-EXTEND INT checkpoint_every "Checkpoint every x iterations"
-{
-  -1:* :: "negative values disable checkpointing"
-} -1
-EXTEND INT checkpoint_keep "How many checkpoint files to keep"
-{
-  1:* :: "1 overwrites the latest checkpoint file"
-} 1
-EXTEND STRING checkpoint_file "File name for regular checkpoint"
-{
-} "checkpoint"
-EXTEND STRING checkpoint_ID_file "File name for initial data checkpoint"
-{
-} "checkpointID"
-EXTEND STRING recover_file "File name of recovery file"
-{
-} "checkpoint"
-EXTEND STRING checkpoint_dir "Output directory for checkpoint files"
-{
-} "."
-EXTEND STRING recovery_dir "Directory to look for the recovery file"
-{
-} "."
+}