[cig-commits] commit:
Mercurial
hg at geodynamics.org
Mon Nov 24 11:59:26 PST 2008
changeset: 138:943938c03acc
user: BelindaMay
date: Wed Aug 13 03:57:41 2008 +0000
files: Mesh/src/CartesianGenerator.c Swarm/src/FileParticleLayout.c Swarm/src/FileParticleLayout.h Swarm/src/Swarm.h Swarm/src/SwarmClass.c Swarm/src/SwarmDump.c Swarm/src/SwarmDump.h
description:
Modified checkpoint file reading and writing to work with new read_hdf5 and write_hdf5 config options.
diff -r 4953943cab6f -r 943938c03acc Mesh/src/CartesianGenerator.c
--- a/Mesh/src/CartesianGenerator.c Mon Aug 11 10:37:52 2008 +0000
+++ b/Mesh/src/CartesianGenerator.c Wed Aug 13 03:57:41 2008 +0000
@@ -33,7 +33,7 @@
#include <string.h>
#include <assert.h>
-#ifdef HAVE_HDF5
+#ifdef READ_HDF5
#include <hdf5.h>
#endif
@@ -200,7 +200,7 @@ void _CartesianGenerator_Construct( void
char* checkpointPrefix;
Index meshStrLen;
-#ifdef HAVE_HDF5
+#ifdef READ_HDF5
hid_t file, fileData;
hid_t props;
double temp1[3], temp2[3];
@@ -309,7 +309,7 @@ void _CartesianGenerator_Construct( void
restartTimestep );
}
-#ifdef HAVE_HDF5
+#ifdef READ_HDF5
sprintf( meshSaveFileName, "%s.h5", meshSaveFileName );
/* Read in minimum coord. */
@@ -2040,7 +2040,7 @@ void CartesianGenerator_GenGeom( Cartesi
Stream* errorStream = Journal_Register( Error_Type, self->type );
int rank, nRanks;
-#ifdef HAVE_HDF5
+#ifdef READ_HDF5
hid_t file, fileSpace, fileData;
hsize_t start[2], count[2], size[2];
hid_t memSpace;
@@ -2090,7 +2090,7 @@ void CartesianGenerator_GenGeom( Cartesi
context->restartTimestep );
}
-#ifdef HAVE_HDF5
+#ifdef READ_HDF5
sprintf( meshSaveFileName, "%s.h5", meshSaveFileName );
Journal_Printf( stream, "... loading from file %s.\n", meshSaveFileName );
diff -r 4953943cab6f -r 943938c03acc Swarm/src/FileParticleLayout.c
--- a/Swarm/src/FileParticleLayout.c Mon Aug 11 10:37:52 2008 +0000
+++ b/Swarm/src/FileParticleLayout.c Wed Aug 13 03:57:41 2008 +0000
@@ -28,7 +28,7 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifdef HAVE_HDF5
+#ifdef READ_HDF5
#include <hdf5.h>
#endif
@@ -214,7 +214,7 @@ void _FileParticleLayout_SetInitialCount
Swarm* swarm = (Swarm*)_swarm;
Name filename = self->filename;
-#ifdef HAVE_HDF5
+#ifdef READ_HDF5
hid_t file, fileData, fileSpace;
hsize_t size[2];
char dataSpaceName[1024];
@@ -231,7 +231,7 @@ void _FileParticleLayout_SetInitialCount
__func__, self->name, self->type );
Stream_IndentBranch( Swarm_Debug );
-#ifdef HAVE_HDF5
+#ifdef READ_HDF5
/* Open the swarm checkpointing file */
file = H5Fopen( filename, H5F_ACC_RDONLY, H5P_DEFAULT );
Journal_Firewall(
@@ -319,7 +319,7 @@ void _FileParticleLayout_InitialiseParti
FileParticleLayout* self = (FileParticleLayout*)particleLayout;
Swarm *swarm = (Swarm*)_swarm;
-#ifdef HAVE_HDF5
+#ifdef READ_HDF5
SwarmVariable* swarmVar;
Index swarmVar_I, dof_I;
char dataSpaceName[1024];
@@ -400,7 +400,7 @@ void _FileParticleLayout_InitialiseParti
int result;
IntegrationPoint* newParticle = (IntegrationPoint*)particle;
-#ifdef HAVE_HDF5
+#ifdef READ_HDF5
SwarmVariable* swarmVar;
Index swarmVar_I;
hid_t memSpace;
diff -r 4953943cab6f -r 943938c03acc Swarm/src/FileParticleLayout.h
--- a/Swarm/src/FileParticleLayout.h Mon Aug 11 10:37:52 2008 +0000
+++ b/Swarm/src/FileParticleLayout.h Wed Aug 13 03:57:41 2008 +0000
@@ -46,7 +46,7 @@
extern const Type FileParticleLayout_Type;
/* FileParticleLayout information */
-#ifdef HAVE_HDF5
+#ifdef READ_HDF5
#define __FileParticleLayout \
__GlobalParticleLayout \
\
diff -r 4953943cab6f -r 943938c03acc Swarm/src/Swarm.h
--- a/Swarm/src/Swarm.h Mon Aug 11 10:37:52 2008 +0000
+++ b/Swarm/src/Swarm.h Wed Aug 13 03:57:41 2008 +0000
@@ -42,7 +42,7 @@
#ifndef __Domain_Swarm_h__
#define __Domain_Swarm_h__
-#ifdef HAVE_HDF5
+#if defined(READ_HDF5) || defined(WRITE_HDF5)
#include <hdf5.h>
#endif
diff -r 4953943cab6f -r 943938c03acc Swarm/src/SwarmClass.c
--- a/Swarm/src/SwarmClass.c Mon Aug 11 10:37:52 2008 +0000
+++ b/Swarm/src/SwarmClass.c Wed Aug 13 03:57:41 2008 +0000
@@ -28,7 +28,7 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifdef HAVE_HDF5
+#ifdef READ_HDF5
#include <hdf5.h>
#endif
@@ -1660,7 +1660,7 @@ void Swarm_ReplaceCurrentParticleLayoutW
void Swarm_GetCheckpointFilenameForGivenTimestep( Swarm* self, AbstractContext* context, char* swarmSaveFileName ) {
-#ifdef HAVE_HDF5
+#ifdef READ_HDF5
if ( strlen(context->checkPointPrefixString) > 0 ) {
sprintf( swarmSaveFileName, "%s/%s.%s.%05d.h5", context->checkpointReadPath,
context->checkPointPrefixString, self->name, context->restartTimestep );
diff -r 4953943cab6f -r 943938c03acc Swarm/src/SwarmDump.c
--- a/Swarm/src/SwarmDump.c Mon Aug 11 10:37:52 2008 +0000
+++ b/Swarm/src/SwarmDump.c Wed Aug 13 03:57:41 2008 +0000
@@ -46,7 +46,7 @@
#include <assert.h>
#include <string.h>
-#ifdef HAVE_HDF5
+#ifdef WRITE_HDF5
#include <hdf5.h>
#endif
@@ -282,7 +282,7 @@ void _SwarmDump_Execute( void* swarmDump
MPI_Barrier( swarm->comm );
}
-#ifdef HAVE_HDF5
+#ifdef WRITE_HDF5
Stg_asprintf( &filename, "%s.h5", filename );
SwarmDump_DumpToHDF5( self, swarm, filename );
#else
@@ -308,7 +308,7 @@ void SwarmDump_Execute( void* swarmDump,
self->_execute( self, context );
}
-#ifdef HAVE_HDF5
+#ifdef WRITE_HDF5
void SwarmDump_DumpToHDF5( SwarmDump* self, Swarm* swarm, const char* filename ) {
hid_t file, fileSpace, fileData;
hid_t memSpace;
diff -r 4953943cab6f -r 943938c03acc Swarm/src/SwarmDump.h
--- a/Swarm/src/SwarmDump.h Mon Aug 11 10:37:52 2008 +0000
+++ b/Swarm/src/SwarmDump.h Wed Aug 13 03:57:41 2008 +0000
@@ -101,7 +101,7 @@
/** Virtual Function Wrappers */
void SwarmDump_Execute( void* swarmDump, void* context ) ;
-#ifdef HAVE_HDF5
+#ifdef WRITE_HDF5
void SwarmDump_DumpToHDF5( SwarmDump* self, Swarm* swarm, const char* filename );
#endif
More information about the CIG-COMMITS
mailing list