From 5d5e8119f474e26df07c8f2b426674a92d320077 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Fri, 10 Nov 2023 12:17:05 -0700 Subject: [PATCH] EXODUS: Change ne__ to nei_ --- packages/seacas/libraries/exodus/include/exodusII_int.h | 4 ++-- packages/seacas/libraries/exodus/src/ex_get_cmap_params.c | 4 ++-- packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c | 4 ++-- packages/seacas/libraries/exodus/src/ex_get_init_global.c | 2 +- .../seacas/libraries/exodus/src/ex_get_loadbal_param.c | 2 +- packages/seacas/libraries/exodus/src/ex_get_node_cmap.c | 4 ++-- packages/seacas/libraries/exodus/src/ex_ne_util.c | 8 ++++---- packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c | 2 +- packages/seacas/libraries/exodus/src/ex_put_node_cmap.c | 2 +- .../libraries/exodus/src/ex_put_partial_node_cmap.c | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/seacas/libraries/exodus/include/exodusII_int.h b/packages/seacas/libraries/exodus/include/exodusII_int.h index ac61ca8a3a..1295c96363 100644 --- a/packages/seacas/libraries/exodus/include/exodusII_int.h +++ b/packages/seacas/libraries/exodus/include/exodusII_int.h @@ -870,9 +870,9 @@ EXODUS_EXPORT int exi_put_nemesis_version(int exoid); EXODUS_EXPORT int exi_put_homogenous_block_params(int exoid, size_t block_count, const struct ex_block *blocks); -EXODUS_EXPORT int ne__check_file_version(int exoid); +EXODUS_EXPORT int nei_check_file_version(int exoid); -EXODUS_EXPORT int ne__id_lkup(int exoid, /* NetCDF/Exodus file ID */ +EXODUS_EXPORT int nei_id_lkup(int exoid, /* NetCDF/Exodus file ID */ const char *ne_var_name, /* Nemesis variable name */ int64_t *idx, /* index variable for variable, length 2 */ ex_entity_id ne_var_id /* NetCDF variable ID */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c b/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c index 388e1c782e..83299094ee 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c +++ b/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c @@ -134,7 +134,7 @@ int ex_get_cmap_params(int exoid, void_int *node_cmap_ids, void_int *node_cmap_n cmap_id = ((int *)node_cmap_ids)[cnt]; } - if ((map_idx = ne__id_lkup(exoid, VAR_N_COMM_IDS, cmap_info_idx, cmap_id)) < 0) { + if ((map_idx = nei_id_lkup(exoid, VAR_N_COMM_IDS, cmap_info_idx, cmap_id)) < 0) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find nodal comm map with ID %" PRId64 " in file ID %d", cmap_id, exoid); @@ -295,7 +295,7 @@ int ex_get_cmap_params(int exoid, void_int *node_cmap_ids, void_int *node_cmap_n cmap_id = ((int *)elem_cmap_ids)[cnt]; } - if ((map_idx = ne__id_lkup(exoid, VAR_E_COMM_IDS, cmap_info_idx, cmap_id)) < 0) { + if ((map_idx = nei_id_lkup(exoid, VAR_E_COMM_IDS, cmap_info_idx, cmap_id)) < 0) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find elemental comm map with ID %" PRId64 " in file ID %d", cmap_id, exoid); diff --git a/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c b/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c index 38dc6baa15..023f172c36 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c @@ -57,11 +57,11 @@ int ex_get_elem_cmap(int exoid, ex_entity_id map_id, void_int *elem_ids, void_in /* * no need to check if the second index is -1 that is handled - * in ne__id_lkup, where the dimension must be looked up anyways + * in nei_id_lkup, where the dimension must be looked up anyways */ /* Get the index of the elemental comm map with the given ID */ - if ((map_idx = ne__id_lkup(exoid, VAR_E_COMM_IDS, varidx, map_id)) < 0) { + if ((map_idx = nei_id_lkup(exoid, VAR_E_COMM_IDS, varidx, map_id)) < 0) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find elemental comm map with ID %" PRId64 " in file \ ID %d", diff --git a/packages/seacas/libraries/exodus/src/ex_get_init_global.c b/packages/seacas/libraries/exodus/src/ex_get_init_global.c index 4e98e68a36..518316a7e4 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_init_global.c +++ b/packages/seacas/libraries/exodus/src/ex_get_init_global.c @@ -71,7 +71,7 @@ int ex_get_init_global(int exoid, void_int *num_nodes_g, void_int *num_elems_g, /* Check the file version information */ int dimid; - if ((dimid = ne__check_file_version(exoid)) != EX_NOERR) { + if ((dimid = nei_check_file_version(exoid)) != EX_NOERR) { EX_FUNC_LEAVE(dimid); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c b/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c index c17423f209..0795dc6ce6 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c @@ -72,7 +72,7 @@ int ex_get_loadbal_param(int exoid, void_int *num_int_nodes, void_int *num_bor_n } /* Check the file version information */ - if ((dimid = ne__check_file_version(exoid)) != EX_NOERR) { + if ((dimid = nei_check_file_version(exoid)) != EX_NOERR) { EX_FUNC_LEAVE(dimid); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c b/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c index a36eb19b57..9a989dd337 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c @@ -53,11 +53,11 @@ int ex_get_node_cmap(int exoid, ex_entity_id map_id, void_int *node_ids, void_in /* * no need to check if the second index is -1 that is handled - * in ne__id_lkup, where the dimension must be looked up anyways + * in nei_id_lkup, where the dimension must be looked up anyways */ /* Get the index of the nodal comm map with the given ID */ - if ((map_idx = ne__id_lkup(exoid, VAR_N_COMM_IDS, varidx, map_id)) < 0) { + if ((map_idx = nei_id_lkup(exoid, VAR_N_COMM_IDS, varidx, map_id)) < 0) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find nodal comm map with ID %" PRId64 " in file ID %d", map_id, exoid); diff --git a/packages/seacas/libraries/exodus/src/ex_ne_util.c b/packages/seacas/libraries/exodus/src/ex_ne_util.c index 6dfdb00d05..1161820445 100644 --- a/packages/seacas/libraries/exodus/src/ex_ne_util.c +++ b/packages/seacas/libraries/exodus/src/ex_ne_util.c @@ -12,10 +12,10 @@ /* Function(s) contained in this file: * * exi_leavedef() - * ne__id_lkup() + * nei_id_lkup() * exi_get_file_type() * exi_put_nemesis_version() - * ne__check_file_version() + * nei_check_file_version() * ex_get_idx() * ***************************************************************************** @@ -37,7 +37,7 @@ char *ne_ret_string; /* Note: This function assumes a 1-d vector of data for "ne_var_name". */ /*****************************************************************************/ -int ne__id_lkup(int exoid, const char *ne_var_name, int64_t *idx, ex_entity_id ne_var_id) +int nei_id_lkup(int exoid, const char *ne_var_name, int64_t *idx, ex_entity_id ne_var_id) { int status; int varid; @@ -192,7 +192,7 @@ int exi_put_nemesis_version(int exoid) /* This function checks that the version info is correct. */ /*****************************************************************************/ -int ne__check_file_version(int exoid) +int nei_check_file_version(int exoid) { #if 0 float file_ver; diff --git a/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c b/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c index 77975801d6..4d0a022cd0 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c @@ -56,7 +56,7 @@ int ex_put_elem_cmap(int exoid, ex_entity_id map_id, const void_int *elem_ids, } /* Get the index for this map_id */ - if ((map_idx = ne__id_lkup(exoid, VAR_E_COMM_IDS, varidx, map_id)) == -1) { + if ((map_idx = nei_id_lkup(exoid, VAR_E_COMM_IDS, varidx, map_id)) == -1) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find index for variable \"%s\" in file ID %d", VAR_E_COMM_IDS, exoid); diff --git a/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c b/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c index 19d1968d79..580251542b 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c @@ -56,7 +56,7 @@ int ex_put_node_cmap(int exoid, ex_entity_id map_id, const void_int *node_ids, } /* Get the index for this map_id */ - if ((map_idx = ne__id_lkup(exoid, VAR_N_COMM_IDS, varidx, map_id)) == -1) { + if ((map_idx = nei_id_lkup(exoid, VAR_N_COMM_IDS, varidx, map_id)) == -1) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find index for variable \"%s\" in file ID %d", VAR_N_COMM_IDS, exoid); diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_node_cmap.c b/packages/seacas/libraries/exodus/src/ex_put_partial_node_cmap.c index a30945c4e5..d533b7b61b 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_node_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_node_cmap.c @@ -66,7 +66,7 @@ int ex_put_partial_node_cmap(int exoid, ex_entity_id map_id, int64_t start_entit } /* Get the index for this map_id */ - if ((map_idx = ne__id_lkup(exoid, VAR_N_COMM_IDS, varidx, map_id)) == -1) { + if ((map_idx = nei_id_lkup(exoid, VAR_N_COMM_IDS, varidx, map_id)) == -1) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find index for variable \"%s\" in file ID %d", VAR_N_COMM_IDS, exoid);