diff options
author | tradke <tradke@0888f3d4-9f52-45d2-93bc-d00801ff5e46> | 2003-06-16 14:30:48 +0000 |
---|---|---|
committer | tradke <tradke@0888f3d4-9f52-45d2-93bc-d00801ff5e46> | 2003-06-16 14:30:48 +0000 |
commit | 3c2739a651d05825f29c96d1140cd4f3e4b706e7 (patch) | |
tree | cdb0aa142b78a149d78c821408cdf92542129530 | |
parent | 602fed65e6ce98962ba6112a322a07838e4a3263 (diff) |
Don't try to recover from a streamed HDF5 file when in "auto" or "autoprobe"
mode.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOStreamedHDF5/trunk@96 0888f3d4-9f52-45d2-93bc-d00801ff5e46
-rw-r--r-- | src/RecoverGH.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/RecoverGH.c b/src/RecoverGH.c index 2007672..5a674a0 100644 --- a/src/RecoverGH.c +++ b/src/RecoverGH.c @@ -2,7 +2,7 @@ @file RecoverGH.c @date Tue Oct 10 2000 @author Thomas Radke - @desc + @desc Contains the routines to recover from a streamed HDF5 checkpoint. Currently can recover from: @@ -10,7 +10,7 @@ (2) Multiple unrecombined files, where the current number of processors and IO processors match those used to write the files. - @enddesc + @enddesc @version $Id$ @@*/ @@ -45,11 +45,11 @@ static int OpenFile (cGH *GH, const char *basefilename, int called_from, @routine IOStreamedHDF5_Recover @date Tue Oct 10 2000 @author Thomas Radke - @desc + @desc Recovers a GH from a streamed HDF5 checkpoint file. This routine is registered with IOUtil as IOStreamedHDF5's recovery routine. - @enddesc + @enddesc @var GH @vdesc Pointer to CCTK grid hierarchy @vtype cGH * @@ -94,7 +94,7 @@ int IOStreamedHDF5_Recover (cGH *GH, const char *basefilename, int called_from) /* start the recovery timer if we were called at CCTK_RECOVER */ - myGH = (ioStreamedHDF5GH *) CCTK_GHExtension (GH, "IOStreamedHDF5"); + myGH = CCTK_GHExtension (GH, "IOStreamedHDF5"); if (myGH && myGH->print_timing_info) { CCTK_TimerStartI (myGH->timers[RECOVERY_TIMER]); @@ -114,7 +114,7 @@ int IOStreamedHDF5_Recover (cGH *GH, const char *basefilename, int called_from) else { /* This is the case for CP_RECOVER_DATA. - CCTK_RECOVER_PARAMETERS must have been called before + CCTK_RECOVER_PARAMETERS must have been called before and set up the file info structure. */ if (! fileinfo.is_HDF5_file) { @@ -166,7 +166,7 @@ int IOStreamedHDF5_Recover (cGH *GH, const char *basefilename, int called_from) } HDF5_ERROR (H5Fclose (fileinfo.file)); } - + /* free the allocated filename */ if (fileinfo.filename) { @@ -187,7 +187,7 @@ int IOStreamedHDF5_Recover (cGH *GH, const char *basefilename, int called_from) /* print an info message */ if (called_from == CP_RECOVER_DATA) { - CCTK_VInfo (CCTK_THORNSTRING, + CCTK_VInfo (CCTK_THORNSTRING, "Restarting simulation at iteration %d (physical time %g)", GH->cctk_iteration, (double) GH->cctk_time); } @@ -232,10 +232,10 @@ int IOStreamedHDF5_RecoverParameters (void) DECLARE_CCTK_PARAMETERS - if (CCTK_Equals (recover, "auto")) + if (CCTK_Equals (recover, "auto") || CCTK_Equals (recover, "autoprobe")) { - CCTK_WARN (2, "'IO::recover = \"auto\"' selected which doesn't make sense " - "for streamed HDF5 checkpoint files"); + CCTK_WARN (2, "'IO::recover = \"auto|autoprobe\"' selected which doesn't " + "make sense for streamed HDF5 checkpoint files"); retval = -1; } else @@ -255,7 +255,7 @@ int IOStreamedHDF5_RecoverParameters (void) @date Tue Oct 10 2000 @author Thomas Radke @desc - Open a streamed HDF5 file given by its filename + Open a streamed HDF5 file given by its filename (which has format 'host:port') and checks whether we can recover from that file. The file information is broadcasted by the IO processor(s) @@ -368,10 +368,10 @@ static int OpenFile (cGH *GH, const char *basefilename, int called_from, HDF5_ERROR (H5Gclose (group)); /* If we recover from chunked file(s) the number of - * writing processors must match the number of reading + * writing processors must match the number of reading * processors, and the total number of processors must match. */ - + if ((fileinfo->ioproc_every == nprocs && nprocs > 1) || fileinfo->unchunked) { |