Do not use CCTK_QueryParameterTimesSet to find out whether to use a

Do not use CCTK_QueryParameterTimesSet to find out whether to use a
parameter value from this thorn, or from IO.  Use special parameter
values for that instead, and make these the default.

Remove now-unnecessary Get*Parameter functions.

darcs-hash:20040403104021-07bb3-88addd2629255577d851436003f854791670ac7a.gz

1 files changed, 15 insertions, 12 deletions

diff --git a/Carpet/CarpetIOHDF5/param.ccl b/Carpet/CarpetIOHDF5/param.ccl
index 2c0e5d8e1..9d8aa2480 100644
--- a/Carpet/CarpetIOHDF5/param.ccl
+++ b/Carpet/CarpetIOHDF5/param.ccl
@@ -1,5 +1,5 @@
 # Parameter definitions for thorn CarpetIOHDF5
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/param.ccl,v 1.6 2004/03/20 15:43:37 cott Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/param.ccl,v 1.7 2004/04/03 12:40:21 schnetter Exp $
 
 
 
@@ -34,41 +34,44 @@ BOOLEAN h5verbose "Produce log output" STEERABLE = ALWAYS
 
 
 
-CCTK_STRING out3D_dir "Name of 3D CarpetIOHDF5 output directory, overrides out_dir" STEERABLE = ALWAYS
+CCTK_STRING out3D_dir "Name of 3D CarpetIOHDF5 output directory, overrides IO::out_dir" STEERABLE = ALWAYS
 {
-  .* :: "A regex which matches everything"
-} "."
+  "^$" :: "Empty: use IO::out_dir"
+  ".+" :: "Not empty: directory name"
+} ""
 
 CCTK_STRING out3D_vars "Variables to output in 3D CarpetIOHDF5 file format" STEERABLE = ALWAYS
 {
-  .* :: "A regex which matches everything"
+  .* :: "List of group and variable names"
 } ""
 
 CCTK_STRING out3D_extension "File extension to use for 3D CarpetIOHDF5 output" STEERABLE = ALWAYS
 {
-  .* :: "A regex which matches everything"
+  ".*" :: "File extension (including a leading dot, if desired)"
 } ".h5"
 
 CCTK_INT out3D_every "How often to do 3D CarpetIOHDF5 output, overrides out_every" STEERABLE = ALWAYS
 {
-  -1:* :: "Values <= 0 disable 3D output"
-} -1
+  1:*  :: "Output every so many time steps"
+  -1:0 :: "No output"
+  -2   :: "Use IO::out_every"
+} -2
 
 
 
 CCTK_STRING in3D_dir "Name of 3D CarpetIOHDF5 input directory" STEERABLE = ALWAYS
 {
-  .* :: "A regex which matches everything"
-} "."
+  ".*" :: "Directory name"
+} ""
 
 CCTK_STRING in3D_vars "Variables to input in 3D CarpetIOHDF5 file format" STEERABLE = ALWAYS
 {
-  .* :: "A regex which matches everything"
+  .* :: "List of group and variable names"
 } ""
 
 CCTK_STRING in3D_extension "File extension to use for 3D CarpetIOHDF5 input" STEERABLE = ALWAYS
 {
-  .* :: "A regex which matches everything"
+  ".*" :: "File extension (including a leading dot, if desired)"
 } ".h5"