aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortradke <tradke@ebee0441-1374-4afa-a3b5-247f3ba15b9a>2002-04-30 14:11:30 +0000
committertradke <tradke@ebee0441-1374-4afa-a3b5-247f3ba15b9a>2002-04-30 14:11:30 +0000
commit4121f7f8af4cb1b3232319205129d9cef22e53b1 (patch)
tree62824f17aacd64d31a5026a2029a55a2d7f8eb2c
parenteecb2ef6e8756d309afc5dd1a15ea5835745dea6 (diff)
Changed the default for 'IOFlexIO::outdir?D' to be an empty string which then
causes IOFlexIO I/O methods to use 'IO::outdir'. git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOFlexIO/trunk@239 ebee0441-1374-4afa-a3b5-247f3ba15b9a
-rw-r--r--param.ccl12
-rw-r--r--src/Startup.c4
2 files changed, 8 insertions, 8 deletions
diff --git a/param.ccl b/param.ccl
index dde580a..7db18a0 100644
--- a/param.ccl
+++ b/param.ccl
@@ -25,14 +25,14 @@ INT out3D_every "How often to do 3D output, overrides out_every" STEERABLE = ALW
####################
# Output directories
####################
-STRING outdir2D "Name of IO 2D output directory, overrides outdir"
+STRING outdir2D "Name of IO 2D output directory, overrides IO::outdir"
{
- .* :: "A regex which matches everything"
-} "."
-STRING outdir3D "Name of IO 3D output directory, overrides outdir"
+ .* :: "Any valid directory name, an empty string defaults to outdir"
+} ""
+STRING outdir3D "Name of IO 3D output directory, overrides IO::outdir"
{
- .* :: "A regex which matches everything"
-} "."
+ .* :: "Any valid directory name, an empty string defaults to outdir"
+} ""
##########################
diff --git a/src/Startup.c b/src/Startup.c
index 42cafce..ecddd20 100644
--- a/src/Startup.c
+++ b/src/Startup.c
@@ -258,7 +258,7 @@ static void *SetupGH (tFleshConfig *config, int conv_level, cGH *GH)
/* check whether "outdir2D" and/or "outdir3D" were set.
If so take these dirs otherwise default to "IO::outdir" */
- if (CCTK_ParameterQueryTimesSet ("outdir2D", CCTK_THORNSTRING) > 0)
+ if (*outdir2D)
{
myGH->outdir2D = strdup (outdir2D);
}
@@ -268,7 +268,7 @@ static void *SetupGH (tFleshConfig *config, int conv_level, cGH *GH)
CCTK_ImplementationThorn ("IO"));
}
- if (CCTK_ParameterQueryTimesSet ("outdir3D", CCTK_THORNSTRING) > 0)
+ if (*outdir3D)
{
myGH->outdir = strdup (outdir3D);
}