Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync fortran src files with develop #3126

Merged
merged 2 commits into from
Jun 15, 2023
Merged

Sync fortran src files with develop #3126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1e3f50
Sync fortran src files with develop
byrnHDF Jun 14, 2023
9c9bdf3
Remove duplicate line
byrnHDF Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 0 additions & 97 deletions fortran/src/H5Of.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,50 +132,6 @@ h5olink_c(hid_t_f *object_id, hid_t_f *new_loc_id, _fcd name, size_t_f *namelen,
return ret_value;
}

/****if* H5Of/h5ovisit_c
* NAME
* h5ovisit_c
* PURPOSE
* Calls H5Ovisit
* INPUTS
* object_id - Identifier specifying subject group
* index_type - Type of index which determines the order
* order - Order within index
* idx - Iteration position at which to start
* op - Callback function passing data regarding the link to the calling application
* op_data - User-defined pointer to data required by the application for its processing of the link
* fields - Flags specifying the fields to include in object_info.
*
* OUTPUTS
* idx - Position at which an interrupted iteration may be restarted
*
* RETURNS
* >0 on success, 0< on failure
* AUTHOR
* M. Scot Breitenfeld
* November 19, 2008
* SOURCE
*/
int_f
h5ovisit_c(hid_t_f *group_id, int_f *index_type, int_f *order, H5O_iterate2_t op, void *op_data,
int_f *fields)
/******/
{
int_f ret_value = -1; /* Return value */
herr_t func_ret_value; /* H5Linterate return value */

/*
* Call H5Ovisit
*/

func_ret_value = H5Ovisit3((hid_t)*group_id, (H5_index_t)*index_type, (H5_iter_order_t)*order, op,
op_data, (unsigned)*fields);

ret_value = (int_f)func_ret_value;

return ret_value;
}

/****if* H5Of/h5oopen_by_token_c
* NAME
* h5oopen_by_token_c
Expand Down Expand Up @@ -358,59 +314,6 @@ h5oget_info_c(hid_t_f *object_id, H5O_info_t_f *object_info, int_f *fields)
return ret_value;
}

/****if* H5Of/h5ovisit_by_name_c
* NAME
* h5ovisit_by_name_c
* PURPOSE
* Calls H5Ovisit_by_name
* INPUTS
* object_id - Identifier specifying subject group.
* index_type - Type of index which determines the order.
* order - Order within index.
* idx - Iteration position at which to start.
* op - Callback function passing data regarding the link to the calling application.
* op_data - User-defined pointer to data required by the application for its processing of the link.
* fields - Flags specifying the fields to include in object_info.
*
* OUTPUTS
* idx - Position at which an interrupted iteration may be restarted.
*
* RETURNS
* >0 on success, 0< on failure
* AUTHOR
* M. Scot Breitenfeld
* May 16, 2012
* SOURCE
*/
int_f
h5ovisit_by_name_c(hid_t_f *loc_id, _fcd object_name, size_t_f *namelen, int_f *index_type, int_f *order,
H5O_iterate2_t op, void *op_data, hid_t_f *lapl_id, int_f *fields)
/******/
{
int_f ret_value = -1; /* Return value */
herr_t func_ret_value; /* H5Linterate return value */
char *c_object_name = NULL; /* Buffer to hold C string */

/*
* Convert FORTRAN name to C name
*/
if ((c_object_name = HD5f2cstring(object_name, (size_t)*namelen)) == NULL)
HGOTO_DONE(FAIL);

/*
* Call H5Ovisit_by_name
*/
func_ret_value =
H5Ovisit_by_name3((hid_t)*loc_id, c_object_name, (H5_index_t)*index_type, (H5_iter_order_t)*order, op,
op_data, (unsigned)*fields, (hid_t)*lapl_id);
ret_value = (int_f)func_ret_value;

done:
if (c_object_name)
HDfree(c_object_name);
return ret_value;
}

/****if* H5Of/h5odecr_refcount_c
* NAME
* h5odecr_refcount_c
Expand Down
65 changes: 63 additions & 2 deletions fortran/src/H5_f.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,9 @@ h5init_flags_c(int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags, hid
H5ES_status_t *h5es_flags, hid_t_f *h5es_hid_flags, int_f *h5f_flags, int_f *h5fd_flags,
hid_t_f *h5fd_hid_flags, int_f *h5g_flags, int_f *h5i_flags, int_f *h5l_flags,
int_f *h5o_flags, hid_t_f *h5p_flags, int_f *h5p_flags_int, int_f *h5r_flags, int_f *h5s_flags,
hid_t_f *h5s_hid_flags, hsize_t_f *h5s_hsize_flags, int_f *h5t_flags, int_f *h5z_flags,
int_f *h5_generic_flags, haddr_t_f *h5_haddr_generic_flags)
hid_t_f *h5s_hid_flags, hsize_t_f *h5s_hsize_flags, int_f *h5t_flags, int_f *h5vl_flags,
uint64_t *h5vl_int64_flags, int_f *h5z_flags, int_f *h5_generic_flags,
haddr_t_f *h5_haddr_generic_flags)
/******/
{
/*
Expand Down Expand Up @@ -820,6 +821,66 @@ h5init_flags_c(int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags, hid
h5t_flags[33] = (int_f)H5T_DIR_ASCEND;
h5t_flags[34] = (int_f)H5T_DIR_DESCEND;

/*
* H5VL flags
*/

/*
* Capability flags for VOL connectors
*/

h5vl_flags[0] = (int_f)H5VL_VERSION;
h5vl_flags[1] = (int_f)H5_VOL_INVALID;
h5vl_flags[2] = (int_f)H5_VOL_NATIVE;

h5vl_int64_flags[0] = H5VL_CAP_FLAG_NONE;
h5vl_int64_flags[1] = H5VL_CAP_FLAG_THREADSAFE;
h5vl_int64_flags[2] = H5VL_CAP_FLAG_ASYNC;
h5vl_int64_flags[3] = H5VL_CAP_FLAG_NATIVE_FILES;
h5vl_int64_flags[4] = H5VL_CAP_FLAG_ATTR_BASIC;
h5vl_int64_flags[5] = H5VL_CAP_FLAG_ATTR_MORE;
h5vl_int64_flags[6] = H5VL_CAP_FLAG_DATASET_BASIC;
h5vl_int64_flags[7] = H5VL_CAP_FLAG_DATASET_MORE;
h5vl_int64_flags[8] = H5VL_CAP_FLAG_FILE_BASIC;
h5vl_int64_flags[9] = H5VL_CAP_FLAG_FILE_MORE;
h5vl_int64_flags[10] = H5VL_CAP_FLAG_GROUP_BASIC;
h5vl_int64_flags[11] = H5VL_CAP_FLAG_GROUP_MORE;
h5vl_int64_flags[12] = H5VL_CAP_FLAG_LINK_BASIC;
h5vl_int64_flags[13] = H5VL_CAP_FLAG_LINK_MORE;
h5vl_int64_flags[14] = H5VL_CAP_FLAG_MAP_BASIC;
h5vl_int64_flags[15] = H5VL_CAP_FLAG_MAP_MORE;
h5vl_int64_flags[16] = H5VL_CAP_FLAG_OBJECT_BASIC;
h5vl_int64_flags[17] = H5VL_CAP_FLAG_OBJECT_MORE;
h5vl_int64_flags[18] = H5VL_CAP_FLAG_REF_BASIC;
h5vl_int64_flags[19] = H5VL_CAP_FLAG_REF_MORE;
h5vl_int64_flags[20] = H5VL_CAP_FLAG_OBJ_REF;
h5vl_int64_flags[21] = H5VL_CAP_FLAG_REG_REF;
h5vl_int64_flags[22] = H5VL_CAP_FLAG_ATTR_REF;
h5vl_int64_flags[23] = H5VL_CAP_FLAG_STORED_DATATYPES;
h5vl_int64_flags[24] = H5VL_CAP_FLAG_CREATION_ORDER;
h5vl_int64_flags[25] = H5VL_CAP_FLAG_ITERATE;
h5vl_int64_flags[26] = H5VL_CAP_FLAG_STORAGE_SIZE;
h5vl_int64_flags[27] = H5VL_CAP_FLAG_BY_IDX;
h5vl_int64_flags[28] = H5VL_CAP_FLAG_GET_PLIST;
h5vl_int64_flags[29] = H5VL_CAP_FLAG_FLUSH_REFRESH;
h5vl_int64_flags[30] = H5VL_CAP_FLAG_EXTERNAL_LINKS;
h5vl_int64_flags[31] = H5VL_CAP_FLAG_HARD_LINKS;
h5vl_int64_flags[32] = H5VL_CAP_FLAG_SOFT_LINKS;
h5vl_int64_flags[33] = H5VL_CAP_FLAG_UD_LINKS;
h5vl_int64_flags[34] = H5VL_CAP_FLAG_TRACK_TIMES;
h5vl_int64_flags[35] = H5VL_CAP_FLAG_MOUNT;
h5vl_int64_flags[36] = H5VL_CAP_FLAG_FILTERS;
h5vl_int64_flags[37] = H5VL_CAP_FLAG_FILL_VALUES;

h5vl_int64_flags[38] = H5VL_OPT_QUERY_SUPPORTED;
h5vl_int64_flags[39] = H5VL_OPT_QUERY_READ_DATA;
h5vl_int64_flags[40] = H5VL_OPT_QUERY_WRITE_DATA;
h5vl_int64_flags[41] = H5VL_OPT_QUERY_QUERY_METADATA;
h5vl_int64_flags[42] = H5VL_OPT_QUERY_MODIFY_METADATA;
h5vl_int64_flags[43] = H5VL_OPT_QUERY_COLLECTIVE;
h5vl_int64_flags[44] = H5VL_OPT_QUERY_NO_ASYNC;
h5vl_int64_flags[45] = H5VL_OPT_QUERY_MULTI_OBJ;

/*
* H5Z flags
*/
Expand Down
Loading