Several things which I missed to commit individually but rather do it in

one go now:

 - checkpoint/recover parameters as a single string which could also be used
   for writing a parameter file
 - added routine to be scheduled at CCTK_RECOVER_PARAMETERS
 - automatically select the latest checkpoint file for recovery if
   IO::recover = "auto" was set
 - Use IOFlexIO::reuse_filehandles with a different meaning now:
   By default all IEEEIO output files are kept open all the time.
   This is the most efficient method for writing data.
   If you run out of system file handles you can enable this parameter then
   to use the pause/resume scheme of the IEEEIO lib.
 - automatically append data sets to already exisiting output files after
   restart from recovery; duplicate timesteps are **NOT** removed from the
   output files because IEEEIO lib cannot delete/overwrite individual data sets
   So the reader has to handle this, it should always choose the latest data set
   of a given timestep.
 - fixed rcsid warnings
 - use CCTK_Info() rather than printf() for giving verbose output


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

1 files changed, 9 insertions, 15 deletions

diff --git a/src/Output2D.c b/src/Output2D.c
index 171b050..20b3a27 100644
--- a/src/Output2D.c
+++ b/src/Output2D.c
@@ -71,10 +71,9 @@ int IOFlexIO_Output2DGH (cGH *GH)
       name = CCTK_VarName (i);
       fullname = CCTK_FullName (i);
 
-      if (verbose) {
-        printf("IOFlexIO Output2DGH : \n");
-        printf("  fullname/name = %s/%s\n", fullname, name);
-      }
+      if (verbose)
+        CCTK_VInfo (CCTK_THORNSTRING, "IOFlexIO_Output2DGH: "
+                    "fullname / name = %s / %s", fullname, name);
 
       IOFlexIO_Output2DVarAs (GH, fullname, name);
 
@@ -129,12 +128,9 @@ int IOFlexIO_Output2DVarAs (cGH *GH, const char *fullname, const char *alias)
 
   index = CCTK_VarIndex (fullname);
 
-  if (verbose) {
-    printf ("\nIn IOFlexIO Output2DVarAs\n-------------------\n");
-    printf ("  Fullname = -%s-\n", fullname);
-    printf ("  Alias = -%s-\n", alias);
-    printf ("  Index = %d\n", index);
-  }
+  if (verbose)
+    CCTK_VInfo (CCTK_THORNSTRING, "IOFlexIO_Output2DVarAs: "
+                "fullname, alias, index = (%s, %s, %d)", fullname, alias,index);
 
   /* Do the 2D output */
   IOFlexIO_Write2D (GH, index, alias);
@@ -239,11 +235,9 @@ int IOFlexIO_TriggerOutput2D (cGH *GH, int index)
   /* get the handle for IOFlexIO extensions */
   myGH = (flexioGH *) GH->extensions [CCTK_GHExtensionHandle ("IOFlexIO")];
 
-  if (verbose) {
-    printf("\nIn IOFlexIO TriggerOutput2D\n---------------------\n");
-    printf("  Index = %d\n", index);
-    printf("  Variable = -%s-\n", varname);
-  }
+  if (verbose)
+    CCTK_VInfo (CCTK_THORNSTRING, "IOFlexIO_TriggerOutput2D: "
+                "name, index = (%s, %d)", varname, index);
 
   /* Do the 2D output */
   IOFlexIO_Write2D (GH, index, varname);