diff options
| author | tradke <tradke@94b1c47f-dcfd-45ef-a468-0854c0e9e350> | 2002-04-30 14:11:34 +0000 |
|---|---|---|
| committer | tradke <tradke@94b1c47f-dcfd-45ef-a468-0854c0e9e350> | 2002-04-30 14:11:34 +0000 |
| commit | 76d4e575a9901080e16d0558e9d65f7a1ec8fe22 (patch) | |
| tree | 8c5e05f8136f6e4f73cc4071938e6488a13b671a | |
| parent | 320e624c8ecef71d228b6b40326bed6f2afe1f68 (diff) | |
Changed the default for 'IOASCII::outdir?D' to be an empty string which then
causes IOASCII I/O methods to use 'IO::outdir'.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOASCII/trunk@111 94b1c47f-dcfd-45ef-a468-0854c0e9e350
| -rw-r--r-- | param.ccl | 18 | ||||
| -rw-r--r-- | src/Startup.c | 4 |
2 files changed, 11 insertions, 11 deletions
@@ -8,22 +8,22 @@ private: ########################## -# Directories to output to (overriden by outdir) +# Directories to output to ########################## -STRING outdir1D "Name of 1D ASCII output directory, overrides outdir" +STRING outdir1D "Name of 1D ASCII output directory, overrides IO::outdir" { - .* :: "A regex which matches everything" -} "." + .* :: "Any valid directory name, an empty string defaults to outdir" +} "" STRING outdir2D "Name of 2D ASCII output directory, overrides outdir" { - .* :: "A regex which matches everything" -} "." + .* :: "Any valid directory name, an empty string defaults to outdir" +} "" -STRING outdir3D "Name of 3D ASCII output directory, overrides outdir" +STRING outdir3D "Name of 3D ASCII 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 fc9325e..eb24978 100644 --- a/src/Startup.c +++ b/src/Startup.c @@ -29,7 +29,7 @@ CCTK_FILEVERSION(CactusBase_IOASCII_Startup_c) #define CREATE_OUTDIR(dir) \ { \ /* check whether "dir" was set; if not default to "IO::outdir" */ \ - if (CCTK_ParameterQueryTimesSet (#dir, CCTK_THORNSTRING) <= 0) \ + if (*dir == 0) \ { \ dir = outdir; \ } \ @@ -46,7 +46,7 @@ CCTK_FILEVERSION(CactusBase_IOASCII_Startup_c) } \ \ /* create the directory */ \ - i = IOUtil_CreateDirectory (GH, myGH->outdir1D, 0, 0); \ + i = IOUtil_CreateDirectory (GH, myGH->dir, 0, 0); \ if (i < 0) \ { \ CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING, \ |