A lot of parameter name changes, especially for IO

git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOFlexIO/trunk@27 ebee0441-1374-4afa-a3b5-247f3ba15b9a

1 files changed, 20 insertions, 20 deletions

diff --git a/src/GHExtension.c b/src/GHExtension.c
index 20a6d48..cdbcc85 100644
--- a/src/GHExtension.c
+++ b/src/GHExtension.c
@@ -65,23 +65,23 @@ int IOFlexIO_InitGH (cGH *GH)
   myGH = (flexioGH *) GH->extensions [CCTK_GHExtensionHandle ("IOFlexIO")];
 
   /* How often to output */
-  myGH->IO_2Devery = output_every;
-  myGH->IO_3Devery = output_every;
-  if (output2d_every > 0)
-    myGH->IO_2Devery = output2d_every;
-  if (output3d_every > 0)
-    myGH->IO_3Devery = output3d_every;
+  myGH->IO_2Devery = out_every;
+  myGH->IO_3Devery = out_every;
+  if (out2D_every > 0)
+    myGH->IO_2Devery = out2D_every;
+  if (out3D_every > 0)
+    myGH->IO_3Devery = out3D_every;
 
-  InitIONum (myGH->IO_2Dnum, output2D);
-  InitIONum (myGH->IO_3Dnum, output3D);
+  InitIONum (myGH->IO_2Dnum, out2D_vars);
+  InitIONum (myGH->IO_3Dnum, out3D_vars);
 
   /* Deal with the output directories */
   myGH->outpfx_2D = outdir;
   myGH->outpfx_3D = outdir;
-  if (!CCTK_Equals(outdir2d,"outdir"))
-    myGH->outpfx_2D = outdir2d;
-  if (!CCTK_Equals(outdir3d,"outdir"))
-    myGH->outpfx_3D = outdir3d;
+  if (!CCTK_Equals(outdir2D,"outdir"))
+    myGH->outpfx_2D = outdir2D;
+  if (!CCTK_Equals(outdir3D,"outdir"))
+    myGH->outpfx_3D = outdir3D;
 
   /* Create the output directories */
   if (myGH->IO_2Devery > 0) {
@@ -108,20 +108,20 @@ int IOFlexIO_InitGH (cGH *GH)
   for (i=0; i<CCTK_NumVars(); i++)
     myGH->IO_2Dlast [i] = myGH->IO_3Dlast [i] = -1;
 
-  myGH->reuse_fh = reuse_fh;
+  myGH->out3d_reuse_filehandles = out3d_reuse_filehandles;
 
   /* Only have reuse for chunked data */
-  if (myGH->reuse_fh && ! ioUtilGH->unchunked) {
+  if (myGH->out3d_reuse_filehandles && ! ioUtilGH->unchunked) {
     CCTK_WARN (2, "Cannot reuse handles with unchunked data. "
-                  "Ignoring parameter 'reuse_fh'");
-    myGH->reuse_fh = 0;
+                  "Ignoring parameter 'out3d_reuse_filehandles'");
+    myGH->out3d_reuse_filehandles = 0;
   }
 
   /* Only have reuse if not one file per slice */
-  if (myGH->reuse_fh && onefileperslice) {
-    CCTK_WARN (2, "Cannot reuse handles with 'onefileperslice = yes'. "
-                  "Ignoring parameter 'reuse_fh'");
-    myGH->reuse_fh = 0;
+  if (myGH->out3d_reuse_filehandles && out3D_septimefiles) {
+    CCTK_WARN (2, "Cannot reuse handles with 'out3D_septimefiles = yes'. "
+                  "Ignoring parameter 'out3d_reuse_filehandles'");
+    myGH->out3d_reuse_filehandles = 0;
   }
 
   myGH->filenameList2D = NULL;