Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
7c7a4748
Commit
7c7a4748
authored
Oct 14, 2015
by
Matthieu Schaller
Browse files
Port the i/o modifications to the serial and parallel reads as well.
parent
a95a30c0
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/parallel_io.c
View file @
7c7a4748
...
...
@@ -95,11 +95,11 @@ void readArrayBackEnd(hid_t grp, char* name, enum DATA_TYPE type, int N,
/* Check data type */
h_type
=
H5Dget_type
(
h_data
);
if
(
h_type
<
0
)
error
(
"Unable to retrieve data type from the file"
);
if
(
!
H5Tequal
(
h_type
,
hdf5Type
(
type
)))
error
(
"Non-matching types between the code and the file"
);
/*
if (!H5Tequal(h_type, hdf5Type(type)))
*/
/*
error("Non-matching types between the code and the file");
*/
/* Allocate temporary buffer */
temp
=
malloc
(
N
*
dim
*
sizeOfType
(
type
)
);
temp
=
malloc
(
N
*
dim
*
typeSize
);
if
(
temp
==
NULL
)
error
(
"Unable to allocate memory for temporary buffer"
);
/* Prepare information for hyperslab */
...
...
@@ -131,7 +131,7 @@ void readArrayBackEnd(hid_t grp, char* name, enum DATA_TYPE type, int N,
/* Read HDF5 dataspace in temporary buffer */
/* Dirty version that happens to work for vectors but should be improved */
/* Using HDF5 dataspaces would be better */
h_err
=
H5Dread
(
h_data
,
h
_
type
,
h_memspace
,
h_filespace
,
h_plist_id
,
temp
);
h_err
=
H5Dread
(
h_data
,
h
df5Type
(
type
)
,
h_memspace
,
h_filespace
,
h_plist_id
,
temp
);
if
(
h_err
<
0
)
{
error
(
"Error while reading data array '%s'."
,
name
);
}
...
...
src/serial_io.c
View file @
7c7a4748
...
...
@@ -102,11 +102,11 @@ void readArrayBackEnd(hid_t grp, char* name, enum DATA_TYPE type, int N,
/* Check data type */
h_type
=
H5Dget_type
(
h_data
);
if
(
h_type
<
0
)
error
(
"Unable to retrieve data type from the file"
);
if
(
!
H5Tequal
(
h_type
,
hdf5Type
(
type
)))
error
(
"Non-matching types between the code and the file"
);
/*
if (!H5Tequal(h_type, hdf5Type(type)))
*/
/*
error("Non-matching types between the code and the file");
*/
/* Allocate temporary buffer */
temp
=
malloc
(
N
*
dim
*
sizeOfType
(
type
)
);
temp
=
malloc
(
N
*
dim
*
typeSize
);
if
(
temp
==
NULL
)
error
(
"Unable to allocate memory for temporary buffer"
);
/* Prepare information for hyperslab */
...
...
@@ -134,7 +134,7 @@ void readArrayBackEnd(hid_t grp, char* name, enum DATA_TYPE type, int N,
/* Read HDF5 dataspace in temporary buffer */
/* Dirty version that happens to work for vectors but should be improved */
/* Using HDF5 dataspaces would be better */
h_err
=
H5Dread
(
h_data
,
h
_
type
,
h_memspace
,
h_filespace
,
H5P_DEFAULT
,
temp
);
h_err
=
H5Dread
(
h_data
,
h
df5Type
(
type
)
,
h_memspace
,
h_filespace
,
H5P_DEFAULT
,
temp
);
if
(
h_err
<
0
)
{
error
(
"Error while reading data array '%s'."
,
name
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment