Skip to content

Commit

Permalink
EXODUS: Change ne__ to nei_
Browse files Browse the repository at this point in the history
  • Loading branch information
gsjaardema committed Nov 10, 2023
1 parent 7da2cf7 commit 5d5e811
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions packages/seacas/libraries/exodus/include/exodusII_int.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/libraries/exodus/src/ex_get_cmap_params.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/seacas/libraries/exodus/src/ex_get_init_global.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/libraries/exodus/src/ex_get_node_cmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions packages/seacas/libraries/exodus/src/ex_ne_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -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()
*
*****************************************************************************
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion packages/seacas/libraries/exodus/src/ex_put_node_cmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 5d5e811

Please sign in to comment.