Commit 20cd5aae authored by gsell's avatar gsell

src/h5core/h5t_io.c

- adapted to changed 'h5priv_write_attrib()'
parent cae3b008
...@@ -120,22 +120,19 @@ write_vertices ( ...@@ -120,22 +120,19 @@ write_vertices (
"__num_vertices__", "__num_vertices__",
H5_INT64_T, H5_INT64_T,
m->num_glb_vertices, m->num_glb_vertices,
m->num_leaf_levels, m->num_leaf_levels));
1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
m->mesh_gid, m->mesh_gid,
"__num_b_vertices__", "__num_b_vertices__",
H5_INT64_T, H5_INT64_T,
m->num_b_vtx, m->num_b_vtx,
m->num_leaf_levels, m->num_leaf_levels));
1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
m->mesh_gid, m->mesh_gid,
"__first_b_vertices__", "__first_b_vertices__",
H5_INT64_T, H5_INT64_T,
m->first_b_vtx, m->first_b_vtx,
m->num_leaf_levels, m->num_leaf_levels));
1));
H5_RETURN (H5_SUCCESS); H5_RETURN (H5_SUCCESS);
} }
#ifdef WITH_PARALLEL_H5GRID #ifdef WITH_PARALLEL_H5GRID
...@@ -497,22 +494,19 @@ write_vertices_chk ( ...@@ -497,22 +494,19 @@ write_vertices_chk (
"__num_vertices__", "__num_vertices__",
H5_INT64_T, H5_INT64_T,
m->num_glb_vertices, m->num_glb_vertices,
m->num_leaf_levels, m->num_leaf_levels));
1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
m->mesh_gid, m->mesh_gid,
"__num_b_vertices__", "__num_b_vertices__",
H5_INT64_T, H5_INT64_T,
m->num_b_vtx, m->num_b_vtx,
m->num_leaf_levels, m->num_leaf_levels));
1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
m->mesh_gid, m->mesh_gid,
"__first_b_vertices__", "__first_b_vertices__",
H5_INT64_T, H5_INT64_T,
m->first_b_vtx, m->first_b_vtx,
m->num_leaf_levels, m->num_leaf_levels));
1));
TRY (h5priv_end_throttle (m->f)); TRY (h5priv_end_throttle (m->f));
TRY (hdf5_close_dataspace (dspace_id)); TRY (hdf5_close_dataspace (dspace_id));
...@@ -562,23 +556,20 @@ write_elems ( ...@@ -562,23 +556,20 @@ write_elems (
"__num_elems__", "__num_elems__",
H5_INT64_T, H5_INT64_T,
m->num_glb_elems, m->num_glb_elems,
m->num_leaf_levels, m->num_leaf_levels));
1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
m->mesh_gid, m->mesh_gid,
"__num_leaf_elems__", "__num_leaf_elems__",
H5_INT64_T, H5_INT64_T,
m->num_glb_leaf_elems, m->num_glb_leaf_elems,
m->num_leaf_levels, m->num_leaf_levels));
1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
m->mesh_gid, m->mesh_gid,
"__num_leaf_levels__", "__num_leaf_levels__",
H5_INT16_T, H5_INT16_T,
&m->num_leaf_levels, &m->num_leaf_levels,
1,
1)); 1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
...@@ -586,14 +577,12 @@ write_elems ( ...@@ -586,14 +577,12 @@ write_elems (
"__is_chunked__", "__is_chunked__",
H5_INT16_T, H5_INT16_T,
&m->is_chunked, &m->is_chunked,
1,
1)); 1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
m->mesh_gid, m->mesh_gid,
"__num_weights__", "__num_weights__",
H5_INT32_T, H5_INT32_T,
&m->num_weights, &m->num_weights,
1,
1)); 1));
// release mem // release mem
TRY (h5_free (glb_elems)); TRY (h5_free (glb_elems));
...@@ -683,23 +672,20 @@ write_elems_chk ( ...@@ -683,23 +672,20 @@ write_elems_chk (
"__num_elems__", "__num_elems__",
H5_INT64_T, H5_INT64_T,
m->num_glb_elems, m->num_glb_elems,
m->num_leaf_levels, m->num_leaf_levels));
1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
m->mesh_gid, m->mesh_gid,
"__num_leaf_elems__", "__num_leaf_elems__",
H5_INT64_T, H5_INT64_T,
m->num_glb_leaf_elems, m->num_glb_leaf_elems,
m->num_leaf_levels, m->num_leaf_levels));
1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
m->mesh_gid, m->mesh_gid,
"__num_leaf_levels__", "__num_leaf_levels__",
H5_INT16_T, H5_INT16_T,
&m->num_leaf_levels, &m->num_leaf_levels,
1,
1)); 1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
...@@ -707,7 +693,6 @@ write_elems_chk ( ...@@ -707,7 +693,6 @@ write_elems_chk (
"__is_chunked__", "__is_chunked__",
H5_INT16_T, H5_INT16_T,
&m->is_chunked, &m->is_chunked,
1,
1)); 1));
// release mem // release mem
...@@ -803,7 +788,6 @@ write_chunks ( ...@@ -803,7 +788,6 @@ write_chunks (
"__num_chunks__", "__num_chunks__",
H5_INT32_T, H5_INT32_T,
&m->chunks->num_alloc, &m->chunks->num_alloc,
1,
1)); 1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
...@@ -811,7 +795,6 @@ write_chunks ( ...@@ -811,7 +795,6 @@ write_chunks (
"__num_chk_levels__", "__num_chk_levels__",
H5_INT16_T, // note: better uint16? H5_INT16_T, // note: better uint16?
&m->chunks->num_levels, &m->chunks->num_levels,
1,
1)); 1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
...@@ -819,8 +802,7 @@ write_chunks ( ...@@ -819,8 +802,7 @@ write_chunks (
"__num_chk_p_level__", "__num_chk_p_level__",
H5_INT32_T, H5_INT32_T,
m->chunks->num_chunks_p_level, m->chunks->num_chunks_p_level,
m->chunks->num_levels, m->chunks->num_levels));
1));
H5_RETURN (H5_SUCCESS); H5_RETURN (H5_SUCCESS);
} }
...@@ -912,7 +894,6 @@ write_octree ( ...@@ -912,7 +894,6 @@ write_octree (
"__curr_oct_idx__", "__curr_oct_idx__",
H5_INT32_T, H5_INT32_T,
&m->octree->current_oct_idx, &m->octree->current_oct_idx,
1,
1)); 1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
...@@ -920,22 +901,19 @@ write_octree ( ...@@ -920,22 +901,19 @@ write_octree (
"__oct_maxpoints__", "__oct_maxpoints__",
H5_INT32_T, H5_INT32_T,
&m->octree->maxpoints, &m->octree->maxpoints,
1,
1)); 1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
m->mesh_gid, m->mesh_gid,
"__oct_size_userdata__", "__oct_size_userdata__",
H5_INT32_T, H5_INT32_T,
&m->octree->size_userdata, &m->octree->size_userdata,
1,
1)); 1));
TRY (h5priv_write_attrib ( TRY (h5priv_write_attrib (
m->mesh_gid, m->mesh_gid,
"__oct_bounding_box__", "__oct_bounding_box__",
H5_FLOAT64_T, H5_FLOAT64_T,
m->octree->bounding_box, m->octree->bounding_box,
6, 6));
1));
if (m->octree->size_userdata > 0) { if (m->octree->size_userdata > 0) {
m->dsinfo_userdata.dims[0] = m->octree->current_oct_idx + 1; m->dsinfo_userdata.dims[0] = m->octree->current_oct_idx + 1;
...@@ -1042,7 +1020,6 @@ write_weights ( ...@@ -1042,7 +1020,6 @@ write_weights (
"__num_weights__", "__num_weights__",
H5_INT32_T, H5_INT32_T,
&m->num_weights, &m->num_weights,
1,
1)); 1));
H5_RETURN (H5_SUCCESS); H5_RETURN (H5_SUCCESS);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment