[cig-commits] commit:

[Mercurial]

changeset:   63:4e04c13fc839
user:        LukeHodkinson
date:        Thu Mar 20 07:22:34 2008 +0000
files:       Swarm/src/FileParticleLayout.c Swarm/src/SwarmDump.c
description:
Adding a preprocessor conditional to allow for
multiple versions of HDF5.


diff -r 74c7b464b60b -r 4e04c13fc839 Swarm/src/FileParticleLayout.c
--- a/Swarm/src/FileParticleLayout.c	Tue Mar 18 05:11:09 2008 +0000
+++ b/Swarm/src/FileParticleLayout.c	Thu Mar 20 07:22:34 2008 +0000
@@ -232,7 +232,11 @@ void _FileParticleLayout_SetInitialCount
 #ifdef HAVE_HDF5
 	/* Read in data size. */
 	file = H5Fopen( filename, H5F_ACC_RDONLY, H5P_DEFAULT );
+#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR < 8
+	fileData = H5Dopen( file, "/size" );
+#else
 	fileData = H5Dopen( file, "/size", H5P_DEFAULT );
+#endif
 	H5Dread( fileData, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, size );
 	H5Dclose( fileData );
 	H5Fclose( file );
@@ -298,7 +302,11 @@ void _FileParticleLayout_InitialiseParti
 
 	/* Open the file and data set. */
 	file = H5Fopen( self->filename, H5F_ACC_RDONLY, H5P_DEFAULT );
+#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR < 8
+	self->fileData = H5Dopen( file, "/data" );
+#else
 	self->fileData = H5Dopen( file, "/data", H5P_DEFAULT );
+#endif
 	self->fileSpace = H5Dget_space( self->fileData );
 
 	/* Need a memory space for extracting to. */
diff -r 74c7b464b60b -r 4e04c13fc839 Swarm/src/SwarmDump.c
--- a/Swarm/src/SwarmDump.c	Tue Mar 18 05:11:09 2008 +0000
+++ b/Swarm/src/SwarmDump.c	Thu Mar 20 07:22:34 2008 +0000
@@ -327,8 +327,12 @@ void SwarmDump_DumpToHDF5( SwarmDump* se
    /* Dump the size so we don't have to do any divisions later on. */
    size[0] = (hsize_t)2;
    fileSpace = H5Screate_simple( 1, size, NULL );
+#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR < 8
+   fileData = H5Dcreate( file, "/size", H5T_NATIVE_INT, fileSpace, H5P_DEFAULT );
+#else
    fileData = H5Dcreate( file, "/size", H5T_NATIVE_INT, fileSpace,
                          H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT );
+#endif
    MPI_Allreduce( &swarm->particleLocalCount, intSize, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD );
    intSize[1] = swarm->particleExtensionMgr->finalSize;
    props = H5Pcreate( H5P_DATASET_XFER );
@@ -342,8 +346,12 @@ void SwarmDump_DumpToHDF5( SwarmDump* se
    size[0] = intSize[0];
    size[1] = intSize[1];
    fileSpace = H5Screate_simple( 2, size, NULL );
+#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR < 8
+   fileData = H5Dcreate( file, "/data", H5T_NATIVE_CHAR, fileSpace, H5P_DEFAULT );
+#else
    fileData = H5Dcreate( file, "/data", H5T_NATIVE_CHAR, fileSpace,
                          H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT );
+#endif
 
    /* Calculate our file offset. */
    MPI_Comm_rank( MPI_COMM_WORLD, &rank );