vitalif
/
mdtest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #78 from roblatham00/pnetcdf-fixes 

Pnetcdf fixes
master
Julian Kunkel 2018-08-28 21:09:38 +01:00 committed by GitHub
parent c9bb4bb7d2 6b782226c7
commit c8e0ebf816
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/aiori-HDF5.c
View File

@ -260,6 +260,8 @@ static void *HDF5_Open(char *testFileName, IOR_param_t * param)
HDF5_CHECK(H5Fget_vfd_handle
(*fd, apl, (void **)&fd_mpiio),
"cannot get MPIIO file handle");
if (mpiHintsCheck != MPI_INFO_NULL)
MPI_Info_free(&mpiHintsCheck);
MPI_CHECK(MPI_File_get_info
(*fd_mpiio, &mpiHintsCheck),
"cannot get info object through MPIIO");
@ -267,6 +269,8 @@ static void *HDF5_Open(char *testFileName, IOR_param_t * param)
"\nhints returned from opened file (MPIIO) {\n");
ShowHints(&mpiHintsCheck);
fprintf(stdout, "}\n");
if (mpiHintsCheck != MPI_INFO_NULL)
MPI_Info_free(&mpiHintsCheck);
}
}
MPI_CHECK(MPI_Barrier(testComm), "barrier error");
@ -328,6 +332,8 @@ static void *HDF5_Open(char *testFileName, IOR_param_t * param)
and shape of data set, and open it for access */
dataSpace = H5Screate_simple(NUM_DIMS, dataSetDims, NULL);
HDF5_CHECK(dataSpace, "cannot create simple data space");
if (mpiHints != MPI_INFO_NULL)
MPI_Info_free(&mpiHints);
return (fd);
}

6
src/aiori-NCMPI.c
View File

@ -53,7 +53,7 @@ static IOR_offset_t NCMPI_Xfer(int, void *, IOR_size_t *,
IOR_offset_t, IOR_param_t *);
static void NCMPI_Close(void *, IOR_param_t *);
static void NCMPI_Delete(char *, IOR_param_t *);
static void NCMPI_SetVersion(IOR_param_t *);
static char *NCMPI_GetVersion(IOR_param_t *);
static void NCMPI_Fsync(void *, IOR_param_t *);
static IOR_offset_t NCMPI_GetFileSize(IOR_param_t *, MPI_Comm, char *);
static int NCMPI_Access(const char *, int, IOR_param_t *);
@ -175,7 +175,7 @@ static void *NCMPI_Open(char *testFileName, IOR_param_t * param)
static IOR_offset_t NCMPI_Xfer(int access, void *fd, IOR_size_t * buffer,
IOR_offset_t length, IOR_param_t * param)
{
char *bufferPtr = (char *)buffer;
signed char *bufferPtr = (signed char *)buffer;
static int firstReadCheck = FALSE, startDataSet;
int var_id, dim_id[NUM_DIMS];
MPI_Offset bufSize[NUM_DIMS], offset[NUM_DIMS];
@ -343,7 +343,7 @@ static void NCMPI_Delete(char *testFileName, IOR_param_t * param)
*/
static char* NCMPI_GetVersion()
{
return ncmpi_inq_libvers();
return (char *)ncmpi_inq_libvers();
}
/*