Parameter names changes as announced in today's mail to users@cactuscode.org.

You must also update thorns IOHDF5Util and IOUtil now.

This thorn will be moved from AlphaThorns to CactusPUGHIO now.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOHDF5/trunk@127 4825ed28-b72c-4eae-9704-e50c059e567d

1 files changed, 8 insertions, 8 deletions

diff --git a/src/DumpGH.c b/src/DumpGH.c
index b9d5674..952cbc0 100644
--- a/src/DumpGH.c
+++ b/src/DumpGH.c
@@ -16,7 +16,7 @@
 #include "cctk_Parameters.h"
 #include "CactusBase/IOUtil/src/ioGH.h"
 #include "CactusBase/IOUtil/src/ioutil_CheckpointRecovery.h"
-#include "BetaThorns/IOHDF5Util/src/ioHDF5UtilGH.h"
+#include "CactusPUGHIO/IOHDF5Util/src/ioHDF5UtilGH.h"
 #ifdef CCTK_MPI
 #include "CactusPUGH/PUGH/src/include/pugh.h"
 #endif
@@ -30,7 +30,7 @@
 
 /* the rcs ID and its dummy function to use it */
 static const char *rcsid = "$Header$";
-CCTK_FILEVERSION(AlphaThorns_IOHDF5_DumpGH_c)
+CCTK_FILEVERSION(CactusPUGHIO_IOHDF5_DumpGH_c)
 
 
 /********************************************************************
@@ -102,7 +102,7 @@ void IOHDF5_EvolutionCheckpoint (const cGH *GH)
       ((checkpoint_every > 0 && GH->cctk_iteration % checkpoint_every == 0) ||
        checkpoint_next))
   {
-    if (verbose)
+    if (! CCTK_Equals (verbose, "none"))
     {
       CCTK_INFO("------------------------------------------------------------");
       CCTK_VInfo (CCTK_THORNSTRING, "Dumping periodic checkpoint file at "
@@ -232,7 +232,7 @@ static int Checkpoint (const cGH *GH, int called_from)
   /* Now open the file */
   if (myproc == ioUtilGH->ioproc)
   {
-    if (verbose)
+    if (CCTK_Equals (verbose, "full"))
     {
       CCTK_VInfo (CCTK_THORNSTRING, "Creating checkpoint file '%s'",
                   cp_tempname);
@@ -269,7 +269,7 @@ static int Checkpoint (const cGH *GH, int called_from)
   /* close the temporary checkpoint file and rename it to the real file */
   if (myproc == ioUtilGH->ioproc)
   {
-    if (verbose)
+    if (CCTK_Equals (verbose, "full"))
     {
       CCTK_VInfo (CCTK_THORNSTRING, "Closing temporary checkpoint file '%s' "
                                     "and renaming it to '%s'",
@@ -281,7 +281,7 @@ static int Checkpoint (const cGH *GH, int called_from)
       HDF5_ERROR (H5Fclose (file));
     }
 
-    /* delete the oldest checkpoint file if checkpoint_keep_all isn't set
+    /* delete the oldest checkpoint file if requested
        and put the new filename into the ring buffer */
     if (retval == 0)
     {
@@ -301,14 +301,14 @@ static int Checkpoint (const cGH *GH, int called_from)
       {
         if (myGH->cp_filename_list[myGH->cp_filename_index])
         {
-          if (! checkpoint_keep_all)
+          if (checkpoint_keep > 0)
           {
             remove (myGH->cp_filename_list[myGH->cp_filename_index]);
           }
           free (myGH->cp_filename_list[myGH->cp_filename_index]);
         }
         myGH->cp_filename_list[myGH->cp_filename_index] = strdup (cp_filename);
-        myGH->cp_filename_index = (myGH->cp_filename_index+1) % checkpoint_keep;
+        myGH->cp_filename_index = (myGH->cp_filename_index+1) % abs (checkpoint_keep);
       }
     }
   }