Added
Link Here
|
1 |
commit be29ddf0352bc8e5a7eecc8772a3acb64dfde18c |
2 |
Author: miller86 <miller86@llnl.gov> |
3 |
Date: Fri Dec 2 19:00:20 2022 -0800 |
4 |
|
5 |
fix obj-case-macro |
6 |
|
7 |
diff --git src/hdf5_drv/silo_hdf5.c src/hdf5_drv/silo_hdf5.c |
8 |
index 17af250..c45d689 100644 |
9 |
--- src/hdf5_drv/silo_hdf5.c |
10 |
+++ src/hdf5_drv/silo_hdf5.c |
11 |
@@ -1809,7 +1809,7 @@ db_hdf5_cwg(DBfile *_dbfile) |
12 |
*dscount = m.MEMCNT; \ |
13 |
*dsnames = (char **) calloc(*dscount, sizeof(char**)); \ |
14 |
for (i = 0; i < *dscount; i++) \ |
15 |
- (*dsnames)[i] = strdup(m.MEMNAME[i]); \ |
16 |
+ (*dsnames)[i] = strdup(m.MEMNAME); \ |
17 |
break; \ |
18 |
} |
19 |
|
20 |
@@ -1857,15 +1857,15 @@ db_hdf5_get_obj_dsnames(DBfile *_dbfile, char const *name, int *dscount, char ** |
21 |
|
22 |
switch(_objtype) |
23 |
{ |
24 |
- DB_OBJ_CASE(DB_QUADVAR, DBquadvar_mt, nvals, value) |
25 |
- /*DB_OBJ_CASE(DB_QUAD_RECT, DBquadmesh_mt, nspace, coord) wont work for rect case */ |
26 |
- DB_OBJ_CASE(DB_QUAD_CURV, DBquadmesh_mt, nspace, coord) |
27 |
- DB_OBJ_CASE(DB_QUADMESH, DBquadmesh_mt, nspace, coord) |
28 |
- DB_OBJ_CASE(DB_UCDVAR, DBucdvar_mt, nvals, value) |
29 |
- DB_OBJ_CASE(DB_UCDMESH, DBucdmesh_mt, ndims, coord) |
30 |
- DB_OBJ_CASE(DB_POINTVAR, DBpointvar_mt, nvals, data) |
31 |
- DB_OBJ_CASE(DB_POINTMESH, DBpointmesh_mt, ndims, coord) |
32 |
- DB_OBJ_CASE(DB_CSGVAR, DBcsgvar_mt, nvals, vals) |
33 |
+ DB_OBJ_CASE(DB_QUADVAR, DBquadvar_mt, nvals, value[i]) |
34 |
+ /*DB_OBJ_CASE(DB_QUAD_RECT, DBquadmesh_mt, nspace, coord[i]) wont work for rect case */ |
35 |
+ DB_OBJ_CASE(DB_QUAD_CURV, DBquadmesh_mt, nspace, coord[i]) |
36 |
+ DB_OBJ_CASE(DB_QUADMESH, DBquadmesh_mt, nspace, coord[i]) |
37 |
+ DB_OBJ_CASE(DB_UCDVAR, DBucdvar_mt, nvals, value[i]) |
38 |
+ DB_OBJ_CASE(DB_UCDMESH, DBucdmesh_mt, ndims, coord[i]) |
39 |
+ DB_OBJ_CASE(DB_POINTVAR, DBpointvar_mt, nvals, data[i]) |
40 |
+ DB_OBJ_CASE(DB_POINTMESH, DBpointmesh_mt, ndims, coord[i]) |
41 |
+ DB_OBJ_CASE(DB_CSGVAR, DBcsgvar_mt, nvals, vals[i]) |
42 |
DB_OBJ_CASE(DB_CURVE, DBcurve_mt, npts?1:1, yvarname) |
43 |
} |
44 |
H5Tclose(o); |