[exodus] 23/48: Upstream 5.26
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Jul 15 11:36:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository exodus.
commit b9dac4822a68a9ed73bb5cd573c27acc89b55cfc
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Nov 29 11:33:58 2013 +0000
Upstream 5.26
---
exodus/CMakeLists.txt => CMakeLists.txt | 16 +-
exodus/COPYRIGHT => COPYRIGHT | 0
ChangeLog | 104 --
exodus/DartConfig.cmake => DartConfig.cmake | 0
exodus/Doxyfile => Doxyfile | 0
exodus/Imakefile => Imakefile | 0
exodus/Makefile.standalone => Makefile.standalone | 11 +-
exodus/README => README | 33 +-
{exodus/cbind => cbind}/CMakeLists.txt | 4 +-
{exodus/cbind => cbind}/include/Imakefile | 0
{exodus/cbind => cbind}/include/doxygen.h | 0
{exodus/cbind => cbind}/include/exodusII.h | 19 +-
{exodus/cbind => cbind}/include/exodusII_cfg.h | 0
{exodus/cbind => cbind}/include/exodusII_cfg.h.in | 0
{exodus/cbind => cbind}/include/exodusII_int.h | 5 +-
{exodus/cbind => cbind}/include/exodusII_par.h | 0
{exodus/cbind => cbind}/include/exodusII_test.h | 0
{exodus/cbind => cbind}/parallel/Imakefile | 0
{exodus/cbind => cbind}/parallel/ex_create_par.c | 0
{exodus/cbind => cbind}/parallel/ex_open_par.c | 0
{exodus/cbind => cbind}/src/Imakefile | 0
{exodus/cbind => cbind}/src/Makefile.standalone | 1 +
{exodus/cbind => cbind}/src/ex_close.c | 0
{exodus/cbind => cbind}/src/ex_conv.c | 33 +-
{exodus/cbind => cbind}/src/ex_copy.c | 0
{exodus/cbind => cbind}/src/ex_create.c | 2 +-
{exodus/cbind => cbind}/src/ex_create_par.c | 2 +-
.../cbind => cbind}/src/ex_cvt_nodes_to_sides.c | 0
{exodus/cbind => cbind}/src/ex_err.c | 2 +-
{exodus/cbind => cbind}/src/ex_get_all_times.c | 0
{exodus/cbind => cbind}/src/ex_get_attr.c | 0
{exodus/cbind => cbind}/src/ex_get_attr_names.c | 0
{exodus/cbind => cbind}/src/ex_get_attr_param.c | 0
{exodus/cbind => cbind}/src/ex_get_block.c | 0
{exodus/cbind => cbind}/src/ex_get_block_param.c | 0
{exodus/cbind => cbind}/src/ex_get_cmap_params.c | 0
.../cbind => cbind}/src/ex_get_concat_node_sets.c | 0
{exodus/cbind => cbind}/src/ex_get_concat_sets.c | 0
.../src/ex_get_concat_side_set_node_count.c | 0
.../cbind => cbind}/src/ex_get_concat_side_sets.c | 0
{exodus/cbind => cbind}/src/ex_get_conn.c | 0
{exodus/cbind => cbind}/src/ex_get_coord.c | 0
{exodus/cbind => cbind}/src/ex_get_coord_names.c | 0
.../cbind => cbind}/src/ex_get_coordinate_frames.c | 0
.../cbind => cbind}/src/ex_get_eb_info_global.c | 0
{exodus/cbind => cbind}/src/ex_get_elem_attr.c | 0
.../cbind => cbind}/src/ex_get_elem_attr_names.c | 0
{exodus/cbind => cbind}/src/ex_get_elem_blk_ids.c | 0
{exodus/cbind => cbind}/src/ex_get_elem_block.c | 0
{exodus/cbind => cbind}/src/ex_get_elem_cmap.c | 0
{exodus/cbind => cbind}/src/ex_get_elem_conn.c | 0
{exodus/cbind => cbind}/src/ex_get_elem_map.c | 0
{exodus/cbind => cbind}/src/ex_get_elem_num_map.c | 0
{exodus/cbind => cbind}/src/ex_get_elem_type.c | 0
{exodus/cbind => cbind}/src/ex_get_elem_var.c | 0
{exodus/cbind => cbind}/src/ex_get_elem_var_tab.c | 0
{exodus/cbind => cbind}/src/ex_get_elem_var_time.c | 0
.../src/ex_get_entity_count_per_polyhedra.c | 0
{exodus/cbind => cbind}/src/ex_get_glob_var_time.c | 0
{exodus/cbind => cbind}/src/ex_get_glob_vars.c | 0
{exodus/cbind => cbind}/src/ex_get_id_map.c | 0
{exodus/cbind => cbind}/src/ex_get_ids.c | 0
{exodus/cbind => cbind}/src/ex_get_info.c | 0
{exodus/cbind => cbind}/src/ex_get_init.c | 0
{exodus/cbind => cbind}/src/ex_get_init_ext.c | 72 +-
{exodus/cbind => cbind}/src/ex_get_init_global.c | 0
{exodus/cbind => cbind}/src/ex_get_init_info.c | 0
{exodus/cbind => cbind}/src/ex_get_loadbal_param.c | 0
{exodus/cbind => cbind}/src/ex_get_map.c | 0
{exodus/cbind => cbind}/src/ex_get_map_param.c | 0
{exodus/cbind => cbind}/src/ex_get_n_attr.c | 0
{exodus/cbind => cbind}/src/ex_get_n_conn.c | 0
{exodus/cbind => cbind}/src/ex_get_n_coord.c | 0
{exodus/cbind => cbind}/src/ex_get_n_elem_attr.c | 0
{exodus/cbind => cbind}/src/ex_get_n_elem_conn.c | 0
.../cbind => cbind}/src/ex_get_n_elem_num_map.c | 0
{exodus/cbind => cbind}/src/ex_get_n_elem_var.c | 0
{exodus/cbind => cbind}/src/ex_get_n_nodal_var.c | 0
.../cbind => cbind}/src/ex_get_n_node_num_map.c | 0
{exodus/cbind => cbind}/src/ex_get_n_node_set.c | 0
{exodus/cbind => cbind}/src/ex_get_n_node_set_df.c | 0
{exodus/cbind => cbind}/src/ex_get_n_one_attr.c | 0
{exodus/cbind => cbind}/src/ex_get_n_side_set.c | 0
{exodus/cbind => cbind}/src/ex_get_n_side_set_df.c | 0
{exodus/cbind => cbind}/src/ex_get_n_var.c | 0
{exodus/cbind => cbind}/src/ex_get_name.c | 0
{exodus/cbind => cbind}/src/ex_get_names.c | 0
{exodus/cbind => cbind}/src/ex_get_nodal_var.c | 0
.../cbind => cbind}/src/ex_get_nodal_var_time.c | 0
{exodus/cbind => cbind}/src/ex_get_node_cmap.c | 0
{exodus/cbind => cbind}/src/ex_get_node_map.c | 0
{exodus/cbind => cbind}/src/ex_get_node_num_map.c | 0
{exodus/cbind => cbind}/src/ex_get_node_set.c | 0
.../src/ex_get_node_set_dist_fact.c | 0
{exodus/cbind => cbind}/src/ex_get_node_set_ids.c | 0
.../cbind => cbind}/src/ex_get_node_set_param.c | 0
.../cbind => cbind}/src/ex_get_ns_param_global.c | 0
{exodus/cbind => cbind}/src/ex_get_nset_var.c | 0
{exodus/cbind => cbind}/src/ex_get_nset_var_tab.c | 0
{exodus/cbind => cbind}/src/ex_get_num_map.c | 0
.../src/ex_get_object_truth_vector.c | 0
{exodus/cbind => cbind}/src/ex_get_one_attr.c | 0
{exodus/cbind => cbind}/src/ex_get_one_elem_attr.c | 0
{exodus/cbind => cbind}/src/ex_get_partial_attr.c | 0
{exodus/cbind => cbind}/src/ex_get_partial_conn.c | 0
{exodus/cbind => cbind}/src/ex_get_partial_coord.c | 0
.../cbind => cbind}/src/ex_get_partial_elem_attr.c | 0
.../cbind => cbind}/src/ex_get_partial_elem_conn.c | 0
.../cbind => cbind}/src/ex_get_partial_elem_map.c | 0
.../src/ex_get_partial_elem_num_map.c | 0
.../cbind => cbind}/src/ex_get_partial_elem_var.c | 0
.../cbind => cbind}/src/ex_get_partial_id_map.c | 0
.../cbind => cbind}/src/ex_get_partial_nodal_var.c | 0
.../src/ex_get_partial_node_num_map.c | 0
.../cbind => cbind}/src/ex_get_partial_node_set.c | 0
.../src/ex_get_partial_node_set_df.c | 0
.../cbind => cbind}/src/ex_get_partial_num_map.c | 4 +-
.../cbind => cbind}/src/ex_get_partial_one_attr.c | 0
.../src/ex_get_partial_set_dist_fact.c | 0
.../cbind => cbind}/src/ex_get_partial_side_set.c | 0
.../src/ex_get_partial_side_set_df.c | 0
{exodus/cbind => cbind}/src/ex_get_partial_var.c | 0
.../src/ex_get_processor_elem_maps.c | 0
.../src/ex_get_processor_node_maps.c | 0
{exodus/cbind => cbind}/src/ex_get_prop.c | 0
{exodus/cbind => cbind}/src/ex_get_prop_array.c | 0
{exodus/cbind => cbind}/src/ex_get_prop_names.c | 0
{exodus/cbind => cbind}/src/ex_get_qa.c | 0
{exodus/cbind => cbind}/src/ex_get_set.c | 0
{exodus/cbind => cbind}/src/ex_get_set_dist_fact.c | 0
{exodus/cbind => cbind}/src/ex_get_set_param.c | 0
{exodus/cbind => cbind}/src/ex_get_sets.c | 0
{exodus/cbind => cbind}/src/ex_get_side_set.c | 0
.../src/ex_get_side_set_dist_fact.c | 0
{exodus/cbind => cbind}/src/ex_get_side_set_ids.c | 0
.../src/ex_get_side_set_node_count.c | 0
.../src/ex_get_side_set_node_list.c | 0
.../src/ex_get_side_set_node_list_len.c | 0
.../cbind => cbind}/src/ex_get_side_set_param.c | 0
.../cbind => cbind}/src/ex_get_ss_param_global.c | 0
{exodus/cbind => cbind}/src/ex_get_sset_var.c | 0
{exodus/cbind => cbind}/src/ex_get_sset_var_tab.c | 0
{exodus/cbind => cbind}/src/ex_get_time.c | 0
{exodus/cbind => cbind}/src/ex_get_truth_table.c | 0
{exodus/cbind => cbind}/src/ex_get_var.c | 0
{exodus/cbind => cbind}/src/ex_get_var_name.c | 0
{exodus/cbind => cbind}/src/ex_get_var_names.c | 0
{exodus/cbind => cbind}/src/ex_get_var_param.c | 0
{exodus/cbind => cbind}/src/ex_get_var_tab.c | 0
{exodus/cbind => cbind}/src/ex_get_var_time.c | 0
{exodus/cbind => cbind}/src/ex_get_variable_name.c | 0
.../cbind => cbind}/src/ex_get_variable_names.c | 0
.../cbind => cbind}/src/ex_get_variable_param.c | 0
{exodus/cbind => cbind}/src/ex_inquire.c | 6 +
{exodus/cbind => cbind}/src/ex_ne_util.c | 6 -
{exodus/cbind => cbind}/src/ex_open.c | 2 +-
{exodus/cbind => cbind}/src/ex_open_par.c | 2 +-
{exodus/cbind => cbind}/src/ex_opts.c | 0
{exodus/cbind => cbind}/src/ex_put_all_var_param.c | 0
.../cbind => cbind}/src/ex_put_all_var_param_ext.c | 0
{exodus/cbind => cbind}/src/ex_put_attr.c | 0
{exodus/cbind => cbind}/src/ex_put_attr_names.c | 0
{exodus/cbind => cbind}/src/ex_put_attr_param.c | 0
{exodus/cbind => cbind}/src/ex_put_block.c | 0
{exodus/cbind => cbind}/src/ex_put_block_param.c | 0
{exodus/cbind => cbind}/src/ex_put_cmap_params.c | 0
.../cbind => cbind}/src/ex_put_cmap_params_cc.c | 0
.../cbind => cbind}/src/ex_put_concat_all_blocks.c | 0
.../cbind => cbind}/src/ex_put_concat_elem_block.c | 0
.../cbind => cbind}/src/ex_put_concat_node_sets.c | 0
{exodus/cbind => cbind}/src/ex_put_concat_sets.c | 0
.../cbind => cbind}/src/ex_put_concat_side_sets.c | 0
.../cbind => cbind}/src/ex_put_concat_var_param.c | 0
{exodus/cbind => cbind}/src/ex_put_conn.c | 0
{exodus/cbind => cbind}/src/ex_put_coord.c | 0
{exodus/cbind => cbind}/src/ex_put_coord_names.c | 0
.../cbind => cbind}/src/ex_put_coordinate_frames.c | 0
.../cbind => cbind}/src/ex_put_eb_info_global.c | 0
{exodus/cbind => cbind}/src/ex_put_elem_attr.c | 0
.../cbind => cbind}/src/ex_put_elem_attr_names.c | 0
{exodus/cbind => cbind}/src/ex_put_elem_block.c | 0
{exodus/cbind => cbind}/src/ex_put_elem_cmap.c | 0
{exodus/cbind => cbind}/src/ex_put_elem_conn.c | 0
{exodus/cbind => cbind}/src/ex_put_elem_map.c | 0
{exodus/cbind => cbind}/src/ex_put_elem_num_map.c | 0
{exodus/cbind => cbind}/src/ex_put_elem_var.c | 0
{exodus/cbind => cbind}/src/ex_put_elem_var_slab.c | 0
{exodus/cbind => cbind}/src/ex_put_elem_var_tab.c | 0
.../src/ex_put_entity_count_per_polyhedra.c | 0
{exodus/cbind => cbind}/src/ex_put_glob_vars.c | 0
{exodus/cbind => cbind}/src/ex_put_id_map.c | 0
{exodus/cbind => cbind}/src/ex_put_info.c | 134 +--
{exodus/cbind => cbind}/src/ex_put_init.c | 0
{exodus/cbind => cbind}/src/ex_put_init_ext.c | 0
{exodus/cbind => cbind}/src/ex_put_init_global.c | 0
{exodus/cbind => cbind}/src/ex_put_init_info.c | 0
{exodus/cbind => cbind}/src/ex_put_loadbal_param.c | 0
.../cbind => cbind}/src/ex_put_loadbal_param_cc.c | 0
{exodus/cbind => cbind}/src/ex_put_map.c | 0
{exodus/cbind => cbind}/src/ex_put_map_param.c | 0
{exodus/cbind => cbind}/src/ex_put_n_attr.c | 0
{exodus/cbind => cbind}/src/ex_put_n_coord.c | 0
{exodus/cbind => cbind}/src/ex_put_n_elem_attr.c | 0
{exodus/cbind => cbind}/src/ex_put_n_elem_conn.c | 0
.../cbind => cbind}/src/ex_put_n_elem_num_map.c | 0
{exodus/cbind => cbind}/src/ex_put_n_nodal_var.c | 0
.../cbind => cbind}/src/ex_put_n_node_num_map.c | 0
{exodus/cbind => cbind}/src/ex_put_n_node_set.c | 0
{exodus/cbind => cbind}/src/ex_put_n_node_set_df.c | 0
{exodus/cbind => cbind}/src/ex_put_n_one_attr.c | 0
{exodus/cbind => cbind}/src/ex_put_n_side_set.c | 0
{exodus/cbind => cbind}/src/ex_put_n_side_set_df.c | 0
{exodus/cbind => cbind}/src/ex_put_n_var.c | 0
{exodus/cbind => cbind}/src/ex_put_name.c | 0
{exodus/cbind => cbind}/src/ex_put_names.c | 0
{exodus/cbind => cbind}/src/ex_put_nodal_var.c | 0
.../cbind => cbind}/src/ex_put_nodal_var_slab.c | 0
{exodus/cbind => cbind}/src/ex_put_node_cmap.c | 0
{exodus/cbind => cbind}/src/ex_put_node_map.c | 0
{exodus/cbind => cbind}/src/ex_put_node_num_map.c | 0
{exodus/cbind => cbind}/src/ex_put_node_set.c | 0
.../src/ex_put_node_set_dist_fact.c | 0
.../cbind => cbind}/src/ex_put_node_set_param.c | 0
.../cbind => cbind}/src/ex_put_ns_param_global.c | 0
{exodus/cbind => cbind}/src/ex_put_nset_var.c | 0
{exodus/cbind => cbind}/src/ex_put_nset_var_tab.c | 0
{exodus/cbind => cbind}/src/ex_put_num_map.c | 0
{exodus/cbind => cbind}/src/ex_put_one_attr.c | 0
{exodus/cbind => cbind}/src/ex_put_one_elem_attr.c | 0
{exodus/cbind => cbind}/src/ex_put_partial_attr.c | 0
{exodus/cbind => cbind}/src/ex_put_partial_coord.c | 2 +-
.../cbind => cbind}/src/ex_put_partial_elem_attr.c | 0
.../cbind => cbind}/src/ex_put_partial_elem_conn.c | 0
.../cbind => cbind}/src/ex_put_partial_elem_map.c | 0
.../src/ex_put_partial_elem_num_map.c | 0
.../cbind => cbind}/src/ex_put_partial_id_map.c | 79 +-
.../cbind => cbind}/src/ex_put_partial_nodal_var.c | 0
.../src/ex_put_partial_node_num_map.c | 0
.../cbind => cbind}/src/ex_put_partial_node_set.c | 0
.../src/ex_put_partial_node_set_df.c | 0
.../cbind => cbind}/src/ex_put_partial_num_map.c | 4 +-
.../cbind => cbind}/src/ex_put_partial_one_attr.c | 0
{exodus/cbind => cbind}/src/ex_put_partial_set.c | 3 +-
.../src/ex_put_partial_set_dist_fact.c | 0
.../cbind => cbind}/src/ex_put_partial_side_set.c | 0
.../src/ex_put_partial_side_set_df.c | 0
{exodus/cbind => cbind}/src/ex_put_partial_var.c | 0
.../src/ex_put_processor_elem_maps.c | 0
.../src/ex_put_processor_node_maps.c | 0
{exodus/cbind => cbind}/src/ex_put_prop.c | 0
{exodus/cbind => cbind}/src/ex_put_prop_array.c | 0
{exodus/cbind => cbind}/src/ex_put_prop_names.c | 0
{exodus/cbind => cbind}/src/ex_put_qa.c | 138 +--
{exodus/cbind => cbind}/src/ex_put_set.c | 0
{exodus/cbind => cbind}/src/ex_put_set_dist_fact.c | 0
{exodus/cbind => cbind}/src/ex_put_set_param.c | 0
{exodus/cbind => cbind}/src/ex_put_sets.c | 0
{exodus/cbind => cbind}/src/ex_put_side_set.c | 0
.../src/ex_put_side_set_dist_fact.c | 0
.../cbind => cbind}/src/ex_put_side_set_param.c | 0
.../cbind => cbind}/src/ex_put_ss_param_global.c | 0
{exodus/cbind => cbind}/src/ex_put_sset_var.c | 0
{exodus/cbind => cbind}/src/ex_put_sset_var_tab.c | 0
{exodus/cbind => cbind}/src/ex_put_time.c | 0
{exodus/cbind => cbind}/src/ex_put_truth_table.c | 0
{exodus/cbind => cbind}/src/ex_put_var.c | 0
{exodus/cbind => cbind}/src/ex_put_var_name.c | 0
{exodus/cbind => cbind}/src/ex_put_var_names.c | 0
{exodus/cbind => cbind}/src/ex_put_var_param.c | 0
{exodus/cbind => cbind}/src/ex_put_var_tab.c | 0
{exodus/cbind => cbind}/src/ex_put_variable_name.c | 0
.../cbind => cbind}/src/ex_put_variable_names.c | 0
.../cbind => cbind}/src/ex_put_variable_param.c | 0
{exodus/cbind => cbind}/src/ex_update.c | 0
{exodus/cbind => cbind}/src/ex_utils.c | 3 +-
{exodus/cbind => cbind}/test/CMakeLists.txt | 0
{exodus/cbind => cbind}/test/CreateEdgeFace.c | 0
{exodus/cbind => cbind}/test/Imakefile | 13 +-
{exodus/cbind => cbind}/test/MakeTestData.c | 2 +-
{exodus/cbind => cbind}/test/Makefile.standalone | 124 +-
{exodus/cbind => cbind}/test/ReadEdgeFace.c | 0
{exodus/cbind => cbind}/test/create_mesh.c | 8 +-
.../cbind => cbind}/test/exodus_unit_tests.gold | 1 +
{exodus/cbind => cbind}/test/makedmp | 0
{exodus/cbind => cbind}/test/oned.c | 0
{exodus/cbind => cbind}/test/rd_wt_mesh.c | 0
{exodus/cbind => cbind}/test/test.dmp | 0
{exodus/cbind => cbind}/test/test.exo_c | 0
{exodus/cbind => cbind}/test/test1.dmp | 0
{exodus/cbind => cbind}/test/test2-1.dmp | 0
{exodus/cbind => cbind}/test/test2-2.dmp | 0
{exodus/cbind => cbind}/test/test2.dmp | 0
{exodus/cbind => cbind}/test/test_clb.dmp | 0
{exodus/cbind => cbind}/test/test_nemesis.c | 4 -
{exodus/cbind => cbind}/test/test_nemesis.dmp | 2 +-
{exodus/cbind => cbind}/test/testall.in | 4 +-
{exodus/cbind => cbind}/test/testall.in1 | 0
{exodus/cbind => cbind}/test/testall.standalone | 0
{exodus/cbind => cbind}/test/testcp.c | 0
{exodus/cbind => cbind}/test/testcp_dd.dmp | 0
{exodus/cbind => cbind}/test/testcp_ds.dmp | 0
{exodus/cbind => cbind}/test/testcp_ln.c | 0
{exodus/cbind => cbind}/test/testcp_ln.dmp | 0
{exodus/cbind => cbind}/test/testcp_nl.c | 0
{exodus/cbind => cbind}/test/testcp_nl.dmp | 0
{exodus/cbind => cbind}/test/testcp_sd.dmp | 0
{exodus/cbind => cbind}/test/testcp_ss.dmp | 0
{exodus/cbind => cbind}/test/testcpd.c | 0
{exodus/cbind => cbind}/test/testd.dmp | 0
{exodus/cbind => cbind}/test/testrd-long-name.c | 49 +-
{exodus/cbind => cbind}/test/testrd-long-name.dmp | 0
{exodus/cbind => cbind}/test/testrd-nfaced.c | 0
{exodus/cbind => cbind}/test/testrd-nfaced.dmp | 0
{exodus/cbind => cbind}/test/testrd-nm32.dmp | 0
{exodus/cbind => cbind}/test/testrd-nsided.c | 0
{exodus/cbind => cbind}/test/testrd-nsided.dmp | 0
{exodus/cbind => cbind}/test/testrd.c | 0
{exodus/cbind => cbind}/test/testrd.dmp | 0
{exodus/cbind => cbind}/test/testrd1.c | 0
{exodus/cbind => cbind}/test/testrd1.dmp | 0
{exodus/cbind => cbind}/test/testrd_nc.c | 0
{exodus/cbind => cbind}/test/testrd_nc.dmp | 0
{exodus/cbind => cbind}/test/testrd_par.c | 0
{exodus/cbind => cbind}/test/testrd_ss.c | 0
{exodus/cbind => cbind}/test/testrd_ss.dmp | 0
{exodus/cbind => cbind}/test/testrd_zeroe.dmp | 0
{exodus/cbind => cbind}/test/testrd_zeron.dmp | 0
{exodus/cbind => cbind}/test/testrdd.c | 0
{exodus/cbind => cbind}/test/testrdd.dmp | 0
{exodus/cbind => cbind}/test/testrdwt.c | 0
{exodus/cbind => cbind}/test/testwt-long-name.c | 0
{exodus/cbind => cbind}/test/testwt-long-name.dmp | 0
{exodus/cbind => cbind}/test/testwt-nface-nside.c | 0
{exodus/cbind => cbind}/test/testwt-nfaced.c | 0
{exodus/cbind => cbind}/test/testwt-nfaced.dmp | 0
{exodus/cbind => cbind}/test/testwt-nsided.c | 0
{exodus/cbind => cbind}/test/testwt-nsided.dmp | 0
{exodus/cbind => cbind}/test/testwt-one-attrib.c | 0
{exodus/cbind => cbind}/test/testwt-partial.c | 0
{exodus/cbind => cbind}/test/testwt-zeroe.c | 0
{exodus/cbind => cbind}/test/testwt-zeroe.dmp | 0
{exodus/cbind => cbind}/test/testwt-zeron.c | 0
{exodus/cbind => cbind}/test/testwt-zeron.dmp | 0
{exodus/cbind => cbind}/test/testwt.c | 8 +-
{exodus/cbind => cbind}/test/testwt1.c | 0
{exodus/cbind => cbind}/test/testwt2.c | 0
{exodus/cbind => cbind}/test/testwt_clb.c | 0
{exodus/cbind => cbind}/test/testwt_nc.c | 0
{exodus/cbind => cbind}/test/testwt_nossnsdf.c | 0
{exodus/cbind => cbind}/test/testwt_ss.c | 0
{exodus/cbind => cbind}/test/testwt_ss.dmp | 0
{exodus/cbind => cbind}/test/testwtbig.c | 0
{exodus/cbind => cbind}/test/testwtd.c | 0
{exodus/cbind => cbind}/test/testwtm.c | 0
{exodus/cbind => cbind}/test/twod.c | 0
{exodus/cbind => cbind}/test/update_all_tests | 0
cmake-script | 21 +
{exodus/cmake => cmake}/Dependencies.cmake | 0
exodus/customdoxygen.css => customdoxygen.css | 0
{exodus/doc => doc}/doc.poly.txt | 0
{exodus/doc => doc}/exodus-face-edge.pdf | Bin
{exodus/doc => doc}/exodus.pdf | Bin
{exodus/doc => doc}/nemesis.pdf | Bin
exodus/forbind/src/Makefile.standalone | 76 --
exodus/exodusii.dsp => exodusii.dsp | 0
{exodus/forbind => forbind}/CMakeLists.txt | 3 +-
{exodus/forbind => forbind}/include/Imakefile | 0
{exodus/forbind => forbind}/include/exodusII.inc | 0
.../forbind => forbind}/include/exodusII_int.inc | 0
{exodus/forbind => forbind}/src/Imakefile | 0
.../forbind => forbind/src}/Makefile.standalone | 26 +-
{exodus/forbind => forbind}/src/addrwrap.F | 2 +
{exodus/forbind => forbind}/src/exo_jack.src | 0
{exodus/forbind => forbind}/test/CMakeLists.txt | 0
{exodus/forbind => forbind}/test/Imakefile | 0
.../forbind => forbind}/test/Makefile.standalone | 92 +-
.../test/exodus_unit_tests.gold | 1 +
{exodus/forbind => forbind}/test/test-nsided.dmp | 0
{exodus/forbind => forbind}/test/test.dmp | 0
{exodus/forbind => forbind}/test/test1.dmp | 0
{exodus/forbind => forbind}/test/test2-1.dmp | 0
{exodus/forbind => forbind}/test/test2-2.dmp | 0
{exodus/forbind => forbind}/test/test_nem.dmp | 0
{exodus/forbind => forbind}/test/test_nem.f | 0
{exodus/forbind => forbind}/test/test_nem.inc | 0
{exodus/forbind => forbind}/test/testall.in | 6 +-
{exodus/forbind => forbind}/test/testall.in1 | 0
.../forbind => forbind}/test/testall.standalone | 0
{exodus/forbind => forbind}/test/testcp.f | 0
{exodus/forbind => forbind}/test/testcp_dd.dmp | 0
{exodus/forbind => forbind}/test/testcp_ds.dmp | 0
{exodus/forbind => forbind}/test/testcp_sd.dmp | 0
{exodus/forbind => forbind}/test/testcp_ss.dmp | 0
{exodus/forbind => forbind}/test/testcpd.f | 0
{exodus/forbind => forbind}/test/testcpln.dmp | 0
{exodus/forbind => forbind}/test/testcpln.f | 0
{exodus/forbind => forbind}/test/testcpnl.dmp | 0
{exodus/forbind => forbind}/test/testcpnl.f | 0
{exodus/forbind => forbind}/test/testd.dmp | 0
{exodus/forbind => forbind}/test/testrd.dmp | 0
{exodus/forbind => forbind}/test/testrd.f | 0
{exodus/forbind => forbind}/test/testrd1.dmp | 0
{exodus/forbind => forbind}/test/testrd1.f | 0
{exodus/forbind => forbind}/test/testrd_nsid.dmp | 0
{exodus/forbind => forbind}/test/testrd_nsid.f | 0
{exodus/forbind => forbind}/test/testrdd.dmp | 0
{exodus/forbind => forbind}/test/testrdd.f | 0
{exodus/forbind => forbind}/test/testwt.f | 0
{exodus/forbind => forbind}/test/testwt1.f | 0
{exodus/forbind => forbind}/test/testwt2.f | 0
{exodus/forbind => forbind}/test/testwt3.f | 0
{exodus/forbind => forbind}/test/testwt_nsid.f | 0
{exodus/forbind => forbind}/test/testwtd.f | 0
{exodus/forbind => forbind}/test/testwtm.f | 0
nemesis/CMakeLists.txt | 86 --
nemesis/COPYRIGHT | 32 -
nemesis/Imakefile | 142 ---
nemesis/Makefile.standalone | 247 ----
nemesis/README | 27 -
nemesis/forbind/Imakefile | 73 --
nemesis/forbind/Makefile | 585 ----------
nemesis/forbind/addrwrpn.F | 1211 --------------------
nemesis/forbind/ne_ftest.F | 928 ---------------
nemesis/forbind/ne_test.inc | 66 --
nemesis/ne_ctest_wrap.c | 1044 -----------------
nemesis/ne_nemesisI.h | 492 --------
nemesis/ne_nemesisI_int.h | 3 -
nemesis/nemesis_cfg.h.in | 25 -
nemesis/nemesis_wrapper.c | 596 ----------
429 files changed, 489 insertions(+), 6197 deletions(-)
diff --git a/exodus/CMakeLists.txt b/CMakeLists.txt
similarity index 72%
rename from exodus/CMakeLists.txt
rename to CMakeLists.txt
index 935da5a..ca372f5 100644
--- a/exodus/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,13 @@ SET(EXODUSII_VERSION_PATCH "0")
SET(EXODUSII_VERSION "${EXODUSII_VERSION_MAJOR}.${EXODUSII_VERSION_MINOR}")
SET(EXODUSII_VERSION_FULL "${EXODUSII_VERSION}.${EXODUSII_VERSION_PATCH}")
-SET(EXODUSII_BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS}")
+OPTION(BUILD_SHARED "Build the exodus libraries shared." OFF)
+
+IF(BUILD_SHARED)
+ SET(EXODUS_LIBRARY_TYPE SHARED)
+ELSE(BUILD_SHARED)
+ SET(EXODUS_LIBRARY_TYPE STATIC)
+ENDIF(BUILD_SHARED)
SUBDIRS(cbind forbind)
@@ -47,4 +53,10 @@ find_library( HDF5HL_LIBRARY hdf5_hl
/usr/local/hdf5/lib
)
-
+# Check for ZLib, but only if using HDF5.
+FIND_PACKAGE(ZLIB)
+IF(NOT ZLIB_LIBRARY)
+ MESSAGE(FATAL_ERROR "HDF5 Support specified, cannot find ZLib.")
+ENDIF()
+SET(USE_ZLIB ON)
+INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
diff --git a/exodus/COPYRIGHT b/COPYRIGHT
similarity index 100%
rename from exodus/COPYRIGHT
rename to COPYRIGHT
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index f4262d1..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,104 +0,0 @@
-========================================================================
-*** Permit 0 as valid entity (block, set, map) id
-
-* Version 5.09 -- Modifications to let zero be a valid entity (element
- block, nodeset, sideset, map, other sets and blocks). There is a
- new define EX_INVALID_ID (-1) which now indicates that the id for
- an entity has not yet been set. All positive integers are now
- valid id values.
-
-========================================================================
-*** Long Name support.
-
- Exodus from version 5.08 and later can support names of length up
- to NC_MAXNAME which is currently 256. The internals of the exodus
-database have changed with the addition of a new 'dimension' and a new
-database attribute.
-
-This has the following implications:
-*. The old library can read a new database if the new database does
- not use names longer than 32 characters.
-
-*. If the new database uses longer names, the old library will crash.
-
-*. New library with old database will work fine.
-
-*. New library with new database, no code changes. If the database
- uses long names, they will be truncated (with message to stderr) at
- 32 characters. An output database will limit names to 32
- characters by default.
-
-The following code changes are used to work with long names:
-
-========================================
-Reading a database:
-
-* Query a database for the maximum length of a name stored on the
- database. This does not include the space for the trailing null.
-
- int max_name_length = ex_inquire_int(exoid,
- EX_INQ_DB_MAX_USED_NAME_LENGTH);
-
-* Tell the exodus API the maximum name length that your client code
- can handle. This is the size of the character strings that are
- passed to the ex_get_names() and similar calls. Note that the
- maximum_length does not include the trailing null. That means that
- if you tell the library to give you 32-character names, the memory
- buffer you pass to the library must be 33 characters.
-
- int status = ex_set_max_name_length(exoid, maximum_length);
-
- If this size is less than the length of a name on the database, the
- name will be truncated and a message printed to stderr.
-
-* Inquire the size set for the max_name_length. Will return 32 by
- default, or if ex_set_max_name_length was called, it will return the
- size set in that call.
-
- int max_name_length = ex_inquire_int(exoid,
- EX_INQ_CUR_MAX_ALLOWED_NAME_LENGTH);
-
-* Inquire the size that the database used at creation time for the
- maximum name size. This is the value used for
- ex_set_max_name_length() when the database was created. This isn't
- really needed unless you are appending to an existing database and
- want to know how long of names it will support.
-
-========================================
-Writing a database:
-
-* After the ex_create() call and before the call to ex_put_init() or
- ex_put_init_ext(), call ex_set_max_name_length(exoid, max_length); to
- tell the database the maximum size names that you will be
- outputting. If this isn't called, then it will default to 32
- character names.
-
-* The code will keep track of the maximum length that was written and
- will update an attribute on the database with that length. This is
- queryable via the following function:
-
- int max_name_length = ex_inquire_int(exoid,
- EX_INQ_DB_MAX_USED_NAME_LENGTH);
-
-
-========================================
-Names that are included:
-
-* Entity names (element block, nodeset, sideset, faceblock, ...)
-* Attribute names
-* Map names
-* Results variable names
-
-Still 32 characters:
-* QA strings
-* element type in ex_get_block, ex_put_block calls.
-
-Still 80 characters:
-* info records
-* title.
-
-========================================
-Questions / Concerns / Problems:
-
-Greg Sjaardema.
-gdsjaar at sandia.gov or gsjaardema at gmail.com
diff --git a/exodus/DartConfig.cmake b/DartConfig.cmake
similarity index 100%
rename from exodus/DartConfig.cmake
rename to DartConfig.cmake
diff --git a/exodus/Doxyfile b/Doxyfile
similarity index 100%
rename from exodus/Doxyfile
rename to Doxyfile
diff --git a/exodus/Imakefile b/Imakefile
similarity index 100%
rename from exodus/Imakefile
rename to Imakefile
diff --git a/exodus/Makefile.standalone b/Makefile.standalone
similarity index 96%
rename from exodus/Makefile.standalone
rename to Makefile.standalone
index 646ee85..e9bc079 100644
--- a/exodus/Makefile.standalone
+++ b/Makefile.standalone
@@ -54,9 +54,10 @@ SYSTEM := $(shell uname)
#========================================================================
USING_NETCDF4 = "YES"
-NETCDF = /Users/gdsjaar/src/seacas-nopar
+NETCDF = /Users/gdsjaar/src/SEACAS
NETCDF_INC = -I$(NETCDF)/include
NETCDF_LIB = -L$(NETCDF)/lib -lnetcdf
+NCDUMP = ${NETCDF}/bin/ncdump
ifeq ($(USING_NETCDF4), "YES")
LDFLAGS = -L$(NETCDF)/lib -lnetcdf -lhdf5_hl -lhdf5 -lm -lz
@@ -72,8 +73,8 @@ ifeq ($(SYSTEM),Darwin)
RANLIB = ranlib
AR = ar -crsv
-CC = gcc
-FC = gfortran
+CC = /opt/local/bin/gcc-mp-4.8
+FC = /opt/local/bin/gfortran-mp-4.8
CCOPTIONS = -DADDC_
F77OPTIONS =
endif
@@ -226,11 +227,11 @@ test:: libexodus.a libexoIIv2for.a
test::
echo "making test in cbind/test"
- (cd cbind/test && $(MAKE) $(MFLAGS) -f Makefile.standalone "AR=$(AR)" "CC=$(CC)" "CFLAGS=$(CFLAGS)" "LDFLAGS=$(LDFLAGS)" "RANLIB=$(RANLIB)" all)
+ (cd cbind/test && $(MAKE) $(MFLAGS) -f Makefile.standalone "AR=$(AR)" "CC=$(CC)" "CFLAGS=$(CFLAGS)" "LDFLAGS=$(LDFLAGS)" "RANLIB=$(RANLIB)" "NCDUMP=$(NCDUMP)" all)
test::
echo "making test in forbind/test"
- (cd forbind/test && $(MAKE) $(MFLAGS) -f Makefile.standalone "AR=$(AR)" "CC=$(CC)" "CFLAGS=$(CFLAGS)" "FC=$(FC)" "FFLAGS=$(FFLAGS)" "LDFLAGS=$(LDFLAGS)" "RANLIB=$(RANLIB)" all)
+ (cd forbind/test && $(MAKE) $(MFLAGS) -f Makefile.standalone "AR=$(AR)" "CC=$(CC)" "CFLAGS=$(CFLAGS)" "FC=$(FC)" "FFLAGS=$(FFLAGS)" "LDFLAGS=$(LDFLAGS)" "RANLIB=$(RANLIB)" "NCDUMP=$(NCDUMP)" all)
clean::
@for flag in $(MAKEFLAGS) ''; do \
diff --git a/exodus/README b/README
similarity index 71%
rename from exodus/README
rename to README
index e31158d..514391d 100644
--- a/exodus/README
+++ b/README
@@ -32,19 +32,8 @@ top-level exodus directory, do 'accmkmf' followed by 'make
Makefiles' and then 'make'
2. CMAKE: type 'cmake .' or 'cmake -i' to generate the Makefiles
-followed by 'make'. Cmake will search for the netcdf include file in
-the directories:
- ${ACCESS}/inc,
- ${NETCDF_DIR}/inc,
- ${NETCDF_DIR}/libsrc
-
-and the netcdf library in the directories:
- ${ACCESS}/lib,
- ${NETCDF_DIR}/lib,
- ${NETCDF_DIR}/libsrc/.libs
-
-You should one of the environment variables ACCESS or NETCDF_DIR to
-point to the location of your netcdf installation.
+followed by 'make'. There is a cmake-script file which shows how I configure
+cmake.
3. Makefile.standalone. Edit the top-level Makefile.standalone file
and specify the compiler and other options as detailed in the
@@ -63,22 +52,11 @@ NETCDF
The exodus library uses the netcdf library for low-level data
storage.
-Exodus requires NetCDF version 3.6.0 or later with the "large-model
-modifications". NetCDF version 4.1 or later is highly recommended.
+Exodus requires NetCDF version 4.2.1.1 or later.
The netcdf library must be modified slightly in order to handle the
exodus datamodel. The specific changes are:
-PRE netcdf-4.1.2:
-1. libsrc/netcdf.h -- Modify the following defines:
- libsrc4/netcdf_base.h (netcdf-4.X only)
- libsrc4/netcdf.h (netcdf-4.X only if it exists)
-
-#define NC_MAX_DIMS 65536 /* max dimensions per file */
-#define NC_MAX_VARS 524288 /* max variables per file */
-#define NC_MAX_VAR_DIMS 8 /* max per variable dimensions */
-
-netcdf-4.1.2 or later:
1. include/netcdf.h -- Modify the following defines:
#define NC_MAX_DIMS 65536 /* max dimensions per file */
@@ -92,16 +70,13 @@ happens...
2. I typically configure netcdf as follows:
-./configure --enable-netcdf-4 --disable-f77 --disable-f90 --disable-fsync --disable-dap --disable-cdmremote
+./configure --enable-netcdf-4 --disable-fsync --disable-dap --disable-cdmremote
Replace "--enable-netcdf-4" with "--disable-netcdf-4" to not use the
netcdf4 extensions. They are not necessarily needed for exodus, but
will provide compression, larger model sizes, and may be faster in
some cases.
-The --disable-f77 --disable-f90 are not needed for netcdf-4.2 or
-later.
-
3. When running the netcdf tests, you may have to do "unlimit
stacksize" (csh/tcsh) to avoid some failures due to the increased define sizes
above.
diff --git a/exodus/cbind/CMakeLists.txt b/cbind/CMakeLists.txt
similarity index 98%
rename from exodus/cbind/CMakeLists.txt
rename to cbind/CMakeLists.txt
index d556f01..083891f 100644
--- a/exodus/cbind/CMakeLists.txt
+++ b/cbind/CMakeLists.txt
@@ -279,9 +279,9 @@ IF(APPLE)
COMPILE_FLAGS -fno-common)
ENDIF(APPLE)
-ADD_LIBRARY(exoIIv2c ${cbind_SRCS})
+ADD_LIBRARY(exoIIv2c ${EXODUS_LIBRARY_TYPE} ${cbind_SRCS})
-TARGET_LINK_LIBRARIES(exoIIv2c ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${HDF5HL_LIBRARY})
+TARGET_LINK_LIBRARIES(exoIIv2c ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${HDF5HL_LIBRARY} ${ZLIB_LIBRARY})
IF(MSVC)
set_target_properties(exoIIv2c PROPERTIES COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS)
diff --git a/exodus/cbind/include/Imakefile b/cbind/include/Imakefile
similarity index 100%
rename from exodus/cbind/include/Imakefile
rename to cbind/include/Imakefile
diff --git a/exodus/cbind/include/doxygen.h b/cbind/include/doxygen.h
similarity index 100%
rename from exodus/cbind/include/doxygen.h
rename to cbind/include/doxygen.h
diff --git a/exodus/cbind/include/exodusII.h b/cbind/include/exodusII.h
similarity index 99%
rename from exodus/cbind/include/exodusII.h
rename to cbind/include/exodusII.h
index 6560aa0..a7149e3 100644
--- a/exodus/cbind/include/exodusII.h
+++ b/cbind/include/exodusII.h
@@ -58,8 +58,8 @@
#endif
/* EXODUS II version number */
-#define EX_API_VERS 5.24f
-#define EX_API_VERS_NODOT 524
+#define EX_API_VERS 5.26f
+#define EX_API_VERS_NODOT 526
#define EX_VERS EX_API_VERS
#define NEMESIS_API_VERSION EX_API_VERS
#define NEMESIS_API_VERSION_NODOT EX_API_VERS_NODOT
@@ -176,6 +176,7 @@ extern "C" {
EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH = 48, /**< inquire size of MAX_NAME_LENGTH dimension on database */
EX_INQ_DB_MAX_USED_NAME_LENGTH = 49, /**< inquire size of MAX_NAME_LENGTH dimension on database */
EX_INQ_MAX_READ_NAME_LENGTH = 50, /**< inquire client-specified max size of returned names */
+ EX_INQ_DB_FLOAT_SIZE = 51, /**< inquire size of floating-point values stored on database */
EX_INQ_INVALID = -1};
typedef enum ex_inquiry ex_inquiry;
@@ -345,20 +346,20 @@ extern "C" {
int num_glob;
int num_node;
int num_edge;
- int* edge_var_tab;
int num_face;
- int* face_var_tab;
int num_elem;
- int* elem_var_tab;
int num_nset;
- int* nset_var_tab;
int num_eset;
- int* eset_var_tab;
int num_fset;
- int* fset_var_tab;
int num_sset;
- int* sset_var_tab;
int num_elset;
+ int* edge_var_tab;
+ int* face_var_tab;
+ int* elem_var_tab;
+ int* nset_var_tab;
+ int* eset_var_tab;
+ int* fset_var_tab;
+ int* sset_var_tab;
int* elset_var_tab;
} ex_var_params;
/* @} */
diff --git a/exodus/cbind/include/exodusII_cfg.h b/cbind/include/exodusII_cfg.h
similarity index 100%
rename from exodus/cbind/include/exodusII_cfg.h
rename to cbind/include/exodusII_cfg.h
diff --git a/exodus/cbind/include/exodusII_cfg.h.in b/cbind/include/exodusII_cfg.h.in
similarity index 100%
rename from exodus/cbind/include/exodusII_cfg.h.in
rename to cbind/include/exodusII_cfg.h.in
diff --git a/exodus/cbind/include/exodusII_int.h b/cbind/include/exodusII_int.h
similarity index 99%
rename from exodus/cbind/include/exodusII_int.h
rename to cbind/include/exodusII_int.h
index 2501a53..0ac1dc6 100644
--- a/exodus/cbind/include/exodusII_int.h
+++ b/cbind/include/exodusII_int.h
@@ -630,7 +630,7 @@ struct file_item {
unsigned int user_compute_wordsize:1; /* 0 for 4 byte or 1 for 8 byte reals */
unsigned int shuffle:1; /* 1 true, 0 false */
unsigned int file_type:2; /* 0 - classic, 1 -- 64 bit classic, 2 --netcdf4, 3 --netcdf4 classic */
-
+ unsigned int is_parallel:1; /* 1 true, 0 false */
struct file_item* next;
};
@@ -673,12 +673,13 @@ char* ex_dim_num_objects(ex_entity_type obj_type);
char* ex_name_var_of_object( ex_entity_type, int, int );
char* ex_name_of_map( ex_entity_type, int );
-int ex_conv_ini (int exoid, int* comp_wordsize, int* io_wordsize, int file_wordsize, int int64_status);
+int ex_conv_ini (int exoid, int* comp_wordsize, int* io_wordsize, int file_wordsize, int int64_status, int is_parallel);
void ex_conv_exit (int exoid);
nc_type nc_flt_code (int exoid);
int ex_comp_ws (int exoid);
int ex_get_cpu_ws(void);
+int ex_is_parallel(int exoid);
struct list_item** ex_get_counter_list(ex_entity_type obj_type);
int ex_get_file_item (int, struct list_item**);
diff --git a/exodus/cbind/include/exodusII_par.h b/cbind/include/exodusII_par.h
similarity index 100%
rename from exodus/cbind/include/exodusII_par.h
rename to cbind/include/exodusII_par.h
diff --git a/exodus/cbind/include/exodusII_test.h b/cbind/include/exodusII_test.h
similarity index 100%
rename from exodus/cbind/include/exodusII_test.h
rename to cbind/include/exodusII_test.h
diff --git a/exodus/cbind/parallel/Imakefile b/cbind/parallel/Imakefile
similarity index 100%
rename from exodus/cbind/parallel/Imakefile
rename to cbind/parallel/Imakefile
diff --git a/exodus/cbind/parallel/ex_create_par.c b/cbind/parallel/ex_create_par.c
similarity index 100%
rename from exodus/cbind/parallel/ex_create_par.c
rename to cbind/parallel/ex_create_par.c
diff --git a/exodus/cbind/parallel/ex_open_par.c b/cbind/parallel/ex_open_par.c
similarity index 100%
rename from exodus/cbind/parallel/ex_open_par.c
rename to cbind/parallel/ex_open_par.c
diff --git a/exodus/cbind/src/Imakefile b/cbind/src/Imakefile
similarity index 100%
rename from exodus/cbind/src/Imakefile
rename to cbind/src/Imakefile
diff --git a/exodus/cbind/src/Makefile.standalone b/cbind/src/Makefile.standalone
similarity index 99%
rename from exodus/cbind/src/Makefile.standalone
rename to cbind/src/Makefile.standalone
index ffc1698..4fe8228 100644
--- a/exodus/cbind/src/Makefile.standalone
+++ b/cbind/src/Makefile.standalone
@@ -249,6 +249,7 @@ SRCS = ex_close.c \
ex_update.c \
ex_utils.c
+
OBJS = ${SRCS:.c=.o}
all:: libexodus.a
diff --git a/exodus/cbind/src/ex_close.c b/cbind/src/ex_close.c
similarity index 100%
rename from exodus/cbind/src/ex_close.c
rename to cbind/src/ex_close.c
diff --git a/exodus/cbind/src/ex_conv.c b/cbind/src/ex_conv.c
similarity index 93%
rename from exodus/cbind/src/ex_conv.c
rename to cbind/src/ex_conv.c
index ab632ae..de25ba4 100644
--- a/exodus/cbind/src/ex_conv.c
+++ b/cbind/src/ex_conv.c
@@ -81,7 +81,8 @@ int ex_conv_ini( int exoid,
int* comp_wordsize,
int* io_wordsize,
int file_wordsize,
- int int64_status)
+ int int64_status,
+ int is_parallel)
{
char errmsg[MAX_ERR_LENGTH];
struct file_item* new_file;
@@ -190,6 +191,7 @@ int ex_conv_ini( int exoid,
new_file->compression_level = 0;
new_file->shuffle = 0;
new_file->file_type = filetype-1;
+ new_file->is_parallel = is_parallel;
new_file->next = file_list;
file_list = new_file;
@@ -399,16 +401,37 @@ int ex_comp_ws( int exoid )
*/
struct file_item* file = ex_find_file_item(exoid);
+ exerrval = 0; /* clear error code */
+
+ if (!file ) {
+ char errmsg[MAX_ERR_LENGTH];
+ exerrval = EX_BADFILEID;
+ sprintf(errmsg,"Error: unknown file id %d",exoid);
+ ex_err("ex_comp_ws",errmsg,exerrval);
+ return(EX_FATAL);
+ }
+ /* Stored as 0 for 4-byte; 1 for 8-byte */
+ return (file->user_compute_wordsize+1)*4;
+ }
+
+int ex_is_parallel(int exoid)
+{
+ /*! ex_is_parallel() returns 1 (true) or 0 (false) depending on whether
+ * the file was opened in parallel or serial/file-per-processor mode.
+ * Note that in this case parallel assumes the output of a single file,
+ * not a parallel run using file-per-processor.
+ */
+ struct file_item* file = ex_find_file_item(exoid);
+
exerrval = 0; /* clear error code */
if (!file ) {
char errmsg[MAX_ERR_LENGTH];
exerrval = EX_BADFILEID;
sprintf(errmsg,"Error: unknown file id %d",exoid);
- ex_err("ex_comp_ws",errmsg,exerrval);
+ ex_err("ex_is_parallel",errmsg,exerrval);
return(EX_FATAL);
}
- /* Stored as 0 for 4-byte; 1 for 8-byte */
- return (file->user_compute_wordsize+1)*4;
+ /* Stored as 1 for parallel, 0 for serial or file-per-processor */
+ return file->is_parallel;
}
-
diff --git a/exodus/cbind/src/ex_copy.c b/cbind/src/ex_copy.c
similarity index 100%
rename from exodus/cbind/src/ex_copy.c
rename to cbind/src/ex_copy.c
diff --git a/exodus/cbind/src/ex_create.c b/cbind/src/ex_create.c
similarity index 99%
rename from exodus/cbind/src/ex_create.c
rename to cbind/src/ex_create.c
index 37aece8..d8f0bcd 100644
--- a/exodus/cbind/src/ex_create.c
+++ b/cbind/src/ex_create.c
@@ -288,7 +288,7 @@ int ex_create_int (const char *path,
* i/o wordsize attribute from file is zero.
*/
- if (ex_conv_ini( exoid, comp_ws, io_ws, 0, int64_status ) != EX_NOERR) {
+ if (ex_conv_ini(exoid, comp_ws, io_ws, 0, int64_status, 0) != EX_NOERR) {
exerrval = EX_FATAL;
sprintf(errmsg,
"Error: failed to init conversion routines in file id %d",
diff --git a/exodus/cbind/src/ex_create_par.c b/cbind/src/ex_create_par.c
similarity index 99%
rename from exodus/cbind/src/ex_create_par.c
rename to cbind/src/ex_create_par.c
index 4e10ac3..b82def0 100644
--- a/exodus/cbind/src/ex_create_par.c
+++ b/cbind/src/ex_create_par.c
@@ -279,7 +279,7 @@ int ex_create_par_int (const char *path,
* i/o wordsize attribute from file is zero.
*/
- if (ex_conv_ini( exoid, comp_ws, io_ws, 0, int64_status ) != EX_NOERR) {
+ if (ex_conv_ini(exoid, comp_ws, io_ws, 0, int64_status,1) != EX_NOERR) {
exerrval = EX_FATAL;
sprintf(errmsg,
"Error: failed to init conversion routines in file id %d",
diff --git a/exodus/cbind/src/ex_cvt_nodes_to_sides.c b/cbind/src/ex_cvt_nodes_to_sides.c
similarity index 100%
rename from exodus/cbind/src/ex_cvt_nodes_to_sides.c
rename to cbind/src/ex_cvt_nodes_to_sides.c
diff --git a/exodus/cbind/src/ex_err.c b/cbind/src/ex_err.c
similarity index 99%
rename from exodus/cbind/src/ex_err.c
rename to cbind/src/ex_err.c
index 8554782..353295a 100644
--- a/exodus/cbind/src/ex_err.c
+++ b/cbind/src/ex_err.c
@@ -111,7 +111,7 @@ void ex_err(const char *module_name,
else if (exoptval & EX_VERBOSE) /* check see if we really want to hear this */
{
- fprintf(stderr, "Exodus Library Error: [%s]\n\t%s\n",module_name,message);
+ fprintf(stderr, "Exodus Library Warning/Error: [%s]\n\t%s\n",module_name,message);
switch (err_num) {
case NC_SYSERR:
fprintf (stderr,"\t[%d] System error -- Usually disk full or filesystem issue\n", err_num);
diff --git a/exodus/cbind/src/ex_get_all_times.c b/cbind/src/ex_get_all_times.c
similarity index 100%
rename from exodus/cbind/src/ex_get_all_times.c
rename to cbind/src/ex_get_all_times.c
diff --git a/exodus/cbind/src/ex_get_attr.c b/cbind/src/ex_get_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_get_attr.c
rename to cbind/src/ex_get_attr.c
diff --git a/exodus/cbind/src/ex_get_attr_names.c b/cbind/src/ex_get_attr_names.c
similarity index 100%
rename from exodus/cbind/src/ex_get_attr_names.c
rename to cbind/src/ex_get_attr_names.c
diff --git a/exodus/cbind/src/ex_get_attr_param.c b/cbind/src/ex_get_attr_param.c
similarity index 100%
rename from exodus/cbind/src/ex_get_attr_param.c
rename to cbind/src/ex_get_attr_param.c
diff --git a/exodus/cbind/src/ex_get_block.c b/cbind/src/ex_get_block.c
similarity index 100%
rename from exodus/cbind/src/ex_get_block.c
rename to cbind/src/ex_get_block.c
diff --git a/exodus/cbind/src/ex_get_block_param.c b/cbind/src/ex_get_block_param.c
similarity index 100%
rename from exodus/cbind/src/ex_get_block_param.c
rename to cbind/src/ex_get_block_param.c
diff --git a/exodus/cbind/src/ex_get_cmap_params.c b/cbind/src/ex_get_cmap_params.c
similarity index 100%
rename from exodus/cbind/src/ex_get_cmap_params.c
rename to cbind/src/ex_get_cmap_params.c
diff --git a/exodus/cbind/src/ex_get_concat_node_sets.c b/cbind/src/ex_get_concat_node_sets.c
similarity index 100%
rename from exodus/cbind/src/ex_get_concat_node_sets.c
rename to cbind/src/ex_get_concat_node_sets.c
diff --git a/exodus/cbind/src/ex_get_concat_sets.c b/cbind/src/ex_get_concat_sets.c
similarity index 100%
rename from exodus/cbind/src/ex_get_concat_sets.c
rename to cbind/src/ex_get_concat_sets.c
diff --git a/exodus/cbind/src/ex_get_concat_side_set_node_count.c b/cbind/src/ex_get_concat_side_set_node_count.c
similarity index 100%
rename from exodus/cbind/src/ex_get_concat_side_set_node_count.c
rename to cbind/src/ex_get_concat_side_set_node_count.c
diff --git a/exodus/cbind/src/ex_get_concat_side_sets.c b/cbind/src/ex_get_concat_side_sets.c
similarity index 100%
rename from exodus/cbind/src/ex_get_concat_side_sets.c
rename to cbind/src/ex_get_concat_side_sets.c
diff --git a/exodus/cbind/src/ex_get_conn.c b/cbind/src/ex_get_conn.c
similarity index 100%
rename from exodus/cbind/src/ex_get_conn.c
rename to cbind/src/ex_get_conn.c
diff --git a/exodus/cbind/src/ex_get_coord.c b/cbind/src/ex_get_coord.c
similarity index 100%
rename from exodus/cbind/src/ex_get_coord.c
rename to cbind/src/ex_get_coord.c
diff --git a/exodus/cbind/src/ex_get_coord_names.c b/cbind/src/ex_get_coord_names.c
similarity index 100%
rename from exodus/cbind/src/ex_get_coord_names.c
rename to cbind/src/ex_get_coord_names.c
diff --git a/exodus/cbind/src/ex_get_coordinate_frames.c b/cbind/src/ex_get_coordinate_frames.c
similarity index 100%
rename from exodus/cbind/src/ex_get_coordinate_frames.c
rename to cbind/src/ex_get_coordinate_frames.c
diff --git a/exodus/cbind/src/ex_get_eb_info_global.c b/cbind/src/ex_get_eb_info_global.c
similarity index 100%
rename from exodus/cbind/src/ex_get_eb_info_global.c
rename to cbind/src/ex_get_eb_info_global.c
diff --git a/exodus/cbind/src/ex_get_elem_attr.c b/cbind/src/ex_get_elem_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_get_elem_attr.c
rename to cbind/src/ex_get_elem_attr.c
diff --git a/exodus/cbind/src/ex_get_elem_attr_names.c b/cbind/src/ex_get_elem_attr_names.c
similarity index 100%
rename from exodus/cbind/src/ex_get_elem_attr_names.c
rename to cbind/src/ex_get_elem_attr_names.c
diff --git a/exodus/cbind/src/ex_get_elem_blk_ids.c b/cbind/src/ex_get_elem_blk_ids.c
similarity index 100%
rename from exodus/cbind/src/ex_get_elem_blk_ids.c
rename to cbind/src/ex_get_elem_blk_ids.c
diff --git a/exodus/cbind/src/ex_get_elem_block.c b/cbind/src/ex_get_elem_block.c
similarity index 100%
rename from exodus/cbind/src/ex_get_elem_block.c
rename to cbind/src/ex_get_elem_block.c
diff --git a/exodus/cbind/src/ex_get_elem_cmap.c b/cbind/src/ex_get_elem_cmap.c
similarity index 100%
rename from exodus/cbind/src/ex_get_elem_cmap.c
rename to cbind/src/ex_get_elem_cmap.c
diff --git a/exodus/cbind/src/ex_get_elem_conn.c b/cbind/src/ex_get_elem_conn.c
similarity index 100%
rename from exodus/cbind/src/ex_get_elem_conn.c
rename to cbind/src/ex_get_elem_conn.c
diff --git a/exodus/cbind/src/ex_get_elem_map.c b/cbind/src/ex_get_elem_map.c
similarity index 100%
rename from exodus/cbind/src/ex_get_elem_map.c
rename to cbind/src/ex_get_elem_map.c
diff --git a/exodus/cbind/src/ex_get_elem_num_map.c b/cbind/src/ex_get_elem_num_map.c
similarity index 100%
rename from exodus/cbind/src/ex_get_elem_num_map.c
rename to cbind/src/ex_get_elem_num_map.c
diff --git a/exodus/cbind/src/ex_get_elem_type.c b/cbind/src/ex_get_elem_type.c
similarity index 100%
rename from exodus/cbind/src/ex_get_elem_type.c
rename to cbind/src/ex_get_elem_type.c
diff --git a/exodus/cbind/src/ex_get_elem_var.c b/cbind/src/ex_get_elem_var.c
similarity index 100%
rename from exodus/cbind/src/ex_get_elem_var.c
rename to cbind/src/ex_get_elem_var.c
diff --git a/exodus/cbind/src/ex_get_elem_var_tab.c b/cbind/src/ex_get_elem_var_tab.c
similarity index 100%
rename from exodus/cbind/src/ex_get_elem_var_tab.c
rename to cbind/src/ex_get_elem_var_tab.c
diff --git a/exodus/cbind/src/ex_get_elem_var_time.c b/cbind/src/ex_get_elem_var_time.c
similarity index 100%
rename from exodus/cbind/src/ex_get_elem_var_time.c
rename to cbind/src/ex_get_elem_var_time.c
diff --git a/exodus/cbind/src/ex_get_entity_count_per_polyhedra.c b/cbind/src/ex_get_entity_count_per_polyhedra.c
similarity index 100%
rename from exodus/cbind/src/ex_get_entity_count_per_polyhedra.c
rename to cbind/src/ex_get_entity_count_per_polyhedra.c
diff --git a/exodus/cbind/src/ex_get_glob_var_time.c b/cbind/src/ex_get_glob_var_time.c
similarity index 100%
rename from exodus/cbind/src/ex_get_glob_var_time.c
rename to cbind/src/ex_get_glob_var_time.c
diff --git a/exodus/cbind/src/ex_get_glob_vars.c b/cbind/src/ex_get_glob_vars.c
similarity index 100%
rename from exodus/cbind/src/ex_get_glob_vars.c
rename to cbind/src/ex_get_glob_vars.c
diff --git a/exodus/cbind/src/ex_get_id_map.c b/cbind/src/ex_get_id_map.c
similarity index 100%
rename from exodus/cbind/src/ex_get_id_map.c
rename to cbind/src/ex_get_id_map.c
diff --git a/exodus/cbind/src/ex_get_ids.c b/cbind/src/ex_get_ids.c
similarity index 100%
rename from exodus/cbind/src/ex_get_ids.c
rename to cbind/src/ex_get_ids.c
diff --git a/exodus/cbind/src/ex_get_info.c b/cbind/src/ex_get_info.c
similarity index 100%
rename from exodus/cbind/src/ex_get_info.c
rename to cbind/src/ex_get_info.c
diff --git a/exodus/cbind/src/ex_get_init.c b/cbind/src/ex_get_init.c
similarity index 100%
rename from exodus/cbind/src/ex_get_init.c
rename to cbind/src/ex_get_init.c
diff --git a/exodus/cbind/src/ex_get_init_ext.c b/cbind/src/ex_get_init_ext.c
similarity index 93%
rename from exodus/cbind/src/ex_get_init_ext.c
rename to cbind/src/ex_get_init_ext.c
index 3b6e66a..c7fb815 100644
--- a/exodus/cbind/src/ex_get_init_ext.c
+++ b/cbind/src/ex_get_init_ext.c
@@ -95,33 +95,23 @@ int ex_get_init_ext (int exoid,
exerrval = 0; /* clear error code */
- if ((status = nc_inq_att(exoid, NC_GLOBAL, ATT_TITLE, &title_type, &title_len)) != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to inquire title in file id %d", exoid);
- ex_err("ex_get_init_ext",errmsg,exerrval);
- return (EX_FATAL);
- }
-
- /* Check title length to avoid overrunning clients memory space; include trailing null */
- if (title_len > MAX_LINE_LENGTH) {
- char *title = malloc(title_len+1);
- if ((status = nc_get_att_text(exoid, NC_GLOBAL, ATT_TITLE, title)) == NC_NOERR) {
- strncpy(info->title, title, MAX_LINE_LENGTH+1);
- info->title[MAX_LINE_LENGTH] = '\0';
- }
- free(title);
- } else {
- status = nc_get_att_text(exoid, NC_GLOBAL, ATT_TITLE, info->title);
- info->title[title_len] = '\0';
- }
- if (status != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to get title in file id %d", exoid);
- ex_err("ex_get_init_ext",errmsg,exerrval);
- return (EX_FATAL);
- }
+ info->num_dim = 0;
+ info->num_nodes = 0;
+ info->num_edge = 0;
+ info->num_edge_blk = 0;
+ info->num_face = 0;
+ info->num_face_blk = 0;
+ info->num_elem = 0;
+ info->num_elem_blk = 0;
+ info->num_node_sets = 0;
+ info->num_edge_sets = 0;
+ info->num_face_sets = 0;
+ info->num_side_sets = 0;
+ info->num_elem_sets = 0;
+ info->num_node_maps = 0;
+ info->num_edge_maps = 0;
+ info->num_face_maps = 0;
+ info->num_elem_maps = 0;
{
size_t tmp;
@@ -161,5 +151,33 @@ int ex_get_init_ext (int exoid,
if (ex_get_dim_value(exoid,"edge blocks",DIM_NUM_ED_BLK,dimid,&info->num_edge_blk) != EX_NOERR) return EX_FATAL;
if (ex_get_dim_value(exoid,"face blocks",DIM_NUM_FA_BLK,dimid,&info->num_face_blk) != EX_NOERR) return EX_FATAL;
+ if ((status = nc_inq_att(exoid, NC_GLOBAL, ATT_TITLE, &title_type, &title_len)) != NC_NOERR) {
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to inquire title in file id %d", exoid);
+ ex_err("ex_get_init_ext",errmsg,exerrval);
+ return (EX_FATAL);
+ }
+
+ /* Check title length to avoid overrunning clients memory space; include trailing null */
+ if (title_len > MAX_LINE_LENGTH) {
+ char *title = malloc(title_len+1);
+ if ((status = nc_get_att_text(exoid, NC_GLOBAL, ATT_TITLE, title)) == NC_NOERR) {
+ strncpy(info->title, title, MAX_LINE_LENGTH+1);
+ info->title[MAX_LINE_LENGTH] = '\0';
+ }
+ free(title);
+ } else {
+ status = nc_get_att_text(exoid, NC_GLOBAL, ATT_TITLE, info->title);
+ info->title[title_len] = '\0';
+ }
+ if (status != NC_NOERR) {
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to get title in file id %d", exoid);
+ ex_err("ex_get_init_ext",errmsg,exerrval);
+ return (EX_FATAL);
+ }
+
return (EX_NOERR);
}
diff --git a/exodus/cbind/src/ex_get_init_global.c b/cbind/src/ex_get_init_global.c
similarity index 100%
rename from exodus/cbind/src/ex_get_init_global.c
rename to cbind/src/ex_get_init_global.c
diff --git a/exodus/cbind/src/ex_get_init_info.c b/cbind/src/ex_get_init_info.c
similarity index 100%
rename from exodus/cbind/src/ex_get_init_info.c
rename to cbind/src/ex_get_init_info.c
diff --git a/exodus/cbind/src/ex_get_loadbal_param.c b/cbind/src/ex_get_loadbal_param.c
similarity index 100%
rename from exodus/cbind/src/ex_get_loadbal_param.c
rename to cbind/src/ex_get_loadbal_param.c
diff --git a/exodus/cbind/src/ex_get_map.c b/cbind/src/ex_get_map.c
similarity index 100%
rename from exodus/cbind/src/ex_get_map.c
rename to cbind/src/ex_get_map.c
diff --git a/exodus/cbind/src/ex_get_map_param.c b/cbind/src/ex_get_map_param.c
similarity index 100%
rename from exodus/cbind/src/ex_get_map_param.c
rename to cbind/src/ex_get_map_param.c
diff --git a/exodus/cbind/src/ex_get_n_attr.c b/cbind/src/ex_get_n_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_attr.c
rename to cbind/src/ex_get_n_attr.c
diff --git a/exodus/cbind/src/ex_get_n_conn.c b/cbind/src/ex_get_n_conn.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_conn.c
rename to cbind/src/ex_get_n_conn.c
diff --git a/exodus/cbind/src/ex_get_n_coord.c b/cbind/src/ex_get_n_coord.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_coord.c
rename to cbind/src/ex_get_n_coord.c
diff --git a/exodus/cbind/src/ex_get_n_elem_attr.c b/cbind/src/ex_get_n_elem_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_elem_attr.c
rename to cbind/src/ex_get_n_elem_attr.c
diff --git a/exodus/cbind/src/ex_get_n_elem_conn.c b/cbind/src/ex_get_n_elem_conn.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_elem_conn.c
rename to cbind/src/ex_get_n_elem_conn.c
diff --git a/exodus/cbind/src/ex_get_n_elem_num_map.c b/cbind/src/ex_get_n_elem_num_map.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_elem_num_map.c
rename to cbind/src/ex_get_n_elem_num_map.c
diff --git a/exodus/cbind/src/ex_get_n_elem_var.c b/cbind/src/ex_get_n_elem_var.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_elem_var.c
rename to cbind/src/ex_get_n_elem_var.c
diff --git a/exodus/cbind/src/ex_get_n_nodal_var.c b/cbind/src/ex_get_n_nodal_var.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_nodal_var.c
rename to cbind/src/ex_get_n_nodal_var.c
diff --git a/exodus/cbind/src/ex_get_n_node_num_map.c b/cbind/src/ex_get_n_node_num_map.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_node_num_map.c
rename to cbind/src/ex_get_n_node_num_map.c
diff --git a/exodus/cbind/src/ex_get_n_node_set.c b/cbind/src/ex_get_n_node_set.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_node_set.c
rename to cbind/src/ex_get_n_node_set.c
diff --git a/exodus/cbind/src/ex_get_n_node_set_df.c b/cbind/src/ex_get_n_node_set_df.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_node_set_df.c
rename to cbind/src/ex_get_n_node_set_df.c
diff --git a/exodus/cbind/src/ex_get_n_one_attr.c b/cbind/src/ex_get_n_one_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_one_attr.c
rename to cbind/src/ex_get_n_one_attr.c
diff --git a/exodus/cbind/src/ex_get_n_side_set.c b/cbind/src/ex_get_n_side_set.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_side_set.c
rename to cbind/src/ex_get_n_side_set.c
diff --git a/exodus/cbind/src/ex_get_n_side_set_df.c b/cbind/src/ex_get_n_side_set_df.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_side_set_df.c
rename to cbind/src/ex_get_n_side_set_df.c
diff --git a/exodus/cbind/src/ex_get_n_var.c b/cbind/src/ex_get_n_var.c
similarity index 100%
rename from exodus/cbind/src/ex_get_n_var.c
rename to cbind/src/ex_get_n_var.c
diff --git a/exodus/cbind/src/ex_get_name.c b/cbind/src/ex_get_name.c
similarity index 100%
rename from exodus/cbind/src/ex_get_name.c
rename to cbind/src/ex_get_name.c
diff --git a/exodus/cbind/src/ex_get_names.c b/cbind/src/ex_get_names.c
similarity index 100%
rename from exodus/cbind/src/ex_get_names.c
rename to cbind/src/ex_get_names.c
diff --git a/exodus/cbind/src/ex_get_nodal_var.c b/cbind/src/ex_get_nodal_var.c
similarity index 100%
rename from exodus/cbind/src/ex_get_nodal_var.c
rename to cbind/src/ex_get_nodal_var.c
diff --git a/exodus/cbind/src/ex_get_nodal_var_time.c b/cbind/src/ex_get_nodal_var_time.c
similarity index 100%
rename from exodus/cbind/src/ex_get_nodal_var_time.c
rename to cbind/src/ex_get_nodal_var_time.c
diff --git a/exodus/cbind/src/ex_get_node_cmap.c b/cbind/src/ex_get_node_cmap.c
similarity index 100%
rename from exodus/cbind/src/ex_get_node_cmap.c
rename to cbind/src/ex_get_node_cmap.c
diff --git a/exodus/cbind/src/ex_get_node_map.c b/cbind/src/ex_get_node_map.c
similarity index 100%
rename from exodus/cbind/src/ex_get_node_map.c
rename to cbind/src/ex_get_node_map.c
diff --git a/exodus/cbind/src/ex_get_node_num_map.c b/cbind/src/ex_get_node_num_map.c
similarity index 100%
rename from exodus/cbind/src/ex_get_node_num_map.c
rename to cbind/src/ex_get_node_num_map.c
diff --git a/exodus/cbind/src/ex_get_node_set.c b/cbind/src/ex_get_node_set.c
similarity index 100%
rename from exodus/cbind/src/ex_get_node_set.c
rename to cbind/src/ex_get_node_set.c
diff --git a/exodus/cbind/src/ex_get_node_set_dist_fact.c b/cbind/src/ex_get_node_set_dist_fact.c
similarity index 100%
rename from exodus/cbind/src/ex_get_node_set_dist_fact.c
rename to cbind/src/ex_get_node_set_dist_fact.c
diff --git a/exodus/cbind/src/ex_get_node_set_ids.c b/cbind/src/ex_get_node_set_ids.c
similarity index 100%
rename from exodus/cbind/src/ex_get_node_set_ids.c
rename to cbind/src/ex_get_node_set_ids.c
diff --git a/exodus/cbind/src/ex_get_node_set_param.c b/cbind/src/ex_get_node_set_param.c
similarity index 100%
rename from exodus/cbind/src/ex_get_node_set_param.c
rename to cbind/src/ex_get_node_set_param.c
diff --git a/exodus/cbind/src/ex_get_ns_param_global.c b/cbind/src/ex_get_ns_param_global.c
similarity index 100%
rename from exodus/cbind/src/ex_get_ns_param_global.c
rename to cbind/src/ex_get_ns_param_global.c
diff --git a/exodus/cbind/src/ex_get_nset_var.c b/cbind/src/ex_get_nset_var.c
similarity index 100%
rename from exodus/cbind/src/ex_get_nset_var.c
rename to cbind/src/ex_get_nset_var.c
diff --git a/exodus/cbind/src/ex_get_nset_var_tab.c b/cbind/src/ex_get_nset_var_tab.c
similarity index 100%
rename from exodus/cbind/src/ex_get_nset_var_tab.c
rename to cbind/src/ex_get_nset_var_tab.c
diff --git a/exodus/cbind/src/ex_get_num_map.c b/cbind/src/ex_get_num_map.c
similarity index 100%
rename from exodus/cbind/src/ex_get_num_map.c
rename to cbind/src/ex_get_num_map.c
diff --git a/exodus/cbind/src/ex_get_object_truth_vector.c b/cbind/src/ex_get_object_truth_vector.c
similarity index 100%
rename from exodus/cbind/src/ex_get_object_truth_vector.c
rename to cbind/src/ex_get_object_truth_vector.c
diff --git a/exodus/cbind/src/ex_get_one_attr.c b/cbind/src/ex_get_one_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_get_one_attr.c
rename to cbind/src/ex_get_one_attr.c
diff --git a/exodus/cbind/src/ex_get_one_elem_attr.c b/cbind/src/ex_get_one_elem_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_get_one_elem_attr.c
rename to cbind/src/ex_get_one_elem_attr.c
diff --git a/exodus/cbind/src/ex_get_partial_attr.c b/cbind/src/ex_get_partial_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_attr.c
rename to cbind/src/ex_get_partial_attr.c
diff --git a/exodus/cbind/src/ex_get_partial_conn.c b/cbind/src/ex_get_partial_conn.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_conn.c
rename to cbind/src/ex_get_partial_conn.c
diff --git a/exodus/cbind/src/ex_get_partial_coord.c b/cbind/src/ex_get_partial_coord.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_coord.c
rename to cbind/src/ex_get_partial_coord.c
diff --git a/exodus/cbind/src/ex_get_partial_elem_attr.c b/cbind/src/ex_get_partial_elem_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_elem_attr.c
rename to cbind/src/ex_get_partial_elem_attr.c
diff --git a/exodus/cbind/src/ex_get_partial_elem_conn.c b/cbind/src/ex_get_partial_elem_conn.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_elem_conn.c
rename to cbind/src/ex_get_partial_elem_conn.c
diff --git a/exodus/cbind/src/ex_get_partial_elem_map.c b/cbind/src/ex_get_partial_elem_map.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_elem_map.c
rename to cbind/src/ex_get_partial_elem_map.c
diff --git a/exodus/cbind/src/ex_get_partial_elem_num_map.c b/cbind/src/ex_get_partial_elem_num_map.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_elem_num_map.c
rename to cbind/src/ex_get_partial_elem_num_map.c
diff --git a/exodus/cbind/src/ex_get_partial_elem_var.c b/cbind/src/ex_get_partial_elem_var.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_elem_var.c
rename to cbind/src/ex_get_partial_elem_var.c
diff --git a/exodus/cbind/src/ex_get_partial_id_map.c b/cbind/src/ex_get_partial_id_map.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_id_map.c
rename to cbind/src/ex_get_partial_id_map.c
diff --git a/exodus/cbind/src/ex_get_partial_nodal_var.c b/cbind/src/ex_get_partial_nodal_var.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_nodal_var.c
rename to cbind/src/ex_get_partial_nodal_var.c
diff --git a/exodus/cbind/src/ex_get_partial_node_num_map.c b/cbind/src/ex_get_partial_node_num_map.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_node_num_map.c
rename to cbind/src/ex_get_partial_node_num_map.c
diff --git a/exodus/cbind/src/ex_get_partial_node_set.c b/cbind/src/ex_get_partial_node_set.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_node_set.c
rename to cbind/src/ex_get_partial_node_set.c
diff --git a/exodus/cbind/src/ex_get_partial_node_set_df.c b/cbind/src/ex_get_partial_node_set_df.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_node_set_df.c
rename to cbind/src/ex_get_partial_node_set_df.c
diff --git a/exodus/cbind/src/ex_get_partial_num_map.c b/cbind/src/ex_get_partial_num_map.c
similarity index 98%
rename from exodus/cbind/src/ex_get_partial_num_map.c
rename to cbind/src/ex_get_partial_num_map.c
index 7905ce6..ee8186c 100644
--- a/exodus/cbind/src/ex_get_partial_num_map.c
+++ b/cbind/src/ex_get_partial_num_map.c
@@ -112,7 +112,7 @@ int ex_get_partial_num_map (int exoid,
}
/* Check input parameters for a valid range of numbers */
- if (ent_start <= 0 || ent_start > (int)num_mobj) {
+ if (ent_start <= 0 || ent_start > num_mobj) {
exerrval = EX_FATAL;
sprintf(errmsg,
"Error: start count is invalid in file id %d",
@@ -130,7 +130,7 @@ int ex_get_partial_num_map (int exoid,
return (EX_FATAL);
}
- if (ent_start+ent_count-1 > (int)num_mobj) {
+ if (ent_start+ent_count-1 > num_mobj) {
exerrval = EX_FATAL;
sprintf(errmsg,
"Error: start+count-1 is larger than element count in file id %d",
diff --git a/exodus/cbind/src/ex_get_partial_one_attr.c b/cbind/src/ex_get_partial_one_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_one_attr.c
rename to cbind/src/ex_get_partial_one_attr.c
diff --git a/exodus/cbind/src/ex_get_partial_set_dist_fact.c b/cbind/src/ex_get_partial_set_dist_fact.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_set_dist_fact.c
rename to cbind/src/ex_get_partial_set_dist_fact.c
diff --git a/exodus/cbind/src/ex_get_partial_side_set.c b/cbind/src/ex_get_partial_side_set.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_side_set.c
rename to cbind/src/ex_get_partial_side_set.c
diff --git a/exodus/cbind/src/ex_get_partial_side_set_df.c b/cbind/src/ex_get_partial_side_set_df.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_side_set_df.c
rename to cbind/src/ex_get_partial_side_set_df.c
diff --git a/exodus/cbind/src/ex_get_partial_var.c b/cbind/src/ex_get_partial_var.c
similarity index 100%
rename from exodus/cbind/src/ex_get_partial_var.c
rename to cbind/src/ex_get_partial_var.c
diff --git a/exodus/cbind/src/ex_get_processor_elem_maps.c b/cbind/src/ex_get_processor_elem_maps.c
similarity index 100%
rename from exodus/cbind/src/ex_get_processor_elem_maps.c
rename to cbind/src/ex_get_processor_elem_maps.c
diff --git a/exodus/cbind/src/ex_get_processor_node_maps.c b/cbind/src/ex_get_processor_node_maps.c
similarity index 100%
rename from exodus/cbind/src/ex_get_processor_node_maps.c
rename to cbind/src/ex_get_processor_node_maps.c
diff --git a/exodus/cbind/src/ex_get_prop.c b/cbind/src/ex_get_prop.c
similarity index 100%
rename from exodus/cbind/src/ex_get_prop.c
rename to cbind/src/ex_get_prop.c
diff --git a/exodus/cbind/src/ex_get_prop_array.c b/cbind/src/ex_get_prop_array.c
similarity index 100%
rename from exodus/cbind/src/ex_get_prop_array.c
rename to cbind/src/ex_get_prop_array.c
diff --git a/exodus/cbind/src/ex_get_prop_names.c b/cbind/src/ex_get_prop_names.c
similarity index 100%
rename from exodus/cbind/src/ex_get_prop_names.c
rename to cbind/src/ex_get_prop_names.c
diff --git a/exodus/cbind/src/ex_get_qa.c b/cbind/src/ex_get_qa.c
similarity index 100%
rename from exodus/cbind/src/ex_get_qa.c
rename to cbind/src/ex_get_qa.c
diff --git a/exodus/cbind/src/ex_get_set.c b/cbind/src/ex_get_set.c
similarity index 100%
rename from exodus/cbind/src/ex_get_set.c
rename to cbind/src/ex_get_set.c
diff --git a/exodus/cbind/src/ex_get_set_dist_fact.c b/cbind/src/ex_get_set_dist_fact.c
similarity index 100%
rename from exodus/cbind/src/ex_get_set_dist_fact.c
rename to cbind/src/ex_get_set_dist_fact.c
diff --git a/exodus/cbind/src/ex_get_set_param.c b/cbind/src/ex_get_set_param.c
similarity index 100%
rename from exodus/cbind/src/ex_get_set_param.c
rename to cbind/src/ex_get_set_param.c
diff --git a/exodus/cbind/src/ex_get_sets.c b/cbind/src/ex_get_sets.c
similarity index 100%
rename from exodus/cbind/src/ex_get_sets.c
rename to cbind/src/ex_get_sets.c
diff --git a/exodus/cbind/src/ex_get_side_set.c b/cbind/src/ex_get_side_set.c
similarity index 100%
rename from exodus/cbind/src/ex_get_side_set.c
rename to cbind/src/ex_get_side_set.c
diff --git a/exodus/cbind/src/ex_get_side_set_dist_fact.c b/cbind/src/ex_get_side_set_dist_fact.c
similarity index 100%
rename from exodus/cbind/src/ex_get_side_set_dist_fact.c
rename to cbind/src/ex_get_side_set_dist_fact.c
diff --git a/exodus/cbind/src/ex_get_side_set_ids.c b/cbind/src/ex_get_side_set_ids.c
similarity index 100%
rename from exodus/cbind/src/ex_get_side_set_ids.c
rename to cbind/src/ex_get_side_set_ids.c
diff --git a/exodus/cbind/src/ex_get_side_set_node_count.c b/cbind/src/ex_get_side_set_node_count.c
similarity index 100%
rename from exodus/cbind/src/ex_get_side_set_node_count.c
rename to cbind/src/ex_get_side_set_node_count.c
diff --git a/exodus/cbind/src/ex_get_side_set_node_list.c b/cbind/src/ex_get_side_set_node_list.c
similarity index 100%
rename from exodus/cbind/src/ex_get_side_set_node_list.c
rename to cbind/src/ex_get_side_set_node_list.c
diff --git a/exodus/cbind/src/ex_get_side_set_node_list_len.c b/cbind/src/ex_get_side_set_node_list_len.c
similarity index 100%
rename from exodus/cbind/src/ex_get_side_set_node_list_len.c
rename to cbind/src/ex_get_side_set_node_list_len.c
diff --git a/exodus/cbind/src/ex_get_side_set_param.c b/cbind/src/ex_get_side_set_param.c
similarity index 100%
rename from exodus/cbind/src/ex_get_side_set_param.c
rename to cbind/src/ex_get_side_set_param.c
diff --git a/exodus/cbind/src/ex_get_ss_param_global.c b/cbind/src/ex_get_ss_param_global.c
similarity index 100%
rename from exodus/cbind/src/ex_get_ss_param_global.c
rename to cbind/src/ex_get_ss_param_global.c
diff --git a/exodus/cbind/src/ex_get_sset_var.c b/cbind/src/ex_get_sset_var.c
similarity index 100%
rename from exodus/cbind/src/ex_get_sset_var.c
rename to cbind/src/ex_get_sset_var.c
diff --git a/exodus/cbind/src/ex_get_sset_var_tab.c b/cbind/src/ex_get_sset_var_tab.c
similarity index 100%
rename from exodus/cbind/src/ex_get_sset_var_tab.c
rename to cbind/src/ex_get_sset_var_tab.c
diff --git a/exodus/cbind/src/ex_get_time.c b/cbind/src/ex_get_time.c
similarity index 100%
rename from exodus/cbind/src/ex_get_time.c
rename to cbind/src/ex_get_time.c
diff --git a/exodus/cbind/src/ex_get_truth_table.c b/cbind/src/ex_get_truth_table.c
similarity index 100%
rename from exodus/cbind/src/ex_get_truth_table.c
rename to cbind/src/ex_get_truth_table.c
diff --git a/exodus/cbind/src/ex_get_var.c b/cbind/src/ex_get_var.c
similarity index 100%
rename from exodus/cbind/src/ex_get_var.c
rename to cbind/src/ex_get_var.c
diff --git a/exodus/cbind/src/ex_get_var_name.c b/cbind/src/ex_get_var_name.c
similarity index 100%
rename from exodus/cbind/src/ex_get_var_name.c
rename to cbind/src/ex_get_var_name.c
diff --git a/exodus/cbind/src/ex_get_var_names.c b/cbind/src/ex_get_var_names.c
similarity index 100%
rename from exodus/cbind/src/ex_get_var_names.c
rename to cbind/src/ex_get_var_names.c
diff --git a/exodus/cbind/src/ex_get_var_param.c b/cbind/src/ex_get_var_param.c
similarity index 100%
rename from exodus/cbind/src/ex_get_var_param.c
rename to cbind/src/ex_get_var_param.c
diff --git a/exodus/cbind/src/ex_get_var_tab.c b/cbind/src/ex_get_var_tab.c
similarity index 100%
rename from exodus/cbind/src/ex_get_var_tab.c
rename to cbind/src/ex_get_var_tab.c
diff --git a/exodus/cbind/src/ex_get_var_time.c b/cbind/src/ex_get_var_time.c
similarity index 100%
rename from exodus/cbind/src/ex_get_var_time.c
rename to cbind/src/ex_get_var_time.c
diff --git a/exodus/cbind/src/ex_get_variable_name.c b/cbind/src/ex_get_variable_name.c
similarity index 100%
rename from exodus/cbind/src/ex_get_variable_name.c
rename to cbind/src/ex_get_variable_name.c
diff --git a/exodus/cbind/src/ex_get_variable_names.c b/cbind/src/ex_get_variable_names.c
similarity index 100%
rename from exodus/cbind/src/ex_get_variable_names.c
rename to cbind/src/ex_get_variable_names.c
diff --git a/exodus/cbind/src/ex_get_variable_param.c b/cbind/src/ex_get_variable_param.c
similarity index 100%
rename from exodus/cbind/src/ex_get_variable_param.c
rename to cbind/src/ex_get_variable_param.c
diff --git a/exodus/cbind/src/ex_inquire.c b/cbind/src/ex_inquire.c
similarity index 99%
rename from exodus/cbind/src/ex_inquire.c
rename to cbind/src/ex_inquire.c
index 36cbd2c..db21f62 100644
--- a/exodus/cbind/src/ex_inquire.c
+++ b/cbind/src/ex_inquire.c
@@ -495,6 +495,12 @@ static int ex_inquire_internal (int exoid,
}
break;
+ case EX_INQ_DB_FLOAT_SIZE:
+ {
+ nc_get_att_longlong(exoid, NC_GLOBAL, ATT_FLT_WORDSIZE, (long long*)ret_int);
+ }
+ break;
+
case EX_INQ_DB_MAX_USED_NAME_LENGTH:
/* Return the value of the ATT_MAX_NAME_LENGTH attribute (if it
exists) which is the maximum length of any entity, variable,
diff --git a/exodus/cbind/src/ex_ne_util.c b/cbind/src/ex_ne_util.c
similarity index 99%
rename from exodus/cbind/src/ex_ne_util.c
rename to cbind/src/ex_ne_util.c
index cb2b0b8..be2e929 100644
--- a/exodus/cbind/src/ex_ne_util.c
+++ b/cbind/src/ex_ne_util.c
@@ -405,9 +405,3 @@ int ex_get_idx(int exoid, const char *ne_var_name, int64_t *my_index, int pos)
return 1;
}
-
-struct ex_stat_struct {
- int exoid;
- int *stats;
- size_t num;
-} ex_stat_struct;
diff --git a/exodus/cbind/src/ex_open.c b/cbind/src/ex_open.c
similarity index 99%
rename from exodus/cbind/src/ex_open.c
rename to cbind/src/ex_open.c
index e61df79..2fa88f0 100644
--- a/exodus/cbind/src/ex_open.c
+++ b/cbind/src/ex_open.c
@@ -296,7 +296,7 @@ int ex_open_int (const char *path,
int64_status |= (mode & EX_ALL_INT64_API);
/* initialize floating point and integer size conversion. */
- if (ex_conv_ini( exoid, comp_ws, io_ws, file_wordsize, int64_status ) != EX_NOERR ) {
+ if (ex_conv_ini(exoid, comp_ws, io_ws, file_wordsize, int64_status, 0) != EX_NOERR ) {
exerrval = EX_FATAL;
sprintf(errmsg,
"Error: failed to initialize conversion routines in file id %d",
diff --git a/exodus/cbind/src/ex_open_par.c b/cbind/src/ex_open_par.c
similarity index 99%
rename from exodus/cbind/src/ex_open_par.c
rename to cbind/src/ex_open_par.c
index 4320f70..455af47 100644
--- a/exodus/cbind/src/ex_open_par.c
+++ b/cbind/src/ex_open_par.c
@@ -305,7 +305,7 @@ int ex_open_par_int (const char *path,
int64_status |= (mode & EX_ALL_INT64_API);
/* initialize floating point and integer size conversion. */
- if (ex_conv_ini( exoid, comp_ws, io_ws, file_wordsize, int64_status ) != EX_NOERR ) {
+ if (ex_conv_ini(exoid, comp_ws, io_ws, file_wordsize, int64_status, 1) != EX_NOERR ) {
exerrval = EX_FATAL;
sprintf(errmsg,
"Error: failed to initialize conversion routines in file id %d",
diff --git a/exodus/cbind/src/ex_opts.c b/cbind/src/ex_opts.c
similarity index 100%
rename from exodus/cbind/src/ex_opts.c
rename to cbind/src/ex_opts.c
diff --git a/exodus/cbind/src/ex_put_all_var_param.c b/cbind/src/ex_put_all_var_param.c
similarity index 100%
rename from exodus/cbind/src/ex_put_all_var_param.c
rename to cbind/src/ex_put_all_var_param.c
diff --git a/exodus/cbind/src/ex_put_all_var_param_ext.c b/cbind/src/ex_put_all_var_param_ext.c
similarity index 100%
rename from exodus/cbind/src/ex_put_all_var_param_ext.c
rename to cbind/src/ex_put_all_var_param_ext.c
diff --git a/exodus/cbind/src/ex_put_attr.c b/cbind/src/ex_put_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_put_attr.c
rename to cbind/src/ex_put_attr.c
diff --git a/exodus/cbind/src/ex_put_attr_names.c b/cbind/src/ex_put_attr_names.c
similarity index 100%
rename from exodus/cbind/src/ex_put_attr_names.c
rename to cbind/src/ex_put_attr_names.c
diff --git a/exodus/cbind/src/ex_put_attr_param.c b/cbind/src/ex_put_attr_param.c
similarity index 100%
rename from exodus/cbind/src/ex_put_attr_param.c
rename to cbind/src/ex_put_attr_param.c
diff --git a/exodus/cbind/src/ex_put_block.c b/cbind/src/ex_put_block.c
similarity index 100%
rename from exodus/cbind/src/ex_put_block.c
rename to cbind/src/ex_put_block.c
diff --git a/exodus/cbind/src/ex_put_block_param.c b/cbind/src/ex_put_block_param.c
similarity index 100%
rename from exodus/cbind/src/ex_put_block_param.c
rename to cbind/src/ex_put_block_param.c
diff --git a/exodus/cbind/src/ex_put_cmap_params.c b/cbind/src/ex_put_cmap_params.c
similarity index 100%
rename from exodus/cbind/src/ex_put_cmap_params.c
rename to cbind/src/ex_put_cmap_params.c
diff --git a/exodus/cbind/src/ex_put_cmap_params_cc.c b/cbind/src/ex_put_cmap_params_cc.c
similarity index 100%
rename from exodus/cbind/src/ex_put_cmap_params_cc.c
rename to cbind/src/ex_put_cmap_params_cc.c
diff --git a/exodus/cbind/src/ex_put_concat_all_blocks.c b/cbind/src/ex_put_concat_all_blocks.c
similarity index 100%
rename from exodus/cbind/src/ex_put_concat_all_blocks.c
rename to cbind/src/ex_put_concat_all_blocks.c
diff --git a/exodus/cbind/src/ex_put_concat_elem_block.c b/cbind/src/ex_put_concat_elem_block.c
similarity index 100%
rename from exodus/cbind/src/ex_put_concat_elem_block.c
rename to cbind/src/ex_put_concat_elem_block.c
diff --git a/exodus/cbind/src/ex_put_concat_node_sets.c b/cbind/src/ex_put_concat_node_sets.c
similarity index 100%
rename from exodus/cbind/src/ex_put_concat_node_sets.c
rename to cbind/src/ex_put_concat_node_sets.c
diff --git a/exodus/cbind/src/ex_put_concat_sets.c b/cbind/src/ex_put_concat_sets.c
similarity index 100%
rename from exodus/cbind/src/ex_put_concat_sets.c
rename to cbind/src/ex_put_concat_sets.c
diff --git a/exodus/cbind/src/ex_put_concat_side_sets.c b/cbind/src/ex_put_concat_side_sets.c
similarity index 100%
rename from exodus/cbind/src/ex_put_concat_side_sets.c
rename to cbind/src/ex_put_concat_side_sets.c
diff --git a/exodus/cbind/src/ex_put_concat_var_param.c b/cbind/src/ex_put_concat_var_param.c
similarity index 100%
rename from exodus/cbind/src/ex_put_concat_var_param.c
rename to cbind/src/ex_put_concat_var_param.c
diff --git a/exodus/cbind/src/ex_put_conn.c b/cbind/src/ex_put_conn.c
similarity index 100%
rename from exodus/cbind/src/ex_put_conn.c
rename to cbind/src/ex_put_conn.c
diff --git a/exodus/cbind/src/ex_put_coord.c b/cbind/src/ex_put_coord.c
similarity index 100%
rename from exodus/cbind/src/ex_put_coord.c
rename to cbind/src/ex_put_coord.c
diff --git a/exodus/cbind/src/ex_put_coord_names.c b/cbind/src/ex_put_coord_names.c
similarity index 100%
rename from exodus/cbind/src/ex_put_coord_names.c
rename to cbind/src/ex_put_coord_names.c
diff --git a/exodus/cbind/src/ex_put_coordinate_frames.c b/cbind/src/ex_put_coordinate_frames.c
similarity index 100%
rename from exodus/cbind/src/ex_put_coordinate_frames.c
rename to cbind/src/ex_put_coordinate_frames.c
diff --git a/exodus/cbind/src/ex_put_eb_info_global.c b/cbind/src/ex_put_eb_info_global.c
similarity index 100%
rename from exodus/cbind/src/ex_put_eb_info_global.c
rename to cbind/src/ex_put_eb_info_global.c
diff --git a/exodus/cbind/src/ex_put_elem_attr.c b/cbind/src/ex_put_elem_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_put_elem_attr.c
rename to cbind/src/ex_put_elem_attr.c
diff --git a/exodus/cbind/src/ex_put_elem_attr_names.c b/cbind/src/ex_put_elem_attr_names.c
similarity index 100%
rename from exodus/cbind/src/ex_put_elem_attr_names.c
rename to cbind/src/ex_put_elem_attr_names.c
diff --git a/exodus/cbind/src/ex_put_elem_block.c b/cbind/src/ex_put_elem_block.c
similarity index 100%
rename from exodus/cbind/src/ex_put_elem_block.c
rename to cbind/src/ex_put_elem_block.c
diff --git a/exodus/cbind/src/ex_put_elem_cmap.c b/cbind/src/ex_put_elem_cmap.c
similarity index 100%
rename from exodus/cbind/src/ex_put_elem_cmap.c
rename to cbind/src/ex_put_elem_cmap.c
diff --git a/exodus/cbind/src/ex_put_elem_conn.c b/cbind/src/ex_put_elem_conn.c
similarity index 100%
rename from exodus/cbind/src/ex_put_elem_conn.c
rename to cbind/src/ex_put_elem_conn.c
diff --git a/exodus/cbind/src/ex_put_elem_map.c b/cbind/src/ex_put_elem_map.c
similarity index 100%
rename from exodus/cbind/src/ex_put_elem_map.c
rename to cbind/src/ex_put_elem_map.c
diff --git a/exodus/cbind/src/ex_put_elem_num_map.c b/cbind/src/ex_put_elem_num_map.c
similarity index 100%
rename from exodus/cbind/src/ex_put_elem_num_map.c
rename to cbind/src/ex_put_elem_num_map.c
diff --git a/exodus/cbind/src/ex_put_elem_var.c b/cbind/src/ex_put_elem_var.c
similarity index 100%
rename from exodus/cbind/src/ex_put_elem_var.c
rename to cbind/src/ex_put_elem_var.c
diff --git a/exodus/cbind/src/ex_put_elem_var_slab.c b/cbind/src/ex_put_elem_var_slab.c
similarity index 100%
rename from exodus/cbind/src/ex_put_elem_var_slab.c
rename to cbind/src/ex_put_elem_var_slab.c
diff --git a/exodus/cbind/src/ex_put_elem_var_tab.c b/cbind/src/ex_put_elem_var_tab.c
similarity index 100%
rename from exodus/cbind/src/ex_put_elem_var_tab.c
rename to cbind/src/ex_put_elem_var_tab.c
diff --git a/exodus/cbind/src/ex_put_entity_count_per_polyhedra.c b/cbind/src/ex_put_entity_count_per_polyhedra.c
similarity index 100%
rename from exodus/cbind/src/ex_put_entity_count_per_polyhedra.c
rename to cbind/src/ex_put_entity_count_per_polyhedra.c
diff --git a/exodus/cbind/src/ex_put_glob_vars.c b/cbind/src/ex_put_glob_vars.c
similarity index 100%
rename from exodus/cbind/src/ex_put_glob_vars.c
rename to cbind/src/ex_put_glob_vars.c
diff --git a/exodus/cbind/src/ex_put_id_map.c b/cbind/src/ex_put_id_map.c
similarity index 100%
rename from exodus/cbind/src/ex_put_id_map.c
rename to cbind/src/ex_put_id_map.c
diff --git a/exodus/cbind/src/ex_put_info.c b/cbind/src/ex_put_info.c
similarity index 67%
rename from exodus/cbind/src/ex_put_info.c
rename to cbind/src/ex_put_info.c
index 66101ca..fbf4957 100644
--- a/exodus/cbind/src/ex_put_info.c
+++ b/cbind/src/ex_put_info.c
@@ -116,45 +116,45 @@ int ex_put_info (int exoid,
/* See if the number of info records has already been defined.
Assume that if the DIM_NUM_INFO dimension exists, then the
VAR_INFO variable also exists...
- */
+ */
status = nc_inq_dimid(exoid, DIM_NUM_INFO, &num_info_dim);
if (status != NC_NOERR) {
/* inquire previously defined dimensions */
if ((status = nc_inq_dimid(exoid, DIM_LIN, &lindim)) != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to get line string length in file id %d", exoid);
- ex_err("ex_put_info",errmsg,exerrval);
- return (EX_FATAL);
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to get line string length in file id %d", exoid);
+ ex_err("ex_put_info",errmsg,exerrval);
+ return (EX_FATAL);
}
/* put file into define mode */
if ((status = nc_redef (exoid)) != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed put file id %d into define mode", exoid);
- ex_err("ex_put_info",errmsg,exerrval);
- return (EX_FATAL);
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed put file id %d into define mode", exoid);
+ ex_err("ex_put_info",errmsg,exerrval);
+ return (EX_FATAL);
}
/* define dimensions */
if ((status = nc_def_dim(exoid, DIM_NUM_INFO, num_info, &num_info_dim)) != NC_NOERR) {
- if (status == NC_ENAMEINUSE) { /* duplicate entry? */
- exerrval = status;
- sprintf(errmsg,
- "Error: info records already exist in file id %d",
- exoid);
- ex_err("ex_put_info",errmsg,exerrval);
- } else {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to define number of info records in file id %d",
- exoid);
- ex_err("ex_put_info",errmsg,exerrval);
- }
-
- goto error_ret; /* exit define mode and return */
+ if (status == NC_ENAMEINUSE) { /* duplicate entry? */
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: info records already exist in file id %d",
+ exoid);
+ ex_err("ex_put_info",errmsg,exerrval);
+ } else {
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to define number of info records in file id %d",
+ exoid);
+ ex_err("ex_put_info",errmsg,exerrval);
+ }
+
+ goto error_ret; /* exit define mode and return */
}
/* define variable */
@@ -162,66 +162,72 @@ int ex_put_info (int exoid,
dims[1] = lindim;
if ((status = nc_def_var(exoid, VAR_INFO, NC_CHAR, 2, dims, &varid)) != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to define info record in file id %d",
- exoid);
- ex_err("ex_put_info",errmsg,exerrval);
- goto error_ret; /* exit define mode and return */
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to define info record in file id %d",
+ exoid);
+ ex_err("ex_put_info",errmsg,exerrval);
+ goto error_ret; /* exit define mode and return */
}
ex_compress_variable(exoid, varid, 3);
/* leave define mode */
if ((status = nc_enddef (exoid)) != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to complete info record definition in file id %d",
- exoid);
- ex_err("ex_put_info",errmsg,exerrval);
- return (EX_FATAL);
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to complete info record definition in file id %d",
+ exoid);
+ ex_err("ex_put_info",errmsg,exerrval);
+ return (EX_FATAL);
}
} else {
if ((status = nc_inq_varid(exoid, VAR_INFO, &varid)) != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to find info record variable in file id %d",
- exoid);
- ex_err("ex_put_info",errmsg,exerrval);
- return (EX_FATAL);
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to find info record variable in file id %d",
+ exoid);
+ ex_err("ex_put_info",errmsg,exerrval);
+ return (EX_FATAL);
}
}
if (info != NULL) {
/* write out information records */
-
for (i=0; i<num_info; i++) {
- int length = strlen(info[i]);
- start[0] = i;
- start[1] = 0;
-
- count[0] = 1;
- count[1] = length < MAX_LINE_LENGTH ? length : MAX_LINE_LENGTH;
-
- if ((status = nc_put_vara_text(exoid, varid, start, count, info[i])) != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to store info record in file id %d",
- exoid);
- ex_err("ex_put_info",errmsg,exerrval);
- return (EX_FATAL);
- }
+ int length = strlen(info[i]);
+ start[0] = i;
+ start[1] = 0;
+
+ count[0] = 1;
+ count[1] = length < MAX_LINE_LENGTH ? length : MAX_LINE_LENGTH;
+
+ if ((status = nc_put_vara_text(exoid, varid, start, count, info[i])) != NC_NOERR) {
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to store info record in file id %d",
+ exoid);
+ ex_err("ex_put_info",errmsg,exerrval);
+ return (EX_FATAL);
+ }
+ }
+ } else if (ex_is_parallel(exoid)) {
+ /* All processors need to call nc_put_vara_text in case in a global collective mode */
+ char dummy[] = " ";
+ for (i=0; i<num_info; i++) {
+ start[0] = start[1] = 0;
+ count[0] = count[1] = 0;
+ nc_put_vara_text(exoid, varid, start, count, dummy);
}
}
}
-
return (EX_NOERR);
/* Fatal error: exit definition mode and return */
- error_ret:
+ error_ret:
if (nc_enddef (exoid) != NC_NOERR) { /* exit define mode */
sprintf(errmsg,
- "Error: failed to complete definition for file id %d",
- exoid);
+ "Error: failed to complete definition for file id %d",
+ exoid);
ex_err("ex_put_info",errmsg,exerrval);
}
return (EX_FATAL);
diff --git a/exodus/cbind/src/ex_put_init.c b/cbind/src/ex_put_init.c
similarity index 100%
rename from exodus/cbind/src/ex_put_init.c
rename to cbind/src/ex_put_init.c
diff --git a/exodus/cbind/src/ex_put_init_ext.c b/cbind/src/ex_put_init_ext.c
similarity index 100%
rename from exodus/cbind/src/ex_put_init_ext.c
rename to cbind/src/ex_put_init_ext.c
diff --git a/exodus/cbind/src/ex_put_init_global.c b/cbind/src/ex_put_init_global.c
similarity index 100%
rename from exodus/cbind/src/ex_put_init_global.c
rename to cbind/src/ex_put_init_global.c
diff --git a/exodus/cbind/src/ex_put_init_info.c b/cbind/src/ex_put_init_info.c
similarity index 100%
rename from exodus/cbind/src/ex_put_init_info.c
rename to cbind/src/ex_put_init_info.c
diff --git a/exodus/cbind/src/ex_put_loadbal_param.c b/cbind/src/ex_put_loadbal_param.c
similarity index 100%
rename from exodus/cbind/src/ex_put_loadbal_param.c
rename to cbind/src/ex_put_loadbal_param.c
diff --git a/exodus/cbind/src/ex_put_loadbal_param_cc.c b/cbind/src/ex_put_loadbal_param_cc.c
similarity index 100%
rename from exodus/cbind/src/ex_put_loadbal_param_cc.c
rename to cbind/src/ex_put_loadbal_param_cc.c
diff --git a/exodus/cbind/src/ex_put_map.c b/cbind/src/ex_put_map.c
similarity index 100%
rename from exodus/cbind/src/ex_put_map.c
rename to cbind/src/ex_put_map.c
diff --git a/exodus/cbind/src/ex_put_map_param.c b/cbind/src/ex_put_map_param.c
similarity index 100%
rename from exodus/cbind/src/ex_put_map_param.c
rename to cbind/src/ex_put_map_param.c
diff --git a/exodus/cbind/src/ex_put_n_attr.c b/cbind/src/ex_put_n_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_put_n_attr.c
rename to cbind/src/ex_put_n_attr.c
diff --git a/exodus/cbind/src/ex_put_n_coord.c b/cbind/src/ex_put_n_coord.c
similarity index 100%
rename from exodus/cbind/src/ex_put_n_coord.c
rename to cbind/src/ex_put_n_coord.c
diff --git a/exodus/cbind/src/ex_put_n_elem_attr.c b/cbind/src/ex_put_n_elem_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_put_n_elem_attr.c
rename to cbind/src/ex_put_n_elem_attr.c
diff --git a/exodus/cbind/src/ex_put_n_elem_conn.c b/cbind/src/ex_put_n_elem_conn.c
similarity index 100%
rename from exodus/cbind/src/ex_put_n_elem_conn.c
rename to cbind/src/ex_put_n_elem_conn.c
diff --git a/exodus/cbind/src/ex_put_n_elem_num_map.c b/cbind/src/ex_put_n_elem_num_map.c
similarity index 100%
rename from exodus/cbind/src/ex_put_n_elem_num_map.c
rename to cbind/src/ex_put_n_elem_num_map.c
diff --git a/exodus/cbind/src/ex_put_n_nodal_var.c b/cbind/src/ex_put_n_nodal_var.c
similarity index 100%
rename from exodus/cbind/src/ex_put_n_nodal_var.c
rename to cbind/src/ex_put_n_nodal_var.c
diff --git a/exodus/cbind/src/ex_put_n_node_num_map.c b/cbind/src/ex_put_n_node_num_map.c
similarity index 100%
rename from exodus/cbind/src/ex_put_n_node_num_map.c
rename to cbind/src/ex_put_n_node_num_map.c
diff --git a/exodus/cbind/src/ex_put_n_node_set.c b/cbind/src/ex_put_n_node_set.c
similarity index 100%
rename from exodus/cbind/src/ex_put_n_node_set.c
rename to cbind/src/ex_put_n_node_set.c
diff --git a/exodus/cbind/src/ex_put_n_node_set_df.c b/cbind/src/ex_put_n_node_set_df.c
similarity index 100%
rename from exodus/cbind/src/ex_put_n_node_set_df.c
rename to cbind/src/ex_put_n_node_set_df.c
diff --git a/exodus/cbind/src/ex_put_n_one_attr.c b/cbind/src/ex_put_n_one_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_put_n_one_attr.c
rename to cbind/src/ex_put_n_one_attr.c
diff --git a/exodus/cbind/src/ex_put_n_side_set.c b/cbind/src/ex_put_n_side_set.c
similarity index 100%
rename from exodus/cbind/src/ex_put_n_side_set.c
rename to cbind/src/ex_put_n_side_set.c
diff --git a/exodus/cbind/src/ex_put_n_side_set_df.c b/cbind/src/ex_put_n_side_set_df.c
similarity index 100%
rename from exodus/cbind/src/ex_put_n_side_set_df.c
rename to cbind/src/ex_put_n_side_set_df.c
diff --git a/exodus/cbind/src/ex_put_n_var.c b/cbind/src/ex_put_n_var.c
similarity index 100%
rename from exodus/cbind/src/ex_put_n_var.c
rename to cbind/src/ex_put_n_var.c
diff --git a/exodus/cbind/src/ex_put_name.c b/cbind/src/ex_put_name.c
similarity index 100%
rename from exodus/cbind/src/ex_put_name.c
rename to cbind/src/ex_put_name.c
diff --git a/exodus/cbind/src/ex_put_names.c b/cbind/src/ex_put_names.c
similarity index 100%
rename from exodus/cbind/src/ex_put_names.c
rename to cbind/src/ex_put_names.c
diff --git a/exodus/cbind/src/ex_put_nodal_var.c b/cbind/src/ex_put_nodal_var.c
similarity index 100%
rename from exodus/cbind/src/ex_put_nodal_var.c
rename to cbind/src/ex_put_nodal_var.c
diff --git a/exodus/cbind/src/ex_put_nodal_var_slab.c b/cbind/src/ex_put_nodal_var_slab.c
similarity index 100%
rename from exodus/cbind/src/ex_put_nodal_var_slab.c
rename to cbind/src/ex_put_nodal_var_slab.c
diff --git a/exodus/cbind/src/ex_put_node_cmap.c b/cbind/src/ex_put_node_cmap.c
similarity index 100%
rename from exodus/cbind/src/ex_put_node_cmap.c
rename to cbind/src/ex_put_node_cmap.c
diff --git a/exodus/cbind/src/ex_put_node_map.c b/cbind/src/ex_put_node_map.c
similarity index 100%
rename from exodus/cbind/src/ex_put_node_map.c
rename to cbind/src/ex_put_node_map.c
diff --git a/exodus/cbind/src/ex_put_node_num_map.c b/cbind/src/ex_put_node_num_map.c
similarity index 100%
rename from exodus/cbind/src/ex_put_node_num_map.c
rename to cbind/src/ex_put_node_num_map.c
diff --git a/exodus/cbind/src/ex_put_node_set.c b/cbind/src/ex_put_node_set.c
similarity index 100%
rename from exodus/cbind/src/ex_put_node_set.c
rename to cbind/src/ex_put_node_set.c
diff --git a/exodus/cbind/src/ex_put_node_set_dist_fact.c b/cbind/src/ex_put_node_set_dist_fact.c
similarity index 100%
rename from exodus/cbind/src/ex_put_node_set_dist_fact.c
rename to cbind/src/ex_put_node_set_dist_fact.c
diff --git a/exodus/cbind/src/ex_put_node_set_param.c b/cbind/src/ex_put_node_set_param.c
similarity index 100%
rename from exodus/cbind/src/ex_put_node_set_param.c
rename to cbind/src/ex_put_node_set_param.c
diff --git a/exodus/cbind/src/ex_put_ns_param_global.c b/cbind/src/ex_put_ns_param_global.c
similarity index 100%
rename from exodus/cbind/src/ex_put_ns_param_global.c
rename to cbind/src/ex_put_ns_param_global.c
diff --git a/exodus/cbind/src/ex_put_nset_var.c b/cbind/src/ex_put_nset_var.c
similarity index 100%
rename from exodus/cbind/src/ex_put_nset_var.c
rename to cbind/src/ex_put_nset_var.c
diff --git a/exodus/cbind/src/ex_put_nset_var_tab.c b/cbind/src/ex_put_nset_var_tab.c
similarity index 100%
rename from exodus/cbind/src/ex_put_nset_var_tab.c
rename to cbind/src/ex_put_nset_var_tab.c
diff --git a/exodus/cbind/src/ex_put_num_map.c b/cbind/src/ex_put_num_map.c
similarity index 100%
rename from exodus/cbind/src/ex_put_num_map.c
rename to cbind/src/ex_put_num_map.c
diff --git a/exodus/cbind/src/ex_put_one_attr.c b/cbind/src/ex_put_one_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_put_one_attr.c
rename to cbind/src/ex_put_one_attr.c
diff --git a/exodus/cbind/src/ex_put_one_elem_attr.c b/cbind/src/ex_put_one_elem_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_put_one_elem_attr.c
rename to cbind/src/ex_put_one_elem_attr.c
diff --git a/exodus/cbind/src/ex_put_partial_attr.c b/cbind/src/ex_put_partial_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_put_partial_attr.c
rename to cbind/src/ex_put_partial_attr.c
diff --git a/exodus/cbind/src/ex_put_partial_coord.c b/cbind/src/ex_put_partial_coord.c
similarity index 99%
rename from exodus/cbind/src/ex_put_partial_coord.c
rename to cbind/src/ex_put_partial_coord.c
index 0cb4a94..fa3c3be 100644
--- a/exodus/cbind/src/ex_put_partial_coord.c
+++ b/cbind/src/ex_put_partial_coord.c
@@ -123,7 +123,7 @@ int ex_put_partial_coord (int exoid,
return (EX_FATAL);
}
- if (start_node_num + num_nodes -1 > (int)num_nod) {
+ if (start_node_num + num_nodes -1 > num_nod) {
exerrval = EX_BADPARAM;
sprintf(errmsg,
"Error: start index (%"PRId64") + node count (%"PRId64") is larger than total number of nodes (%"PRId64") in file id %d",
diff --git a/exodus/cbind/src/ex_put_partial_elem_attr.c b/cbind/src/ex_put_partial_elem_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_put_partial_elem_attr.c
rename to cbind/src/ex_put_partial_elem_attr.c
diff --git a/exodus/cbind/src/ex_put_partial_elem_conn.c b/cbind/src/ex_put_partial_elem_conn.c
similarity index 100%
rename from exodus/cbind/src/ex_put_partial_elem_conn.c
rename to cbind/src/ex_put_partial_elem_conn.c
diff --git a/exodus/cbind/src/ex_put_partial_elem_map.c b/cbind/src/ex_put_partial_elem_map.c
similarity index 100%
rename from exodus/cbind/src/ex_put_partial_elem_map.c
rename to cbind/src/ex_put_partial_elem_map.c
diff --git a/exodus/cbind/src/ex_put_partial_elem_num_map.c b/cbind/src/ex_put_partial_elem_num_map.c
similarity index 100%
rename from exodus/cbind/src/ex_put_partial_elem_num_map.c
rename to cbind/src/ex_put_partial_elem_num_map.c
diff --git a/exodus/cbind/src/ex_put_partial_id_map.c b/cbind/src/ex_put_partial_id_map.c
similarity index 79%
rename from exodus/cbind/src/ex_put_partial_id_map.c
rename to cbind/src/ex_put_partial_id_map.c
index ef4d4b9..60d7b93 100644
--- a/exodus/cbind/src/ex_put_partial_id_map.c
+++ b/cbind/src/ex_put_partial_id_map.c
@@ -65,10 +65,10 @@
*/
int ex_put_partial_id_map (int exoid,
- ex_entity_type map_type,
- int64_t start_entity_num,
- int64_t num_entities,
- const void_int *map)
+ ex_entity_type map_type,
+ int64_t start_entity_num,
+ int64_t num_entities,
+ const void_int *map)
{
int dimid, mapid, status, dims[1];
int map_int_type;
@@ -79,9 +79,9 @@ int ex_put_partial_id_map (int exoid,
const char* vmap;
exerrval = 0; /* clear error code */
- if (num_entities == 0)
- return (EX_NOERR);
-
+ if (num_entities == 0 && !ex_is_parallel(exoid))
+ return EX_NOERR;
+
switch ( map_type ) {
case EX_NODE_MAP:
tname = "node";
@@ -106,8 +106,8 @@ int ex_put_partial_id_map (int exoid,
default:
exerrval = EX_BADPARAM;
sprintf( errmsg,
- "Error: Bad map type (%d) specified for file id %d",
- map_type, exoid );
+ "Error: Bad map type (%d) specified for file id %d",
+ map_type, exoid );
ex_err( "ex_put_partial_id_map", errmsg, exerrval );
return (EX_FATAL);
}
@@ -118,30 +118,31 @@ int ex_put_partial_id_map (int exoid,
* but the dimension 'dnumentries' is not defined which
* indicates that either the entity count is zero, or
* there is an error in that the dimension has not yet
- * been defined.
+ * been defined. Note that in parallel, num_entities could
+ * be zero on a processor, but non-zero globally.
*/
exerrval = EX_BADPARAM;
sprintf(errmsg,
- "Error: The %s count is %ld, but the %s dimension is not defined on file id %d.",
- tname, num_entities, dnumentries, exoid);
+ "Error: The %s count is %ld, but the %s dimension is not defined on file id %d.",
+ tname, num_entities, dnumentries, exoid);
ex_err("ex_put_partial_id_map",errmsg,exerrval);
return (EX_FATAL);
}
-
+
/* define the map if it doesn't already exist... */
if (nc_inq_varid (exoid, vmap, &mapid) != NC_NOERR) {
if ((status = nc_redef (exoid)) != NC_NOERR) {
exerrval = status;
sprintf(errmsg,
- "Error: failed to put file id %d into define mode",
- exoid);
+ "Error: failed to put file id %d into define mode",
+ exoid);
ex_err("ex_put_partial_id_map",errmsg,exerrval);
return (EX_FATAL);
}
-
+
/* create a variable array in which to store the id map */
dims[0] = dimid;
-
+
/* Check type to be used for maps... */
map_int_type = NC_INT;
if (ex_int64_status(exoid) & EX_MAPS_INT64_DB) {
@@ -150,29 +151,29 @@ int ex_put_partial_id_map (int exoid,
if ((status = nc_def_var(exoid, vmap, map_int_type, 1, dims, &mapid)) != NC_NOERR) {
if (status == NC_ENAMEINUSE) {
- exerrval = status;
- sprintf(errmsg,
- "Error: %s numbering map already exists in file id %d",
- tname, exoid);
- ex_err("ex_put_partial_id_map",errmsg,exerrval);
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: %s numbering map already exists in file id %d",
+ tname, exoid);
+ ex_err("ex_put_partial_id_map",errmsg,exerrval);
} else {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to create %s id map in file id %d",
- tname, exoid);
- ex_err("ex_put_partial_id_map",errmsg,exerrval);
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to create %s id map in file id %d",
+ tname, exoid);
+ ex_err("ex_put_partial_id_map",errmsg,exerrval);
}
goto error_ret; /* exit define mode and return */
}
ex_compress_variable(exoid, mapid, 1);
-
+
/* leave define mode */
if ((status = nc_enddef (exoid)) != NC_NOERR) {
exerrval = status;
sprintf(errmsg,
- "Error: failed to complete definition in file id %d",
- exoid);
+ "Error: failed to complete definition in file id %d",
+ exoid);
ex_err("ex_put_partial_id_map",errmsg,exerrval);
return (EX_FATAL);
}
@@ -194,8 +195,8 @@ int ex_put_partial_id_map (int exoid,
if (status!= NC_NOERR) {
exerrval = status;
sprintf(errmsg,
- "Error: failed to store %s numbering map in file id %d",
- tname, exoid);
+ "Error: failed to store %s numbering map in file id %d",
+ tname, exoid);
ex_err("ex_put_partial_id_map",errmsg,exerrval);
return (EX_FATAL);
}
@@ -204,14 +205,14 @@ int ex_put_partial_id_map (int exoid,
return (EX_NOERR);
/* Fatal error: exit definition mode and return */
- error_ret:
+ error_ret:
if (nc_enddef (exoid) != NC_NOERR) /* exit define mode */
- {
- sprintf(errmsg,
- "Error: failed to complete definition for file id %d",
- exoid);
- ex_err("ex_put_partial_id_map",errmsg,exerrval);
- }
+ {
+ sprintf(errmsg,
+ "Error: failed to complete definition for file id %d",
+ exoid);
+ ex_err("ex_put_partial_id_map",errmsg,exerrval);
+ }
return (EX_FATAL);
}
diff --git a/exodus/cbind/src/ex_put_partial_nodal_var.c b/cbind/src/ex_put_partial_nodal_var.c
similarity index 100%
rename from exodus/cbind/src/ex_put_partial_nodal_var.c
rename to cbind/src/ex_put_partial_nodal_var.c
diff --git a/exodus/cbind/src/ex_put_partial_node_num_map.c b/cbind/src/ex_put_partial_node_num_map.c
similarity index 100%
rename from exodus/cbind/src/ex_put_partial_node_num_map.c
rename to cbind/src/ex_put_partial_node_num_map.c
diff --git a/exodus/cbind/src/ex_put_partial_node_set.c b/cbind/src/ex_put_partial_node_set.c
similarity index 100%
rename from exodus/cbind/src/ex_put_partial_node_set.c
rename to cbind/src/ex_put_partial_node_set.c
diff --git a/exodus/cbind/src/ex_put_partial_node_set_df.c b/cbind/src/ex_put_partial_node_set_df.c
similarity index 100%
rename from exodus/cbind/src/ex_put_partial_node_set_df.c
rename to cbind/src/ex_put_partial_node_set_df.c
diff --git a/exodus/cbind/src/ex_put_partial_num_map.c b/cbind/src/ex_put_partial_num_map.c
similarity index 98%
rename from exodus/cbind/src/ex_put_partial_num_map.c
rename to cbind/src/ex_put_partial_num_map.c
index 921b2aa..fc67112 100644
--- a/exodus/cbind/src/ex_put_partial_num_map.c
+++ b/cbind/src/ex_put_partial_num_map.c
@@ -188,7 +188,7 @@ int ex_put_partial_num_map (int exoid,
}
/* Check input parameters for a valid range of numbers */
- if (ent_start <= 0 || ent_start > (int)num_mobj) {
+ if (ent_start <= 0 || ent_start > num_mobj) {
exerrval = EX_FATAL;
sprintf(errmsg,
"Error: start count is invalid in file id %d",
@@ -204,7 +204,7 @@ int ex_put_partial_num_map (int exoid,
ex_err("ex_put_partial_num_map",errmsg,exerrval);
return (EX_FATAL);
}
- if (ent_start+ent_count-1 > (int)num_mobj) {
+ if (ent_start+ent_count-1 > num_mobj) {
exerrval = EX_FATAL;
sprintf(errmsg,
"Error: start+count-1 is larger than mesh object count in file id %d",
diff --git a/exodus/cbind/src/ex_put_partial_one_attr.c b/cbind/src/ex_put_partial_one_attr.c
similarity index 100%
rename from exodus/cbind/src/ex_put_partial_one_attr.c
rename to cbind/src/ex_put_partial_one_attr.c
diff --git a/exodus/cbind/src/ex_put_partial_set.c b/cbind/src/ex_put_partial_set.c
similarity index 99%
rename from exodus/cbind/src/ex_put_partial_set.c
rename to cbind/src/ex_put_partial_set.c
index d07ebc9..9b090c7 100644
--- a/exodus/cbind/src/ex_put_partial_set.c
+++ b/cbind/src/ex_put_partial_set.c
@@ -154,8 +154,7 @@ int ex_put_partial_set (int exoid,
}
/* write out the entry list and extra list arrays */
- if (set_entry_list != NULL) {
-
+ if (set_entry_list != NULL || ex_is_parallel(exoid)) {
start[0] = offset-1;
count[0] = num_to_put;
if (count[0] == 0)
diff --git a/exodus/cbind/src/ex_put_partial_set_dist_fact.c b/cbind/src/ex_put_partial_set_dist_fact.c
similarity index 100%
rename from exodus/cbind/src/ex_put_partial_set_dist_fact.c
rename to cbind/src/ex_put_partial_set_dist_fact.c
diff --git a/exodus/cbind/src/ex_put_partial_side_set.c b/cbind/src/ex_put_partial_side_set.c
similarity index 100%
rename from exodus/cbind/src/ex_put_partial_side_set.c
rename to cbind/src/ex_put_partial_side_set.c
diff --git a/exodus/cbind/src/ex_put_partial_side_set_df.c b/cbind/src/ex_put_partial_side_set_df.c
similarity index 100%
rename from exodus/cbind/src/ex_put_partial_side_set_df.c
rename to cbind/src/ex_put_partial_side_set_df.c
diff --git a/exodus/cbind/src/ex_put_partial_var.c b/cbind/src/ex_put_partial_var.c
similarity index 100%
rename from exodus/cbind/src/ex_put_partial_var.c
rename to cbind/src/ex_put_partial_var.c
diff --git a/exodus/cbind/src/ex_put_processor_elem_maps.c b/cbind/src/ex_put_processor_elem_maps.c
similarity index 100%
rename from exodus/cbind/src/ex_put_processor_elem_maps.c
rename to cbind/src/ex_put_processor_elem_maps.c
diff --git a/exodus/cbind/src/ex_put_processor_node_maps.c b/cbind/src/ex_put_processor_node_maps.c
similarity index 100%
rename from exodus/cbind/src/ex_put_processor_node_maps.c
rename to cbind/src/ex_put_processor_node_maps.c
diff --git a/exodus/cbind/src/ex_put_prop.c b/cbind/src/ex_put_prop.c
similarity index 100%
rename from exodus/cbind/src/ex_put_prop.c
rename to cbind/src/ex_put_prop.c
diff --git a/exodus/cbind/src/ex_put_prop_array.c b/cbind/src/ex_put_prop_array.c
similarity index 100%
rename from exodus/cbind/src/ex_put_prop_array.c
rename to cbind/src/ex_put_prop_array.c
diff --git a/exodus/cbind/src/ex_put_prop_names.c b/cbind/src/ex_put_prop_names.c
similarity index 100%
rename from exodus/cbind/src/ex_put_prop_names.c
rename to cbind/src/ex_put_prop_names.c
diff --git a/exodus/cbind/src/ex_put_qa.c b/cbind/src/ex_put_qa.c
similarity index 64%
rename from exodus/cbind/src/ex_put_qa.c
rename to cbind/src/ex_put_qa.c
index 4f279fa..4347b1a 100644
--- a/exodus/cbind/src/ex_put_qa.c
+++ b/cbind/src/ex_put_qa.c
@@ -105,52 +105,52 @@ int ex_put_qa (int exoid,
/* See if the number of qa records has already been defined.
Assume that if the DIM_NUM_QA dimension exists, then the
VAR_QA_TITLE variable also exists...
- */
+ */
status = nc_inq_dimid(exoid, DIM_NUM_QA, &num_qa_dim);
if (status != NC_NOERR) {
/* inquire previously defined dimensions */
if ((status = nc_inq_dimid(exoid, DIM_STR, &strdim)) != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to locate string length in file id %d", exoid);
- ex_err("ex_put_qa",errmsg,exerrval);
- return (EX_FATAL);
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to locate string length in file id %d", exoid);
+ ex_err("ex_put_qa",errmsg,exerrval);
+ return (EX_FATAL);
}
if ((status = nc_inq_dimid(exoid, DIM_N4, &n4dim)) != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to locate record length in file id %d", exoid);
- ex_err("ex_put_qa",errmsg,exerrval);
- return (EX_FATAL);
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to locate record length in file id %d", exoid);
+ ex_err("ex_put_qa",errmsg,exerrval);
+ return (EX_FATAL);
}
/* put file into define mode */
if ((status = nc_redef(exoid)) != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to put file id %d into define mode", exoid);
- ex_err("ex_put_qa",errmsg,exerrval);
- return (EX_FATAL);
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to put file id %d into define mode", exoid);
+ ex_err("ex_put_qa",errmsg,exerrval);
+ return (EX_FATAL);
}
/* define dimensions */
if ((status = nc_def_dim(exoid,DIM_NUM_QA,num_qa_records, &num_qa_dim)) != NC_NOERR) {
- if (status == NC_ENAMEINUSE) { /* duplicate entry? */
- exerrval = status;
- sprintf(errmsg,
- "Error: qa records already exist in file id %d", exoid);
- ex_err("ex_put_qa",errmsg,exerrval);
- } else {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to define qa record array size in file id %d", exoid);
- ex_err("ex_put_qa",errmsg,exerrval);
- }
-
- goto error_ret; /* exit define mode and return */
+ if (status == NC_ENAMEINUSE) { /* duplicate entry? */
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: qa records already exist in file id %d", exoid);
+ ex_err("ex_put_qa",errmsg,exerrval);
+ } else {
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to define qa record array size in file id %d", exoid);
+ ex_err("ex_put_qa",errmsg,exerrval);
+ }
+
+ goto error_ret; /* exit define mode and return */
}
/* define variable */
@@ -159,28 +159,28 @@ int ex_put_qa (int exoid,
dims[2] = strdim;
if ((status = nc_def_var(exoid, VAR_QA_TITLE, NC_CHAR, 3, dims, &varid)) != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to define qa record array in file id %d", exoid);
- ex_err("ex_put_qa",errmsg,exerrval);
- goto error_ret; /* exit define mode and return */
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to define qa record array in file id %d", exoid);
+ ex_err("ex_put_qa",errmsg,exerrval);
+ goto error_ret; /* exit define mode and return */
}
/* leave define mode */
if ((status = nc_enddef (exoid)) != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to complete definition in file id %d", exoid);
- ex_err("ex_put_qa",errmsg,exerrval);
- return (EX_FATAL);
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to complete definition in file id %d", exoid);
+ ex_err("ex_put_qa",errmsg,exerrval);
+ return (EX_FATAL);
}
} else {
if ((status = nc_inq_varid(exoid, VAR_QA_TITLE, &varid)) != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to find qa records variable in file id %d", exoid);
- ex_err("ex_put_qa",errmsg,exerrval);
- return (EX_FATAL);
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to find qa records variable in file id %d", exoid);
+ ex_err("ex_put_qa",errmsg,exerrval);
+ return (EX_FATAL);
}
}
@@ -188,34 +188,44 @@ int ex_put_qa (int exoid,
/* write out QA records */
for (i=0; i<num_qa_records; i++) {
- for (j=0; j<4; j++) {
- start[0] = i;
- start[1] = j;
- start[2] = 0;
-
- count[0] = 1;
- count[1] = 1;
- count[2] = strlen(qa_record[i][j]) + 1;
-
- if ((status = nc_put_vara_text(exoid, varid, start, count, qa_record[i][j])) != NC_NOERR) {
- exerrval = status;
- sprintf(errmsg,
- "Error: failed to store qa record in file id %d", exoid);
- ex_err("ex_put_qa",errmsg,exerrval);
- return (EX_FATAL);
- }
- }
+ for (j=0; j<4; j++) {
+ start[0] = i;
+ start[1] = j;
+ start[2] = 0;
+
+ count[0] = 1;
+ count[1] = 1;
+ count[2] = strlen(qa_record[i][j]) + 1;
+
+ if ((status = nc_put_vara_text(exoid, varid, start, count, qa_record[i][j])) != NC_NOERR) {
+ exerrval = status;
+ sprintf(errmsg,
+ "Error: failed to store qa record in file id %d", exoid);
+ ex_err("ex_put_qa",errmsg,exerrval);
+ return (EX_FATAL);
+ }
+ }
+ }
+ } else if (ex_is_parallel(exoid)) {
+ /* In case we are in a collective mode, all processors need to call */
+ const char dummy[] = " ";
+ for (i=0; i<num_qa_records; i++) {
+ for (j=0; j<4; j++) {
+ start[0] = start[1] = start[2] = 0;
+ count[0] = count[1] = count[2] = 0;
+ nc_put_vara_text(exoid, varid, start, count, dummy);
+ }
}
}
}
return (EX_NOERR);
/* Fatal error: exit definition mode and return */
- error_ret:
+ error_ret:
if (nc_enddef (exoid) != NC_NOERR) { /* exit define mode */
sprintf(errmsg,
- "Error: failed to complete definition for file id %d",
- exoid);
+ "Error: failed to complete definition for file id %d",
+ exoid);
ex_err("ex_put_qa",errmsg,exerrval);
}
return (EX_FATAL);
diff --git a/exodus/cbind/src/ex_put_set.c b/cbind/src/ex_put_set.c
similarity index 100%
rename from exodus/cbind/src/ex_put_set.c
rename to cbind/src/ex_put_set.c
diff --git a/exodus/cbind/src/ex_put_set_dist_fact.c b/cbind/src/ex_put_set_dist_fact.c
similarity index 100%
rename from exodus/cbind/src/ex_put_set_dist_fact.c
rename to cbind/src/ex_put_set_dist_fact.c
diff --git a/exodus/cbind/src/ex_put_set_param.c b/cbind/src/ex_put_set_param.c
similarity index 100%
rename from exodus/cbind/src/ex_put_set_param.c
rename to cbind/src/ex_put_set_param.c
diff --git a/exodus/cbind/src/ex_put_sets.c b/cbind/src/ex_put_sets.c
similarity index 100%
rename from exodus/cbind/src/ex_put_sets.c
rename to cbind/src/ex_put_sets.c
diff --git a/exodus/cbind/src/ex_put_side_set.c b/cbind/src/ex_put_side_set.c
similarity index 100%
rename from exodus/cbind/src/ex_put_side_set.c
rename to cbind/src/ex_put_side_set.c
diff --git a/exodus/cbind/src/ex_put_side_set_dist_fact.c b/cbind/src/ex_put_side_set_dist_fact.c
similarity index 100%
rename from exodus/cbind/src/ex_put_side_set_dist_fact.c
rename to cbind/src/ex_put_side_set_dist_fact.c
diff --git a/exodus/cbind/src/ex_put_side_set_param.c b/cbind/src/ex_put_side_set_param.c
similarity index 100%
rename from exodus/cbind/src/ex_put_side_set_param.c
rename to cbind/src/ex_put_side_set_param.c
diff --git a/exodus/cbind/src/ex_put_ss_param_global.c b/cbind/src/ex_put_ss_param_global.c
similarity index 100%
rename from exodus/cbind/src/ex_put_ss_param_global.c
rename to cbind/src/ex_put_ss_param_global.c
diff --git a/exodus/cbind/src/ex_put_sset_var.c b/cbind/src/ex_put_sset_var.c
similarity index 100%
rename from exodus/cbind/src/ex_put_sset_var.c
rename to cbind/src/ex_put_sset_var.c
diff --git a/exodus/cbind/src/ex_put_sset_var_tab.c b/cbind/src/ex_put_sset_var_tab.c
similarity index 100%
rename from exodus/cbind/src/ex_put_sset_var_tab.c
rename to cbind/src/ex_put_sset_var_tab.c
diff --git a/exodus/cbind/src/ex_put_time.c b/cbind/src/ex_put_time.c
similarity index 100%
rename from exodus/cbind/src/ex_put_time.c
rename to cbind/src/ex_put_time.c
diff --git a/exodus/cbind/src/ex_put_truth_table.c b/cbind/src/ex_put_truth_table.c
similarity index 100%
rename from exodus/cbind/src/ex_put_truth_table.c
rename to cbind/src/ex_put_truth_table.c
diff --git a/exodus/cbind/src/ex_put_var.c b/cbind/src/ex_put_var.c
similarity index 100%
rename from exodus/cbind/src/ex_put_var.c
rename to cbind/src/ex_put_var.c
diff --git a/exodus/cbind/src/ex_put_var_name.c b/cbind/src/ex_put_var_name.c
similarity index 100%
rename from exodus/cbind/src/ex_put_var_name.c
rename to cbind/src/ex_put_var_name.c
diff --git a/exodus/cbind/src/ex_put_var_names.c b/cbind/src/ex_put_var_names.c
similarity index 100%
rename from exodus/cbind/src/ex_put_var_names.c
rename to cbind/src/ex_put_var_names.c
diff --git a/exodus/cbind/src/ex_put_var_param.c b/cbind/src/ex_put_var_param.c
similarity index 100%
rename from exodus/cbind/src/ex_put_var_param.c
rename to cbind/src/ex_put_var_param.c
diff --git a/exodus/cbind/src/ex_put_var_tab.c b/cbind/src/ex_put_var_tab.c
similarity index 100%
rename from exodus/cbind/src/ex_put_var_tab.c
rename to cbind/src/ex_put_var_tab.c
diff --git a/exodus/cbind/src/ex_put_variable_name.c b/cbind/src/ex_put_variable_name.c
similarity index 100%
rename from exodus/cbind/src/ex_put_variable_name.c
rename to cbind/src/ex_put_variable_name.c
diff --git a/exodus/cbind/src/ex_put_variable_names.c b/cbind/src/ex_put_variable_names.c
similarity index 100%
rename from exodus/cbind/src/ex_put_variable_names.c
rename to cbind/src/ex_put_variable_names.c
diff --git a/exodus/cbind/src/ex_put_variable_param.c b/cbind/src/ex_put_variable_param.c
similarity index 100%
rename from exodus/cbind/src/ex_put_variable_param.c
rename to cbind/src/ex_put_variable_param.c
diff --git a/exodus/cbind/src/ex_update.c b/cbind/src/ex_update.c
similarity index 100%
rename from exodus/cbind/src/ex_update.c
rename to cbind/src/ex_update.c
diff --git a/exodus/cbind/src/ex_utils.c b/cbind/src/ex_utils.c
similarity index 99%
rename from exodus/cbind/src/ex_utils.c
rename to cbind/src/ex_utils.c
index d245d10..9fabe42 100644
--- a/exodus/cbind/src/ex_utils.c
+++ b/cbind/src/ex_utils.c
@@ -162,6 +162,7 @@ void ex_update_max_name_length(int exoid, int length)
if (length > db_length) {
/* Update with new value... */
nc_put_att_int(exoid, NC_GLOBAL, ATT_MAX_NAME_LENGTH, NC_INT, 1, &length);
+ nc_sync(exoid);
}
}
@@ -790,7 +791,7 @@ int ex_id_lkup( int exoid,
/* allocate space for new status array */
- if (!(stat_vals = malloc((int)dim_len*sizeof(int)))) {
+ if (!(stat_vals = malloc(dim_len*sizeof(int)))) {
exerrval = EX_MEMFAIL;
sprintf(errmsg,
"Error: failed to allocate memory for %s array for file id %d",
diff --git a/exodus/cbind/test/CMakeLists.txt b/cbind/test/CMakeLists.txt
similarity index 100%
rename from exodus/cbind/test/CMakeLists.txt
rename to cbind/test/CMakeLists.txt
diff --git a/exodus/cbind/test/CreateEdgeFace.c b/cbind/test/CreateEdgeFace.c
similarity index 100%
rename from exodus/cbind/test/CreateEdgeFace.c
rename to cbind/test/CreateEdgeFace.c
diff --git a/exodus/cbind/test/Imakefile b/cbind/test/Imakefile
similarity index 93%
rename from exodus/cbind/test/Imakefile
rename to cbind/test/Imakefile
index 03a51d1..362c3cb 100644
--- a/exodus/cbind/test/Imakefile
+++ b/cbind/test/Imakefile
@@ -39,19 +39,30 @@ EXOIITEST = -Wl,-R../src -L../src -lexodus
LOCALEXO = ../src/libexodus.a
LIBS = $(LOCALEXO) -L$(USRLIBDIR) $(NETCDF) $(EXTRANETCDFLIB)
+#if defined(ParallelAwareExodus)
+PARTEST = testrd_par
+#endif
+
PROGS = testwt testwtd testrd testrd1 testrdd testwt1 testwt2 testwtm \
testwt_ss testwt_nossnsdf testrd_ss testrdwt testcp testcpd testcp_nl \
testcp_ln testwt_clb testwt_nc testrd_nc testwt-zeroe testwt-zeron \
testwt-one-attrib create_mesh rd_wt_mesh \
testwt-partial testwt-nsided testrd-nsided testwt-nfaced \
testrd-nfaced testwt-long-name testrd-long-name \
- oned twod MakeTestData test_nemesis
+ oned twod MakeTestData test_nemesis $(PARTEST)
#if 0
CreateEdgeFace ReadEdgeFace
#endif
all:: check
+#if defined(ParallelAwareExodus)
+LOCALPAREXO = ../parallel/libexodus_par.a
+PLIBS = $(LOCALPAREXO) $(LOCALEXO) -L$(USRLIBDIR) $(NETCDF) $(EXTRANETCDFLIB)
+
+NormalProgramTarget(testrd_par, testrd_par.o, $(LOCALEXO), /**/, $(PLIBS))
+#endif
+
NormalProgramTarget(oned, oned.o, $(LOCALEXO), /**/, $(LIBS))
NormalProgramTarget(twod, twod.o, $(LOCALEXO), /**/, $(LIBS))
NormalProgramTarget(MakeTestData,MakeTestData.o, $(LOCALEXO), /**/, $(LIBS))
diff --git a/exodus/cbind/test/MakeTestData.c b/cbind/test/MakeTestData.c
similarity index 99%
rename from exodus/cbind/test/MakeTestData.c
rename to cbind/test/MakeTestData.c
index 98d046b..659ee2c 100644
--- a/exodus/cbind/test/MakeTestData.c
+++ b/cbind/test/MakeTestData.c
@@ -3,7 +3,7 @@
#include <string.h>
#include <stdlib.h>
-#if 1
+#if 0
int mymode = EX_MAPS_INT64_DB|EX_MAPS_INT64_API|EX_BULK_INT64_DB|EX_BULK_INT64_API|EX_IDS_INT64_API|EX_IDS_INT64_DB;
typedef int64_t INT;
#else
diff --git a/exodus/cbind/test/Makefile.standalone b/cbind/test/Makefile.standalone
similarity index 51%
rename from exodus/cbind/test/Makefile.standalone
rename to cbind/test/Makefile.standalone
index 5c13e11..8351d65 100644
--- a/exodus/cbind/test/Makefile.standalone
+++ b/cbind/test/Makefile.standalone
@@ -31,129 +31,135 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-NETCDF = /Users/gdsjaar/src/seacas-nopar
-LDFLAGS = -L$(NETCDF)/lib -lnetcdf -lhdf5_hl -lhdf5 -lm -lz
-CFLAGS = -I../include -I$(NETCDF)/include
+EXOIITEST = -L../.. -lexodus
LOCALEXO = ../../libexodus.a
-NCDUMP = $(NETCDF)/bin/ncdump
+LIBS = $(LOCALEXO) $(NETCDF_LIB) -lm
PROGS = testwt testwtd testrd testrd1 testrdd testwt1 testwt2 testwtm \
- testwt_ss testwt_nossnsdf testrd_ss testrdwt testcp testcpd \
- testwt_clb testwt_nc testrd_nc testwt-zeroe testwt-zeron \
- testwt-one-attrib create_mesh rd_wt_mesh testcef test_nemesis \
- testref testwt-nsided testrd-nsided testwt-nfaced testrd-nfaced \
- testwt-long-name testrd-long-name testcp_nl testcp_ln
+ testwt_ss testwt_nossnsdf testrd_ss testrdwt testcp testcpd testcp_nl \
+ testcp_ln testwt_clb testwt_nc testrd_nc testwt-zeroe testwt-zeron \
+ testwt-one-attrib create_mesh rd_wt_mesh \
+ testwt-partial testwt-nsided testrd-nsided testwt-nfaced \
+ testrd-nfaced testwt-long-name testrd-long-name \
+ oned twod MakeTestData test_nemesis
all:: check
-testcp_ln : testcp_ln.o $(LOCALEXO)
- $(RM) $@
- $(CC) -o $@ $(LDOPTIONS) testcp_ln.o $(LOCALEXO) $(LDFLAGS)
+oned: oned.o $(LOCALEXO)
+ $(CC) -o $@ $(CFLAGS) oned.o $(LDFLAGS) $(LIBS)
-testcp_nl : testcp_nl.o $(LOCALEXO)
- $(RM) $@
- $(CC) $(CFLAGS) -o $@ testcp_nl.o $(LOCALEXO) $(LDFLAGS)
+twod: twod.o $(LOCALEXO)
+ $(CC) -o $@ $(CFLAGS) twod.o $(LDFLAGS) $(LIBS)
-testcp_ln : testcp_ln.o $(LOCALEXO)
- $(RM) $@
- $(CC) $(CFLAGS) -o $@ testcp_ln.o $(LOCALEXO) $(LDFLAGS)
+MakeTestData: MakeTestData.o $(LOCALEXO)
+ $(CC) -o $@ $(CFLAGS) MakeTestData.o $(LDFLAGS) $(LIBS)
testwt: testwt.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwt.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testwt.o $(LDFLAGS) $(LIBS)
testwt_clb: testwt_clb.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwt_clb.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testwt_clb.o $(LDFLAGS) $(LIBS)
testwtd: testwtd.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwtd.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testwtd.o $(LDFLAGS) $(LIBS)
testrd: testrd.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testrd.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testrd.o $(LDFLAGS) $(LIBS)
testrd1: testrd1.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testrd1.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testrd1.o $(LDFLAGS) $(LIBS)
testrdd: testrdd.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testrdd.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testrdd.o $(LDFLAGS) $(LIBS)
testwt1: testwt1.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwt1.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testwt1.o $(LDFLAGS) $(LIBS)
testwt2: testwt2.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwt2.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testwt2.o $(LDFLAGS) $(LIBS)
testwtm: testwtm.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwtm.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testwtm.o $(LDFLAGS) $(LIBS)
testwt_ss: testwt_ss.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwt_ss.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testwt_ss.o $(LDFLAGS) $(LIBS)
testwt_nossnsdf: testwt_nossnsdf.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwt_nossnsdf.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testwt_nossnsdf.o $(LDFLAGS) $(LIBS)
testrd_ss: testrd_ss.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testrd_ss.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testrd_ss.o $(LDFLAGS) $(LIBS)
testrdwt: testrdwt.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testrdwt.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testrdwt.o $(LDFLAGS) $(LIBS)
testcp: testcp.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testcp.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testcp.o $(LDFLAGS) $(LIBS)
testcpd: testcpd.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testcpd.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testcpd.o $(LDFLAGS) $(LIBS)
+
+testcp_nl : testcp_nl.o $(LOCALEXO)
+ $(CC) -o $@ $(CFLAGS) testcp_nl.o $(LDFLAGS) $(LIBS)
+
+testcp_ln : testcp_ln.o $(LOCALEXO)
+ $(CC) -o $@ $(CFLAGS) testcp_ln.o $(LDFLAGS) $(LIBS)
testwt_nc: testwt_nc.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwt_nc.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testwt_nc.o $(LDFLAGS) $(LIBS)
testrd_nc: testrd_nc.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testrd_nc.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testrd_nc.o $(LDFLAGS) $(LIBS)
+
+testwt-long-name: testwt-long-name.o $(LOCALEXO)
+ $(CC) -o $@ $(CFLAGS) testwt-long-name.o $(LDFLAGS) $(LIBS)
+
+testrd-long-name: testrd-long-name.o $(LOCALEXO)
+ $(CC) -o $@ $(CFLAGS) testrd-long-name.o $(LDFLAGS) $(LIBS)
testwt-zeroe: testwt-zeroe.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwt-zeroe.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testwt-zeroe.o $(LDFLAGS) $(LIBS)
testwt-zeron: testwt-zeron.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwt-zeron.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testwt-zeron.o $(LDFLAGS) $(LIBS)
testwt-one-attrib: testwt-one-attrib.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwt-one-attrib.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testwt-one-attrib.o $(LDFLAGS) $(LIBS)
+
+testwt-partial: testwt-partial.o $(LOCALEXO)
+ $(CC) -o $@ $(CFLAGS) testwt-partial.o $(LDFLAGS) $(LIBS)
testwt-nsided: testwt-nsided.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwt-nsided.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testwt-nsided.o $(LDFLAGS) $(LIBS)
testrd-nsided: testrd-nsided.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testrd-nsided.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testrd-nsided.o $(LDFLAGS) $(LIBS)
testwt-nfaced: testwt-nfaced.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwt-nfaced.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testwt-nfaced.o $(LDFLAGS) $(LIBS)
testrd-nfaced: testrd-nfaced.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testrd-nfaced.o $(LOCALEXO) $(LDFLAGS)
-
-testrd-long-name: testrd-long-name.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testrd-long-name.o $(LOCALEXO) $(LDFLAGS)
-
-testwt-long-name: testwt-long-name.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ testwt-long-name.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) testrd-nfaced.o $(LDFLAGS) $(LIBS)
create_mesh: create_mesh.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ create_mesh.o $(LOCALEXO) $(LDFLAGS)
+ $(CC) -o $@ $(CFLAGS) create_mesh.o $(LDFLAGS) $(LIBS)
+
+rd_wt_mesh: rd_wt_mesh.o $(LOCALEXO)
+ $(CC) -o $@ $(CFLAGS) rd_wt_mesh.o $(LDFLAGS) $(LIBS)
-test_nemesis: test_nemesis.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ test_nemesis.o $(LOCALEXO) $(LDFLAGS)
+CreateEdgeFace: CreateEdgeFace.o $(LOCALEXO)
+ $(CC) -o $@ $(CFLAGS) CreateEdgeFace.o $(LDFLAGS) $(LIBS)
-rd_wt_mesh: rd_wt_mesh.o $(LOCALEXO)
- $(CC) $(CFLAGS) -o $@ rd_wt_mesh.o $(LOCALEXO) $(LDFLAGS)
+ReadEdgeFace: ReadEdgeFace.o $(LOCALEXO)
+ $(CC) -o $@ $(CFLAGS) ReadEdgeFace.o $(LDFLAGS) $(LIBS)
-testcef: CreateEdgeFace.c $(LOCALEXO)
- $(CC) $(CFLAGS) -DCreateEdgeFace=main -o $@ CreateEdgeFace.c $(LOCALEXO) $(LDFLAGS)
+test_nemesis: test_nemesis.o $(LOCALEXO)
+ $(CC) -o $@ $(CFLAGS) test_nemesis.o $(LDFLAGS) $(LIBS)
-testref: ReadEdgeFace.c $(LOCALEXO)
- $(CC) $(CFLAGS) -DReadEdgeFace=main -o $@ ReadEdgeFace.c $(LOCALEXO) $(LDFLAGS)
test: check
check: $(PROGS)
- csh ./testall.standalone $(NCDUMP)
+ csh ./testall.standalone ${NCDUMP}
clean::
rm -f *.res $(PROGS)
@@ -171,7 +177,7 @@ clean::
.SUFFIXES: .c
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $*.c
+ $(CC) -c $(CFLAGS) $*.c
# ----------------------------------------------------------------------
# dependencies generated by makedepend or sfmakedepend
diff --git a/exodus/cbind/test/ReadEdgeFace.c b/cbind/test/ReadEdgeFace.c
similarity index 100%
rename from exodus/cbind/test/ReadEdgeFace.c
rename to cbind/test/ReadEdgeFace.c
diff --git a/exodus/cbind/test/create_mesh.c b/cbind/test/create_mesh.c
similarity index 100%
rename from exodus/cbind/test/create_mesh.c
rename to cbind/test/create_mesh.c
index 0362fb8..430da13 100644
--- a/exodus/cbind/test/create_mesh.c
+++ b/cbind/test/create_mesh.c
@@ -501,14 +501,14 @@ void write_exo_mesh(
accum_num_elements = 0;
for (i=0; i<num_domains; i++) {
-
- /* create the EXODUSII file */
- get_file_name(file_name, "e", i, num_domains, NULL, temporary_name);
-
int mymode = EX_MAPS_INT64_API|EX_BULK_INT64_API|EX_IDS_INT64_API;
if (int64bit) {
mymode |= EX_MAPS_INT64_DB|EX_BULK_INT64_DB|EX_IDS_INT64_DB;
}
+
+ /* create the EXODUSII file */
+ get_file_name(file_name, "e", i, num_domains, NULL, temporary_name);
+
exoid = ex_create (temporary_name, EX_CLOBBER|mymode, &CPU_word_size, &IO_word_size);
if (exoid < 0) {
diff --git a/exodus/cbind/test/exodus_unit_tests.gold b/cbind/test/exodus_unit_tests.gold
similarity index 98%
rename from exodus/cbind/test/exodus_unit_tests.gold
rename to cbind/test/exodus_unit_tests.gold
index dba7a1a..5ad773f 100644
--- a/exodus/cbind/test/exodus_unit_tests.gold
+++ b/cbind/test/exodus_unit_tests.gold
@@ -36,5 +36,6 @@ testrd-nfaced - read file with nfaced elements...
testwt-long-name - write file with long (64-character) names...
testrd - read long name file truncating to 32 characters on read...
testrd-long-name - read long name file...
+test_nemesis - read long name file...
************************************************************************
************************************************************************
diff --git a/exodus/cbind/test/makedmp b/cbind/test/makedmp
similarity index 100%
rename from exodus/cbind/test/makedmp
rename to cbind/test/makedmp
diff --git a/exodus/cbind/test/oned.c b/cbind/test/oned.c
similarity index 100%
rename from exodus/cbind/test/oned.c
rename to cbind/test/oned.c
diff --git a/exodus/cbind/test/rd_wt_mesh.c b/cbind/test/rd_wt_mesh.c
similarity index 100%
rename from exodus/cbind/test/rd_wt_mesh.c
rename to cbind/test/rd_wt_mesh.c
diff --git a/exodus/cbind/test/test.dmp b/cbind/test/test.dmp
similarity index 100%
rename from exodus/cbind/test/test.dmp
rename to cbind/test/test.dmp
diff --git a/exodus/cbind/test/test.exo_c b/cbind/test/test.exo_c
similarity index 100%
rename from exodus/cbind/test/test.exo_c
rename to cbind/test/test.exo_c
diff --git a/exodus/cbind/test/test1.dmp b/cbind/test/test1.dmp
similarity index 100%
rename from exodus/cbind/test/test1.dmp
rename to cbind/test/test1.dmp
diff --git a/exodus/cbind/test/test2-1.dmp b/cbind/test/test2-1.dmp
similarity index 100%
rename from exodus/cbind/test/test2-1.dmp
rename to cbind/test/test2-1.dmp
diff --git a/exodus/cbind/test/test2-2.dmp b/cbind/test/test2-2.dmp
similarity index 100%
rename from exodus/cbind/test/test2-2.dmp
rename to cbind/test/test2-2.dmp
diff --git a/exodus/cbind/test/test2.dmp b/cbind/test/test2.dmp
similarity index 100%
rename from exodus/cbind/test/test2.dmp
rename to cbind/test/test2.dmp
diff --git a/exodus/cbind/test/test_clb.dmp b/cbind/test/test_clb.dmp
similarity index 100%
rename from exodus/cbind/test/test_clb.dmp
rename to cbind/test/test_clb.dmp
diff --git a/exodus/cbind/test/test_nemesis.c b/cbind/test/test_nemesis.c
similarity index 99%
rename from exodus/cbind/test/test_nemesis.c
rename to cbind/test/test_nemesis.c
index 2926c99..64e8a31 100644
--- a/exodus/cbind/test/test_nemesis.c
+++ b/cbind/test/test_nemesis.c
@@ -186,11 +186,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "[%s]: ERROR, unable to create test file \"%s\"!\n",
yo, file_name);
exit(-1);
- } else {
- printf(" (netcdf3 format) ");
}
- } else {
- printf(" (netcdf4 format) ");
}
printf("successful\n"); fflush(stdout);
t_pass++;
diff --git a/exodus/cbind/test/test_nemesis.dmp b/cbind/test/test_nemesis.dmp
similarity index 95%
rename from exodus/cbind/test/test_nemesis.dmp
rename to cbind/test/test_nemesis.dmp
index 9807fcf..94cf160 100644
--- a/exodus/cbind/test/test_nemesis.dmp
+++ b/cbind/test/test_nemesis.dmp
@@ -1,5 +1,5 @@
*********************Output Tests***********************
-creating ExodusII file... (netcdf4 format) successful
+creating ExodusII file... successful
testing init info output...successful
testing global init info output...successful
testing global element block ID output...successful
diff --git a/exodus/cbind/test/testall.in b/cbind/test/testall.in
similarity index 99%
rename from exodus/cbind/test/testall.in
rename to cbind/test/testall.in
index 6fbddb8..15a1cf2 100644
--- a/exodus/cbind/test/testall.in
+++ b/cbind/test/testall.in
@@ -38,10 +38,10 @@
#set PREFIX = "valgrind --tool=memcheck"
set PREFIX = ""
-set SUFFIX = ""
+set SUFFIX = ".exe"
set BINDIR = @CMAKE_CURRENT_BINARY_DIR@
set SRCDIR = @CMAKE_CURRENT_SOURCE_DIR@
-set NCDUMP = @NETCDF_NCDUMP@
+set NCDUMP = @Netcdf_LIBRARY_DIRS@/../bin/ncdump
set DIFF = "diff -w"
echo "************************************************************************"
diff --git a/exodus/cbind/test/testall.in1 b/cbind/test/testall.in1
similarity index 100%
rename from exodus/cbind/test/testall.in1
rename to cbind/test/testall.in1
diff --git a/exodus/cbind/test/testall.standalone b/cbind/test/testall.standalone
similarity index 100%
rename from exodus/cbind/test/testall.standalone
rename to cbind/test/testall.standalone
diff --git a/exodus/cbind/test/testcp.c b/cbind/test/testcp.c
similarity index 100%
rename from exodus/cbind/test/testcp.c
rename to cbind/test/testcp.c
diff --git a/exodus/cbind/test/testcp_dd.dmp b/cbind/test/testcp_dd.dmp
similarity index 100%
rename from exodus/cbind/test/testcp_dd.dmp
rename to cbind/test/testcp_dd.dmp
diff --git a/exodus/cbind/test/testcp_ds.dmp b/cbind/test/testcp_ds.dmp
similarity index 100%
rename from exodus/cbind/test/testcp_ds.dmp
rename to cbind/test/testcp_ds.dmp
diff --git a/exodus/cbind/test/testcp_ln.c b/cbind/test/testcp_ln.c
similarity index 100%
rename from exodus/cbind/test/testcp_ln.c
rename to cbind/test/testcp_ln.c
diff --git a/exodus/cbind/test/testcp_ln.dmp b/cbind/test/testcp_ln.dmp
similarity index 100%
rename from exodus/cbind/test/testcp_ln.dmp
rename to cbind/test/testcp_ln.dmp
diff --git a/exodus/cbind/test/testcp_nl.c b/cbind/test/testcp_nl.c
similarity index 100%
rename from exodus/cbind/test/testcp_nl.c
rename to cbind/test/testcp_nl.c
diff --git a/exodus/cbind/test/testcp_nl.dmp b/cbind/test/testcp_nl.dmp
similarity index 100%
rename from exodus/cbind/test/testcp_nl.dmp
rename to cbind/test/testcp_nl.dmp
diff --git a/exodus/cbind/test/testcp_sd.dmp b/cbind/test/testcp_sd.dmp
similarity index 100%
rename from exodus/cbind/test/testcp_sd.dmp
rename to cbind/test/testcp_sd.dmp
diff --git a/exodus/cbind/test/testcp_ss.dmp b/cbind/test/testcp_ss.dmp
similarity index 100%
rename from exodus/cbind/test/testcp_ss.dmp
rename to cbind/test/testcp_ss.dmp
diff --git a/exodus/cbind/test/testcpd.c b/cbind/test/testcpd.c
similarity index 100%
rename from exodus/cbind/test/testcpd.c
rename to cbind/test/testcpd.c
diff --git a/exodus/cbind/test/testd.dmp b/cbind/test/testd.dmp
similarity index 100%
rename from exodus/cbind/test/testd.dmp
rename to cbind/test/testd.dmp
diff --git a/exodus/cbind/test/testrd-long-name.c b/cbind/test/testrd-long-name.c
similarity index 97%
rename from exodus/cbind/test/testrd-long-name.c
rename to cbind/test/testrd-long-name.c
index 4114b5d..208eb03 100644
--- a/exodus/cbind/test/testrd-long-name.c
+++ b/cbind/test/testrd-long-name.c
@@ -143,8 +143,8 @@ int main (int argc, char **argv)
ex_set_max_name_length(exoid, max_name_length);
}
- name = (char*) calloc((max_name_length+1), sizeof(char));
-
+ name = (char *) calloc(max_name_length+1, sizeof(char));
+
/* read database parameters */
error = ex_get_init (exoid, title, &num_dim, &num_nodes, &num_elem,
&num_elem_blk, &num_node_sets, &num_side_sets);
@@ -291,25 +291,26 @@ int main (int argc, char **argv)
error = ex_get_names(exoid, EX_ELEM_BLOCK, block_names);
printf ("\nafter ex_get_names, error = %3d\n", error);
- for (i=0; i<num_elem_blk; i++) {
- ex_get_name(exoid, EX_ELEM_BLOCK, ids[i], name);
- if (strcmp(name, block_names[i]) != 0) {
- printf ("error in ex_get_name for block id %d\n", ids[i]);
+ for (i=0; i<num_elem_blk; i++)
+ {
+ ex_get_name(exoid, EX_ELEM_BLOCK, ids[i], name);
+ if (strcmp(name, block_names[i]) != 0) {
+ printf ("error in ex_get_name for block id %d\n", ids[i]);
+ }
+ error = ex_get_elem_block (exoid, ids[i], elem_type,
+ &(num_elem_in_block[i]),
+ &(num_nodes_per_elem[i]), &(num_attr[i]));
+ printf ("\nafter ex_get_elem_block, error = %d\n", error);
+
+ printf ("element block id = %2d\n",ids[i]);
+ printf ("element type = '%s'\n", elem_type);
+ printf ("num_elem_in_block = %2d\n",num_elem_in_block[i]);
+ printf ("num_nodes_per_elem = %2d\n",num_nodes_per_elem[i]);
+ printf ("num_attr = %2d\n",num_attr[i]);
+ printf ("name = '%s'\n",block_names[i]);
+ free(block_names[i]);
}
- error = ex_get_elem_block (exoid, ids[i], elem_type,
- &(num_elem_in_block[i]),
- &(num_nodes_per_elem[i]), &(num_attr[i]));
- printf ("\nafter ex_get_elem_block, error = %d\n", error);
-
- printf ("element block id = %2d\n",ids[i]);
- printf ("element type = '%s'\n", elem_type);
- printf ("num_elem_in_block = %2d\n",num_elem_in_block[i]);
- printf ("num_nodes_per_elem = %2d\n",num_nodes_per_elem[i]);
- printf ("num_attr = %2d\n",num_attr[i]);
- printf ("name = '%s'\n",block_names[i]);
- free(block_names[i]);
- }
-
+
/* read element block properties */
error = ex_inquire (exoid, EX_INQ_EB_PROP, &num_props, &fdum, cdum);
printf ("\nafter ex_inquire, error = %d\n", error);
@@ -855,7 +856,7 @@ int main (int argc, char **argv)
/* read nodal variables parameters and names */
num_nod_vars = 0;
if (num_nodes > 0) {
- error = ex_get_variable_param (exoid, EX_NODAL, &num_nod_vars);
+ error = ex_get_var_param (exoid, "n", &num_nod_vars);
printf ("\nafter ex_get_var_param, error = %3d\n", error);
for (i=0; i<num_nod_vars; i++)
@@ -863,7 +864,7 @@ int main (int argc, char **argv)
var_names[i] = (char *) calloc ((max_name_length+1), sizeof(char));
}
- error = ex_get_variable_names (exoid, EX_NODAL, num_nod_vars, var_names);
+ error = ex_get_var_names (exoid, "n", num_nod_vars, var_names);
printf ("\nafter ex_get_var_names, error = %3d\n", error);
printf ("There are %2d nodal variables; their names are :\n", num_nod_vars);
@@ -1199,9 +1200,11 @@ int main (int argc, char **argv)
}
free(ids);
}
- free(name);
if (num_node_sets > 0)
free (num_nodes_per_set);
+
+ free (name);
error = ex_close (exoid);
printf ("\nafter ex_close, error = %3d\n", error);
+ return 0;
}
diff --git a/exodus/cbind/test/testrd-long-name.dmp b/cbind/test/testrd-long-name.dmp
similarity index 100%
rename from exodus/cbind/test/testrd-long-name.dmp
rename to cbind/test/testrd-long-name.dmp
diff --git a/exodus/cbind/test/testrd-nfaced.c b/cbind/test/testrd-nfaced.c
similarity index 100%
rename from exodus/cbind/test/testrd-nfaced.c
rename to cbind/test/testrd-nfaced.c
diff --git a/exodus/cbind/test/testrd-nfaced.dmp b/cbind/test/testrd-nfaced.dmp
similarity index 100%
rename from exodus/cbind/test/testrd-nfaced.dmp
rename to cbind/test/testrd-nfaced.dmp
diff --git a/exodus/cbind/test/testrd-nm32.dmp b/cbind/test/testrd-nm32.dmp
similarity index 100%
rename from exodus/cbind/test/testrd-nm32.dmp
rename to cbind/test/testrd-nm32.dmp
diff --git a/exodus/cbind/test/testrd-nsided.c b/cbind/test/testrd-nsided.c
similarity index 100%
rename from exodus/cbind/test/testrd-nsided.c
rename to cbind/test/testrd-nsided.c
diff --git a/exodus/cbind/test/testrd-nsided.dmp b/cbind/test/testrd-nsided.dmp
similarity index 100%
rename from exodus/cbind/test/testrd-nsided.dmp
rename to cbind/test/testrd-nsided.dmp
diff --git a/exodus/cbind/test/testrd.c b/cbind/test/testrd.c
similarity index 100%
rename from exodus/cbind/test/testrd.c
rename to cbind/test/testrd.c
diff --git a/exodus/cbind/test/testrd.dmp b/cbind/test/testrd.dmp
similarity index 100%
rename from exodus/cbind/test/testrd.dmp
rename to cbind/test/testrd.dmp
diff --git a/exodus/cbind/test/testrd1.c b/cbind/test/testrd1.c
similarity index 100%
rename from exodus/cbind/test/testrd1.c
rename to cbind/test/testrd1.c
diff --git a/exodus/cbind/test/testrd1.dmp b/cbind/test/testrd1.dmp
similarity index 100%
rename from exodus/cbind/test/testrd1.dmp
rename to cbind/test/testrd1.dmp
diff --git a/exodus/cbind/test/testrd_nc.c b/cbind/test/testrd_nc.c
similarity index 100%
rename from exodus/cbind/test/testrd_nc.c
rename to cbind/test/testrd_nc.c
diff --git a/exodus/cbind/test/testrd_nc.dmp b/cbind/test/testrd_nc.dmp
similarity index 100%
rename from exodus/cbind/test/testrd_nc.dmp
rename to cbind/test/testrd_nc.dmp
diff --git a/exodus/cbind/test/testrd_par.c b/cbind/test/testrd_par.c
similarity index 100%
rename from exodus/cbind/test/testrd_par.c
rename to cbind/test/testrd_par.c
diff --git a/exodus/cbind/test/testrd_ss.c b/cbind/test/testrd_ss.c
similarity index 100%
rename from exodus/cbind/test/testrd_ss.c
rename to cbind/test/testrd_ss.c
diff --git a/exodus/cbind/test/testrd_ss.dmp b/cbind/test/testrd_ss.dmp
similarity index 100%
rename from exodus/cbind/test/testrd_ss.dmp
rename to cbind/test/testrd_ss.dmp
diff --git a/exodus/cbind/test/testrd_zeroe.dmp b/cbind/test/testrd_zeroe.dmp
similarity index 100%
rename from exodus/cbind/test/testrd_zeroe.dmp
rename to cbind/test/testrd_zeroe.dmp
diff --git a/exodus/cbind/test/testrd_zeron.dmp b/cbind/test/testrd_zeron.dmp
similarity index 100%
rename from exodus/cbind/test/testrd_zeron.dmp
rename to cbind/test/testrd_zeron.dmp
diff --git a/exodus/cbind/test/testrdd.c b/cbind/test/testrdd.c
similarity index 100%
rename from exodus/cbind/test/testrdd.c
rename to cbind/test/testrdd.c
diff --git a/exodus/cbind/test/testrdd.dmp b/cbind/test/testrdd.dmp
similarity index 100%
rename from exodus/cbind/test/testrdd.dmp
rename to cbind/test/testrdd.dmp
diff --git a/exodus/cbind/test/testrdwt.c b/cbind/test/testrdwt.c
similarity index 100%
rename from exodus/cbind/test/testrdwt.c
rename to cbind/test/testrdwt.c
diff --git a/exodus/cbind/test/testwt-long-name.c b/cbind/test/testwt-long-name.c
similarity index 100%
rename from exodus/cbind/test/testwt-long-name.c
rename to cbind/test/testwt-long-name.c
diff --git a/exodus/cbind/test/testwt-long-name.dmp b/cbind/test/testwt-long-name.dmp
similarity index 100%
rename from exodus/cbind/test/testwt-long-name.dmp
rename to cbind/test/testwt-long-name.dmp
diff --git a/exodus/cbind/test/testwt-nface-nside.c b/cbind/test/testwt-nface-nside.c
similarity index 100%
rename from exodus/cbind/test/testwt-nface-nside.c
rename to cbind/test/testwt-nface-nside.c
diff --git a/exodus/cbind/test/testwt-nfaced.c b/cbind/test/testwt-nfaced.c
similarity index 100%
rename from exodus/cbind/test/testwt-nfaced.c
rename to cbind/test/testwt-nfaced.c
diff --git a/exodus/cbind/test/testwt-nfaced.dmp b/cbind/test/testwt-nfaced.dmp
similarity index 100%
rename from exodus/cbind/test/testwt-nfaced.dmp
rename to cbind/test/testwt-nfaced.dmp
diff --git a/exodus/cbind/test/testwt-nsided.c b/cbind/test/testwt-nsided.c
similarity index 100%
rename from exodus/cbind/test/testwt-nsided.c
rename to cbind/test/testwt-nsided.c
diff --git a/exodus/cbind/test/testwt-nsided.dmp b/cbind/test/testwt-nsided.dmp
similarity index 100%
rename from exodus/cbind/test/testwt-nsided.dmp
rename to cbind/test/testwt-nsided.dmp
diff --git a/exodus/cbind/test/testwt-one-attrib.c b/cbind/test/testwt-one-attrib.c
similarity index 100%
rename from exodus/cbind/test/testwt-one-attrib.c
rename to cbind/test/testwt-one-attrib.c
diff --git a/exodus/cbind/test/testwt-partial.c b/cbind/test/testwt-partial.c
similarity index 100%
rename from exodus/cbind/test/testwt-partial.c
rename to cbind/test/testwt-partial.c
diff --git a/exodus/cbind/test/testwt-zeroe.c b/cbind/test/testwt-zeroe.c
similarity index 100%
rename from exodus/cbind/test/testwt-zeroe.c
rename to cbind/test/testwt-zeroe.c
diff --git a/exodus/cbind/test/testwt-zeroe.dmp b/cbind/test/testwt-zeroe.dmp
similarity index 100%
rename from exodus/cbind/test/testwt-zeroe.dmp
rename to cbind/test/testwt-zeroe.dmp
diff --git a/exodus/cbind/test/testwt-zeron.c b/cbind/test/testwt-zeron.c
similarity index 100%
rename from exodus/cbind/test/testwt-zeron.c
rename to cbind/test/testwt-zeron.c
diff --git a/exodus/cbind/test/testwt-zeron.dmp b/cbind/test/testwt-zeron.dmp
similarity index 100%
rename from exodus/cbind/test/testwt-zeron.dmp
rename to cbind/test/testwt-zeron.dmp
diff --git a/exodus/cbind/test/testwt.c b/cbind/test/testwt.c
similarity index 99%
rename from exodus/cbind/test/testwt.c
rename to cbind/test/testwt.c
index bff799a..f464cdc 100644
--- a/exodus/cbind/test/testwt.c
+++ b/cbind/test/testwt.c
@@ -279,6 +279,8 @@ int main (int argc, char **argv)
ebids[5] = 15;
ebids[6] = 16;
+ error = ex_put_name(exoid, EX_ELEM_BLOCK, ebids[0], block_names[0]);
+
error = ex_put_elem_block (exoid, ebids[0], "quad", num_elem_in_block[0],
num_nodes_per_elem[0], 1);
printf ("after ex_put_elem_block, error = %d\n", error);
@@ -343,8 +345,10 @@ int main (int argc, char **argv)
}
/* Write element block names */
- error = ex_put_names(exoid, EX_ELEM_BLOCK, block_names);
- printf ("after ex_put_names, error = %d\n", error);
+ for (i=0; i < 7; i++) {
+ error = ex_put_name(exoid, EX_ELEM_BLOCK, ebids[i], block_names[i]);
+ printf ("after ex_put_names, error = %d\n", error);
+ }
if (error) {
ex_close (exoid);
diff --git a/exodus/cbind/test/testwt1.c b/cbind/test/testwt1.c
similarity index 100%
rename from exodus/cbind/test/testwt1.c
rename to cbind/test/testwt1.c
diff --git a/exodus/cbind/test/testwt2.c b/cbind/test/testwt2.c
similarity index 100%
rename from exodus/cbind/test/testwt2.c
rename to cbind/test/testwt2.c
diff --git a/exodus/cbind/test/testwt_clb.c b/cbind/test/testwt_clb.c
similarity index 100%
rename from exodus/cbind/test/testwt_clb.c
rename to cbind/test/testwt_clb.c
diff --git a/exodus/cbind/test/testwt_nc.c b/cbind/test/testwt_nc.c
similarity index 100%
rename from exodus/cbind/test/testwt_nc.c
rename to cbind/test/testwt_nc.c
diff --git a/exodus/cbind/test/testwt_nossnsdf.c b/cbind/test/testwt_nossnsdf.c
similarity index 100%
rename from exodus/cbind/test/testwt_nossnsdf.c
rename to cbind/test/testwt_nossnsdf.c
diff --git a/exodus/cbind/test/testwt_ss.c b/cbind/test/testwt_ss.c
similarity index 100%
rename from exodus/cbind/test/testwt_ss.c
rename to cbind/test/testwt_ss.c
diff --git a/exodus/cbind/test/testwt_ss.dmp b/cbind/test/testwt_ss.dmp
similarity index 100%
rename from exodus/cbind/test/testwt_ss.dmp
rename to cbind/test/testwt_ss.dmp
diff --git a/exodus/cbind/test/testwtbig.c b/cbind/test/testwtbig.c
similarity index 100%
rename from exodus/cbind/test/testwtbig.c
rename to cbind/test/testwtbig.c
diff --git a/exodus/cbind/test/testwtd.c b/cbind/test/testwtd.c
similarity index 100%
rename from exodus/cbind/test/testwtd.c
rename to cbind/test/testwtd.c
diff --git a/exodus/cbind/test/testwtm.c b/cbind/test/testwtm.c
similarity index 100%
rename from exodus/cbind/test/testwtm.c
rename to cbind/test/testwtm.c
diff --git a/exodus/cbind/test/twod.c b/cbind/test/twod.c
similarity index 100%
rename from exodus/cbind/test/twod.c
rename to cbind/test/twod.c
diff --git a/exodus/cbind/test/update_all_tests b/cbind/test/update_all_tests
similarity index 100%
rename from exodus/cbind/test/update_all_tests
rename to cbind/test/update_all_tests
diff --git a/cmake-script b/cmake-script
new file mode 100755
index 0000000..0880188
--- /dev/null
+++ b/cmake-script
@@ -0,0 +1,21 @@
+EXTRA_ARGS=$@
+
+FC=/opt/local/bin/gfortran-mp-4.8
+
+ACCESS=/Users/gdsjaar/src/SEACAS
+
+rm -f CMakeCache.txt
+
+cmake \
+-DBUILD_SHARED=ON \
+-DCMAKE_Fortran_COMPILER:FILEPATH=${FC} \
+-DNETCDF_NCDUMP:PATH=${ACCESS}/bin/ncdump \
+-DNETCDF_INCLUDE_DIR:PATH=${ACCESS}/include \
+-DNETCDF_LIBRARY:PATH=${ACCESS}/lib/libnetcdf.a \
+-DHDF5HL_LIBRARY:PATH=${ACCESS}/lib/libhdf5_hl.a \
+-DHDF5_LIBRARY:PATH=${ACCESS}/lib/libhdf5.a \
+$EXTRA_ARGS
+
+
+
+
diff --git a/exodus/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
similarity index 100%
rename from exodus/cmake/Dependencies.cmake
rename to cmake/Dependencies.cmake
diff --git a/exodus/customdoxygen.css b/customdoxygen.css
similarity index 100%
rename from exodus/customdoxygen.css
rename to customdoxygen.css
diff --git a/exodus/doc/doc.poly.txt b/doc/doc.poly.txt
similarity index 100%
rename from exodus/doc/doc.poly.txt
rename to doc/doc.poly.txt
diff --git a/exodus/doc/exodus-face-edge.pdf b/doc/exodus-face-edge.pdf
similarity index 100%
rename from exodus/doc/exodus-face-edge.pdf
rename to doc/exodus-face-edge.pdf
diff --git a/exodus/doc/exodus.pdf b/doc/exodus.pdf
similarity index 100%
rename from exodus/doc/exodus.pdf
rename to doc/exodus.pdf
diff --git a/exodus/doc/nemesis.pdf b/doc/nemesis.pdf
similarity index 100%
rename from exodus/doc/nemesis.pdf
rename to doc/nemesis.pdf
diff --git a/exodus/forbind/src/Makefile.standalone b/exodus/forbind/src/Makefile.standalone
deleted file mode 100644
index e7a5a7e..0000000
--- a/exodus/forbind/src/Makefile.standalone
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright (c) 2005 Sandia Corporation. Under the terms of Contract
-# DE-AC04-94AL85000 with Sandia Corporation, the U.S. Governement
-# retains certain rights in this software.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# * Neither the name of Sandia Corporation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-AR = ar cr
-INCLUDES = -I../../cbind/include -I/Users/gdsjaar/src/SEACAS-SF-INSTALL/include
-F77EXTRAOPTIONS = -I../include
-CFLAGS = -DADDC_
-CC = /opt/local/bin/clang-mp-3.1
-FC = /opt/local/bin/gfortran-mp-4.8
-RANLIB = true
-
-SRCS = exo_jack.c
-
-SRCSF = addrwrap.f
-
-OBJS = ${SRCS:.c=.o} ${SRCSF:.f=.o}l
-
-all:: libexoIIv2for.a libexoIIv2for32.a
-
-libexoIIv2for.a: addrwrap.o exo_jack.o
- $(AR) $@ $?
- $(RANLIB) $@
- cp libexoIIv2for.a ../../
-
-libexoIIv2for32.a: exo_jack32.o
- $(AR) $@ $?
- $(RANLIB) $@
- cp libexoIIv2for32.a ../../
-
-exo_jack32.o: exo_jack.c
- $(CC) -o exo_jack32.o -c $(CFLAGS) $(INCLUDES) -DDEFAULT_REAL_INT exo_jack.c
-
-clean::
- rm -f *.CKP *.ln *.BAK *.bak *.o *.M *.mod core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"*
-
-.SUFFIXES: .c .F .f
-.c.o:
- $(CC) $(INCLUDES) -c $(CFLAGS) $*.c
-.f.o:
- $(FC) -c $(FFLAGS) $*.f
-.F.o:
- $(FC) -c $(DEFINES) $(FFLAGS) $*.F
-
-# ----------------------------------------------------------------------
-# dependencies generated by makedepend or sfmakedepend
-
diff --git a/exodus/exodusii.dsp b/exodusii.dsp
similarity index 100%
rename from exodus/exodusii.dsp
rename to exodusii.dsp
diff --git a/exodus/forbind/CMakeLists.txt b/forbind/CMakeLists.txt
similarity index 93%
rename from exodus/forbind/CMakeLists.txt
rename to forbind/CMakeLists.txt
index 4a5e7c7..5ee026c 100644
--- a/exodus/forbind/CMakeLists.txt
+++ b/forbind/CMakeLists.txt
@@ -42,6 +42,7 @@ find_library( HDF5HL_LIBRARY hdf5_hl
INCLUDE_DIRECTORIES(
"${CMAKE_CURRENT_SOURCE_DIR}/include"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../cbind/include"
"${CMAKE_CURRENT_BINARY_DIR}/include"
"${NETCDF_INCLUDE_DIR}"
)
@@ -50,7 +51,7 @@ SET(forbind_SRCS
src/exo_jack.c
)
-ADD_LIBRARY(exoIIv2for ${forbind_SRCS})
+ADD_LIBRARY(exoIIv2for ${EXODUS_LIBRARY_TYPE} ${forbind_SRCS})
TARGET_LINK_LIBRARIES(exoIIv2for exoIIv2c ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${HDF5HL_LIBRARY})
diff --git a/exodus/forbind/include/Imakefile b/forbind/include/Imakefile
similarity index 100%
rename from exodus/forbind/include/Imakefile
rename to forbind/include/Imakefile
diff --git a/exodus/forbind/include/exodusII.inc b/forbind/include/exodusII.inc
similarity index 100%
rename from exodus/forbind/include/exodusII.inc
rename to forbind/include/exodusII.inc
diff --git a/exodus/forbind/include/exodusII_int.inc b/forbind/include/exodusII_int.inc
similarity index 100%
rename from exodus/forbind/include/exodusII_int.inc
rename to forbind/include/exodusII_int.inc
diff --git a/exodus/forbind/src/Imakefile b/forbind/src/Imakefile
similarity index 100%
rename from exodus/forbind/src/Imakefile
rename to forbind/src/Imakefile
diff --git a/nemesis/forbind/Makefile.standalone b/forbind/src/Makefile.standalone
similarity index 82%
rename from nemesis/forbind/Makefile.standalone
rename to forbind/src/Makefile.standalone
index 952438b..f58e3e7 100644
--- a/nemesis/forbind/Makefile.standalone
+++ b/forbind/src/Makefile.standalone
@@ -1,4 +1,4 @@
-# Copyright (c) 1998 Sandia Corporation. Under the terms of Contract
+# Copyright (c) 2005 Sandia Corporation. Under the terms of Contract
# DE-AC04-94AL85000 with Sandia Corporation, the U.S. Governement
# retains certain rights in this software.
#
@@ -31,37 +31,31 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-INCLUDES = -I..
-F77EXTRAOPTIONS = -I..
+INCLUDES = -I../../cbind/include
+F77EXTRAOPTIONS = -I../include
-SRCS = ne_jack.c
+SRCS = exo_jack.c
-SRCSF = addrwrpn.F
+SRCSF = addrwrap.F
OBJS = ${SRCS:.c=.o} ${SRCSF:.F=.o}
-ne_jack.c: ne_jack.src fortc1.sed fortc2.sed common.m4 $(OS_TYPE).m4
- ./fortc -P $(BITS) -L . -O $(OS_TYPE) ne_jack.src > $@
-
-all:: libnemIf.a
-libnemIf.a: $(OBJS)
+all:: libexoIIv2for.a
+libexoIIv2for.a: $(OBJS)
$(AR) $@ $?
$(RANLIB) $@
- cp libnemIf.a ..
-
-clean::
- rm -f *.c addrwrpn.f
+ cp libexoIIv2for.a ../../
clean::
rm -f *.CKP *.ln *.BAK *.bak *.o *.M *.mod core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"*
.SUFFIXES: .c .F .f
.c.o:
- $(CC) -c -I.. $(CFLAGS) $*.c
+ $(CC) -c $(CFLAGS) $*.c
.f.o:
$(FC) -c $(FFLAGS) $*.f
.F.o:
- $(FC) -c -I.. $(DEFINES) $(FFLAGS) $*.F
+ $(FC) -c $(DEFINES) $(FFLAGS) $*.F
# ----------------------------------------------------------------------
# dependencies generated by makedepend or sfmakedepend
diff --git a/exodus/forbind/src/addrwrap.F b/forbind/src/addrwrap.F
similarity index 99%
rename from exodus/forbind/src/addrwrap.F
rename to forbind/src/addrwrap.F
index a5290c5..482e8ff 100644
--- a/exodus/forbind/src/addrwrap.F
+++ b/forbind/src/addrwrap.F
@@ -3824,7 +3824,9 @@ C
POINTER (PI4, I4)
IF (PI4 .EQ. 0) RETURN
+#ifndef __XLF__
CALL FREE (PI4)
+#endif
PI4 = 0
END
#endif
diff --git a/exodus/forbind/src/exo_jack.src b/forbind/src/exo_jack.src
similarity index 100%
rename from exodus/forbind/src/exo_jack.src
rename to forbind/src/exo_jack.src
diff --git a/exodus/forbind/test/CMakeLists.txt b/forbind/test/CMakeLists.txt
similarity index 100%
rename from exodus/forbind/test/CMakeLists.txt
rename to forbind/test/CMakeLists.txt
diff --git a/exodus/forbind/test/Imakefile b/forbind/test/Imakefile
similarity index 100%
rename from exodus/forbind/test/Imakefile
rename to forbind/test/Imakefile
diff --git a/exodus/forbind/test/Makefile.standalone b/forbind/test/Makefile.standalone
similarity index 58%
rename from exodus/forbind/test/Makefile.standalone
rename to forbind/test/Makefile.standalone
index 6ae26a4..84eb65c 100644
--- a/exodus/forbind/test/Makefile.standalone
+++ b/forbind/test/Makefile.standalone
@@ -32,119 +32,59 @@
#
-NETCDF = /Users/gdsjaar/src/seacas-nopar
-NETCDF_LIB = -L$(NETCDF)/lib -lnetcdf -lhdf5_hl -lhdf5 -lm -lz
-NCDUMP = $(NETCDF)/bin/ncdump
-
-# Use libexoIIv2for32.a if not using -fdefault-real-8 -fdefault-integer-8
+EXOIITEST = -L../.. -lexoIIv2for -lexodus
LOCALEXO = ../../libexoIIv2for.a ../../libexodus.a
-
LIBS = $(LOCALEXO) $(NETCDF_LIB)
-FC = /opt/local/bin/gfortran-mp-4.8
-FFLAGS = -I../include -O -fno-range-check -fcray-pointer
PROGS = testwt testwtd testrd testrd1 testrdd testwt1 testwt2 testwtm testcp testcpnl testcpln testwt_nsid testrd_nsid test_nem
all:: check
-all:: testwt
testwt:: testwt.o $(LOCALEXO)
- $(FC) -o $@ $(LDOPTIONS) testwt.o $(LIBPATH) $(LDLIBS) $(LIBS) $(EXTRA_LOAD_FLAGS)
-
-clean::
- $(RM) testwt
+ $(FC) -o $@ $(FFLAGS) testwt.o $(LDFLAGS) $(LIBS)
-all:: testwtd
testwtd:: testwtd.o $(LOCALEXO)
- $(FC) -o $@ $(LDOPTIONS) testwtd.o $(LIBPATH) $(LDLIBS) $(LIBS) $(EXTRA_LOAD_FLAGS)
+ $(FC) -o $@ $(FFLAGS) testwtd.o $(LDFLAGS) $(LIBS)
-clean::
- $(RM) testwtd
-
-all:: testrd
testrd:: testrd.o $(LOCALEXO)
- $(FC) -o $@ $(LDOPTIONS) testrd.o $(LIBPATH) $(LDLIBS) $(LIBS) $(EXTRA_LOAD_FLAGS)
-
-clean::
- $(RM) testrd
+ $(FC) -o $@ $(FFLAGS) testrd.o $(LDFLAGS) $(LIBS)
-all:: testrd1
testrd1:: testrd1.o $(LOCALEXO)
- $(FC) -o $@ $(LDOPTIONS) testrd1.o $(LIBPATH) $(LDLIBS) $(LIBS) $(EXTRA_LOAD_FLAGS)
-
-clean::
- $(RM) testrd1
+ $(FC) -o $@ $(FFLAGS) testrd1.o $(LDFLAGS) $(LIBS)
-all:: testrdd
testrdd:: testrdd.o $(LOCALEXO)
- $(FC) -o $@ $(LDOPTIONS) testrdd.o $(LIBPATH) $(LDLIBS) $(LIBS) $(EXTRA_LOAD_FLAGS)
+ $(FC) -o $@ $(FFLAGS) testrdd.o $(LDFLAGS) $(LIBS)
-clean::
- $(RM) testrdd
-
-all:: testwt1
testwt1:: testwt1.o $(LOCALEXO)
- $(FC) -o $@ $(LDOPTIONS) testwt1.o $(LIBPATH) $(LDLIBS) $(LIBS) $(EXTRA_LOAD_FLAGS)
-
-clean::
- $(RM) testwt1
+ $(FC) -o $@ $(FFLAGS) testwt1.o $(LDFLAGS) $(LIBS)
-all:: testwt2
testwt2:: testwt2.o $(LOCALEXO)
- $(FC) -o $@ $(LDOPTIONS) testwt2.o $(LIBPATH) $(LDLIBS) $(LIBS) $(EXTRA_LOAD_FLAGS)
+ $(FC) -o $@ $(FFLAGS) testwt2.o $(LDFLAGS) $(LIBS)
-clean::
- $(RM) testwt2
-
-all:: testwtm
testwtm:: testwtm.o $(LOCALEXO)
- $(FC) -o $@ $(LDOPTIONS) testwtm.o $(LIBPATH) $(LDLIBS) $(LIBS) $(EXTRA_LOAD_FLAGS)
-
-clean::
- $(RM) testwtm
+ $(FC) -o $@ $(FFLAGS) testwtm.o $(LDFLAGS) $(LIBS)
-all:: testcp
testcp:: testcp.o $(LOCALEXO)
- $(FC) -o $@ $(LDOPTIONS) testcp.o $(LIBPATH) $(LDLIBS) $(LIBS) $(EXTRA_LOAD_FLAGS)
+ $(FC) -o $@ $(FFLAGS) testcp.o $(LDFLAGS) $(LIBS)
-clean::
- $(RM) testcp
-
-all:: testcpnl
testcpnl:: testcpnl.o $(LOCALEXO)
- $(FC) -o $@ $(LDOPTIONS) testcpnl.o $(LIBPATH) $(LDLIBS) $(LIBS) $(EXTRA_LOAD_FLAGS)
-
-clean::
- $(RM) testcpnl
+ $(FC) -o $@ $(FFLAGS) testcpnl.o $(LDFLAGS) $(LIBS)
-all:: testcpln
testcpln:: testcpln.o $(LOCALEXO)
- $(FC) -o $@ $(LDOPTIONS) testcpln.o $(LIBPATH) $(LDLIBS) $(LIBS) $(EXTRA_LOAD_FLAGS)
-
-clean::
- $(RM) testcpln
+ $(FC) -o $@ $(FFLAGS) testcpln.o $(LDFLAGS) $(LIBS)
-all:: testwt_nsid
testwt_nsid:: testwt_nsid.o $(LOCALEXO)
- $(FC) -o $@ $(LDOPTIONS) testwt_nsid.o $(LIBPATH) $(LDLIBS) $(LIBS) $(EXTRA_LOAD_FLAGS)
+ $(FC) -o $@ $(FFLAGS) testwt_nsid.o $(LDFLAGS) $(LIBS)
-clean::
- $(RM) testwt_nsid
-
-all:: testrd_nsid
testrd_nsid:: testrd_nsid.o $(LOCALEXO)
- $(FC) -o $@ $(LDOPTIONS) testrd_nsid.o $(LIBPATH) $(LDLIBS) $(LIBS) $(EXTRA_LOAD_FLAGS)
-
-clean::
- $(RM) testrd_nsid
+ $(FC) -o $@ $(FFLAGS) testrd_nsid.o $(LDFLAGS) $(LIBS)
-all:: test_nem
test_nem:: test_nem.o $(LOCALEXO)
- $(FC) -o $@ $(LDOPTIONS) test_nem.o $(LIBPATH) $(LDLIBS) $(LIBS) $(EXTRA_LOAD_FLAGS)
+ $(FC) -o $@ $(FFLAGS) test_nem.o $(LDFLAGS) $(LIBS)
test: check
check: $(PROGS)
- csh ./testall.standalone $(NCDUMP)
+ csh ./testall.standalone ${NCDUMP}
clean::
rm -f *.res $(PROGS)
diff --git a/exodus/forbind/test/exodus_unit_tests.gold b/forbind/test/exodus_unit_tests.gold
similarity index 97%
rename from exodus/forbind/test/exodus_unit_tests.gold
rename to forbind/test/exodus_unit_tests.gold
index 4bf9794..07bf07a 100644
--- a/exodus/forbind/test/exodus_unit_tests.gold
+++ b/forbind/test/exodus_unit_tests.gold
@@ -15,5 +15,6 @@ testrdd ...
testwt2 ...
testwt_nsid ...
testrd_nsid ...
+test_nem ...
************************************************************************
************************************************************************
diff --git a/exodus/forbind/test/test-nsided.dmp b/forbind/test/test-nsided.dmp
similarity index 100%
rename from exodus/forbind/test/test-nsided.dmp
rename to forbind/test/test-nsided.dmp
diff --git a/exodus/forbind/test/test.dmp b/forbind/test/test.dmp
similarity index 100%
rename from exodus/forbind/test/test.dmp
rename to forbind/test/test.dmp
diff --git a/exodus/forbind/test/test1.dmp b/forbind/test/test1.dmp
similarity index 100%
rename from exodus/forbind/test/test1.dmp
rename to forbind/test/test1.dmp
diff --git a/exodus/forbind/test/test2-1.dmp b/forbind/test/test2-1.dmp
similarity index 100%
rename from exodus/forbind/test/test2-1.dmp
rename to forbind/test/test2-1.dmp
diff --git a/exodus/forbind/test/test2-2.dmp b/forbind/test/test2-2.dmp
similarity index 100%
rename from exodus/forbind/test/test2-2.dmp
rename to forbind/test/test2-2.dmp
diff --git a/exodus/forbind/test/test_nem.dmp b/forbind/test/test_nem.dmp
similarity index 100%
rename from exodus/forbind/test/test_nem.dmp
rename to forbind/test/test_nem.dmp
diff --git a/exodus/forbind/test/test_nem.f b/forbind/test/test_nem.f
similarity index 100%
rename from exodus/forbind/test/test_nem.f
rename to forbind/test/test_nem.f
diff --git a/exodus/forbind/test/test_nem.inc b/forbind/test/test_nem.inc
similarity index 100%
rename from exodus/forbind/test/test_nem.inc
rename to forbind/test/test_nem.inc
diff --git a/exodus/forbind/test/testall.in b/forbind/test/testall.in
similarity index 97%
rename from exodus/forbind/test/testall.in
rename to forbind/test/testall.in
index 02594f8..c65b909 100644
--- a/exodus/forbind/test/testall.in
+++ b/forbind/test/testall.in
@@ -38,10 +38,10 @@
#set PREFIX = "valgrind --tool=memcheck"
set PREFIX = ""
-set SUFFIX = ""
+set SUFFIX = ".exe"
set BINDIR = @CMAKE_CURRENT_BINARY_DIR@
set SRCDIR = @CMAKE_CURRENT_SOURCE_DIR@
-set NCDUMP = @NETCDF_NCDUMP@
+set NCDUMP = @SEACASExodus_Netcdf_EXECUTABLE_NCDUMP@
# testwt - single precision write test
echo "************************************************************************"
@@ -122,7 +122,7 @@ ${PREFIX} ${BINDIR}/f_testrd_nsid${SUFFIX} | grep -v version | diff - ${SRCDIR}/
# test_nem - nemesis routines
echo "test_nem ..."
-${PREFIX} ${BINDIR}/f_test_nem
+${PREFIX} ${BINDIR}/f_test_nem${SUFFIX} | diff -w - ${SRCDIR}/test_nem.dmp | tee test_nem.res
echo "************************************************************************"
echo "************************************************************************"
diff --git a/exodus/forbind/test/testall.in1 b/forbind/test/testall.in1
similarity index 100%
rename from exodus/forbind/test/testall.in1
rename to forbind/test/testall.in1
diff --git a/exodus/forbind/test/testall.standalone b/forbind/test/testall.standalone
similarity index 100%
rename from exodus/forbind/test/testall.standalone
rename to forbind/test/testall.standalone
diff --git a/exodus/forbind/test/testcp.f b/forbind/test/testcp.f
similarity index 100%
rename from exodus/forbind/test/testcp.f
rename to forbind/test/testcp.f
diff --git a/exodus/forbind/test/testcp_dd.dmp b/forbind/test/testcp_dd.dmp
similarity index 100%
rename from exodus/forbind/test/testcp_dd.dmp
rename to forbind/test/testcp_dd.dmp
diff --git a/exodus/forbind/test/testcp_ds.dmp b/forbind/test/testcp_ds.dmp
similarity index 100%
rename from exodus/forbind/test/testcp_ds.dmp
rename to forbind/test/testcp_ds.dmp
diff --git a/exodus/forbind/test/testcp_sd.dmp b/forbind/test/testcp_sd.dmp
similarity index 100%
rename from exodus/forbind/test/testcp_sd.dmp
rename to forbind/test/testcp_sd.dmp
diff --git a/exodus/forbind/test/testcp_ss.dmp b/forbind/test/testcp_ss.dmp
similarity index 100%
rename from exodus/forbind/test/testcp_ss.dmp
rename to forbind/test/testcp_ss.dmp
diff --git a/exodus/forbind/test/testcpd.f b/forbind/test/testcpd.f
similarity index 100%
rename from exodus/forbind/test/testcpd.f
rename to forbind/test/testcpd.f
diff --git a/exodus/forbind/test/testcpln.dmp b/forbind/test/testcpln.dmp
similarity index 100%
rename from exodus/forbind/test/testcpln.dmp
rename to forbind/test/testcpln.dmp
diff --git a/exodus/forbind/test/testcpln.f b/forbind/test/testcpln.f
similarity index 100%
rename from exodus/forbind/test/testcpln.f
rename to forbind/test/testcpln.f
diff --git a/exodus/forbind/test/testcpnl.dmp b/forbind/test/testcpnl.dmp
similarity index 100%
rename from exodus/forbind/test/testcpnl.dmp
rename to forbind/test/testcpnl.dmp
diff --git a/exodus/forbind/test/testcpnl.f b/forbind/test/testcpnl.f
similarity index 100%
rename from exodus/forbind/test/testcpnl.f
rename to forbind/test/testcpnl.f
diff --git a/exodus/forbind/test/testd.dmp b/forbind/test/testd.dmp
similarity index 100%
rename from exodus/forbind/test/testd.dmp
rename to forbind/test/testd.dmp
diff --git a/exodus/forbind/test/testrd.dmp b/forbind/test/testrd.dmp
similarity index 100%
rename from exodus/forbind/test/testrd.dmp
rename to forbind/test/testrd.dmp
diff --git a/exodus/forbind/test/testrd.f b/forbind/test/testrd.f
similarity index 100%
rename from exodus/forbind/test/testrd.f
rename to forbind/test/testrd.f
diff --git a/exodus/forbind/test/testrd1.dmp b/forbind/test/testrd1.dmp
similarity index 100%
rename from exodus/forbind/test/testrd1.dmp
rename to forbind/test/testrd1.dmp
diff --git a/exodus/forbind/test/testrd1.f b/forbind/test/testrd1.f
similarity index 100%
rename from exodus/forbind/test/testrd1.f
rename to forbind/test/testrd1.f
diff --git a/exodus/forbind/test/testrd_nsid.dmp b/forbind/test/testrd_nsid.dmp
similarity index 100%
rename from exodus/forbind/test/testrd_nsid.dmp
rename to forbind/test/testrd_nsid.dmp
diff --git a/exodus/forbind/test/testrd_nsid.f b/forbind/test/testrd_nsid.f
similarity index 100%
rename from exodus/forbind/test/testrd_nsid.f
rename to forbind/test/testrd_nsid.f
diff --git a/exodus/forbind/test/testrdd.dmp b/forbind/test/testrdd.dmp
similarity index 100%
rename from exodus/forbind/test/testrdd.dmp
rename to forbind/test/testrdd.dmp
diff --git a/exodus/forbind/test/testrdd.f b/forbind/test/testrdd.f
similarity index 100%
rename from exodus/forbind/test/testrdd.f
rename to forbind/test/testrdd.f
diff --git a/exodus/forbind/test/testwt.f b/forbind/test/testwt.f
similarity index 100%
rename from exodus/forbind/test/testwt.f
rename to forbind/test/testwt.f
diff --git a/exodus/forbind/test/testwt1.f b/forbind/test/testwt1.f
similarity index 100%
rename from exodus/forbind/test/testwt1.f
rename to forbind/test/testwt1.f
diff --git a/exodus/forbind/test/testwt2.f b/forbind/test/testwt2.f
similarity index 100%
rename from exodus/forbind/test/testwt2.f
rename to forbind/test/testwt2.f
diff --git a/exodus/forbind/test/testwt3.f b/forbind/test/testwt3.f
similarity index 100%
rename from exodus/forbind/test/testwt3.f
rename to forbind/test/testwt3.f
diff --git a/exodus/forbind/test/testwt_nsid.f b/forbind/test/testwt_nsid.f
similarity index 100%
rename from exodus/forbind/test/testwt_nsid.f
rename to forbind/test/testwt_nsid.f
diff --git a/exodus/forbind/test/testwtd.f b/forbind/test/testwtd.f
similarity index 100%
rename from exodus/forbind/test/testwtd.f
rename to forbind/test/testwtd.f
diff --git a/exodus/forbind/test/testwtm.f b/forbind/test/testwtm.f
similarity index 100%
rename from exodus/forbind/test/testwtm.f
rename to forbind/test/testwtm.f
diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt
deleted file mode 100644
index 64aff5d..0000000
--- a/nemesis/CMakeLists.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-SET(NEMESIS_VERSION_MAJOR "5")
-SET(NEMESIS_VERSION_MINOR "15")
-SET(NEMESIS_VERSION_PATCH "0")
-SET(NEMESIS_VERSION "${NEMESIS_VERSION_MAJOR}.${NEMESIS_VERSION_MINOR}")
-SET(NEMESIS_VERSION_FULL "${NEMESIS_VERSION}.${NEMESIS_VERSION_PATCH}")
-
-SET(NEMESIS_BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS}")
-SET(HEADERS "ne_nemesisI.h")
-
-
-find_path( NETCDF_INCLUDE_DIR netcdf.h
- $ENV{ACCESS}/inc
- $ENV{NETCDF_DIR}/inc
- $ENV{NETCDF_DIR}/include
- $ENV{NETCDF_DIR}/libsrc
- )
-
-find_library( NETCDF_LIBRARY netcdf
- $ENV{ACCESS}/lib/shared
- $ENV{ACCESS}/lib
- $ENV{NETCDF_DIR}/lib
- $ENV{NETCDF_DIR}/libsrc/.libs
- )
-
-find_program (NETCDF_NCDUMP ncdump
- $ENV{ACCESS}/bin
- $ENV{NETCDF_DIR}/bin
- $ENV{NETCDF_DIR}/ncdump
- )
-
-find_library( EXODUS_LIBRARY exodus
- $ENV{ACCESS}/lib/shared
- $ENV{ACCESS}/lib
- )
-
-# Hack for HDF5
-find_library( HDF5_LIBRARY hdf5
- $ENV{ACCESS}/lib/shared
- $ENV{ACCESS}/lib
- $ENV{NETCDF_DIR}/lib
- $ENV{NETCDF_DIR}/libsrc/.libs
- /usr/local/hdf5/lib
- )
-
-find_library( HDF5HL_LIBRARY hdf5_hl
- $ENV{ACCESS}/lib/shared
- $ENV{ACCESS}/lib
- $ENV{NETCDF_DIR}/lib
- $ENV{NETCDF_DIR}/libsrc/.libs
- /usr/local/hdf5/lib
- )
-
-find_library(Z_LIBRARY z
- /usr/local/zlib/lib
- )
-
-find_library(MATH_LIBRARY
- NAMES m
- PATHS /usr/lib64
- /usr/lib
-)
-
-INCLUDE_DIRECTORIES(
- "${CMAKE_CURRENT_SOURCE_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}"
- "${CMAKE_CURRENT_SOURCE_DIR}/../exodusii/cbind/include/"
- "${CMAKE_CURRENT_BINARY_DIR}/../exodusii/cbind/include/"
- "${NETCDF_INCLUDE_DIR}")
-
-SET(SOURCES
-nemesis_wrapper.c
-)
-
-ADD_LIBRARY(nemesis ${SOURCES})
-TARGET_LINK_LIBRARIES(nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
-
-ADD_EXECUTABLE(ne_test ne_ctest_wrap.c)
-TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
-
-INSTALL(TARGETS nemesis
- RUNTIME DESTINATION lib COMPONENT Runtime
- LIBRARY DESTINATION lib COMPONENT Runtime
- ARCHIVE DESTINATION lib COMPONENT Development)
-INSTALL(FILES ${HEADERS} DESTINATION include COMPONENT Development)
-
diff --git a/nemesis/COPYRIGHT b/nemesis/COPYRIGHT
deleted file mode 100644
index 07f206f..0000000
--- a/nemesis/COPYRIGHT
+++ /dev/null
@@ -1,32 +0,0 @@
-Copyright (c) 1998 Sandia Corporation. Under the terms of Contract
-DE-AC04-94AL85000 with Sandia Corporation, the U.S. Governement
-retains certain rights in this software.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of Sandia Corporation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/nemesis/Imakefile b/nemesis/Imakefile
deleted file mode 100644
index 6435610..0000000
--- a/nemesis/Imakefile
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 1998 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Governement
- * retains certain rights in this software.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * * Neither the name of Sandia Corporation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-XCOMM $Id: Imakefile,v 1.15 2008/01/24 19:43:41 gdsjaar Exp $
-XCOMM Imakefile for Nemesis libraries
-/* Building Nemesis libraries for installation
- * % accmkmf
- * % make Makefiles
- * % make all
- * % make install
- *
- * Building Nemesis libraries for debugging
- * % accmkmf
- * % make Makefiles
- * % make DEBUG=-g
- *
- */
-
-#define IHaveSubdirs
-
-#define PassDebugFlags "DEBUG=$(DEBUG)" \
- "CDEBUGFLAGS=$(CDEBUGFLAGS)" \
- "CXXDEBUGFLAGS=$(CXXDEBUGFLAGS)" \
- "F90DEBUGFLAGS=$(F90DEBUGFLAGS)" \
- "F77DEBUGFLAGS=$(F77DEBUGFLAGS)"
-
-#define ExtraOptions "CCOPTIONS=$(CCOPTIONS)"
-
-#ifndef BuildSharedExodusLibrary
-#define BuildSharedExodusLibrary NO
-#endif
-
-#define DoNormalLib YES
-#define DoSharedLib BuildSharedExodusLibrary
-#define LibName nemesis
-SOREV = 4
-#define SoRev SOREV
-
-#ifdef PARALLEL
-CCOPTIONS = ParallelCCOptions
-F77OPTIONS = ParallelF77Options
-LIBDIR = $(PLIBDIR)
-#endif
-
-DEFINES = $(PICFLAGS)
-SUBDIRS = forbind
-
-INCLIST = ne_nemesisI.h ne_nemesisI_int.h
-
-SRCS = nemesis_wrapper.c
-
-OBJS = ${SRCS:.c=.o}
-
-REQUIREDLIBS = -L$(SHLIBDIR) $(EXOIIV2C) $(NETCDF)
-LIBS = $(NETCDF) $(EXOIIV2C)
-
-#include <Library.tmpl>
-
-#if Build64BitAccess == YES
-AllTarget(libnemesis.a libnemIf.a libnemIf32.a)
-#else
-AllTarget(libnemesis.a libnemIf.a)
-#endif
-
-InstallIncludeList(makeincludes,$(INCLIST),$(INCDIR))
-InstallIncludeList(install,$(INCLIST),$(INCDIR))
-
-/* Directory for nemesis c library */
-NormalLibraryTarget(nemesis,$(OBJS))
-
-/* Directory for nemesis fortran wrappers */
-NamedTargetSubdirs(libnemIf.a,forbind,"making nemIf ",PassDebugFlags ExtraOptions,libnemIf.a)
-
-#if Build64BitAccess == YES
-NamedTargetSubdirs(libnemIf32.a,forbind,"making nemIf32 ",PassDebugFlags ExtraOptions,libnemIf32.a)
-#endif
-
-InstallLibrary(nemesis,$(LIBDIR))
-InstallLibraryAlias(nemesis,nemIc,$(LIBDIR))
-InstallLibrary(nemIf,$(LIBDIR))
-
-#if Build64BitAccess == YES
-InstallLibrary(nemIf32,$(LIBDIR))
-#endif
-
-#if Parallel
-InstallParallelLibrary(nemesis,$(PLIBDIR))
-InstallParallelLibrary(nemIf,$(PLIBDIR))
-
-#if Build64BitAccess == YES
-InstallParallelLibrary(nemIf32,$(PLIBDIR))
-#endif
-
-#endif
-
-
-CTESTLIBS = $(EXOIIV2C) $(NETCDF) -lm
-FTESTLIBS = $(EXOIIV2FOR) $(EXOIIV2C) $(NETCDF) -lm
-
-test: libnemesis.a libnemIf.a ne_ctest_wrap.c forbind/ne_ftest.F
- $(CC) -c $(CFLAGS) ne_ctest_wrap.c
- $(CC) $(LDOPTIONS) -o ne_ctest_wrap ne_ctest_wrap.o libnemesis.a $(LIBPATH) $(CTESTLIBS)
- $(FC) -c $(FFLAGS) $(STD_DEFINES) -I./forbind forbind/ne_ftest.F
- $(FC) $(LDOPTIONS) -o ne_ftest ne_ftest.o libnemIf.a $(LIBPATH) $(FTESTLIBS)
-
-ExtraStuffToClean(ne_ctest_wrap ne_ftest ne_test.exoII ne_test.nemI)
-
-$(OBJS): ne_nemesisI.h
-
-DependTarget()
-LibraryObjectRule()
diff --git a/nemesis/Makefile.standalone b/nemesis/Makefile.standalone
deleted file mode 100644
index 3e44075..0000000
--- a/nemesis/Makefile.standalone
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright (c) 1998 Sandia Corporation. Under the terms of Contract
-# DE-AC04-94AL85000 with Sandia Corporation, the U.S. Governement
-# retains certain rights in this software.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# * Neither the name of Sandia Corporation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-#========================================================================
-# A platform must define:
-#
-# BITS either 32 or 64 depending on a 32-bit or 64-bit build
-# CC == the C compiler
-# FC == the Fortran compiler
-# CCOPTIONS == non-optimization related flags for C compiling on this platform
-# F77OPTIONS == non-optimization related flags for Fortran compiling on this platform
-# OS_TYPE == See listing in forbind/src/Imakefile
-# RANLIB == ranlib or 'true' if no ranlib
-# AR == command to build an archive library.
-#
-#========================================================================
-
-SYSTEM := $(shell uname)
-
-#========================================================================
-# Linux
-#========================================================================
-ifeq ($(SYSTEM),Linux)
-BITS = 32
-RANLIB = ranlib
-OS_TYPE = linux
-
-AR = ar -rcv
-
-ifeq ($(COMPILER),Portland)
-CC = pgcc
-FC = pgf77
-CCOPTIONS = -Mframe
-F77OPTIONS = -fast
-endif
-
-ifeq ($(COMPILER),Intel)
-CC = icc
-CCOPTIONS = -Xc
-endif
-
-ifeq ($(COMPILER),GNU)
-CC = gcc
-FC = g77
-CCOPTIONS = -O2 -Wall -Wno-deprecated
-F77OPTIONS = -O2
-endif
-
-endif
-
-#========================================================================
-# SUN
-#========================================================================
-ifeq ($(SYSTEM),SunOS)
-RANLIB = ranlib
-OS_TYPE = sunos
-
-AR = CC -xar -o
-
-ifeq ($(COMPILER),GNU)
-BITS = 32
-CC = gcc
-FC = g77
-CCOPTIONS = -Wall
-else
-BITS = 32
-CC = cc
-FC = f77
-CCOPTIONS = -xtarget=ultra2 -xarch=v9 -g -ftrap=common -Xc
-F77OPTIONS = -xtarget=ultra2 -xarch=v9 -g -ftrap=common -errtags=INVOKE -C
-endif
-endif
-
-#========================================================================
-# SGI
-#========================================================================
-ifeq ($(SYSTEM),IRIX64)
-
-DO32=FALSE
-
-RANLIB = true
-OS_TYPE = irix
-AR = ar -rcv
-CC = cc
-FC = f77
-
-ifeq ($(DO32),TRUE)
-BITS = 32
-CCOPTIONS = -n32 -LANG:std
-F77OPTIONS = -n32
-F77PREC =
-
-else
-BITS = 64
-CCOPTIONS = -64 -LANG:std
-F77OPTIONS = -64
-F77PREC = -DBuild64 -r8 -i8
-endif
-endif
-
-#========================================================================
-# IBM
-#========================================================================
-ifeq ($(SYSTEM),AIX)
-BITS = 64
-RANLIB = ranlib
-OS_TYPE = aix
-
-AR = ar -rcv -X64
-CC = xlc
-FC = xlf
-CCOPTIONS = -q64 -w
-F77OPTIONS = -q64 -w
-F77PREC = -WF,-DBuild64 -qintsize=8 -qrealsize=8
-SYSLIB = -lm
-endif
-
-#========================================================================
-
-#========================================================================
-# TFLOP
-#========================================================================
-ifeq ($(SYSTEM),TFLOP)
-BITS = 32
-RANLIB = ranlib
-OS_TYPE = osf
-
-AR = xar -rcv
-CC = icc
-FC = if77
-CCOPTIONS = -DPUMAGON -cougar
-F77OPTIONS = -cougar
-endif
-
-#========================================================================
-
-#========================================================================
-# OSF (DEC Alpha)
-#========================================================================
-ifeq ($(SYSTEM),OSF1)
-BITS = 32
-RANLIB = ranlib
-OS_TYPE = osf
-
-AR = ar -crsv
-CC = cc
-FC = f77
-CCOPTIONS = -std strict_ansi -ptr $(shell pwd)/OSF1/cxx_repository -noimplicit_include -ttimestamp
-endif
-#========================================================================
-
-OPTIMIZE_FLAG = -O
-STD_DEFINES = -DVERBOSE
-
-CFLAGS = $(OPTIMIZE_FLAG) $(CCOPTIONS) $(STD_DEFINES) $(EXODUS_INC) $(NETCDF_INC)
-FFLAGS = $(OPTIMIZE_FLAG) $(F77OPTIONS) $(F77PREC) $(EXODUS_INC)
-
-NETCDF_INC = -I$(ACCESS)/inc
-EXODUS_INC = -I$(ACCESS)/inc
-
-NETCDF_LIB_DIR = ${ACCESS}/lib
-NETCDF_LIB = -L$(NETCDF_LIB_DIR) -lnetcdf
-
-EXODUS_LIB_DIR = ${ACCESS}/lib
-EXODUS_LIB = -L$(EXODUS_LIB_DIR) -lexodus
-EXODUS_FLIB = -L$(EXODUS_LIB_DIR) -lexoIIv2for
-
-EXT_LIBS = $(EXODUS_LIB) $(NETCDF_LIB)
-EXT_FLIBS = $(EXODUS_FLIB)
-
-SUBDIRS = forbind
-
-SRCS = nemesis_wrapper.c
-
-OBJS = ${SRCS:.c=.o}
-
-all:: libnemesis.a libnemIf.a
-
-libnemesis.a: $(OBJS)
- $(AR) $@ $?
- $(RANLIB) $@
-
-libnemIf.a:
- (cd forbind && $(MAKE) $(MFLAGS) -f Makefile.standalone "BITS=$(BITS)" "AR=$(AR)" "CC=$(CC)" "CFLAGS=$(CFLAGS)" "FC=$(FC)" "FFLAGS=$(FFLAGS)" "RANLIB=$(RANLIB)" "SYSTEM=$(SYSTEM)" "OS_TYPE=$(OS_TYPE)" libnemIf.a)
- cp forbind/libnemIf.a .
-
-check: test
-test:: ne_test.c libnemesis.a
- $(CC) -c $(CFLAGS) ne_test.c
- $(CC) $(CFLAGS) -o ne_ctest ne_test.o libnemesis.a $(EXT_LIBS) -lm
- ./ne_ctest
-
-test:: forbind/ne_test.f libnemIf.a
- $(FC) -c $(FFLAGS) -I./forbind forbind/ne_test.f
- $(FC) $(FFLAGS) -o ne_ftest ne_test.o libnemIf.a libnemesis.a $(EXT_FLIBS) $(EXT_LIBS) -lm
- ./ne_ftest
-
-clean::
- rm -f *.CKP *.ln *.BAK *.bak *.o *.M *.mod core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"*
-
-clean::
- rm -f ne_ctest ne_ftest ne_test.exoII ne_test.nemI
-
-clean::
- @for flag in $(MAKEFLAGS) ''; do \
- case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
- for i in $(SUBDIRS) ;\
- do \
- if test -d $$i; then \
- echo "cleaning" "in $(CURRENT_DIR)/$$i..."; \
- (cd $$i && $(MAKE) -f Makefile.standalone $(MFLAGS) clean); \
- fi; \
- done
-
-.SUFFIXES: .c
-.c.o:
- $(CC) -c -I. $(CFLAGS) $*.c
diff --git a/nemesis/README b/nemesis/README
deleted file mode 100644
index 31029c8..0000000
--- a/nemesis/README
+++ /dev/null
@@ -1,27 +0,0 @@
-The Nemesis library is licensed under the terms of the BSD License.
-
-Legal stuff (copyright, licensing restrictions, etc.) can be found in
-the file COPYRIGHT which contains:
-
-1. The Sandia Corporation Copyright Notice.
-2. The BSD License text.
-
-We appreciate feedback from users of this package. Please send
-comments, suggestions, and bug reports to Greg Sjaardema <gdsjaar at sandia.gov>.
-Please identify the version of the package.
-
-========================================================================
-
-NEMESIS is an enhancement to the EXODUSII finite element database
-model used to store and retrieve data for unstructured parallel finite
-element analyses. NEMESIS adds data structures which facilitate the
-partitioning of a scalar (standard serial) EXODUSII file onto parallel
-disk systems found on many parallel computers. Since the NEMESIS
-application programming interface (API) can be used to append
-information to an existing EXODUSII database, any existing software
-that reads EXODUSII files can be used on files which contain NEMESIS
-information. The NEMESIS information is written and read via C or C++
-callable functions which compromise the NEMESIS I API.
-
-The exodusII package is available at http://sourceforge.net/projects/exodusii
-
diff --git a/nemesis/forbind/Imakefile b/nemesis/forbind/Imakefile
deleted file mode 100644
index 61662ae..0000000
--- a/nemesis/forbind/Imakefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright (c) 1998 Sandia Corporation. Under the terms of Contract
-# DE-AC04-94AL85000 with Sandia Corporation, the U.S. Governement
-# retains certain rights in this software.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# * Neither the name of Sandia Corporation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-/* Use local include/XXX.h files instead of installed *.h files */
-ALTINC = IncRef-I../
-
-F77CPPFLAGS = F77CppFlags
-
-SRCS = ne_jack.c
-SRCSF = addrwrpn.F
-
-OBJS = ${SRCS:.c=.o} ${SRCSF:.F=.o}
-LibraryTargetSubdirsCopy(libnemIf.a,$(OBJS),../)
-CleanupCapF(addrwrpn.f)
-
-#if Build64BitAccess == YES
-/* Need to compile ne_jack.c without the -DBuild64 option
- * real* -> float* (actually void* since it handles both float* and double*)
- */
-ne_jack32.o: ne_jack.c
- $(CC) -o ne_jack32.o -c $(CFLAGS) -DDEFAULT_REAL_INT ne_jack.c
-
-all:: libnemIf32.a
-libnemIf32.a: ne_jack32.o
- $(AR) $@ $?
- $(_NULLCMD_)
- $(_NULLCMD_)
- $(CP) $@ ../
-#endif
-
-/*
- * 32-bit build:
- * Compile ne_jack.c and put in libexoIIv2for.a archive.
- *
- * 64-bit build: (using 8-byte integer/real)
- * Compile addrwrap.F (contains main api name 'func'; calls 'func4' name)
- * Compile ne_jack.c with -DBuild64 (adds 4_ to function names)
- * -- put above two object files into libnemIf.a
- *
- */
-
-DependTarget()
-
diff --git a/nemesis/forbind/Makefile b/nemesis/forbind/Makefile
deleted file mode 100644
index 212c74d..0000000
--- a/nemesis/forbind/Makefile
+++ /dev/null
@@ -1,585 +0,0 @@
-# Makefile generated by imake - do not edit!
-# $XConsortium: imake.c /main/90 1996/11/13 14:43:23 lehors $
-
-# ----------------------------------------------------------------------
-# Makefile generated from "Imake.tmpl" and </tmp/IIf.hQ1HOM>
-# $XConsortium: Imake.tmpl /main/243 1996/11/13 14:42:56 lehors $
-#
-
-all::
-
-.SUFFIXES: .i
-
-# $XConsortium: Imake.cf /main/26 1996/09/28 16:05:09 rws $
-
-# -----------------------------------------------------------------------
-# site-specific configuration parameters that need to come before
-# the platform-specific parameters - edit site.def to change
-
-# site.def file for SNL ACCESS System
-
-# ----------------------------------------------------------------------
-# platform-specific configuration parameters - edit darwin.cf to change
-
-#
-# NOTE: This was copied from the X11 distribution and modified.
-# It includes several symbols that are not used in ACCESS.
-#
-# NOTE: The default flags do not do very aggressive optimization;
-# You can change this if you want (possibly) faster execution.
-#
-# Contact seacas at sandia.gov if you have any questions
-#
-
-# operating system: Darwin (10.8.0)
-
-# $XFree86: xc/config/cf/darwinLib.rules,v 1.8 2003/10/09 22:43:18 herrb Exp $
-
-# ----------------------------------------------------------------------
-# site-specific configuration parameters that go after
-# the platform-specific parameters - edit site.def to change
-
-# site.def file for SNL ACCESS Darwin
-
-# ---------------------------------------------------------------------
-# Imake rules for building libraries, programs, scripts, and data files
-# rules: $XConsortium: Imake.rules /main/217 1996/12/05 09:48:26 kaleb $
-
- _NULLCMD_ = @ echo -n
-
- PATHSEP = /
- SHELL = /bin/sh
-
- SYSTEM = Darwin
- LSYSTEM = `echo $(SYSTEM) | tr "[A-Z]" "[a-z]"`
-
- TOP = ../../..
- CURRENT_DIR = libraries/nemesis/forbind
- DESTDIR =
- SERIALDEBUGCMD = "dbx"
- PARDEBUGCMDSNGL = "mpirun -dbx"
- PARDEBUGCMDMULT = "mpirun -dbx"
-
- IMAKE = $(ETCDIR)/imake
- DEPEND = $(ETCDIR)/makedepend
- MKDIRHIER = mkdir -p
- EXPORTLISTGEN =
- CONFIGSRC = $(TOP)/config
- IMAKESRC = $(CONFIGSRC)/imake
- DEPENDSRC = $(CONFIGSRC)/makedepend
-
- INCROOT = /Users/gdsjaar/src/SEACAS-SF-INSTALL/inc
- USRLIBDIR = /Users/gdsjaar/src/SEACAS-SF-INSTALL/lib
- SHLIBDIR = /Users/gdsjaar/src/SEACAS-SF-INSTALL/lib/shared
- LINTLIBDIR = $(USRLIBDIR)/lint
- MANPATH = /Users/gdsjaar/src/SEACAS-SF-INSTALL/man
- MANSOURCEPATH = $(MANPATH)/man
- MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
- LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSUFFIX)
- FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSUFFIX)
-
- AR = ar cr
- ARFLAGS = cru
- BOOTSTRAPCFLAGS =
- CC = /opt/local/bin/clang-mp-3.1
- FC = /opt/local/bin/gfortran-mp-4.8
- F90C = /opt/local/bin/gfortran-mp-4.8
- CCPAR = /opt/local/bin/clang-mp-3.1
- FCPAR = /opt/local/bin/gfortran-mp-4.8
- F90CPAR = /opt/local/bin/gfortran-mp-4.8
- AS = as
- TEST = /bin/test
- M2C = /bin/true
-
-.SUFFIXES: .cxx
-
- CXX = /opt/local/bin/clang++-mp-3.1
- CXXFILT = c++filt
- CXXLIB =
- CXXDEBUGFLAGS =
-CXXDEPENDINCLUDES =
- CXXEXTRA_DEFINES =
-CXXEXTRA_INCLUDES =
- CXXSTD_DEFINES = -DBuild64 -DADDC_ $(CXXPROJECT_DEFINES)
- CXXOPTIONS =
- CXXINCLUDES = $(CXXEXTRA_INCLUDES) $(INCLUDES) $(TOP_INCLUDES)
- CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
- CXXFLAGS = $(CXXDEBUGFLAGS) $(DEBUG) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) $(PROJECT_INCLUDES)
-
- COMPRESS = compress
- CPP = /usr/bin/cpp $(STD_CPP_DEFINES)
- PREPROCESSCMD = /usr/bin/cpp -P $(STD_CPP_DEFINES)
- INSTALL = install
- INSTALLFLAGS = -c
- LD = ld
- LEX = lex
- LEXLIB = -ll
- YACC = yacc
- CCYACC = yacc
- LINT = lint
- LINTLIBFLAG = -C
- LINTOPTS = -axz
- LN = ln -s
- MAKE = make
- MV = mv
- CP = cp
-
- RANLIB = ranlib
- RANLIBINSTFLAGS =
-
- RM = rm -f
- MANSUFFIX = n
- LIBMANSUFFIX = 3
- FILEMANSUFFIX = 5
- TROFF = psroff
- NROFF = nroff
- MSMACROS = -ms
- MANMACROS = -man
- TBL = tbl
- EQN = eqn
- NEQN = neqn
- COL = col
-
- PICFLAGS = -fPIC
-
- SHAREDCODEDEF =
- SHLIBDEF =
-
- SHLIBLDFLAGS = -dynamiclib -headerpad_max_install_names
-
- PICFLAGS = -fPIC
-
- CXXPICFLAGS = -fPIC
-
- INSTPGMFLAGS =
-
- INSTETCFLAGS = -m 775 -o gdsjaar -g _developer
- INSTBINFLAGS = -m 775 -o gdsjaar -g _developer
- INSTUIDFLAGS = -m InstAccUid -o gdsjaar -g _developer
- INSTLIBFLAGS = -m 775 -o gdsjaar -g _developer
- INSTINCFLAGS = -m 775 -o gdsjaar -g _developer
- INSTMANFLAGS = -m 765 -o gdsjaar -g _developer
- INSTDATFLAGS = -m 765 -o gdsjaar -g _developer
- INSTKMEMFLAGS = -m InstAccUid -o gdsjaar -g _developer
-
- PROJECTROOT = /Users/gdsjaar/src/SEACAS-SF-INSTALL
-
- STD_INCLUDES =
- STD_CPP_DEFINES = -DBuild64 -DADDC_ $(PROJECT_DEFINES)
- STD_DEFINES = -DBuild64 -DADDC_ $(PROJECT_DEFINES)
- EXTRA_LOAD_FLAGS =
- EXTRA_LDOPTIONS =
- EXTRA_LIBRARIES =
-F90EXTRALIBRARIES =
- TAGS = ctags
-
- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
- ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(THREADS_DEFINES) $(DEFINES)
-
- DEBUG = -O
- CDEBUGFLAGS =
- CCOPTIONS =
- PARCCOPTIONS =
- CCEXTRAOPTIONS =
- CFLAGS = $(CDEBUGFLAGS) $(DEBUG) $(CCOPTIONS) $(CCEXTRAOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(PROJECT_INCLUDES)
- LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
-
- F77DEBUGFLAGS =
- F77OPTIONS = -fno-range-check -fcray-pointer -fdefault-real-8 -fdefault-integer-8
- F77EXTRAOPTIONS =
- F77PRECOPTIONS =
- PARF77OPTIONS = -fno-range-check -fcray-pointer -fdefault-real-8 -fdefault-integer-8
- F77STATICFLAGS =
- F77CPPFLAGS = -D$(SYSTEM)
- FFLAGS = $(F77DEBUGFLAGS) $(DEBUG) $(F77OPTIONS) $(F77PRECOPTIONS) $(F77EXTRAOPTIONS) $(PROJECT_INCLUDES)
-
- F90DEBUGFLAGS =
- F90OPTIONS = -fno-range-check
- F90EXTRAOPTIONS =
- PARF90OPTIONS = -fno-range-check
- F90STATICFLAGS =
- F90CPPFLAGS = -D$(SYSTEM) $(STD_CPP_DEFINES)
- F90PRECOPTIONS =
-F90EXTRALDOPTIONS =
- F90FLAGS = $(F90DEBUGFLAGS) $(DEBUG) $(F90OPTIONS) $(F90EXTRAOPTIONS) $(F90PRECOPTIONS) $(PROJECT_INCLUDES)
-
- LDPRELIB = -L$(USRLIBDIR)
- LDPOSTLIB =
- LDOPTIONS = $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
- PARLDOPTIONS =
- LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
- CXXLDOPTIONS = $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-
- CCLINK = $(CC)
-
- NATIVECC = /opt/local/bin/clang-mp-3.1
- NATIVEF77 = /opt/local/bin/gfortran-mp-4.8
- CROSSCC = /opt/local/bin/clang-mp-3.1
- CROSSACCESSROOT = /Net/projects/seacas/janus/current
- CROSSACCESSSRC = $(CROSSACCESSROOT)/ACCESS
- CROSSALLDEFINES = -I$(CROSSACCESSROOT)/inc -Dcouar -DADDC_ -Usun
- CROSSLIBPATH = -L./ -L$(CROSSACCESSROOT)/lib
- CROSSPLIBPATH = -L./ -L$(CROSSACCESSROOT)/plib
- CROSSLIBDIR = $(CROSSACCESSROOT)/lib
- CROSSPLIBDIR = $(CROSSACCESSROOT)/plib
- CROSSPROJECTINCS = -I./ -I$(CROSSACCESSROOT)/inc
-
- CXXLINK = $(CXX)
-
- LDSTRIPFLAGS = -x
- LDCOMBINEFLAGS = -r
- DEPENDFLAGS =
-
- MACROFILE = darwin.cf
- RM_CMD = $(RM)
-
- IMAKE_DEFINES =
- ITOOLS_DEFINES = -DUseSfmakedepend=0
-
- IRULESRC = $(CONFIGDIR)
- IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
-
-# ----------------------------------------------------------------------
-# ACCESS Darwin Build Parameters and Rules
-# ACCESS.tmpl
-
- TEMPDIR = /tmp
-
-# PROJECTNAME : name of project
-# PROJECTRELEASE : release number of ACCESS distribution
-# ACCESSSRC : location of ACCESS source code
-# ACCESSDIR : location of ACCESS installation directories
-# Set in site.def : "SNLA ACCESS", "1.0", /Users/gdsjaar/src/SEACAS-SF, /Users/gdsjaar/src/SEACAS-SF-INSTALL
- PROJECTNAME = "SNLA ACCESS"
- PROJECTRELEASE = "1.0"
- ACCESSSRC = /Users/gdsjaar/src/SEACAS-SF/ACCESS
- ACCESSDIR = /Users/gdsjaar/src/SEACAS-SF-INSTALL
-
- TFLOPROOT = TflopAccessRoot
- CPLANTROOT = CplantAccessRoot
-
-# Used to specify location of hdf5 libraries for use with netcdf-4
- HDF5ROOT = /Users/gdsjaar/src/SEACAS-SF
-
-# Source code for the ACCESS Darwin
- ITOOLSSRC = itools
- GRAPHICSSRC = graphics
- SVDISRC = svdi
- LIBRARIESSRC = libraries
- NETCDFSRC = netcdf
- HDF5SRC = hdf5
- SERIALMPISRC = serial_mpi
- APPLICATIONSRC = applications
- SCRIPTSSRC = scripts
- TESTPROBS = test
- PARLIBRARIESSRC = parallellibraries
- PARNETCDFSRC = parallelnetcdf
-
-# Translator Subdirectories
- ALGEBRASRC = algebra
- ALGEBRA2SRC = algebra2
- CONCATSRC = concat
- CONEXSRC = conex
- CONEX2SRC = conex2
- CONJOINSRC = conjoin
- EJOINSRC = ejoin
- EMERGESRC = emerge
- EXOCTHSRC = exocth
- EXOEXOSRC = exoexo
- EXOPATSRC = exopat
- EXOSYMSRC = exosym
- EXOTRCSRC = exotrc
- EXOTEC2SRC = exotec2
- EXOTXTSRC = exotxt
- EXOTXT2SRC = exotxt2
- PATEXOSRC = patexo
- SEAEXOSRC = seaexo
- SPHGEN2DSRC = sphgen2d
- SPHGEN3DSRC = sphgen3d
- SPHGEN3D2SRC = sphgen3d2
- TXTEXOSRC = txtexo
- TXTEXO2SRC = txtexo2
- EXO2VISSRC = exo2vis
- EXOMATLABSRC = exomatlab
- EXOMATSRC = exomat
- EXO2MATSRC = exo2mat
-
- EX1EX2V2SRC = ex1ex2v2
- EX2EX1V2SRC = ex2ex1v2
- EXODIFFSRC = exodiff
- EPUSRC = epu
- ABAEXOSRC = abaexo
- NEM_JOINSRC = nem_join
- NEM_SLICESRC = nem_slice
- NEM_SPREADSRC = nem_spread
- WTO3DSRC = wto3d
-
-# Graphics Subdirectories
- BLOTSRC = blot
- BLOTII2SRC = blotII2
- FASTQSRC = fastq
- FONTSSRC = fonts
- GRAPHSRC = graph
-
-# Library Subdirectories
- SUPESSRC = supes
- SUPESDPSRC = supesdp
- SUPLIBSRC = suplib
- LEGACYSRC = legacy
- MAPVARLIBSRC = mapvarlib
- EXODUSSRC = exodus
- PLTSRC = plt
- VDI_DRIVERSSRC = vdi_drivers
- IOSSSRC = ioss
- ZOLTANSRC = zoltan
- CHACOSRC = chaco
- NEMESISSRC = nemesis
- APREPROLIBSRC = aprepro
- XHELPSRC = xhelp
-# Library Subdirectories for svdi
- CGISRC = cgi
- CDRSRC = cdr
- POSTSRC = post
- TESTSRC = test
-
-# Pre- and Post-processing Subdirectories
- APREPROSRC = aprepro
- FAILPROBSRC = failprob
- GEN3DSRC = gen3d
- GEN3D2SRC = gen3d2
- GENSHELLSRC = genshell
- GENSHELL2SRC = genshell2
- GENHXSHLSRC = genhxshl
- GJOINSRC = gjoin
- GJOIN1SRC = gjoin1
- GJOIN2SRC = gjoin2
- GREPOSSRC = grepos
- GREPOS2SRC = grepos2
- GROPESRC = grope
- MAPVARSRC = mapvar
- MAPVARKDSRC = mapvar-kd
- NUMBERSSRC = numbers
- NUMBERS2SRC = numbers2
- EX_JOINSRC = ex_join
- SPIFFSRC = spiff
-
-# ACCESS installation directories
- BINDIR = $(ACCESSDIR)/bin
- CONFIGDIR = $(ACCESSDIR)/config
- ETCDIR = $(ACCESSDIR)/etc
- INCDIR = $(ACCESSDIR)/inc
- LIBDIR = $(ACCESSDIR)/lib
- PLIBDIR = $(ACCESSDIR)/plib
- MATLABDIR = $(ACCESSDIR)/matlab
- SVDIDIR = $(ACCESSDIR)/svdi
- SVDITESTDIR = $(ACCESSDIR)/svdi/test
- BUILDINCDIR = $(ACCESSDIR)/inc
- BUILDINCTOP = ..
- BUILDLIBDIR = $(TOP)/usrlib
-
-# Override Include directories
- INCREF =
- ALTINC =
- INCLUDESRC = ./
- PROJECT_INCLUDES = -I$(INCLUDESRC) $(ALTINC) -I$(INCDIR)
-
-# Override Library directories
- LIBREF =
- ALTLIBPATH =
- LIBPATH = -L$(INCLUDESRC) $(ALTLIBPATH) -L$(LIBDIR)
- PLIBPATH = -L$(INCLUDESRC) $(ALTLIBPATH) -L$(PLIBDIR)
-
-# Libraries
- IOSS = -lIonit -lIoex -lIogn -lIotr -lIohb -lIoss
- HDF5 = -lhdf5
- HDF5_HL = -lhdf5_hl
- SUPES = -lsupes
- SUPESDP = -lsupesdp
- SUPLIB = -lsuplib
- LEGACY = -llegacy
- MAPVARLIB = -lmapvarlib
- PLT = -lplt
- RPCLIB =
- EXTRANETCDFLIB = -L$(HDF5ROOT)/lib -lhdf5_hl -lhdf5 -lm -lz
- LCLIB = -lLegacyContact
- NETCDF = -lnetcdf $(EXTRANETCDFLIB)
- EXOIIV2C = -lexodus
- EXODUS = -lexodus
- EXOIIV2FOR = -lexoIIv2for
- EXOIIV2FOR32 = -lexoIIv2for32
- ABALIB =
- CGI = -lcgi
- CDR = -lcdr
- NEMESIS = -lnemesis
- NEMESISC = -lnemesis
- NEMESISF = -lnemIf
- NEMESISF32 = -lnemIf32
- CHACO = -lchaco
- ZOLTAN = -lzoltan
- MATIO = -lmatio -lz
-
-# Libraries and include path used for building parallel executables
- PARFLIBS = -lmpi
- PARCLIBS = -lmpi
- PARINCPATH =
-
-# Perl command and includes needed for sfmakedepend
- PERLCMD = /usr/bin/perl
- DEPENDINC = -I /usr/include -I $(INCDIR)
-
-# X11 includes and libraries
- X11INCLUDES = -I/usr/X11R6/include
- X11 = -L/usr/X11R6/lib -lX11
-
-# Definitions used for running parallel executables
- PARALLEL = Parallel
- NUM_PROCS = 1
- PARRUNCMD = mpirun
- NPCMD = -np
- HFCMD = -p4pg
-
-# Imake flag used in the parallel directories
-
-PARALLELIMAKEFLAG = ParallelImakeFlag
-
- ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/ACCESS.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(EXTRA_ICONFIGFILES)
-
- CONFIGDIR = $(ACCESSDIR)/config
-
- USRLIBDIRPATH = /Users/gdsjaar/src/SEACAS-SF-INSTALL/lib
- LDPRELIBS =
- LDPOSTLIBS =
- TOP_INCLUDES = -I$(INCROOT)
- PROJECT_DEFINES =
-
-CXXPROJECT_DEFINES =
-
-# ----------------------------------------------------------------------
-# start of Imakefile
-
-# Copyright (c) 1998 Sandia Corporation. Under the terms of Contract
-# DE-AC04-94AL85000 with Sandia Corporation, the U.S. Governement
-# retains certain rights in this software.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# * Neither the name of Sandia Corporation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN 0 EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-ALTINC = -I../
-
-F77CPPFLAGS = -D$(SYSTEM)
-
-SRCS = ne_jack.c
-SRCSF = addrwrpn.F
-
-OBJS = ${SRCS:.c=.o} ${SRCSF:.F=.o}
-
-all:: libnemIf.a
-libnemIf.a: $(OBJS)
- $(AR) $@ $?
- $(RANLIB) $@
- $(_NULLCMD_)
- $(CP) libnemIf.a ../
-
-ne_jack32.o: ne_jack.c
- $(CC) -o ne_jack32.o -c $(CFLAGS) -DDEFAULT_REAL_INT ne_jack.c
-
-all:: libnemIf32.a
-libnemIf32.a: ne_jack32.o
- $(AR) $@ $?
- $(_NULLCMD_)
- $(_NULLCMD_)
- $(CP) $@ ../
-
-depend::
- $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)
-
-# ----------------------------------------------------------------------
-# common rules for all Makefiles - do not edit
-
-.c.i:
- $(RM) $@
- $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
-
-emptyrule::
-
-clean::
- $(RM) *.CKP *.ln *.BAK *.bak *.o *.M *.mod core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"*
-
-Makefile::
- - at if [ -f Makefile ]; then set -x; \
- $(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \
- else exit 0; fi
- $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-
-tags::
- $(TAGS) -w *.[ch]
- $(TAGS) -xw *.[ch] > TAGS
-
-man_keywords::
-
-# ----------------------------------------------------------------------
-# empty rules for directories that do not have SUBDIRS - do not edit
-
-install::
- @echo "install in $(CURRENT_DIR) done"
-
-install.man::
- @echo "install.man in $(CURRENT_DIR) done"
-
-install.linkkit::
- @echo "install.linkkit in $(CURRENT_DIR) done"
-
-Makefiles::
-
-includes::
-
-depend::
-
-# ----------------------------------------------------------------------
-
-.SUFFIXES: .F .f .f90 .c .C .cpp
-.c.o:
- $(CC) -c $(CFLAGS) $*.c
-.C.o:
- $(CXX) -c $(CXXFLAGS) $*.C
-.cpp.o:
- $(CXX) -c $(CXXFLAGS) $*.cpp
-.f.o:
- $(FC) -c $(STATICFLAGS) $(FFLAGS) $*.f
-.f90.o:
- $(F90C) -c $(STATICFLAGS) $(F90FLAGS) $*.f90
-.f90.mod:
- $(F90C) -c $(STATICFLAGS) $(F90FLAGS) $*.f90
-.mod.o:
-.F.o:
- $(FC) -c $(STD_CPP_DEFINES) $(F77CPPFLAGS) $(DEFINES) $(STATICFLAGS) $(FFLAGS) $*.F
-
-# ----------------------------------------------------------------------
-# dependencies generated by makedepend or sfmakedepend
-
diff --git a/nemesis/forbind/addrwrpn.F b/nemesis/forbind/addrwrpn.F
deleted file mode 100644
index ed6dddc..0000000
--- a/nemesis/forbind/addrwrpn.F
+++ /dev/null
@@ -1,1211 +0,0 @@
-C Copyright (c) 1998 Sandia Corporation. Under the terms of Contract
-C DE-AC04-94AL85000 with Sandia Corporation, the U.S. Governement
-C retains certain rights in this software.
-C
-C Redistribution and use in source and binary forms, with or without
-C modification, are permitted provided that the following conditions are
-C met:
-C
-C * Redistributions of source code must retain the above copyright
-C notice, this list of conditions and the following disclaimer.
-C
-C * Redistributions in binary form must reproduce the above
-C copyright notice, this list of conditions and the following
-C disclaimer in the documentation and/or other materials provided
-C with the distribution.
-C
-C * Neither the name of Sandia Corporation nor the names of its
-C contributors may be used to endorse or promote products derived
-C from this software without specific prior written permission.
-C
-C THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-C "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-C LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-C A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-C OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-C SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-C LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-C DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-C THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-C (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-C OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-C
-
- subroutine adrdumn
- end
-
-#ifdef Build64
-C-----------------------------------------------------------------------
-C
-C Get initial information from nemesis file
-C
- subroutine negii (idne, nproc, nproc_in_f, ftype, ierr)
- implicit none
- integer idne
- integer nproc
- integer nproc_in_f
- character*(*) ftype
- integer ierr
-C
- integer*4 idne4
- integer*4 nproc4
- integer*4 nproc_in_f4
- integer*4 ierr4
-C
- idne4 = idne
- call negii4 (idne4, nproc4, nproc_in_f4, ftype, ierr4)
- nproc = nproc4
- nproc_in_f = nproc_in_f4
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write initial information from nemesis file
-C
- subroutine nepii (idne, nproc, nproc_in_f, ftype, ierr)
- implicit none
- integer idne
- integer nproc
- integer nproc_in_f
- character*(*) ftype
- integer ierr
-C
- integer*4 idne4
- integer*4 nproc4
- integer*4 nproc_in_f4
- integer*4 ierr4
-C
- idne4 = idne
- nproc4 = nproc
- nproc_in_f4 = nproc_in_f
- call nepii4 (idne4, nproc4, nproc_in_f4, ftype, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read initial global information
-C
- subroutine negig (idne, nnodes_g, nelems_g, nelem_blks_g,
- $ nnode_sets_g, nside_sets_g, ierr)
- implicit none
- integer idne
- integer nnodes_g
- integer nelems_g
- integer nelem_blks_g
- integer nnode_sets_g
- integer nside_sets_g
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call negig4 (idne4, nnodes_g, nelems_g, nelem_blks_g,
- $ nnode_sets_g, nside_sets_g, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write initial global information
-C
- subroutine nepig (idne, nnodes_g, nelems_g, nelem_blks_g,
- $ nnode_sets_g, nside_sets_g, ierr)
- implicit none
- integer idne
- integer nnodes_g
- integer nelems_g
- integer nelem_blks_g
- integer nnode_sets_g
- integer nside_sets_g
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call nepig4 (idne4, nnodes_g, nelems_g, nelem_blks_g,
- $ nnode_sets_g, nside_sets_g, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read load balance parameters
-C
- subroutine neglbp (idne, nint_nodes, nbor_nodes, next_nodes,
- $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps,
- $ processor, ierr)
- implicit none
- integer idne
- integer nint_nodes
- integer nbor_nodes
- integer next_nodes
- integer nint_elems
- integer nbor_elems
- integer nnode_cmaps
- integer nelem_cmaps
- integer processor
- integer ierr
-C
- integer*4 idne4
- integer*4 processor4
- integer*4 ierr4
-C
- idne4 = idne
- processor4 = processor
- call neglbp4 (idne4, nint_nodes, nbor_nodes, next_nodes,
- $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps,
- $ processor4, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write load balance parameters
-C
- subroutine neplbp (idne, nint_nodes, nbor_nodes, next_nodes,
- $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps,
- $ processor, ierr)
- implicit none
- integer idne
- integer nint_nodes
- integer nbor_nodes
- integer next_nodes
- integer nint_elems
- integer nbor_elems
- integer nnode_cmaps
- integer nelem_cmaps
- integer processor
- integer ierr
-C
- integer*4 idne4
- integer*4 processor4
- integer*4 ierr4
-C
- idne4 = idne
- processor4 = processor
- call neplbp4 (idne4, nint_nodes, nbor_nodes, next_nodes,
- $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps,
- $ processor4, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write concatenated load balance parameters
-C
- subroutine neplbpc (idne, nint_nodes, nbor_nodes, next_nodes,
- $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps, ierr)
- implicit none
- integer idne
- integer nint_nodes(*)
- integer nbor_nodes(*)
- integer next_nodes(*)
- integer nint_elems(*)
- integer nbor_elems(*)
- integer nnode_cmaps(*)
- integer nelem_cmaps(*)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call neplbpc4 (idne4, nint_nodes, nbor_nodes, next_nodes,
- $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps,
- $ ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read global node set parameters
-C
- subroutine negnspg (idne, ns_ids_glob, ns_n_cnt_glob,
- $ ns_df_cnt_glob, ierr)
- implicit none
- integer idne
- integer ns_ids_glob(*)
- integer ns_n_cnt_glob(*)
- integer ns_df_cnt_glob(*)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call negnspg4 (idne4, ns_ids_glob, ns_n_cnt_glob,
- $ ns_df_cnt_glob, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write global node set parameters
-C
- subroutine nepnspg (idne, global_ids, global_n_cnts,
- $ global_df_cnts, ierr)
- integer idne
- integer global_ids(*)
- integer global_n_cnts(*)
- integer global_df_cnts(*)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call nepnspg4 (idne4, global_ids, global_n_cnts,
- $ global_df_cnts, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read global side set parameters
-C
- subroutine negsspg (idne, ss_ids_glob, ss_n_cnt_glob,
- $ ss_df_cnt_glob, ierr)
- implicit none
- integer idne
- integer ss_ids_glob(*)
- integer ss_n_cnt_glob(*)
- integer ss_df_cnt_glob(*)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call negsspg4 (idne4, ss_ids_glob, ss_n_cnt_glob,
- $ ss_df_cnt_glob, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write global side set parameters
-C
- subroutine nepsspg (idne, global_ids, global_el_cnts,
- $ global_df_cnts, ierr)
- implicit none
- integer idne
- integer global_ids(*)
- integer global_el_cnts(*)
- integer global_df_cnts(*)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call nepsspg4 (idne4, global_ids, global_el_cnts,
- $ global_df_cnts, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read global element block information
-C
- subroutine negebig (idne, el_blk_ids, el_blk_cnts, ierr)
- implicit none
- integer idne
- integer el_blk_ids(*)
- integer el_blk_cnts(*)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call negebig4 (idne4, el_blk_ids, el_blk_cnts, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write global element block information
-C
- subroutine nepebig (idne, el_blk_ids, el_blk_cnts, ierr)
- implicit none
- integer idne
- integer el_blk_ids(*)
- integer el_blk_cnts(*)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call nepebig4 (idne4, el_blk_ids, el_blk_cnts, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read side set element list and side set side list
-C
- subroutine negnss (idne, ss_id, start_side_num, num_sides,
- $ ss_elem_list, ss_side_list, ierr)
- implicit none
- integer idne
- integer ss_id
- integer start_side_num
- integer num_sides
- integer ss_elem_list(num_sides)
- integer ss_side_list(num_sides)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call negnss4 (idne4, ss_id, start_side_num, num_sides,
- $ ss_elem_list, ss_side_list, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write side set element list and side set side list
-C
- subroutine nepnss (idne, ss_id, start_side_num, num_sides,
- $ ss_elem_list, ss_side_list, ierr)
- implicit none
- integer idne
- integer ss_id
- integer start_side_num
- integer num_sides
- integer ss_elem_list(num_sides)
- integer ss_side_list(num_sides)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call nepnss4 (idne4, ss_id, start_side_num, num_sides,
- $ ss_elem_list, ss_side_list, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read side set distribution factor
-C
- subroutine negnssd (idne, ss_id, start_num, num_df_to_get,
- $ ss_df, ierr)
- implicit none
- integer idne
- integer ss_id
- integer start_num
- integer num_df_to_get
- real ss_df(num_df_to_get)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call negnssd4 (idne4, ss_id, start_num, num_df_to_get,
- $ ss_df, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write side set distribution factor
-C
- subroutine nepnssd (idne, ss_id, start_num, num_df_to_get,
- $ ss_df, ierr)
- implicit none
- integer idne
- integer ss_id
- integer start_num
- integer num_df_to_get
- real ss_df(num_df_to_get)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call nepnssd4 (idne4, ss_id, start_num, num_df_to_get,
- $ ss_df, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read node set list for a single node set
-C
- subroutine negnns (idne, ns_id, start_node_num, num_node,
- $ ns_node_list, ierr)
- implicit none
- integer idne
- integer ns_id
- integer start_node_num
- integer num_node
- integer ns_node_list(num_node)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call negnns4 (idne4, ns_id, start_node_num, num_node,
- $ ns_node_list, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write node set list for a single node set
-C
- subroutine nepnns (idne, ns_id, start_node_num, num_node,
- $ ns_node_list, ierr)
- implicit none
- integer idne
- integer ns_id
- integer start_node_num
- integer num_node
- integer ns_node_list(num_node)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call nepnns4 (idne4, ns_id, start_node_num, num_node,
- $ ns_node_list, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read node set distribution factor
-C
- subroutine negnnsd (idne, ns_id, start_num, num_df_to_get,
- $ ns_df, ierr)
- implicit none
- integer idne
- integer ns_id
- integer start_num
- integer num_df_to_get
- real ns_df(num_df_to_get)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call negnnsd4 (idne4, ns_id, start_num, num_df_to_get,
- $ ns_df, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write node set distribution factor
-C
- subroutine nepnnsd (idne, ns_id, start_num, num_df_to_get,
- $ ns_df, ierr)
- implicit none
- integer idne
- integer ns_id
- integer start_num
- integer num_df_to_get
- real ns_df(num_df_to_get)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call nepnnsd4 (idne4, ns_id, start_num, num_df_to_get,
- $ ns_df, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read coordinates of the nodes
-C
- subroutine negcor (idne, start_node_num, num_nodes, x_coor,
- $ y_coor, z_coor, ierr)
- implicit none
- integer idne
- integer start_node_num
- integer num_nodes
- real x_coor(num_nodes)
- real y_coor(num_nodes)
- real z_coor(num_nodes)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call negcor4 (idne4, start_node_num, num_nodes, x_coor,
- $ y_coor, z_coor, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write coordinates of the nodes
-C
- subroutine nepcor (idne, start_node_num, num_nodes, x_coor,
- $ y_coor, z_coor, ierr)
- implicit none
- integer idne
- integer start_node_num
- integer num_nodes
- real x_coor(num_nodes)
- real y_coor(num_nodes)
- real z_coor(num_nodes)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call nepcor4 (idne4, start_node_num, num_nodes, x_coor,
- $ y_coor, z_coor, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read an element blocks connectivity list
-C
- subroutine negnec (idne, elem_blk_id, start_elem_num,
- $ num_elems, connect, ierr)
- implicit none
- integer idne
- integer elem_blk_id
- integer start_elem_num
- integer num_elems
- integer connect(num_elems)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call negnec4 (idne4, elem_blk_id, start_elem_num,
- $ num_elems, connect, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write an element blocks connectivity list
-C
- subroutine nepnec (idne, elem_blk_id, start_elem_num,
- $ num_elems, connect, ierr)
- implicit none
- integer idne
- integer elem_blk_id
- integer start_elem_num
- integer num_elems
- integer connect(num_elems)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call nepnec4 (idne4, elem_blk_id, start_elem_num,
- $ num_elems, connect, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read an element blocks attributes
-C
- subroutine negneat (idne, elem_blk_id, start_elem_num,
- $ num_elems, attrib, ierr)
- implicit none
- integer idne
- integer elem_blk_id
- integer start_elem_num
- integer num_elems
- real attrib(num_elems)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call negneat4 (idne4, elem_blk_id, start_elem_num,
- $ num_elems, attrib, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write an element blocks attributes
-C
- subroutine nepneat (idne, elem_blk_id, start_elem_num,
- $ num_elems, attrib, ierr)
- implicit none
- integer idne
- integer elem_blk_id
- integer start_elem_num
- integer num_elems
- real attrib(num_elems)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call nepneat4 (idne4, elem_blk_id, start_elem_num,
- $ num_elems, attrib, ierr4)
- ierr = ierr4
-C
- end
-C
-C-----------------------------------------------------------------------
-C Read the element type for a specific element block
-C
- subroutine negelt (idne, elem_blk_id, elem_type, ierr)
- implicit none
- integer idne
- integer elem_blk_id
- character*(*) elem_type
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call negelt4 (idne4, elem_blk_id, elem_type, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read a variable for an element block
-C
- subroutine negnev (idne, time_step, elem_var_index,
- $ elem_blk_id, num_elem_this_blk, start_elem_num,
- $ num_elem, elem_var_vals, ierr)
- implicit none
- integer idne
- integer time_step
- integer elem_var_index
- integer elem_blk_id
- integer num_elem_this_blk
- integer start_elem_num
- integer num_elem
- real elem_var_vals(num_elem)
- integer ierr
-C
- integer*4 idne4
- integer*4 time_step4
- integer*4 elem_var_index4
- integer*4 ierr4
-C
- idne4 = idne
- time_step4 = time_step
- elem_var_index4 = elem_var_index
- call negnev4 (idne4, time_step4, elem_var_index4,
- $ elem_blk_id, num_elem_this_blk, start_elem_num,
- $ num_elem, elem_var_vals, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write a variable slab for an element block
-C
- subroutine nepevs (idne, time_step, elem_var_index,
- $ elem_blk_id, start_pos, num_vals, elem_var_vals,
- $ ierr)
- implicit none
- integer idne
- integer time_step
- integer elem_var_index
- integer elem_blk_id
- integer start_pos
- integer num_vals
- real elem_var_vals(num_vals)
- integer ierr
-C
- integer*4 idne4
- integer*4 time_step4
- integer*4 elem_var_index4
- integer*4 ierr4
-C
- idne4 = idne
- time_step4 = time_step
- elem_var_index4 = elem_var_index
- call nepevs4 (idne4, time_step4, elem_var_index4,
- $ elem_blk_id, start_pos, num_vals, elem_var_vals,
- $ ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read the values of a single nodal variable for a single time step
-C
- subroutine negnnv (idne, time_step, nodal_var_index,
- $ start_node_num, num_nodes, nodal_vars, ierr)
- implicit none
- integer idne
- integer time_step
- integer nodal_var_index
- integer start_node_num
- integer num_nodes
- real nodal_vars(num_nodes)
- integer ierr
-C
- integer*4 idne4
- integer*4 time_step4
- integer*4 nodal_var_index4
- integer*4 ierr4
-C
- idne4 = idne
- time_step4 = time_step
- nodal_var_index4 = nodal_var_index
- call negnnv4 (idne4, time_step4, nodal_var_index4,
- $ start_node_num, num_nodes, nodal_vars, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write nodal variable slab
-C
- subroutine nepnvs (idne, time_step, nodal_var_index,
- $ start_pos, num_vals, nodal_var_vals, ierr)
- implicit none
- integer idne
- integer time_step
- integer nodal_var_index
- integer start_pos
- integer num_vals
- real nodal_var_vals(num_vals)
- integer ierr
-C
- integer*4 idne4
- integer*4 time_step4
- integer*4 nodal_var_index4
- integer*4 ierr4
-C
- idne4 = idne
- time_step4 = time_step
- nodal_var_index4 = nodal_var_index
- call nepnvs4 (idne4, time_step4, nodal_var_index4,
- $ start_pos, num_vals, nodal_var_vals, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read the element numbering map
-C
- subroutine negnenm (idne, starte, num_ent, elem_map, ierr)
- implicit none
- integer idne
- integer starte
- integer num_ent
- integer elem_map(num_ent)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call negnenm4 (idne4, starte, num_ent, elem_map, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write the element numbering map
-C
- subroutine nepnenm (idne, starte, num_ent, elem_map, ierr)
- implicit none
- integer idne
- integer starte
- integer num_ent
- integer elem_map(num_ent)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call nepnenm4 (idne4, starte, num_ent, elem_map, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read the node numbering map
-C
- subroutine negnnnm (idne, startn, num_ent, node_map, ierr)
- implicit none
- integer idne
- integer startn
- integer num_ent
- integer node_map(num_ent)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call negnnnm4 (idne4, startn, num_ent, node_map, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write the node numbering map
-C
- subroutine nepnnnm (idne, startn, num_ent, node_map, ierr)
- implicit none
- integer idne
- integer startn
- integer num_ent
- integer node_map(num_ent)
- integer ierr
-C
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call nepnnnm4 (idne4, startn, num_ent, node_map, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read the node map for a processor
-C
- subroutine negnm (idne, node_mapi, node_mapb, node_mape,
- $ processor, ierr)
- implicit none
- integer idne
- integer node_mapi(*)
- integer node_mapb(*)
- integer node_mape(*)
- integer processor
- integer ierr
-C
- integer*4 idne4
- integer*4 processor4
- integer*4 ierr4
-C
- idne4 = idne
- processor4 = processor
- call negnm4 (idne4, node_mapi, node_mapb, node_mape,
- $ processor4, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write a node map for a processor
-C
- subroutine nepnm (idne, node_mapi, node_mapb, node_mape,
- $ processor, ierr)
- implicit none
- integer idne
- integer node_mapi(*)
- integer node_mapb(*)
- integer node_mape(*)
- integer processor
- integer ierr
-C
- integer*4 idne4
- integer*4 processor4
- integer*4 ierr4
-C
- idne4 = idne
- processor4 = processor
- call nepnm4 (idne4, node_mapi, node_mapb, node_mape,
- $ processor4, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read the element map for a processor
-C
- subroutine negem (idne, elem_mapi, elem_mapb, processor, ierr)
- implicit none
- integer idne
- integer elem_mapi(*)
- integer elem_mapb(*)
- integer processor
- integer ierr
-C
- integer*4 idne4
- integer*4 processor4
- integer*4 ierr4
-C
- idne4 = idne
- processor4 = processor
- call negem4 (idne4, elem_mapi, elem_mapb, processor4, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write the element map for a processor
-C
- subroutine nepem (idne, elem_mapi, elem_mapb, processor, ierr)
- implicit none
- integer idne
- integer elem_mapi(*)
- integer elem_mapb(*)
- integer processor
- integer ierr
-C
- integer*4 idne4
- integer*4 processor4
- integer*4 ierr4
-C
- idne4 = idne
- processor4 = processor
- call nepem4 (idne4, elem_mapi, elem_mapb, processor4, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read the communications map parameters for a single processor
-C
- subroutine negcmp (idne, ncmap_ids, ncmap_node_cnts,
- $ ecmap_ids, ecmap_elem_cnts, processor, ierr)
- implicit none
- integer idne
- integer ncmap_ids(*)
- integer ncmap_node_cnts(*)
- integer ecmap_ids(*)
- integer ecmap_elem_cnts(*)
- integer processor
- integer ierr
-C
- integer*4 idne4
- integer*4 processor4
- integer*4 ierr4
-C
- idne4 = idne
- processor4 = processor
- call negcmp4 (idne4, ncmap_ids, ncmap_node_cnts,
- $ ecmap_ids, ecmap_elem_cnts, processor4, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write the communications map parameters for a single processor
-C
- subroutine nepcmp (idne, nmap_ids, nmap_node_cnts, emap_ids,
- $ emap_elem_cnts, processor, ierr)
- implicit none
- integer idne
- integer nmap_ids(*)
- integer nmap_node_cnts(*)
- integer emap_ids(*)
- integer emap_elem_cnts(*)
- integer processor
- integer ierr
-
- integer*4 idne4
- integer*4 processor4
- integer*4 ierr4
-C
- idne4 = idne
- processor4 = processor
- call nepcmp4 (idne4, nmap_ids, nmap_node_cnts, emap_ids,
- $ emap_elem_cnts, processor4, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write the communications map parameters for all processors
-C
- subroutine nepcmpc (idne, nmap_ids, nmap_node_cnts,
- $ nproc_ptrs, emap_ids, emap_elem_cnts, eproc_ptrs, ierr)
- implicit none
- integer idne
- integer nmap_ids(*)
- integer nmap_node_cnts(*)
- integer nproc_ptrs(*)
- integer emap_ids(*)
- integer emap_elem_cnts(*)
- integer eproc_ptrs(*)
- integer ierr
-
- integer*4 idne4
- integer*4 ierr4
-C
- idne4 = idne
- call nepcmpc4 (idne4, nmap_ids, nmap_node_cnts,
- $ nproc_ptrs, emap_ids, emap_elem_cnts, eproc_ptrs, ierr4)
- ierr = ierr4
-
- end
-
-C-----------------------------------------------------------------------
-C
-C Read the nodal communications map for a single processor
-C
- subroutine negncm (idne, map_id, node_ids, proc_ids,
- $ processor, ierr)
- implicit none
- integer idne
- integer map_id
- integer node_ids(*)
- integer proc_ids(*)
- integer processor
- integer ierr
-C
- integer*4 idne4
- integer*4 processor4
- integer*4 ierr4
-C
- idne4 = idne
- processor4 = processor
- call negncm4 (idne4, map_id, node_ids, proc_ids,
- $ processor4, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write the nodal communications map for a single processor
-C
- subroutine nepncm (idne, map_id, node_ids, proc_ids,
- $ processor, ierr)
- implicit none
- integer idne
- integer map_id
- integer node_ids(*)
- integer proc_ids(*)
- integer processor
- integer ierr
-C
- integer*4 idne4
- integer*4 processor4
- integer*4 ierr4
-C
- idne4 = idne
- processor4 = processor
- call nepncm4 (idne4, map_id, node_ids, proc_ids,
- $ processor4, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Read the elemental communications map for a single processor
-C
- subroutine negecm (idne, map_id, elem_ids, side_ids,
- $ proc_ids, processor, ierr)
- implicit none
- integer idne
- integer map_id
- integer elem_ids(*)
- integer side_ids(*)
- integer proc_ids(*)
- integer processor
- integer ierr
-
- integer*4 idne4
- integer*4 processor4
- integer*4 ierr4
-C
- idne4 = idne
- processor4 = processor
- call negecm4 (idne4, map_id, elem_ids, side_ids,
- $ proc_ids, processor4, ierr4)
- ierr = ierr4
-C
- end
-
-C-----------------------------------------------------------------------
-C
-C Write the elemental communications map for a single processor
-C
- subroutine nepecm (idne, map_id, elem_ids, side_ids,
- $ proc_ids, processor, ierr)
- implicit none
- integer idne
- integer map_id
- integer elem_ids(*)
- integer side_ids(*)
- integer proc_ids(*)
- integer processor
- integer ierr
-
- integer*4 idne4
- integer*4 processor4
- integer*4 ierr4
-
- idne4 = idne
- processor4 = processor
- call nepecm4 (idne4, map_id, elem_ids, side_ids,
- $ proc_ids, processor4, ierr4)
- ierr = ierr4
-
- end
-C-----------------------------------------------------------------------
-#endif
diff --git a/nemesis/forbind/ne_ftest.F b/nemesis/forbind/ne_ftest.F
deleted file mode 100644
index 08c3330..0000000
--- a/nemesis/forbind/ne_ftest.F
+++ /dev/null
@@ -1,928 +0,0 @@
-C Copyright (c) 1998 Sandia Corporation. Under the terms of Contract
-C DE-AC04-94AL85000 with Sandia Corporation, the U.S. Governement
-C retains certain rights in this software.
-C
-C Redistribution and use in source and binary forms, with or without
-C modification, are permitted provided that the following conditions are
-C met:
-C
-C * Redistributions of source code must retain the above copyright
-C notice, this list of conditions and the following disclaimer.
-C
-C * Redistributions in binary form must reproduce the above
-C copyright notice, this list of conditions and the following
-C disclaimer in the documentation and/or other materials provided
-C with the distribution.
-C
-C * Neither the name of Sandia Corporation nor the names of its
-C contributors may be used to endorse or promote products derived
-C from this software without specific prior written permission.
-C
-C THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-C "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-C LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-C A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-C OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-C SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-C LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-C DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-C THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-C (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-C OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-C
-C=================================================================
-C
-C This is just a simple test program to test the fortran interface
-C for the NEMESIS I library.
-C
-C This file was created by translating ne_test.c into fortran.
-C
-C=================================================================
-
-C=================================================================
- PROGRAM NETEST
-C=================================================================
- INCLUDE 'exodusII.inc'
- INCLUDE 'ne_test.inc'
-
-C local variables
- INTEGER NEID, IO_WS, CPU_WS, T_PASS, T_FAIL, DBG_FLAG, IERR
- CHARACTER FNAME*256, YO*6
- REAL VERSION
-
- YO = 'NETEST'
- IO_WS = 0
- CPU_WS = 0
- T_PASS = 0
- T_FAIL = 0
- DBG_FLAG = 0
-
-C now let's get going...
-
-C I don't care about input arguements, so the file name will be ne_test.nemI
- FNAME = 'ne_test.nemI'
-C and set the debug flag to 0
- DBG_FLAG = 0
-
- PRINT*, '******************Output Tests*****************'
-C create the exodus II file
- PRINT*, 'creating ExodusII file...'
- NEID = EXCRE(FNAME, EXCLOB, CPU_WS, IO_WS, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- PRINT*, YO, ': ERROR, unable to create test file', FNAME, '!'
- GOTO 100
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test the output of initial information
- PRINT*, 'testing init info output...'
- CALL NEPII(NEID, NPROC, NPROCF, 'S', IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test the output of initial global information
- PRINT*, 'testing global init info output...'
- CALL NEPIG(NEID, NNG, NEG, NEBG, NNSG, NSSG, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test the output of the global element block IDs
- PRINT*, 'testing global element block ID output...'
- CALL NETPEBI(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test the output of the global node-set info
- PRINT*, 'testing global node-set params output...'
- CALL NETPNSP(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test the output of the global side-set info
- PRINT*, 'testing global side-set params output...'
- CALL NETPSSP(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test the output of the concatenated load-balance parameters
- PRINT*, 'testing concatenated load balance info output...'
- CALL NETPLBPC(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test the output of the node map
- PRINT*, 'testing node map output...'
- CALL NETPNM(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test the output of the element map
- PRINT*, 'testing element map output...'
- CALL NETPEM(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test the output of the concatenated communication map params
- PRINT*, 'testing concatenated communication map params output...'
- CALL NETPCMPC(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test nodal communication map output
- PRINT*, 'testing nodal communication map output...'
- CALL NETPNCM(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test elemental communication map output
- PRINT*, 'testing elemental communication map output...'
- CALL NETPECM(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Close the ExodusII/Nemesis test file
- PRINT*, 'closing ExodusII file...'
- CALL EXCLOS(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- PRINT*, YO, ': ERROR, unable to close test file', FNAME, '!'
- GOTO 100
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C=================================================================
-C INPUT TEST SECTION
-C=================================================================
-
- PRINT*, '******************Input Tests******************'
-
-C Re-open the ExodusII/NemesisI file
- PRINT*, 'reopening ExodusII file...'
- NEID = EXOPEN(FNAME, EXREAD, CPU_WS, IO_WS, VERSION, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- PRINT*, YO, ': ERROR, unable to open test file', FNAME, '!'
- GOTO 100
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test read of of the initial information
- PRINT*, 'testing init info input...'
- CALL NETGII(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test read of initial global information
- PRINT*, 'testing global init info input...'
- CALL NETGIG(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test read of global element block IDs
- PRINT*, 'testing global element block IDs input...'
- CALL NETGEBI(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test read of global node-set params
- PRINT*, 'testing global node-set params input...'
- CALL NETGNSP(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test read of global side-set params
- PRINT*, 'testing global side-set params input...'
- CALL NETGSSP(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test read of load-balance params
- PRINT*, 'testing load-balance params input...'
- CALL NETGLBP(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test read of the node map
- PRINT*, 'testing node map input...'
- CALL NETGNM(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test read of the element map
- PRINT*, 'testing element map input...'
- CALL NETGEM(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test read of nodal communication maps
- PRINT*, 'testing nodal communication map input...'
- CALL NETGNCM(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Test read of elemental communication maps
- PRINT*, 'testing elemental communication map input...'
- CALL NETGECM(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- IF (DBG_FLAG.EQ.1) THEN
- GOTO 100
- END IF
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
-C Close the ExodusII/Nemesis test file
- PRINT*, 'closing ExodusII file...'
- CALL EXCLOS(NEID, IERR)
- IF (IERR.NE.0) THEN
- PRINT*, '...FAILED'
- T_FAIL = T_FAIL + 1
- PRINT*, YO, ': ERROR, unable to close test file', FNAME, '!'
- GOTO 100
- ELSE
- PRINT*, '...successful'
- T_PASS = T_PASS + 1
- END IF
-
- PRINT*, 'Tests Passed: ', T_PASS
- PRINT*, 'Tests Failed: ', T_FAIL
-
- 100 CONTINUE
- END
-
-C=================================================================
- SUBROUTINE NETPEBI(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER I, EBLK_IDS(NEBG)
- INTEGER EBLK_CNTS(NEBG)
-
- DO 110 I=1,NEBG
- EBLK_IDS(I) = I
- EBLK_CNTS(I) = 10
- 110 CONTINUE
-
- CALL NEPEBIG(NEID, EBLK_IDS, EBLK_CNTS, IERR)
-
- END
-
-C=================================================================
- SUBROUTINE NETPNSP(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER I, GLBL_IDS(NNSG), GLBL_NC(NNSG), GLBL_DFC(NNSG)
-
- DO 120 I = 1,NNSG
- GLBL_IDS(I) = 2 * I
- GLBL_NC(I) = 3 * I
- GLBL_DFC(I) = 1
- 120 CONTINUE
-
- CALL NEPNSPG(NEID, GLBL_IDS, GLBL_NC, GLBL_DFC, IERR)
-
- END
-
-C=================================================================
- SUBROUTINE NETPSSP(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER I, GLBL_IDS(NSSG), GLBL_ELC(NSSG), GLBL_DFC(NSSG)
-
- DO 130 I = 1,NSSG
- GLBL_IDS(I) = 3 * I
- GLBL_ELC(I) = 2 * I
- GLBL_DFC(I) = 1
- 130 CONTINUE
-
- CALL NEPSSPG(NEID, GLBL_IDS, GLBL_ELC, GLBL_DFC, IERR)
-
- END
-
-C=================================================================
- SUBROUTINE NETPLBPC(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER IPROC, NUM_IN(NPROCF), NUM_BN(NPROCF), NUM_EN(NPROCF),
- 1 NUM_IE(NPROCF), NUM_BE(NPROCF), NUM_NCM(NPROCF), NUM_ECM(NPROCF)
-
- DO 140 IPROC = 1,NPROCF
- NUM_IN(IPROC) = NINTN
- NUM_BN(IPROC) = NBORN
- NUM_EN(IPROC) = NEXTN
-
- NUM_IE(IPROC) = NINTE
- NUM_BE(IPROC) = NBORE
-
- NUM_NCM(IPROC) = NNCMAP
- NUM_ECM(IPROC) = NECMAP
- 140 CONTINUE
-
- CALL NEPLBPC(NEID, NUM_IN, NUM_BN, NUM_EN, NUM_IE, NUM_BE,
- 1 NUM_NCM, NUM_ECM, IERR)
-
- END
-
-C=================================================================
- SUBROUTINE NETPNM(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER IPROC, I, J, NMAPI(NINTN), NMAPB(NBORN), NMAPE(NEXTN)
-
- I = 0
- DO 200 IPROC = 0,(NPROCF-1)
- DO 150 J = 1,NINTN
- NMAPI(J) = I
- I = I + 1
- 150 CONTINUE
- DO 160 J = 1,NBORN
- NMAPB(J) = I
- I = I + 1
- 160 CONTINUE
- DO 170 J = 1,NEXTN
- NMAPE(J) = I
- I = I + 1
- 170 CONTINUE
-
- I = 0
-
- CALL NEPNM(NEID, NMAPI, NMAPB, NMAPE, IPROC, IERR)
- IF (IERR.NE.0) GOTO 210
-
- 200 CONTINUE
-
- 210 CONTINUE
- END
-
-C=================================================================
- SUBROUTINE NETPEM(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER IPROC, I, J, EMAPI(NINTE), EMAPB(NBORE)
-
- I = 0
- DO 200 IPROC = 0,(NPROCF-1)
- DO 150 J = 1,NINTE
- EMAPI(J) = I
- I = I + 1
- 150 CONTINUE
- DO 160 J = 1,NBORE
- EMAPB(J) = I
- I = I + 1
- 160 CONTINUE
-
- I = 0
-
- CALL NEPEM(NEID, EMAPI, EMAPB, IPROC, IERR)
- IF (IERR.NE.0) GOTO 210
-
- 200 CONTINUE
-
- 210 CONTINUE
- END
-
-C=================================================================
- SUBROUTINE NETPCMPC(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER IPROC, I, NCNTR, ECNTR, NMAPIDS(NNCXNPF),
- 1 NMAPCNT(NNCXNPF), NMAPPROC(NPROCF+1), EMAPIDS(NECXNPF),
- 1 EMAPCNT(NECXNPF), EMAPPROC(NPROCF+1)
-
- NMAPPROC(1) = 0
- EMAPPROC(1) = 0
- NCNTR = 1
- ECNTR = 1
- DO 200 IPROC = 1,NPROCF
- DO 150 I = 1,NNCMAP
- NMAPIDS(NCNTR) = I
- NMAPCNT(NCNTR) = NCNTCM
- NCNTR = NCNTR + 1
- 150 CONTINUE
- DO 160 I = 1,NECMAP
- EMAPIDS(ECNTR) = 2*I
- EMAPCNT(ECNTR) = ECNTCM
- ECNTR = ECNTR + 1
- 160 CONTINUE
-
- NMAPPROC(IPROC+1) = NMAPPROC(IPROC) + NNCMAP
- EMAPPROC(IPROC+1) = EMAPPROC(IPROC) + NECMAP
-
- 200 CONTINUE
-
- CALL NEPCMPC(NEID, NMAPIDS, NMAPCNT, NMAPPROC, EMAPIDS, EMAPCNT,
- 1 EMAPPROC, IERR)
-
- END
-
-C=================================================================
- SUBROUTINE NETPNCM(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER IPROC, I, NMAPIDS(NNCMAP), NIDS(NCNTCM), PIDS(NCNTCM)
-
- DO 200 IPROC = 0,(NPROCF-1)
- DO 150 I = 1,NNCMAP
- NMAPIDS(I) = I
- 150 CONTINUE
- DO 160 I = 1,NCNTCM
- NIDS(I) = 2*I
- PIDS(I) = 3*I
- 160 CONTINUE
-
- DO 170 I=1,NNCMAP
- CALL NEPNCM(NEID, NMAPIDS(I), NIDS, PIDS, IPROC, IERR)
- IF (IERR.NE.0) GOTO 210
- 170 CONTINUE
-
- 200 CONTINUE
-
- 210 CONTINUE
- END
-
-C=================================================================
- SUBROUTINE NETPECM(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER IPROC, I, EMAPIDS(NECMAP), EIDS(ECNTCM), PIDS(ECNTCM),
- 1 SIDS(ECNTCM)
-
- DO 200 IPROC = 0,(NPROCF-1)
- DO 150 I = 1,NECMAP
- EMAPIDS(I) = 2*I
- 150 CONTINUE
- DO 160 I = 1,ECNTCM
- EIDS(I) = 2*I
- SIDS(I) = 3*I
- PIDS(I) = 4*I
- 160 CONTINUE
-
- DO 170 I=1,NECMAP
- CALL NEPECM(NEID, EMAPIDS(I), EIDS, SIDS, PIDS, IPROC, IERR)
- IF (IERR.NE.0) GOTO 210
- 170 CONTINUE
-
- 200 CONTINUE
-
- 210 CONTINUE
- END
-
-C=================================================================
- SUBROUTINE NETGII(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER NP, NPF
- CHARACTER FTYPE*2
-
- CALL NEGII(NEID, NP, NPF, FTYPE, IERR)
-
- IF (IERR.NE.0) GOTO 210
-
- IF (NP.NE.NPROC) IERR = -1
- IF (NPF.NE.NPROCF) IERR = -1
- IF (NP.NE.NPROC) IERR = -1
-
- 210 CONTINUE
- END
-
-C=================================================================
- SUBROUTINE NETGIG(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER NUMNG, NUMEG, NUMEBG, NUMNSG, NUMSSG
-
- CALL NEGIG(NEID, NUMNG, NUMEG, NUMEBG, NUMNSG, NUMSSG, IERR)
-
- IF (IERR.NE.0) GOTO 210
-
- IF (NUMNG.NE.NNG) IERR = -1
- IF (NUMEG.NE.NEG) IERR = -1
- IF (NUMEBG.NE.NEBG) IERR = -1
- IF (NUMNSG.NE.NNSG) IERR = -1
- IF (NUMSSG.NE.NSSG) IERR = -1
-
- 210 CONTINUE
- END
-
-C=================================================================
- SUBROUTINE NETGEBI(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER I, EBLK_IDS(NEBG)
- INTEGER EBLK_CNTS(NEBG)
-
- CALL NEGEBIG(NEID, EBLK_IDS, EBLK_CNTS, IERR)
-
- IF (IERR.NE.0) GOTO 210
-
- DO 150 I=1,NEBG
- IF (EBLK_IDS(I).NE.I) IERR = -1
- IF (EBLK_CNTS(I) .NE. 10) IERR = -1
- 150 CONTINUE
-
- 210 CONTINUE
- END
-
-C=================================================================
- SUBROUTINE NETGNSP(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER I, GLBL_IDS(NNSG), GLBL_NC(NNSG), GLBL_DFC(NNSG)
-
- CALL NEGNSPG(NEID, GLBL_IDS, GLBL_NC, GLBL_DFC, IERR)
-
- IF (IERR.NE.0) GOTO 210
-
- DO 150 I=1,NNSG
- IF (GLBL_IDS(I).NE.(2*I)) IERR = -1
- IF (GLBL_NC(I).NE.(3*I)) IERR = -1
- IF (GLBL_DFC(I).NE.1) IERR = -1
- 150 CONTINUE
-
- 210 CONTINUE
- END
-
-C=================================================================
- SUBROUTINE NETGSSP(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER I, GLBL_IDS(NSSG), GLBL_EC(NSSG), GLBL_DFC(NSSG)
-
- CALL NEGSSPG(NEID, GLBL_IDS, GLBL_EC, GLBL_DFC, IERR)
-
- IF (IERR.NE.0) GOTO 210
-
- DO 150 I=1,NNSG
- IF (GLBL_IDS(I).NE.(3*I)) IERR = -1
- IF (GLBL_EC(I).NE.(2*I)) IERR = -1
- IF (GLBL_DFC(I).NE.1) IERR = -1
- 150 CONTINUE
-
- 210 CONTINUE
- END
-
-C=================================================================
- SUBROUTINE NETGLBP(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER IPROC, NUM_IN, NUM_BN, NUM_EN, NUM_IE, NUM_BE,
- * NUM_NCM, NUM_ECM
-
- DO 150 IPROC = 0,(NPROCF-1)
- CALL NEGLBP(NEID, NUM_IN, NUM_BN, NUM_EN, NUM_IE, NUM_BE,
- 1 NUM_NCM, NUM_ECM, IPROC, IERR)
-
- IF (IERR.NE.0) GOTO 210
-
- IF(NUM_IN.NE.NINTN) IERR = -1
- IF(NUM_BN.NE.NBORN) IERR = -1
- IF(NUM_EN.NE.NEXTN) IERR = -1
- IF(NUM_IE.NE.NINTE) IERR = -1
- IF(NUM_BE.NE.NBORE) IERR = -1
- IF(NUM_NCM.NE.NNCMAP) IERR = -1
- IF(NUM_ECM.NE.NECMAP) IERR = -1
- 150 CONTINUE
-
- 210 CONTINUE
- END
-
-C=================================================================
- SUBROUTINE NETGNM(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER IPROC, I, J, NMAPI(NINTN), NMAPB(NBORN), NMAPE(NEXTN)
-
- I = 0
- DO 200 IPROC = 0,(NPROCF-1)
-
- CALL NEGNM(NEID, NMAPI, NMAPB, NMAPE, IPROC, IERR)
-
- IF (IERR.NE.0) GOTO 210
-
- DO 150 J = 1,NINTN
- IF (NMAPI(J).NE.I) ERR = -1
- I = I + 1
- 150 CONTINUE
- DO 160 J = 1,NBORN
- IF (NMAPB(J).NE.I) ERR = -1
- I = I + 1
- 160 CONTINUE
- DO 170 J = 1,NEXTN
- IF (NMAPE(J).NE.I) ERR = -1
- I = I + 1
- 170 CONTINUE
-
- I = 0
-
- IF (IERR.NE.0) GOTO 210
-
- 200 CONTINUE
-
- 210 CONTINUE
- END
-
-C=================================================================
- SUBROUTINE NETGEM(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER IPROC, I, J, EMAPI(NINTE), EMAPB(NBORE)
-
- I = 0
- DO 200 IPROC = 0,(NPROCF-1)
- CALL NEGEM(NEID, EMAPI, EMAPB, IPROC, IERR)
-
- IF (IERR.NE.0) GOTO 210
-
- DO 150 J = 1,NINTE
- IF (EMAPI(J).NE.I) ERR = -1
- I = I + 1
- 150 CONTINUE
- DO 160 J = 1,NBORE
- IF (EMAPB(J).NE.I) ERR = -1
- I = I + 1
- 160 CONTINUE
-
- I = 0
-
- IF (IERR.NE.0) GOTO 210
-
- 200 CONTINUE
-
- 210 CONTINUE
- END
-
-C=================================================================
- SUBROUTINE NETGNCM(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER IPROC, I, J, NMAPIDS(NNCMAP), NMAPCNT(NNCMAP),
- 1 NIDS(NCNTCM), PIDS(NCNTCM), EMAPIDS(NECMAP), EMAPCNT(NECMAP)
-
- DO 200 IPROC = 0,(NPROCF-1)
- CALL NEGCMP(NEID, NMAPIDS, NMAPCNT, EMAPIDS, EMAPCNT,
- 1 IPROC, IERR)
-
- IF (IERR.NE.0) GOTO 210
-
- DO 170 I = 1,NNCMAP
- CALL NEGNCM(NEID, NMAPIDS(I), NIDS, PIDS, IPROC, IERR)
-
- IF (IERR.NE.0) GOTO 210
-
- IF (NMAPIDS(I).NE.I) IERR = -1
- DO 160 J = 1,NCNTCM
- IF (NIDS(J).NE.2*J) IERR = -1
- IF (PIDS(J).NE.3*J) IERR = -1
- 160 CONTINUE
-
- IF (IERR.NE.0) GOTO 210
- 170 CONTINUE
-
- 200 CONTINUE
-
- 210 CONTINUE
- END
-
-C=================================================================
- SUBROUTINE NETGECM(NEID, IERR)
-C=================================================================
-
- INCLUDE 'ne_test.inc'
-
- INTEGER IPROC, I, EMAPIDS(NECMAP), EMAPCNT(NECMAP), EIDS(ECNTCM),
- 1 PIDS(ECNTCM), SIDS(ECNTCM), NMAPIDS(NNCMAP), NMAPCNT(NNCMAP)
-
- DO 200 IPROC = 0,(NPROCF-1)
- CALL NEGCMP(NEID, NMAPIDS, NMAPCNT, EMAPIDS, EMAPCNT,
- 1 IPROC, IERR)
-
- IF (IERR.NE.0) GOTO 210
-
- DO 170 I = 1,NECMAP
- CALL NEGECM(NEID, EMAPIDS(I), EIDS, SIDS, PIDS, IPROC, IERR)
-
- IF (IERR.NE.0) GOTO 210
-
- IF (EMAPIDS(I).NE.(2*I)) IERR = -1
- DO 160 J = 1,ECNTCM
- IF (EIDS(J).NE.2*J) IERR = -1
- IF (SIDS(J).NE.3*J) IERR = -1
- IF (PIDS(J).NE.4*J) IERR = -1
- 160 CONTINUE
-
- IF (IERR.NE.0) GOTO 210
- 170 CONTINUE
-
- 200 CONTINUE
-
- 210 CONTINUE
- END
-
diff --git a/nemesis/forbind/ne_test.inc b/nemesis/forbind/ne_test.inc
deleted file mode 100644
index 0f033a1..0000000
--- a/nemesis/forbind/ne_test.inc
+++ /dev/null
@@ -1,66 +0,0 @@
-C Copyright (c) 1998 Sandia Corporation. Under the terms of Contract
-C DE-AC04-94AL85000 with Sandia Corporation, the U.S. Governement
-C retains certain rights in this software.
-C
-C Redistribution and use in source and binary forms, with or without
-C modification, are permitted provided that the following conditions are
-C met:
-C
-C * Redistributions of source code must retain the above copyright
-C notice, this list of conditions and the following disclaimer.
-C
-C * Redistributions in binary form must reproduce the above
-C copyright notice, this list of conditions and the following
-C disclaimer in the documentation and/or other materials provided
-C with the distribution.
-C
-C * Neither the name of Sandia Corporation nor the names of its
-C contributors may be used to endorse or promote products derived
-C from this software without specific prior written permission.
-C
-C THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-C "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-C LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-C A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-C OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-C SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-C LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-C DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-C THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-C (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-C OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-C
-C==================================================
-C Parameters for the NE_TEST fortran interface test
-C program
-C==================================================
-
-C Constants for init_global functions
- PARAMETER (NNG = 100)
- PARAMETER (NEG = 50)
- PARAMETER (NEBG = 5)
- PARAMETER (NNSG = 2)
- PARAMETER (NSSG = 3)
-
-C Constants for load-balance functions
- PARAMETER (NPROC = 10)
- PARAMETER (NPROCF = NPROC)
- PARAMETER (NINTN = 200)
- PARAMETER (NBORN = 10)
- PARAMETER (NEXTN = 5)
- PARAMETER (NINTE = 100)
- PARAMETER (NBORE = 20)
- INTEGER NNCMAP, NECMAP
- PARAMETER (NNCMAP = 4)
- PARAMETER (NECMAP = 2)
-
-C Constants for communication map
- PARAMETER (NCNTCM = 20)
- INTEGER ECNTCM
- PARAMETER (ECNTCM = 17)
-
-C Some multiplied values
-C NNCMAP * NPROCF
- PARAMETER (NNCXNPF = 40)
-C NECMAP * NPROCF
- PARAMETER (NECXNPF = 20)
diff --git a/nemesis/ne_ctest_wrap.c b/nemesis/ne_ctest_wrap.c
deleted file mode 100644
index ccc33be..0000000
--- a/nemesis/ne_ctest_wrap.c
+++ /dev/null
@@ -1,1044 +0,0 @@
-/*
- * Copyright (c) 1998 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Governement
- * retains certain rights in this software.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * * Neither the name of Sandia Corporation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-/*****************************************************************************/
-/*****************************************************************************/
-/*****************************************************************************/
-/* This file contains the source code for the program used to test the
- * Nemesis distribution.
- *****************************************************************************
- * Written By: Gary L. Hennigan (SNL, 1421)
- *****************************************************************************
- * Functions contained in this file:
- * main() - Entry point and main calling program.
- */
-/*****************************************************************************/
-/*****************************************************************************/
-/*****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <exodusII.h>
-
-#include "ne_nemesisI.h"
-
-/* Constants for init_global functions */
-#define NNG 100
-#define NEG 50
-#define NEBG 5
-#define NEBCG 10
-#define NNSG 2
-#define NSSG 3
-
-/* Constants for load-balance functions */
-#define NPROC 10
-#define NPROCF NPROC
-#define NINTN 200
-#define NBORN 10
-#define NEXTN 5
-#define NINTE 100
-#define NBORE 20
-#define NNCMAP 4
-#define NECMAP 2
-
-/* Constants for communication map */
-#define NCNTCM 20
-#define ECNTCM 17
-
-int main(int argc, char *argv[])
-{
-
- /* Local function calls */
- int ne_test_glbp(int);
- int ne_test_piinf(int);
- int ne_test_pinig(int);
- int ne_test_pelbid(int);
- int ne_test_pnsp(int);
- int ne_test_pssp(int);
- int ne_test_pnm(int);
- int ne_test_pem(int);
- int ne_test_pcmp(int);
- int ne_test_pncm(int);
- int ne_test_pecm(int);
-
- int ne_test_giinf(int);
- int ne_test_ginig(int);
- int ne_test_gelbid(int);
- int ne_test_gnsp(int);
- int ne_test_gssp(int);
- int ne_test_gnm(int);
- int ne_test_gem(int);
- int ne_test_gncm(int);
- int ne_test_gecm(int);
-
- int ne_test_plbpc(int);
- int ne_test_pcmpc(int);
-
- /* Unitialized local variables */
- int ne_file_id;
- char test_direc[256], file_name[256];
- float version;
-
- /* Initialized local variables */
- int mode3 = EX_CLOBBER;
- int mode4 = EX_CLOBBER|EX_NETCDF4|EX_NOCLASSIC;
-
- char *yo="main";
- int io_ws=0, cpu_ws=0, t_pass=0, t_fail=0;
- int debug_flag=0;
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- /* Get the location of the temporary file to use for the test */
- if (argc <= 1) {
- /* Nothing specified. Use defaults. */
- strcpy(file_name, "./ne_test.exoII");
- }
- else if (argc == 2) {
- /* Test for the help flag */
- if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "-?") == 0) {
- /* Output the help line */
- printf("Usage:\n\tne_test <optional directory> <optional file name>\n");
- exit(0);
- }
- /* Test for the debug flag */
- else if (strcmp(argv[1], "-d") == 0 || strcmp(argv[1], "-d") == 0) {
- printf("****DEBUG MODE****\n");
- ex_opts(EX_VERBOSE | EX_DEBUG);
- strcpy(file_name, "./ne_test.exoII");
- debug_flag = 1;
- }
- /* Else get the directory name and assign default name */
- else {
- strcpy(test_direc, argv[1]);
- if (test_direc[strlen(test_direc)-1] != '/') {
- strcpy(file_name, test_direc);
- strcat(file_name, "/ne_test.exoII");
- }
- else {
- strcpy(file_name, test_direc);
- strcat(file_name, "ne_test.exoII");
- }
- }
- }
- else if (argc == 3) {
- /* Both directory and file name specified */
- strcpy(test_direc, argv[1]);
- if (test_direc[strlen(test_direc)-1] == '/') {
- strcpy(file_name, test_direc);
- strcat(file_name, "/");
- strcat(file_name, argv[2]);
- }
- else {
- strcpy(file_name, test_direc);
- strcat(file_name, argv[2]);
- }
- }
-
-/*---------------------------------------------------------------------------*/
-/* OUTPUT TEST SECTION */
-/*---------------------------------------------------------------------------*/
-
- printf("*********************Output Tests***********************\n");
-
- /* Create the ExodusII/Nemesis file */
- printf("creating ExodusII file..."); fflush(stdout);
-
- /* Attempt to create a netcdf4-format file; if it fails, then assume
- that the netcdf library does not support that mode and fall back
- to classic netcdf3 format. If that fails, issue an error and
- die.
- */
- if ((ne_file_id=ex_create(file_name, mode4, &cpu_ws, &io_ws)) < 0) {
- /* netcdf4 create failed, try netcdf3 */
- if ((ne_file_id=ex_create(file_name, mode3, &cpu_ws, &io_ws)) < 0) {
- printf("FAILED\n");
- t_fail++;
- fprintf(stderr, "[%s]: ERROR, unable to create test file \"%s\"!\n",
- yo, file_name);
- exit(-1);
- } else {
- printf(" (netcdf3 format) ");
- }
- } else {
- printf(" (netcdf4 format) ");
- }
- printf("successful\n"); fflush(stdout);
- t_pass++;
-
- /* Test the output of initial information */
- printf("testing init info output..."); fflush(stdout);
- if (ne_test_piinf(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test the output of initial global information */
- printf("testing global init info output..."); fflush(stdout);
- if (ne_test_pinig(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test the output of the global element block IDs */
- printf("testing global element block ID output..."); fflush(stdout);
- if (ne_test_pelbid(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test the output of the global node-set info */
- printf("testing global node-set params output..."); fflush(stdout);
- if (ne_test_pnsp(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test the output of the global side-set info */
- printf("testing global side-set params output..."); fflush(stdout);
- if (ne_test_pssp(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test the output of the concatenated load-balance parameters */
- printf("testing concatenated load balance info output...");
- fflush(stdout);
- if (ne_test_plbpc(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- }
- else {
- printf("succesful\n"); fflush(stdout);
- }
-
- /* Test the output of the node map */
- printf("testing node map output..."); fflush(stdout);
- if (ne_test_pnm(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test the output of the element map */
- printf("testing element map output..."); fflush(stdout);
- if (ne_test_pem(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test the output of the concatenated communication map params */
- printf("testing concatenated communication map params output...");
- fflush(stdout);
- if (ne_test_pcmpc(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test nodal communication map output */
- printf("testing nodal communication map output..."); fflush(stdout);
- if (ne_test_pncm(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test elemental communication map output */
- printf("testing elemental communication map output..."); fflush(stdout);
- if (ne_test_pecm(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Close the ExodusII/Nemesis test file */
- printf("closing ExodusII file..."); fflush(stdout);
- if (ex_close(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- fprintf(stderr, "[%s]: ERROR, unable to close test file \"%s\"!\n",
- yo, file_name);
- exit(-1);
- }
- printf("successful\n"); fflush(stdout);
- t_pass++;
-
-/*---------------------------------------------------------------------------*/
-/* INPUT TEST SECTION */
-/*---------------------------------------------------------------------------*/
-
- printf("**********************Input Tests***********************\n");
-
- /* Re-open the ExodusII/NemesisI file */
- printf("reopening ExodusII file..."); fflush(stdout);
- if (ex_open(file_name, EX_READ, &cpu_ws, &io_ws, &version) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test read of of the initial information */
- printf("testing init info input..."); fflush(stdout);
- if (ne_test_giinf(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test read of initial global information */
- printf("testing global init info input..."); fflush(stdout);
- if (ne_test_ginig(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test read of global element block IDs */
- printf("testing global element block IDs input..."); fflush(stdout);
- if (ne_test_gelbid(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test read of global node-set params */
- printf("testing global node-set params input..."); fflush(stdout);
- if (ne_test_gnsp(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test read of global side-set params */
- printf("testing global side-set params input..."); fflush(stdout);
- if (ne_test_gssp(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test read of load-balance params */
- printf("testing load-balance params input..."); fflush(stdout);
- if (ne_test_glbp(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test read of the node map */
- printf("testing node map input..."); fflush(stdout);
- if (ne_test_gnm(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test read of element map */
- printf("testing element map input..."); fflush(stdout);
- if (ne_test_gem(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test read of nodal communication maps */
- printf("testing nodal communication map input..."); fflush(stdout);
- if (ne_test_gncm(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Test read of elemental communication maps */
- printf("testing elemental communication map input..."); fflush(stdout);
- if (ne_test_gecm(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- if (debug_flag == 1)
- return 1;
- }
- else {
- printf("successful\n"); fflush(stdout);
- t_pass++;
- }
-
- /* Close the ExodusII/Nemesis test file */
- printf("closing ExodusII file..."); fflush(stdout);
- if (ex_close(ne_file_id) < 0) {
- printf("FAILED\n"); fflush(stdout);
- t_fail++;
- fprintf(stderr, "[%s]: ERROR, unable to close test file \"%s\"!\n",
- yo, file_name);
- exit(-1);
- }
- printf("successful\n"); fflush(stdout);
- t_pass++;
-
- /* Output a test summary */
- printf("\n");
- printf("Tests Passed: %d\n", t_pass);
- printf("Tests Failed: %d\n", t_fail);
-
- return 0;
-}
-
-/*****************************************************************************/
-int ne_test_piinf(int fileid)
-{
- char ftype[3];
-
- strcpy(ftype, "s");
-
- return (ne_put_init_info(fileid, NPROC, NPROCF, ftype));
-}
-
-/*****************************************************************************/
-int ne_test_pinig(int fileid)
-{
-
- int nng=NNG, neg=NEG, nebg=NEBG, nnsg=NNSG, nssg=NSSG;
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- return (ne_put_init_global(fileid, nng, neg, nebg, nnsg, nssg));
-}
-
-/*****************************************************************************/
-int ne_test_pelbid(int fileid)
-{
- int i, elblk_ids[NEBG], elblk_cnt[NEBG];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- for(i=0; i < NEBG; i++) {
- elblk_ids[i]=(i+1);
- elblk_cnt[i]=NEBCG;
- }
-
- return (ne_put_eb_info_global(fileid, elblk_ids, elblk_cnt));
-}
-
-/*****************************************************************************/
-int ne_test_pnsp(int fileid)
-{
- int i, global_ids[NNSG], global_n_cnts[NNSG], global_df_cnts[NNSG];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- for(i=0; i < NNSG; i++) {
- global_ids[i]=2*(i+1);
- global_n_cnts[i]=3*(i+1);
- global_df_cnts[i]=1;
- }
-
- return (ne_put_ns_param_global(fileid, global_ids, global_n_cnts,
- global_df_cnts));
-}
-
-/*****************************************************************************/
-int ne_test_pssp(int fileid)
-{
- int i, global_ids[NSSG], global_el_cnts[NSSG], global_df_cnts[NSSG];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- for(i=0; i < NSSG; i++) {
- global_ids[i]=3*(i+1);
- global_el_cnts[i]=2*(i+1);
- global_df_cnts[i]=1;
- }
-
- return (ne_put_ss_param_global(fileid, global_ids, global_el_cnts,
- global_df_cnts));
-}
-
-/*****************************************************************************/
-int ne_test_pnm(int fileid)
-{
- int iproc, j, error, j1=0;
- int node_mapi[NINTN], node_mapb[NBORN], node_mape[NEXTN];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- for(iproc=0; iproc < NPROCF; iproc++) {
- for(j=0; j < NINTN; node_mapi[j++]=j1++);
- for(j=0; j < NBORN; node_mapb[j++]=j1++);
- for(j=0; j < NEXTN; node_mape[j++]=j1++);
- j1 = 0;
- error = ne_put_node_map(fileid, node_mapi, node_mapb, node_mape, iproc);
- if (error < 0) return error;
- }
-
- return 0;
-
-}
-
-/*****************************************************************************/
-int ne_test_pem(int fileid)
-{
- int iproc, j, error, j1=0;
- int elem_mapi[NINTE], elem_mapb[NBORE];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- for(iproc=0; iproc < NPROCF; iproc++) {
- for(j=0; j < NINTE; elem_mapi[j++]=j1++);
- for(j=0; j < NBORE; elem_mapb[j++]=j1++);
- j1 = 0;
- error = ne_put_elem_map(fileid, elem_mapi, elem_mapb, iproc);
- if (error < 0) return error;
- }
-
- return 0;
-
-}
-
-/*****************************************************************************/
-int ne_test_pcmp(int fileid)
-{
- int i, iproc, error;
- int node_map_ids[NNCMAP], node_map_node_cnts[NNCMAP];
- int elem_map_ids[NECMAP], elem_map_elem_cnts[NECMAP];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- for(iproc=0; iproc < NPROCF; iproc++) {
- for(i=0; i < NNCMAP; i++) {
- node_map_ids[i]=(i+1);
- node_map_node_cnts[i]=NCNTCM;
- }
-
- for(i=0; i < NECMAP; i++) {
- elem_map_ids[i]=2*(i+1);
- elem_map_elem_cnts[i]=ECNTCM;
- }
-
- error = ne_put_cmap_params(fileid, node_map_node_cnts, node_map_ids,
- elem_map_elem_cnts, elem_map_ids, iproc);
- if (error < 0) return error;
- }
-
- return 0;
-
-}
-
-/*****************************************************************************/
-int ne_test_pncm(int fileid)
-{
- int i, iproc, error;
- int node_map_ids[NNCMAP], node_ids[NCNTCM], proc_ids[NCNTCM];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- for(iproc=0; iproc < NPROCF; iproc++) {
- for(i=0; i < NNCMAP; i++) {
- node_map_ids[i]=(i+1);
- }
- for(i=0; i < NCNTCM; i++) {
- node_ids[i] = 2*(i+1);
- proc_ids[i] = 3*(i+1);
- }
-
- for(i=0; i < NNCMAP; i++) {
- error = ne_put_node_cmap(fileid, node_map_ids[i], node_ids,
- proc_ids, iproc);
- if (error < 0) return error;
- }
- }
-
- return 0;
-}
-
-/*****************************************************************************/
-int ne_test_pecm(int fileid)
-{
- int i, iproc, error;
- int elem_map_ids[NECMAP], elem_ids[ECNTCM], side_ids[ECNTCM];
- int proc_ids[ECNTCM];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- for(iproc=0; iproc < NPROCF; iproc++) {
- for(i=0; i < NECMAP; i++) {
- elem_map_ids[i]=2*(i+1);
- }
- for(i=0; i < ECNTCM; i++) {
- elem_ids[i] = 2*(i+1);
- side_ids[i] = 3*(i+1);
- proc_ids[i] = 4*(i+1);
- }
-
- for(i=0; i < NECMAP; i++) {
- error = ne_put_elem_cmap(fileid, elem_map_ids[i], elem_ids,
- side_ids, proc_ids, iproc);
- if (error < 0) return error;
- }
- }
-
- return 0;
-}
-
-/*****************************************************************************/
-int ne_test_giinf(int fileid)
-{
- int error, nproc, nprocf;
- char ftype[2];
-
-/*-----------------------------Execution Begins-----------------------------*/
- error = ne_get_init_info(fileid, &nproc, &nprocf, ftype);
-
- if (error < 0) return error;
-
- if (nproc != NPROC) return -1;
- if (nprocf != NPROCF) return -1;
- if (strcmp(ftype, "s") != 0) return -1;
-
- return 0;
-}
-
-/*****************************************************************************/
-int ne_test_ginig(int fileid)
-{
-
- int error;
- int num_nodes_g, num_elems_g, num_elem_blks_g, num_ns_g, num_ss_g;
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- error = ne_get_init_global(fileid, &num_nodes_g, &num_elems_g,
- &num_elem_blks_g, &num_ns_g, &num_ss_g);
-
- if (error < 0) return error;
-
- if (num_nodes_g != NNG) return -1;
- if (num_elems_g != NEG) return -1;
- if (num_elem_blks_g != NEBG) return -1;
- if (num_ns_g != NNSG) return -1;
- if (num_ss_g != NSSG) return -1;
-
- return 0;
-}
-
-/*****************************************************************************/
-int ne_test_gelbid(int fileid)
-{
-
- int i, error;
- int el_blk_ids[NEBG], el_blk_cnt[NEBG];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- error = ne_get_eb_info_global(fileid, el_blk_ids, el_blk_cnt);
-
- if (error < 0) return error;
-
- for(i=0; i < NEBG; i++) {
- if (el_blk_ids[i] != (i+1)) return -1;
- if (el_blk_cnt[i] != NEBCG) return -1;
- }
-
- return 0;
-}
-
-/*****************************************************************************/
-int ne_test_gnsp(int fileid)
-{
-
- int i, error;
- int global_ids[NNSG], global_n_cnts[NNSG], global_df_cnts[NNSG];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- error = ne_get_ns_param_global(fileid, global_ids, global_n_cnts,
- global_df_cnts);
-
- if (error < 0) return error;
-
- for(i=0; i < NNSG; i++) {
- if (global_ids[i] != 2*(i+1)) return -1;
- if (global_n_cnts[i] != 3*(i+1)) return -1;
- if (global_df_cnts[i] != 1 ) return -1;
- }
-
- return 0;
-}
-
-/*****************************************************************************/
-int ne_test_gssp(int fileid)
-{
-
- int i, error;
- int global_ids[NSSG], global_e_cnts[NSSG], global_df_cnts[NSSG];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- error = ne_get_ss_param_global(fileid, global_ids, global_e_cnts,
- global_df_cnts);
-
- if (error < 0) return error;
-
- for(i=0; i < NSSG; i++) {
- if (global_ids[i] != 3*(i+1)) return -1;
- if (global_e_cnts[i] != 2*(i+1)) return -1;
- if (global_df_cnts[i] != 1 ) return -1;
- }
-
- return 0;
-}
-
-/*****************************************************************************/
-int ne_test_glbp(int fileid)
-{
-
- int iproc, error;
- int nintn, nborn, nextn, ninte, nbore, nncmap, necmap;
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- for(iproc=0; iproc < NPROCF; iproc++) {
- error = ne_get_loadbal_param(fileid, &nintn, &nborn, &nextn, &ninte,
- &nbore, &nncmap, &necmap, iproc);
-
- if (error < 0) return error;
-
- if (nintn != NINTN ) return -1;
- if (nborn != NBORN ) return -1;
- if (nextn != NEXTN ) return -1;
- if (ninte != NINTE ) return -1;
- if (nbore != NBORE ) return -1;
- if (nncmap != NNCMAP) return -1;
- if (necmap != NECMAP) return -1;
-
- }
-
- return 0;
-}
-
-/*****************************************************************************/
-int ne_test_gnm(int fileid)
-{
- int iproc, j, error, j1=0;
- int node_mapi[NINTN], node_mapb[NBORN], node_mape[NEXTN];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
-
- for(iproc=0; iproc < NPROCF; iproc++) {
- error = ne_get_node_map(fileid, node_mapi, node_mapb, node_mape, iproc);
-
- if (error < 0) return error;
-
- for(j=0; j < NINTN; j++) {
- if (node_mapi[j] != j1++) return -1;
- }
- for(j=0; j < NBORN; j++) {
- if (node_mapb[j] != j1++) return -1;
- }
- for(j=0; j < NEXTN; j++) {
- if (node_mape[j] != j1++) return -1;
- }
-
- j1 = 0;
- }
-
- return 0;
-}
-
-/*****************************************************************************/
-int ne_test_gem(int fileid)
-{
- int iproc, j, error, j1=0;
- int elem_mapi[NINTE], elem_mapb[NBORE];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- for(iproc=0; iproc < NPROCF; iproc++) {
-
- error = ne_get_elem_map(fileid, elem_mapi, elem_mapb, iproc);
-
- if (error < 0) return error;
-
- for(j=0; j < NINTE; j++) {
- if (elem_mapi[j] != j1++) return -1;
- }
- for(j=0; j < NBORE; j++) {
- if (elem_mapb[j] != j1++) return -1;
- }
- j1 = 0;
- }
-
- return 0;
-
-}
-
-/*****************************************************************************/
-int ne_test_gncm(int fileid)
-{
- int i, j, iproc, error;
- int node_map_ids[NNCMAP], node_map_cnts[NNCMAP];
- int node_ids[NCNTCM], proc_ids[NCNTCM];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- for(iproc=0; iproc < NPROCF; iproc++) {
-
- error = ne_get_cmap_params(fileid, node_map_ids, node_map_cnts,
- NULL, NULL, iproc);
-
- if (error < 0) return error;
-
- for(i=0; i < NNCMAP; i++) {
- error = ne_get_node_cmap(fileid, node_map_ids[i], node_ids,
- proc_ids, iproc);
-
- if (error < 0) return error;
-
- for(j=0; j < NCNTCM; j++) {
- if (node_ids[j] != 2*(j+1)) return -1;
- if (proc_ids[j] != 3*(j+1)) return -1;
- }
- }
- }
-
- return 0;
-}
-
-/*****************************************************************************/
-int ne_test_gecm(int fileid)
-{
- int i, j, iproc, error;
- int elem_ids[ECNTCM], elem_map_cnts[NECMAP], proc_ids[ECNTCM];
- int side_ids[ECNTCM], elem_map_ids[NECMAP];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- for(iproc=0; iproc < NPROCF; iproc++) {
-
- error = ne_get_cmap_params(fileid, NULL, NULL,
- elem_map_ids, elem_map_cnts, iproc);
-
- if (error < 0) return error;
-
- for(i=0; i < NECMAP; i++) {
- error = ne_get_elem_cmap(fileid, elem_map_ids[i], elem_ids,
- side_ids, proc_ids, iproc);
-
- if (error < 0) return error;
-
- for(j=0; j < ECNTCM; j++) {
- if (elem_ids[j] != 2*(j+1)) return -1;
- if (side_ids[j] != 3*(j+1)) return -1;
- if (proc_ids[j] != 4*(j+1)) return -1;
- }
- }
- }
-
- return 0;
-}
-
-/*****************************************************************************/
-int ne_test_plbpc(int fileid)
-{
- int iproc;
-
- int num_int_nodes[NPROCF], num_bor_nodes[NPROCF], num_ext_nodes[NPROCF];
- int num_int_elems[NPROCF], num_bor_elems[NPROCF];
- int num_node_cmaps[NPROCF], num_elem_cmaps[NPROCF];
-
-/*-----------------------------Execution Begins-----------------------------*/
-
- /* Set up the vectors */
- for(iproc=0; iproc < NPROCF; iproc++) {
- num_int_nodes[iproc] = NINTN;
- num_bor_nodes[iproc] = NBORN;
- num_ext_nodes[iproc] = NEXTN;
-
- num_int_elems[iproc] = NINTE;
- num_bor_elems[iproc] = NBORE;
-
- num_node_cmaps[iproc] = NNCMAP;
- num_elem_cmaps[iproc] = NECMAP;
- }
-
- return (ne_put_loadbal_param_cc(fileid, num_int_nodes, num_bor_nodes,
- num_ext_nodes, num_int_elems,
- num_bor_elems, num_node_cmaps,
- num_elem_cmaps));
-
-}
-
-/*****************************************************************************/
-int ne_test_pcmpc(int fileid)
-{
- int iproc, j, n_cntr, e_cntr;
-
- int nmap_ids[NNCMAP*NPROCF], nmap_n_cnts[NNCMAP*NPROCF];
- int nmap_proc_ptr[NPROCF+1];
- int emap_ids[NECMAP*NPROCF], emap_e_cnts[NECMAP*NPROCF];
- int emap_proc_ptr[NPROCF+1];
-/*-----------------------------Execution Begins-----------------------------*/
-
- nmap_proc_ptr[0] = 0;
- emap_proc_ptr[0] = 0;
- n_cntr = 0;
- e_cntr = 0;
- for(iproc=0; iproc < NPROCF; iproc++) {
-
- for(j=0; j < NNCMAP; j++) {
- nmap_ids[n_cntr] = (j+1);
- nmap_n_cnts[n_cntr++] = NCNTCM;
- }
-
- for(j=0; j < NECMAP; j++) {
- emap_ids[e_cntr] = 2*(j+1);
- emap_e_cnts[e_cntr++] = ECNTCM;
- }
-
- nmap_proc_ptr[iproc+1] = nmap_proc_ptr[iproc] + NNCMAP;
- emap_proc_ptr[iproc+1] = emap_proc_ptr[iproc] + NECMAP;
- }
-
-
- return (ne_put_cmap_params_cc(fileid, nmap_ids, nmap_n_cnts, nmap_proc_ptr,
- emap_ids, emap_e_cnts, emap_proc_ptr));
-}
diff --git a/nemesis/ne_nemesisI.h b/nemesis/ne_nemesisI.h
deleted file mode 100644
index cbd5b87..0000000
--- a/nemesis/ne_nemesisI.h
+++ /dev/null
@@ -1,492 +0,0 @@
-/*
- * Copyright (c) 1998 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Governement
- * retains certain rights in this software.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * * Neither the name of Sandia Corporation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/****************************************************************************
- * This file contains prototypes for the functions found in the NEMESIS
- * library.
- ****************************************************************************/
-
-#ifndef _NE_NEMESIS_H
-#define _NE_NEMESIS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef EXODUS_II_HDR
-#include <stdint.h>
- /** Specifies that this argument is the id of an entity: element block, nodeset, sideset, ... */
- typedef int64_t ex_entity_id;
-
- /** The mechanism for passing double/float and int/int64_t both use a
- void*; to avoid some confusion as to whether a function takes an
- integer or a float/double, the following typedef is used for the
- integer argument
- */
- typedef void void_int;
-#endif
-
-/*=============================================================================
- * Initial Information Routines
- *===========================================================================*/
-extern int
-ne_get_init_info(int neid, /* NemesisI file ID */
- int *num_proc, /* Number of processors */
- int *num_proc_in_f, /* Number of procs in this file */
- char *ftype
- );
-
-extern int
-ne_put_init_info(int neid, /* NemesisI file ID */
- int num_proc, /* Number of processors */
- int num_proc_in_f, /* Number of procs in this file */
- char *ftype
- );
-
-extern int
-ne_get_init_global(int neid, /* NemesisI file ID */
- void_int *num_nodes_g, /* Number of global FEM nodes */
- void_int *num_elems_g, /* Number of global FEM elements */
- void_int *num_elem_blks_g, /* Number of global elem blocks */
- void_int *num_node_sets_g, /* Number of global node sets */
- void_int *num_side_sets_g /* Number of global side sets */
- );
-extern int
-ne_put_init_global(int neid, /* NemesisI file ID */
- int64_t num_nodes_g, /* Number of global FEM nodes */
- int64_t num_elems_g, /* Number of global FEM elements */
- int64_t num_elem_blks_g, /* Number of global elem blocks */
- int64_t num_node_sets_g, /* Number of global node sets */
- int64_t num_side_sets_g /* Number of global side sets */
- );
-
-extern int
-ne_put_version(int neid);
-
-/*=============================================================================
- * Loadbalance Parameter Routines
- *===========================================================================*/
-extern int
-ne_get_loadbal_param(int neid, /* NetCDF/Exodus file ID */
- void_int *num_int_nodes, /* Number of internal FEM nodes */
- void_int *num_bor_nodes, /* Number of border FEM nodes */
- void_int *num_ext_nodes, /* Number of external FEM nodes */
- void_int *num_int_elems, /* Number of internal FEM elems */
- void_int *num_bor_elems, /* Number of border FEM elems */
- void_int *num_node_cmaps, /* Number of nodal comm maps */
- void_int *num_elem_cmaps, /* Number of elemental comm maps */
- int processor /* Processor ID */
- );
-
-extern int
-ne_put_loadbal_param(int neid, /* NemesisI file ID */
- int64_t num_int_nodes, /* Number of internal FEM nodes */
- int64_t num_bor_nodes, /* Number of border FEM nodes */
- int64_t num_ext_nodes, /* Number of external FEM nodes */
- int64_t num_int_elems, /* Number of internal FEM elems */
- int64_t num_bor_elems, /* Number of border FEM elems */
- int64_t num_node_cmaps,/* Number of nodal comm maps */
- int64_t num_elem_cmaps,/* Number of elemental comm maps */
- int processor /* Processor ID */
- );
-
-extern int
-ne_put_loadbal_param_cc(int neid, /* NetCDF/Exodus file ID */
- void_int *num_int_nodes, /* Number of internal node IDs */
- void_int *num_bor_nodes, /* Number of border node IDs */
- void_int *num_ext_nodes, /* Number of external node IDs */
- void_int *num_int_elems, /* Number of internal elem IDs */
- void_int *num_bor_elems, /* Number of border elem IDs */
- void_int *num_node_cmaps, /* Number of nodal comm maps */
- void_int *num_elem_cmaps /* Number of elem comm maps */
- );
-
-/*=============================================================================
- * NS, SS & EB Global Parameter Routines
- *===========================================================================*/
-extern int
-ne_get_ns_param_global(int neid, /* NetCDF/Exodus file ID */
- void_int *ns_ids_glob, /* Global IDs of node sets */
- void_int *ns_n_cnt_glob, /* Count of nodes in node sets */
- void_int *ns_df_cnt_glob /* Count of dist. factors in ns */
- );
-
-extern int
-ne_put_ns_param_global(int neid, /* NemesisI file ID */
- void_int *global_ids, /* Vector of global node-set IDs */
- void_int *global_n_cnts, /* Vector of node counts in node-sets */
- void_int *global_df_cnts /* Vector of dist factor counts in node-sets */
- );
-
-extern int
-ne_get_ss_param_global(int neid, /* NetCDF/Exodus file ID */
- void_int *ss_ids_glob, /* Global side-set IDs */
- void_int *ss_s_cnt_glob, /* Global side count */
- void_int *ss_df_cnt_glob /* Global dist. factor count */
- );
-
-extern int
-ne_put_ss_param_global(int neid, /* NemesisI file ID */
- void_int *global_ids, /* Vector of global side-set IDs */
- void_int *global_el_cnts, /* Vector of element/side */
- /* counts in each side set */
- void_int *global_df_cnts /* Vector of dist. factor */
- /* counts in each side set */
- );
-
-extern int
-ne_get_eb_info_global(int neid, /* NemesisI file ID */
- void_int *el_blk_ids, /* Vector of global element IDs */
- void_int *el_blk_cnts /* Vector of global element counts */
- );
-
-extern int
-ne_put_eb_info_global(int neid, /* NemesisI file ID */
- void_int *el_blk_ids, /* Vector of global element IDs */
- void_int *el_blk_cnts /* Vector of global element counts */
- );
-
-/*=============================================================================
- * NS, SS & EB Subset Routines
- *===========================================================================*/
-extern int
-ne_get_n_side_set(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id side_set_id, /* Side-set ID to read */
- int64_t start_side_num, /* Starting element number */
- int64_t num_sides, /* Number of sides to read */
- void_int *side_set_elem_list, /* List of element IDs */
- void_int *side_set_side_list /* List of side IDs */
- );
-
-extern int
-ne_put_n_side_set(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id side_set_id, /* Side-set ID to write */
- int64_t start_side_num, /* Starting element number */
- int64_t num_sides, /* Number of sides to write */
- const void_int *side_set_elem_list, /* List of element IDs */
- const void_int *side_set_side_list /* List of side IDs */
- );
-
-extern int
-ne_get_n_side_set_df(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id side_set_id, /* Side-set ID */
- int64_t start_num, /* Starting df number */
- int64_t num_df_to_get, /* Number of df's to read */
- void *side_set_df /* Distribution factors */
- );
-
-extern int
-ne_put_n_side_set_df(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id side_set_id, /* Side-set ID */
- int64_t start_num, /* Starting df number */
- int64_t num_df_to_get, /* Number of df's to write */
- void *side_set_df /* Distribution factors */
- );
-
-extern int
-ne_get_n_node_set(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id node_set_id, /* Node set ID */
- int64_t start_node_num, /* Node index to start reading at */
- int64_t num_node, /* Number of nodes to read */
- void_int *node_set_node_list /* List of nodes in node set */
- );
-
-extern int
-ne_put_n_node_set(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id node_set_id, /* Node set ID */
- int64_t start_node_num, /* Node index to start writing at */
- int64_t num_node, /* Number of nodes to write */
- const void_int *node_set_node_list /* List of nodes in node set */
- );
-
-extern int
-ne_get_n_node_set_df(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id node_set_id, /* Node-set ID */
- int64_t start_num, /* Starting df number */
- int64_t num_df_to_get, /* Number of df's to read */
- void *node_set_df /* Distribution factors */
- );
-
-extern int
-ne_put_n_node_set_df(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id node_set_id, /* Node-set ID */
- int64_t start_num, /* Starting df number */
- int64_t num_df_to_get, /* Number of df's to write */
- void *node_set_df /* Distribution factors */
- );
-
-extern int
-ne_get_n_coord(int neid, /* NetCDF/Exodus file ID */
- int64_t start_node_num, /* Starting position to read from */
- int64_t num_nodes, /* Number of coords to read */
- void *x_coor, /* Vector of X coordinates */
- void *y_coor, /* Vector of Y coordinates */
- void *z_coor /* Vector of Z coordinates */
- );
-
-extern int
-ne_put_n_coord(int neid, /* NetCDF/Exodus file ID */
- int64_t start_node_num, /* Starting position to write to */
- int64_t num_nodes, /* Number of coords to write */
- void *x_coor, /* Vector of X coordinates */
- void *y_coor, /* Vector of Y coordinates */
- void *z_coor /* Vector of Z coordinates */
- );
-
-extern int
-ne_get_n_elem_conn (int neid, /* NetCDF/Exodus file ID */
- ex_entity_id elem_blk_id, /* Element block ID */
- int64_t start_elem_num, /* Starting position to read from */
- int64_t num_elems, /* Number of elements to read */
- void_int *connect /* Connectivity vector */
- );
-
-extern int
-ne_put_n_elem_conn (int neid, /* NetCDF/Exodus file ID */
- ex_entity_id elem_blk_id, /* Element block ID */
- int64_t start_elem_num, /* Starting position to write to */
- int64_t num_elems, /* Number of elements to write */
- const void_int *connect /* Connectivity vector */
-);
-
-extern int
-ne_get_n_elem_attr (int neid, /* NetCDF/Exodus file ID */
- ex_entity_id elem_blk_id, /* Element block ID */
- int64_t start_elem_num, /* Starting position to read from */
- int64_t num_elems, /* Number of elements to read */
- void *attrib /* Attribute */
- );
-
-extern int
-ne_put_n_elem_attr (int neid, /* NetCDF/Exodus file ID */
- ex_entity_id elem_blk_id, /* Element block ID */
- int64_t start_elem_num, /* Starting position to write to */
- int64_t num_elems, /* Number of elements to write */
- void *attrib /* Attribute */
- );
-
-extern int
-ne_get_elem_type(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id elem_blk_id, /* Element block ID */
- char *elem_type /* The name of the element type */
- );
-
-/*=============================================================================
- * Variable Routines
- *===========================================================================*/
-extern int
-ne_get_n_elem_var (int neid, /* NetCDF/Exodus file ID */
- int time_step, /* time index */
- int elem_var_index, /* elemental variable index */
- ex_entity_id elem_blk_id, /* elemental block id */
- int64_t num_elem_this_blk, /* number of elements in block */
- int64_t start_elem_num, /* Starting position for read */
- int64_t num_elem, /* Number of elements to read */
- void *elem_var_vals /* variable values */
- );
-
-extern int
-ne_put_elem_var_slab (int neid, /* NetCDF/Exodus file ID */
- int time_step, /* time index */
- int elem_var_index, /* elemental variable index */
- ex_entity_id elem_blk_id, /* elemental block id */
- int64_t start_pos, /* Starting position to write to */
- int64_t num_vals, /* Number of elements to write */
- void *elem_var_vals /* variable values */
- );
-
-extern int
-ne_get_n_nodal_var(int neid, /* NetCDF/Exodus file ID */
- int time_step, /* whole time step number */
- int nodal_var_index, /* index of desired nodal var */
- int64_t start_node_num, /* starting node number */
- int64_t num_nodes, /* number of nodes to read */
- void *nodal_vars /* array of nodal var values */
- );
-
-extern int
-ne_put_nodal_var_slab(int neid, /* NetCDF/Exodus file ID */
- int time_step, /* The time step index */
- int nodal_var_index, /* Nodal variable index */
- int64_t start_pos, /* Start position for write */
- int64_t num_vals, /* Number of nodal variables */
- void *nodal_var_vals /* Nodal variable values */
- );
-
-/*=============================================================================
- * Number Map Routines
- *===========================================================================*/
-extern int
-ne_get_n_elem_num_map (int neid, /* NetCDF/Exodus file ID */
- int64_t start_ent, /* Starting position to read from */
- int64_t num_ents, /* Number of elements to read */
- void_int *elem_map /* element map numbers */
- );
-
-extern int
-ne_put_n_elem_num_map (int neid, /* NetCDF/Exodus file ID */
- int64_t start_ent, /* Starting position to read from */
- int64_t num_ents, /* Number of elements to read */
- const void_int *elem_map /* element map numbers */
- );
-
-extern int
-ne_get_n_node_num_map(int neid, /* NetCDF/Exodus file ID */
- int64_t start_ent, /* starting node number */
- int64_t num_ents, /* number of nodes to read */
- void_int *node_map /* vector for node map */
- );
-
-extern int
-ne_put_n_node_num_map(int neid, /* NetCDF/Exodus file ID */
- int64_t start_ent, /* starting node number */
- int64_t num_ents, /* number of nodes to read */
- const void_int *node_map /* vector for node map */
- );
-
-extern int
-ne_get_node_map(int neid, /* NetCDF/Exodus file ID */
- void_int *node_mapi, /* Internal FEM node IDs */
- void_int *node_mapb, /* Border FEM node IDs */
- void_int *node_mape, /* External FEM node IDs */
- int processor /* Processor IDs */
- );
-
-extern int
-ne_put_node_map(int neid, /* NetCDF/Exodus file ID */
- void_int *node_mapi, /* Internal FEM node IDs */
- void_int *node_mapb, /* Border FEM node IDs */
- void_int *node_mape, /* External FEM node IDs */
- int processor /* This processor ID */
- );
-
-extern int
-ne_get_elem_map(int neid, /* NetCDF/Exodus file ID */
- void_int *elem_mapi, /* Internal element IDs */
- void_int *elem_mapb, /* Border element IDs */
- int processor /* Processor ID */
- );
-
-extern int
-ne_put_elem_map(int neid, /* NetCDF/Exodus file ID */
- void_int *elem_mapi, /* Internal FEM element IDs */
- void_int *elem_mapb, /* Border FEM element IDs */
- int processor /* This processor ID */
- );
-
-
-/*=============================================================================
- * Communications Maps Routines
- *===========================================================================*/
-
-extern int
-ne_get_cmap_params(int neid, /* NetCDF/Exodus file ID */
- void_int *node_cmap_ids, /* Nodal comm. map IDs */
- void_int *node_cmap_node_cnts, /* Number of nodes in each map */
- void_int *elem_cmap_ids, /* Elemental comm. map IDs */
- void_int *elem_cmap_elem_cnts, /* Number of elems in each map */
- int processor /* This processor ID */
- );
-
-extern int
-ne_put_cmap_params(int neid, /* NetCDF/Exodus file ID */
- void_int *node_map_ids, /* Node map IDs */
- void_int *node_map_node_cnts,/* Nodes in nodal comm */
- void_int *elem_map_ids, /* Elem map IDs */
- void_int *elem_map_elem_cnts,/* Elems in elemental comm */
- int64_t processor /* This processor ID */
- );
-
-extern int
-ne_put_cmap_params_cc(int neid, /* NetCDF/Exodus file ID */
- void_int *node_map_ids, /* Node map IDs */
- void_int *node_map_node_cnts, /* Nodes in nodal comm */
- void_int *node_proc_ptrs, /* Pointer into array for */
- /* node maps */
- void_int *elem_map_ids, /* Elem map IDs */
- void_int *elem_map_elem_cnts, /* Elems in elemental comm */
- void_int *elem_proc_ptrs /* Pointer into array for */
- /* elem maps */
- );
-
-extern int
-ne_get_node_cmap(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id map_id, /* Map ID */
- void_int *node_ids, /* FEM node IDs */
- void_int *proc_ids, /* Processor IDs */
- int processor /* This processor ID */
- );
-
-extern int
-ne_put_node_cmap(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id map_id, /* Nodal comm map ID */
- void_int *node_ids, /* FEM node IDs */
- void_int *proc_ids, /* Processor IDs */
- int processor /* This processor ID */
- );
-
-extern int
-ne_get_elem_cmap(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id map_id, /* Elemental comm map ID */
- void_int *elem_ids, /* Element IDs */
- void_int *side_ids, /* Element side IDs */
- void_int *proc_ids, /* Processor IDs */
- int processor /* This processor ID */
- );
-
-extern int
-ne_put_elem_cmap(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id map_id, /* Elemental comm map ID */
- void_int *elem_ids, /* Vector of element IDs */
- void_int *side_ids, /* Vector of side IDs */
- void_int *proc_ids, /* Vector of processor IDs */
- int processor /* This processor ID */
- );
-
- /* Should be internal use only, but was in external include file for
- nemesis and some codes are using the function
- */
- int ne_get_idx(int neid, /* NetCDF/Exodus file ID */
- const char *ne_var_name, /* Nemesis index variable name */
- int64_t *index, /* array of length 2 to hold results */
- int pos /* position of this proc/cmap in index */
- );
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NE_NEMESIS_H */
diff --git a/nemesis/ne_nemesisI_int.h b/nemesis/ne_nemesisI_int.h
deleted file mode 100644
index 23a76ea..0000000
--- a/nemesis/ne_nemesisI_int.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Dummy file -- Not needed after integration of nemesis library into exodus. */
-
-/* Provided in case an application used to include this file in the past. */
diff --git a/nemesis/nemesis_cfg.h.in b/nemesis/nemesis_cfg.h.in
deleted file mode 100755
index dd32b4a..0000000
--- a/nemesis/nemesis_cfg.h.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __nemesis_cfg_h
-#define __nemesis_cfg_h
-
-#define NEMESIS_VERSION_MAJOR @NEMESIS_VERSION_MAJOR@
-#define NEMESIS_VERSION_MINOR @NEMESIS_VERSION_MINOR@
-#define NEMESIS_VERSION_PATCH @NEMESIS_VERSION_PATCH@
-#define NEMESIS_VERSION "@NEMESIS_VERSION_MAJOR at .@NEMESIS_VERSION_MINOR at .@NEMESIS_VERSION_PATCH@"
-
-#if defined(_WIN32) && !defined(WIN32)
-# define WIN32
-#endif
-
-#cmakedefine NEMESIS_BUILD_SHARED_LIBS
-#if defined(WIN32) && defined(NEMESIS_BUILD_SHARED_LIBS)
-# if defined(nemc_EXPORTS)
-# define NEMESIS_EXPORT __declspec( dllexport ) extern
-# else
-# define NEMESIS_EXPORT __declspec( dllimport ) extern
-# endif
-#else
-# define NEMESIS_EXPORT extern
-#endif
-
-#endif
-
diff --git a/nemesis/nemesis_wrapper.c b/nemesis/nemesis_wrapper.c
deleted file mode 100644
index 531998a..0000000
--- a/nemesis/nemesis_wrapper.c
+++ /dev/null
@@ -1,596 +0,0 @@
-#include <exodusII.h>
-#include <exodusII_int.h>
-#include <ne_nemesisI.h>
-
-/*=============================================================================
- * Initial Information Routines
- *===========================================================================*/
-int
-ne_get_init_info(int neid, /* NemesisI file ID */
- int *num_proc, /* Number of processors */
- int *num_proc_in_f, /* Number of procs in this file */
- char *ftype)
-{
- return ex_get_init_info(neid, num_proc, num_proc_in_f, ftype);
-}
-
-int
-ne_put_init_info(int neid, /* NemesisI file ID */
- int num_proc, /* Number of processors */
- int num_proc_in_f, /* Number of procs in this file */
- char *ftype)
-{
- return ex_put_init_info(neid, num_proc, num_proc_in_f, ftype);
-}
-
-int
-ne_get_init_global(int neid, /* NemesisI file ID */
- void_int *num_nodes_g, /* Number of global FEM nodes */
- void_int *num_elems_g, /* Number of global FEM elements */
- void_int *num_elem_blks_g, /* Number of global elem blocks */
- void_int *num_node_sets_g, /* Number of global node sets */
- void_int *num_side_sets_g /* Number of global side sets */
- )
-{
- return ex_get_init_global(neid, num_nodes_g, num_elems_g, num_elem_blks_g, num_node_sets_g, num_side_sets_g);
-}
-
-int
-ne_put_init_global(int neid, /* NemesisI file ID */
- int64_t num_nodes_g, /* Number of global FEM nodes */
- int64_t num_elems_g, /* Number of global FEM elements */
- int64_t num_elem_blks_g, /* Number of global elem blocks */
- int64_t num_node_sets_g, /* Number of global node sets */
- int64_t num_side_sets_g /* Number of global side sets */
- )
-{
- return ex_put_init_global(neid, num_nodes_g, num_elems_g, num_elem_blks_g, num_node_sets_g, num_side_sets_g);
-}
-
-int ne_put_version(int neid)
-{
- return ex_put_nemesis_version(neid);
-}
-
-/*=============================================================================
- * Loadbalance Parameter Routines
- *===========================================================================*/
-int
-ne_get_loadbal_param(int neid, /* NetCDF/Exodus file ID */
- void_int *num_int_nodes, /* Number of internal FEM nodes */
- void_int *num_bor_nodes, /* Number of border FEM nodes */
- void_int *num_ext_nodes, /* Number of external FEM nodes */
- void_int *num_int_elems, /* Number of internal FEM elems */
- void_int *num_bor_elems, /* Number of border FEM elems */
- void_int *num_node_cmaps, /* Number of nodal comm maps */
- void_int *num_elem_cmaps, /* Number of elemental comm maps */
- int processor /* Processor ID */
- )
-{
- return ex_get_loadbal_param(neid,
- num_int_nodes, num_bor_nodes, num_ext_nodes,
- num_int_elems, num_bor_elems,
- num_node_cmaps, num_elem_cmaps, processor);
-}
-
-int
-ne_put_loadbal_param(int neid, /* NemesisI file ID */
- int64_t num_int_nodes, /* Number of internal FEM nodes */
- int64_t num_bor_nodes, /* Number of border FEM nodes */
- int64_t num_ext_nodes, /* Number of external FEM nodes */
- int64_t num_int_elems, /* Number of internal FEM elems */
- int64_t num_bor_elems, /* Number of border FEM elems */
- int64_t num_node_cmaps,/* Number of nodal comm maps */
- int64_t num_elem_cmaps,/* Number of elemental comm maps */
- int processor /* Processor ID */
- )
-{
- return ex_put_loadbal_param(neid,
- num_int_nodes, num_bor_nodes, num_ext_nodes,
- num_int_elems, num_bor_elems,
- num_node_cmaps, num_elem_cmaps, processor);
-}
-
-int
-ne_put_loadbal_param_cc(int neid, /* NetCDF/Exodus file ID */
- void_int *num_int_nodes, /* Number of internal node IDs */
- void_int *num_bor_nodes, /* Number of border node IDs */
- void_int *num_ext_nodes, /* Number of external node IDs */
- void_int *num_int_elems, /* Number of internal elem IDs */
- void_int *num_bor_elems, /* Number of border elem IDs */
- void_int *num_node_cmaps, /* Number of nodal comm maps */
- void_int *num_elem_cmaps /* Number of elem comm maps */
- )
-{
- return ex_put_loadbal_param_cc(neid,
- num_int_nodes, num_bor_nodes, num_ext_nodes,
- num_int_elems, num_bor_elems,
- num_node_cmaps, num_elem_cmaps);
-}
-
-
-/*=============================================================================
- * NS, SS & EB Global Parameter Routines
- *===========================================================================*/
-int
-ne_get_ns_param_global(int neid, /* NetCDF/Exodus file ID */
- void_int *ns_ids_glob, /* Global IDs of node sets */
- void_int *ns_n_cnt_glob, /* Count of nodes in node sets */
- void_int *ns_df_cnt_glob /* Count of dist. factors in ns */
- )
-{
- return ex_get_ns_param_global(neid, ns_ids_glob, ns_n_cnt_glob, ns_df_cnt_glob);
-}
-
-int
-ne_put_ns_param_global(int neid, /* NemesisI file ID */
- void_int *global_ids, /* Vector of global node-set IDs */
- void_int *global_n_cnts, /* Vector of node counts in node-sets */
- void_int *global_df_cnts /* Vector of dist factor counts in node-sets */
- )
-{
- return ex_put_ns_param_global(neid, global_ids, global_n_cnts, global_df_cnts);
-}
-
-int
-ne_get_ss_param_global(int neid, /* NetCDF/Exodus file ID */
- void_int *ss_ids_glob, /* Global side-set IDs */
- void_int *ss_s_cnt_glob, /* Global side count */
- void_int *ss_df_cnt_glob /* Global dist. factor count */
- )
-{
- return ex_get_ss_param_global(neid, ss_ids_glob, ss_s_cnt_glob, ss_df_cnt_glob);
-}
-
-int
-ne_put_ss_param_global(int neid, /* NemesisI file ID */
- void_int *global_ids, /* Vector of global side-set IDs */
- void_int *global_el_cnts, /* Vector of element/side */
- /* counts in each side set */
- void_int *global_df_cnts /* Vector of dist. factor */
- /* counts in each side set */
- )
-{
- return ex_put_ss_param_global(neid, global_ids, global_el_cnts, global_df_cnts);
-}
-
-
-int
-ne_get_eb_info_global(int neid, /* NemesisI file ID */
- void_int *el_blk_ids, /* Vector of global element IDs */
- void_int *el_blk_cnts /* Vector of global element counts */
- )
-{
- return ex_get_eb_info_global(neid, el_blk_ids, el_blk_cnts);
-}
-
-int
-ne_put_eb_info_global(int neid, /* NemesisI file ID */
- void_int *el_blk_ids, /* Vector of global element IDs */
- void_int *el_blk_cnts /* Vector of global element counts */
- )
-{
- return ex_put_eb_info_global(neid, el_blk_ids, el_blk_cnts);
-}
-
-
-/*=============================================================================
- * NS, SS & EB Subset Routines
- *===========================================================================*/
-int
-ne_get_n_side_set(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id side_set_id, /* Side-set ID to read */
- int64_t start_side_num, /* Starting element number */
- int64_t num_sides, /* Number of sides to read */
- void_int *side_set_elem_list, /* List of element IDs */
- void_int *side_set_side_list /* List of side IDs */
- )
-{
- return ex_get_n_side_set(neid, side_set_id, start_side_num, num_sides, side_set_elem_list, side_set_side_list);
-}
-
-int
-ne_put_n_side_set(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id side_set_id, /* Side-set ID to write */
- int64_t start_side_num, /* Starting element number */
- int64_t num_sides, /* Number of sides to write */
- const void_int *side_set_elem_list, /* List of element IDs */
- const void_int *side_set_side_list /* List of side IDs */
- )
-{
- return ex_put_n_side_set(neid, side_set_id, start_side_num, num_sides, side_set_elem_list, side_set_side_list);
-}
-
-
-int
-ne_get_n_side_set_df(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id side_set_id, /* Side-set ID */
- int64_t start_num, /* Starting df number */
- int64_t num_df_to_get, /* Number of df's to read */
- void *side_set_df /* Distribution factors */
- )
-{
- return ex_get_n_side_set_df(neid, side_set_id, start_num, num_df_to_get, side_set_df);
-}
-
-int
-ne_put_n_side_set_df(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id side_set_id, /* Side-set ID */
- int64_t start_num, /* Starting df number */
- int64_t num_df_to_get, /* Number of df's to write */
- void *side_set_df /* Distribution factors */
- )
-{
- return ex_put_n_side_set_df(neid, side_set_id, start_num, num_df_to_get, side_set_df);
-}
-
-
-int
-ne_get_n_node_set(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id node_set_id, /* Node set ID */
- int64_t start_node_num, /* Node index to start reading at */
- int64_t num_node, /* Number of nodes to read */
- void_int *node_set_node_list /* List of nodes in node set */
- )
-{
- return ex_get_n_node_set(neid, node_set_id, start_node_num, num_node, node_set_node_list);
-}
-
-int
-ne_put_n_node_set(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id node_set_id, /* Node set ID */
- int64_t start_node_num, /* Node index to start writing at */
- int64_t num_node, /* Number of nodes to write */
- const void_int *node_set_node_list /* List of nodes in node set */
- )
-{
- return ex_put_n_node_set(neid, node_set_id, start_node_num, num_node, node_set_node_list);
-}
-
-int
-ne_get_n_node_set_df(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id node_set_id, /* Node-set ID */
- int64_t start_num, /* Starting df number */
- int64_t num_df_to_get, /* Number of df's to read */
- void *node_set_df /* Distribution factors */
- )
-{
- return ex_get_n_node_set_df(neid, node_set_id, start_num, num_df_to_get, node_set_df);
-}
-
-int
-ne_put_n_node_set_df(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id node_set_id, /* Node-set ID */
- int64_t start_num, /* Starting df number */
- int64_t num_df_to_get, /* Number of df's to write */
- void *node_set_df /* Distribution factors */
- )
-{
- return ex_put_n_node_set_df(neid, node_set_id, start_num, num_df_to_get, node_set_df);
-}
-
-int
-ne_get_n_coord(int neid, /* NetCDF/Exodus file ID */
- int64_t start_node_num, /* Starting position to read from */
- int64_t num_nodes, /* Number of coords to read */
- void *x_coor, /* Vector of X coordinates */
- void *y_coor, /* Vector of Y coordinates */
- void *z_coor /* Vector of Z coordinates */
- )
-{
- return ex_get_n_coord(neid, start_node_num, num_nodes, x_coor, y_coor, z_coor);
-}
-
-int
-ne_put_n_coord(int neid, /* NetCDF/Exodus file ID */
- int64_t start_node_num, /* Starting position to write to */
- int64_t num_nodes, /* Number of coords to write */
- void *x_coor, /* Vector of X coordinates */
- void *y_coor, /* Vector of Y coordinates */
- void *z_coor /* Vector of Z coordinates */
- )
-{
- return ex_put_n_coord(neid, start_node_num, num_nodes, x_coor, y_coor, z_coor);
-}
-
-int
-ne_get_n_elem_conn (int neid, /* NetCDF/Exodus file ID */
- ex_entity_id elem_blk_id, /* Element block ID */
- int64_t start_elem_num, /* Starting position to read from */
- int64_t num_elems, /* Number of elements to read */
- void_int *connect /* Connectivity vector */
- )
-{
- return ex_get_n_elem_conn(neid, elem_blk_id, start_elem_num, num_elems, connect);
-}
-
-int
-ne_put_n_elem_conn (int neid, /* NetCDF/Exodus file ID */
- ex_entity_id elem_blk_id, /* Element block ID */
- int64_t start_elem_num, /* Starting position to write to */
- int64_t num_elems, /* Number of elements to write */
- const void_int *connect /* Connectivity vector */
- )
-{
- return ex_put_n_elem_conn(neid, elem_blk_id, start_elem_num, num_elems, connect);
-}
-
-int
-ne_get_n_elem_attr (int neid, /* NetCDF/Exodus file ID */
- ex_entity_id elem_blk_id, /* Element block ID */
- int64_t start_elem_num, /* Starting position to read from */
- int64_t num_elems, /* Number of elements to read */
- void *attrib /* Attribute */
- )
-{
- return ex_get_n_elem_attr(neid, elem_blk_id, start_elem_num, num_elems, attrib);
-}
-
-int
-ne_put_n_elem_attr (int neid, /* NetCDF/Exodus file ID */
- ex_entity_id elem_blk_id, /* Element block ID */
- int64_t start_elem_num, /* Starting position to write to */
- int64_t num_elems, /* Number of elements to write */
- void *attrib /* Attribute */
- )
-{
- return ex_put_n_elem_attr(neid, elem_blk_id, start_elem_num, num_elems, attrib);
-}
-
-int
-ne_get_elem_type(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id elem_blk_id, /* Element block ID */
- char *elem_type /* The name of the element type */
- )
-{
- return ex_get_elem_type(neid, elem_blk_id, elem_type);
-}
-
-/*=============================================================================
- * Variable Routines
- *===========================================================================*/
-int
-ne_get_n_elem_var (int neid, /* NetCDF/Exodus file ID */
- int time_step, /* time index */
- int elem_var_index, /* elemental variable index */
- ex_entity_id elem_blk_id, /* elemental block id */
- int64_t num_elem_this_blk, /* number of elements in block */
- int64_t start_elem_num, /* Starting position for read */
- int64_t num_elem, /* Number of elements to read */
- void *elem_var_vals /* variable values */
- )
-{
- return ex_get_n_var(neid, time_step, EX_ELEM_BLOCK,
- elem_var_index, elem_blk_id,
- start_elem_num, num_elem,
- elem_var_vals);
-}
-
-int
-ne_put_elem_var_slab (int neid, /* NetCDF/Exodus file ID */
- int time_step, /* time index */
- int elem_var_index, /* elemental variable index */
- ex_entity_id elem_blk_id, /* elemental block id */
- int64_t start_pos, /* Starting position to write to */
- int64_t num_vals, /* Number of elements to write */
- void *elem_var_vals /* variable values */
- )
-{
- return ex_put_elem_var_slab(neid, time_step, elem_var_index, elem_blk_id, start_pos, num_vals, elem_var_vals);
-}
-
-int
-ne_get_n_nodal_var(int neid, /* NetCDF/Exodus file ID */
- int time_step, /* whole time step number */
- int nodal_var_index, /* index of desired nodal var */
- int64_t start_node_num, /* starting node number */
- int64_t num_nodes, /* number of nodes to read */
- void *nodal_vars /* array of nodal var values */
- )
-{
- return ex_get_n_var(neid, time_step, EX_NODAL,
- nodal_var_index, 1,
- start_node_num, num_nodes,
- nodal_vars);
-}
-
-int
-ne_put_nodal_var_slab(int neid, /* NetCDF/Exodus file ID */
- int time_step, /* The time step index */
- int nodal_var_index, /* Nodal variable index */
- int64_t start_pos, /* Start position for write */
- int64_t num_vals, /* Number of nodal variables */
- void *nodal_var_vals /* Nodal variable values */
- )
-{
- return ex_put_nodal_var_slab(neid, time_step, nodal_var_index, start_pos, num_vals, nodal_var_vals);
-}
-
-/*=============================================================================
- * Number Map Routines
- *===========================================================================*/
-int
-ne_get_n_elem_num_map (int neid, /* NetCDF/Exodus file ID */
- int64_t start_ent, /* Starting position to read from */
- int64_t num_ents, /* Number of elements to read */
- void_int *elem_map /* element map numbers */
- )
-{
- return ex_get_n_elem_num_map(neid, start_ent, num_ents, elem_map);
-}
-
-int
-ne_put_n_elem_num_map (int neid, /* NetCDF/Exodus file ID */
- int64_t start_ent, /* Starting position to read from */
- int64_t num_ents, /* Number of elements to read */
- const void_int *elem_map /* element map numbers */
- )
-{
- return ex_put_partial_id_map(neid, EX_ELEM_MAP, start_ent, num_ents, elem_map);
-}
-
-int
-ne_get_n_node_num_map(int neid, /* NetCDF/Exodus file ID */
- int64_t start_ent, /* starting node number */
- int64_t num_ents, /* number of nodes to read */
- void_int *node_map /* vector for node map */
- )
-{
- return ex_get_n_node_num_map(neid, start_ent, num_ents, node_map);
-}
-
-int
-ne_put_n_node_num_map(int neid, /* NetCDF/Exodus file ID */
- int64_t start_ent, /* starting node number */
- int64_t num_ents, /* number of nodes to read */
- const void_int *node_map /* vector for node map */
- )
-{
- return ex_put_partial_id_map(neid, EX_NODE_MAP, start_ent, num_ents, node_map);
-}
-
-int
-ne_get_node_map(int neid, /* NetCDF/Exodus file ID */
- void_int *node_mapi, /* Internal FEM node IDs */
- void_int *node_mapb, /* Border FEM node IDs */
- void_int *node_mape, /* External FEM node IDs */
- int processor /* Processor IDs */
- )
-{
- return ex_get_processor_node_maps(neid, node_mapi, node_mapb, node_mape, processor);
-}
-
-int
-ne_put_node_map(int neid, /* NetCDF/Exodus file ID */
- void_int *node_mapi, /* Internal FEM node IDs */
- void_int *node_mapb, /* Border FEM node IDs */
- void_int *node_mape, /* External FEM node IDs */
- int processor /* This processor ID */
- )
-{
- return ex_put_processor_node_maps(neid, node_mapi, node_mapb, node_mape, processor);
-}
-
-int
-ne_get_elem_map(int neid, /* NetCDF/Exodus file ID */
- void_int *elem_mapi, /* Internal element IDs */
- void_int *elem_mapb, /* Border element IDs */
- int processor /* Processor ID */
- )
-{
- return ex_get_processor_elem_maps(neid, elem_mapi, elem_mapb, processor);
-}
-
-int
-ne_put_elem_map(int neid, /* NetCDF/Exodus file ID */
- void_int *elem_mapi, /* Internal FEM element IDs */
- void_int *elem_mapb, /* Border FEM element IDs */
- int processor /* This processor ID */
- )
-{
- return ex_put_processor_elem_maps(neid, elem_mapi, elem_mapb, processor);
-}
-
-
-/*=============================================================================
- * Communications Maps Routines
- *===========================================================================*/
-
-int
-ne_get_cmap_params(int neid, /* NetCDF/Exodus file ID */
- void_int *node_cmap_ids, /* Nodal comm. map IDs */
- void_int *node_cmap_node_cnts, /* Number of nodes in each map */
- void_int *elem_cmap_ids, /* Elemental comm. map IDs */
- void_int *elem_cmap_elem_cnts, /* Number of elems in each map */
- int processor /* This processor ID */
- )
-{
- return ex_get_cmap_params(neid, node_cmap_ids, node_cmap_node_cnts, elem_cmap_ids, elem_cmap_elem_cnts, processor);
-}
-
-int
-ne_put_cmap_params(int neid, /* NetCDF/Exodus file ID */
- void_int *node_map_ids, /* Node map IDs */
- void_int *node_map_node_cnts,/* Nodes in nodal comm */
- void_int *elem_map_ids, /* Elem map IDs */
- void_int *elem_map_elem_cnts,/* Elems in elemental comm */
- int64_t processor /* This processor ID */
- )
-{
- return ex_put_cmap_params(neid, node_map_ids, node_map_node_cnts, elem_map_ids, elem_map_elem_cnts, processor);
-}
-
-int
-ne_put_cmap_params_cc(int neid, /* NetCDF/Exodus file ID */
- void_int *node_map_ids, /* Node map IDs */
- void_int *node_map_node_cnts, /* Nodes in nodal comm */
- void_int *node_proc_ptrs, /* Pointer into array for */
- /* node maps */
- void_int *elem_map_ids, /* Elem map IDs */
- void_int *elem_map_elem_cnts, /* Elems in elemental comm */
- void_int *elem_proc_ptrs /* Pointer into array for */
- /* elem maps */
- )
-{
- return ex_put_cmap_params_cc(neid,
- node_map_ids, node_map_node_cnts, node_proc_ptrs,
- elem_map_ids, elem_map_elem_cnts, elem_proc_ptrs);
-}
-
-
-int
-ne_get_node_cmap(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id map_id, /* Map ID */
- void_int *node_ids, /* FEM node IDs */
- void_int *proc_ids, /* Processor IDs */
- int processor /* This processor ID */
- )
-{
- return ex_get_node_cmap(neid, map_id, node_ids, proc_ids, processor);
-}
-
-int
-ne_put_node_cmap(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id map_id, /* Nodal comm map ID */
- void_int *node_ids, /* FEM node IDs */
- void_int *proc_ids, /* Processor IDs */
- int processor /* This processor ID */
- )
-{
- return ex_put_node_cmap(neid, map_id, node_ids, proc_ids, processor);
-}
-
-int
-ne_get_elem_cmap(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id map_id, /* Elemental comm map ID */
- void_int *elem_ids, /* Element IDs */
- void_int *side_ids, /* Element side IDs */
- void_int *proc_ids, /* Processor IDs */
- int processor /* This processor ID */
- )
-{
- return ex_get_elem_cmap(neid, map_id, elem_ids, side_ids, proc_ids, processor);
-}
-
-
-int
-ne_put_elem_cmap(int neid, /* NetCDF/Exodus file ID */
- ex_entity_id map_id, /* Elemental comm map ID */
- void_int *elem_ids, /* Vector of element IDs */
- void_int *side_ids, /* Vector of side IDs */
- void_int *proc_ids, /* Vector of processor IDs */
- int processor /* This processor ID */
- )
-{
- return ex_put_elem_cmap(neid, map_id, elem_ids, side_ids, proc_ids, processor);
-}
-
-int ne_get_idx(int neid, /* NetCDF/Exodus file ID */
- const char *ne_var_name, /* Nemesis index variable name */
- int64_t *index, /* array of length 2 to hold results */
- int pos /* position of this proc/cmap in index */
- )
-{
- return ex_get_idx(neid, ne_var_name, index, pos);
-}
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/exodus.git
More information about the debian-science-commits
mailing list