Change parameter "outdir" to "out_dir".

darcs-hash:20021024100034-07bb3-ea31bde68f93f0e1f9e4cbfb7bdf34cb93ecc4fd.gz

2 files changed, 8 insertions, 8 deletions

diff --git a/CarpetAttic/CarpetIOFlexIO/param.ccl b/CarpetAttic/CarpetIOFlexIO/param.ccl
index 5edaf1339..78d302c77 100644
--- a/CarpetAttic/CarpetIOFlexIO/param.ccl
+++ b/CarpetAttic/CarpetIOFlexIO/param.ccl
@@ -1,11 +1,11 @@
 # Parameter definitions for thorn CarpetIOFlexIO
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/param.ccl,v 1.5 2002/01/14 14:59:25 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/param.ccl,v 1.6 2002/10/24 12:00:32 schnetter Exp $
 
 
 
 shares: IO
 
-USES STRING outdir
+USES STRING out_dir
 
 USES CCTK_INT out_every
 
@@ -21,7 +21,7 @@ BOOLEAN verbose "Produce log output"
 
 
 
-CCTK_STRING outdir3D "Name of 3D FlexIO output directory, overrides outdir" STEERABLE = ALWAYS
+CCTK_STRING out3D_dir "Name of 3D FlexIO output directory, overrides out_dir" STEERABLE = ALWAYS
 {
   .* :: "A regex which matches everything"
 } "."
diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
index 0bc99d74f..176e82f11 100644
--- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
+++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
@@ -34,7 +34,7 @@
 #include "ioflexio.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.19 2002/10/24 10:50:01 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.20 2002/10/24 12:00:32 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_CarpetIOFlexIO_ioflexio_cc);
 }
 
@@ -142,7 +142,7 @@ namespace CarpetIOFlexIO {
     assert (iogh);
     
     // Create the output directory
-    const char* myoutdir = GetStringParameter("outdir3D", outdir);
+    const char* myoutdir = GetStringParameter("out3D_dir", out_dir);
     if (CCTK_MyProc(cgh)==0) {
       CCTK_CreateDirectory (0755, myoutdir);
     }
@@ -638,7 +638,7 @@ namespace CarpetIOFlexIO {
   {
     if (CCTK_ParameterQueryTimesSet (parametername, CCTK_THORNSTRING) > 0) {
       int ptype;
-      const char** const ppval = (const char**)CCTK_ParameterGet
+      const char* const* const ppval = (const char* const*)CCTK_ParameterGet
 	(parametername, CCTK_THORNSTRING, &ptype);
       assert (ppval);
       const char* const pval = *ppval;
@@ -655,8 +655,8 @@ namespace CarpetIOFlexIO {
   {
     if (CCTK_ParameterQueryTimesSet (parametername, CCTK_THORNSTRING) > 0) {
       int ptype;
-      const int* const ppval
-	= (int*)CCTK_ParameterGet (parametername, CCTK_THORNSTRING, &ptype);
+      const int* const ppval = (const int*)CCTK_ParameterGet
+	(parametername, CCTK_THORNSTRING, &ptype);
       assert (ppval);
       const int pval = *ppval;
       assert (ptype == PARAMETER_INT);