add new I/O parameters

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@726 f88db872-0e4f-0410-b76b-b9085cfa78c5

1 files changed, 43 insertions, 18 deletions

diff --git a/param.ccl b/param.ccl
index 4273259..627817c 100644
--- a/param.ccl
+++ b/param.ccl
@@ -136,12 +136,6 @@ int max_Newton_iterations "maximum number of Newton iterations before giving up"
 (0:* :: "any positive integer"
 } 10
 
-# if this is used, the file names are the usual ones with ".it%d" appended
-boolean output_h_and_H_at_each_Newton_iteration \
-  "should we output h and H at each Newton iteration (for debugging)?"
-{
-} "false"
-
 #
 # to avoid the Newton iteration diverging if there is no horizon present,
 # we limit the distance the horizon may move in any single Newton iteration
@@ -180,15 +174,51 @@ boolean final_H_update_if_exit_x_H_small \
 # input/output parameters
 #
 
+boolean output_initial_guess \
+  "should we output the initial guess back to the h data file?"
+{
+} "true"
+
+# if this is used, the file names are the usual ones with ".it%d" appended
+boolean output_h_and_H_at_each_Newton_iteration \
+  "should we output h and H at each Newton iteration (for debugging)?"
+{
+} "false"
+
+boolean output_h "should we output each horizon's shape h?"
+{
+} "true"
+
+boolean output_H_of_h "should we output each horizon's H(h) function?"
+{
+} "true"
+
+keyword file_format \
+  "what file format should we use for h and H(h) data files?"
+{
+"ASCII"	:: "simple ASCII format, directly readable by gnuplot"
+"HDF5"	:: "HDF5 surface format (not implemented yet)"
+} "ASCII"
+
+string ASCII_file_name_extension "extension for ASCII data files"
+{
+.* :: "any string"
+} "ascii"
+string HDF5_file_name_extension "extension for HDF5 data files"
+{
+.* :: "any string"
+} "hdf5"
+
 #
-# These file names are actually just "base" file names, with the
-# full file names being
-#	"%s.t%d.ah%d[.it%d].dat"
+# These file names are actually just "base" file names, with the full
+# file names being given by a printf() format "%s.t%d.ah%d[.it%d].%s",
 # where
-# the %s is the base file name,
-# the first %d is the global Cactus time iteration number,
-# the second %d is the apparent horizon number, ande
-# the optional third %d is the horizon finder iteration number
+# - the first %s is the base file name,
+# - the first %d is the global Cactus time iteration number,
+# - the second %d is the apparent horizon number, ande
+# - the optional third %d is the horizon finder iteration number
+# - the second %s is the file name extension as set by the
+#   {ASCII,HDF5}_data_file_name_extension
 #
 
 string h_base_file_name \
@@ -425,11 +455,6 @@ keyword initial_guess_method \
 "sphere"           :: "set to a coordinate sphere"
 } "read from file"
 
-boolean output_initial_guess \
-  "should we write the initial guess back to the h data file?"
-{
-} "true"
-
 # parameters for initial_guess_method = "sphere"
 real initial_guess__sphere__x_center[5] "x coordinate of sphere center"
 {