diff options
| author | tradke <tradke@4825ed28-b72c-4eae-9704-e50c059e567d> | 2005-11-16 13:49:02 +0000 |
|---|---|---|
| committer | tradke <tradke@4825ed28-b72c-4eae-9704-e50c059e567d> | 2005-11-16 13:49:02 +0000 |
| commit | 8dfb67180f171eb85522aca444c26334287987a2 (patch) | |
| tree | 0f45976fc70fe781fb61c3a1193857d16e102deb | |
| parent | 01bdf3aa27e2aa63f85d79ffab8f58643759ba33 (diff) | |
Don't remove an initial data checkpoint file if IO::checkpoint_keep is set to
a value larger 0.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOHDF5/trunk@225 4825ed28-b72c-4eae-9704-e50c059e567d
| -rw-r--r-- | src/DumpGH.c | 2 | ||||
| -rw-r--r-- | src/make.configuration.defn | 2 | ||||
| -rw-r--r-- | src/make.configuration.deps | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/DumpGH.c b/src/DumpGH.c index bc673c3..e844592 100644 --- a/src/DumpGH.c +++ b/src/DumpGH.c @@ -321,7 +321,7 @@ static int Checkpoint (const cGH *GH, int called_from) tempname, filename); retval = -1; } - else + else if (called_from == CP_EVOLUTION_DATA) { if (checkpoint_keep > 0) { diff --git a/src/make.configuration.defn b/src/make.configuration.defn index aba91f8..7e9ca9d 100644 --- a/src/make.configuration.defn +++ b/src/make.configuration.defn @@ -2,7 +2,7 @@ # $Header$ # add the recombiner and the IEEEIO converter to the Cactus utitlity tools -ALL_UTILS += hdf5_recombiner hdf5_merge hdf5_extract hdf5_double_to_single +ALL_UTILS += hdf5_recombiner hdf5_merge hdf5_extract hdf5_double_to_single hdf5_convert_from_carpetiohdf5 ifneq ($(strip $(HAVE_FLEXIO)), ) ALL_UTILS += hdf5_convert_from_ieeeio diff --git a/src/make.configuration.deps b/src/make.configuration.deps index bb1cae5..1163053 100644 --- a/src/make.configuration.deps +++ b/src/make.configuration.deps @@ -52,3 +52,10 @@ $(IOHDF5_BUILD_DIR)/hdf5_convert_from_sdf.o: $(IOHDF5_SRC_DIR)/hdf5_convert_from @echo Compiling $< if [ ! -d $(IOHDF5_BUILD_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(IOHDF5_BUILD_DIR) ; fi $(CC) $< $(IOHDF5_CFLAGS) $(INC_DIRS:%=-I%) -c -o $@ + + +# linking rule for hdf5_convert_from_carpetiohdf5 +$(UTIL_DIR)/hdf5_convert_from_carpetiohdf5: $(IOHDF5_BUILD_DIR)/hdf5_convert_from_carpetiohdf5.o + @echo Creating hdf5_convert_from_carpetiohdf5 in $(UTIL_DIR) from $< + if [ ! -d $(UTIL_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(UTIL_DIR) ; fi + $(LD) $< $(TOP)/datestamp.o $(IOHDF5_LDFLAGS) $(GENERAL_LIBRARIES) -o $@ |