From a17dd7b18c564f6cd7cd3bf0f8d9dcff5f9ddc9e Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 5 Jul 2022 10:54:25 -0600 Subject: [PATCH 001/110] IOSS: Better handling of qa and info records in parallel --- .../ioss/src/exodus/Ioex_BaseDatabaseIO.C | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C index f0f9bd6a8d..7d1e1d35f0 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C @@ -590,10 +590,16 @@ namespace Ioex { Ioss::Utils::copy_string(qa[num_qa_records].qa_record[0][0], codename, MAX_STR_LENGTH + 1); Ioss::Utils::copy_string(qa[num_qa_records].qa_record[0][1], version, MAX_STR_LENGTH + 1); - int ierr = ex_put_qa(get_file_pointer(), num_qa_records + 1, qa[0].qa_record); - if (ierr < 0) { - Ioex::exodus_error(get_file_pointer(), __LINE__, __func__, __FILE__); - } + int ierr = 0; + if (isParallel && myProcessor != 0) { + ierr = ex_put_qa(get_file_pointer(), num_qa_records + 1, nullptr); + } + else { + ierr = ex_put_qa(get_file_pointer(), num_qa_records + 1, qa[0].qa_record); + } + if (ierr < 0) { + Ioex::exodus_error(get_file_pointer(), __LINE__, __func__, __FILE__); + } for (size_t i = 0; i < num_qa_records + 1; i++) { for (int j = 0; j < 4; j++) { From 05ee0193c055d8e97fb47498bd9a5b77b72931e8 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 26 Sep 2023 14:37:05 -0600 Subject: [PATCH 002/110] Sync with sierra nvidia changes --- .../libraries/ioss/src/main/cgns_decomp.C | 30 +++++++++++++++---- .../libraries/ioss/src/main/io_modify.C | 26 ++++++++++++---- 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C index cba45cc04b..79aaa878b7 100644 --- a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C +++ b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C @@ -45,7 +45,9 @@ #include #include +#if !defined __NVCC__ #include +#endif #include namespace { @@ -391,7 +393,10 @@ namespace { auto search = comms.find(std::make_pair(value, key)); if (search == comms.end()) { valid = false; - fmt::print(stderr, fg(fmt::color::red), + fmt::print(stderr, +#if !defined __NVCC__ + fg(fmt::color::red), +#endif "ERROR: Could not find matching ZGC for {}, proc {} -> {}, proc {}\n", key.first, key.second, value.first, value.second); } @@ -442,7 +447,11 @@ namespace { for (const auto &proc : comms) { if (proc.second < 0) { // From decomposition - fmt::print(fg(fmt::color::yellow), "[{:{}}->{:{}}] ", proc.first, pw, -proc.second, + fmt::print( +#if !defined __NVCC__ + fg(fmt::color::yellow), +#endif + "[{:{}}->{:{}}] ", proc.first, pw, -proc.second, pw); } else { @@ -635,11 +644,19 @@ namespace { std::string stars(star_cnt, '*'); std::string format = "\tProcessor {:{}}, work = {:{}} ({:.2f})\t{}\n"; if (proc_work[i] == max_work) { - fmt::print(fg(fmt::color::red), format, i, proc_width, fmt::group_digits(proc_work[i]), + fmt::print( +#if !defined __NVCC__ + fg(fmt::color::red), +#endif + format, i, proc_width, fmt::group_digits(proc_work[i]), work_width, proc_work[i] / avg_work, stars); } else if (proc_work[i] == min_work) { - fmt::print(fg(fmt::color::green), format, i, proc_width, + fmt::print( +#if !defined __NVCC__ + fg(fmt::color::green), +#endif + format, i, proc_width, fmt::group_digits(proc_work[i]), work_width, proc_work[i] / avg_work, stars); } else { @@ -788,7 +805,10 @@ int main(int argc, char *argv[]) auto valid = validate_symmetric_communications(zones); if (!valid) { - fmt::print(stderr, fg(fmt::color::red), + fmt::print(stderr, +#if !defined __NVCC__ + fg(fmt::color::red), +#endif "\nERROR: Zone Grid Communication interfaces are not symmetric. There is an error " "in the decomposition.\n"); } diff --git a/packages/seacas/libraries/ioss/src/main/io_modify.C b/packages/seacas/libraries/ioss/src/main/io_modify.C index ba8dd4ad7b..cbe5b2a6e7 100644 --- a/packages/seacas/libraries/ioss/src/main/io_modify.C +++ b/packages/seacas/libraries/ioss/src/main/io_modify.C @@ -967,7 +967,10 @@ namespace { if (Ioss::Utils::substr_equal(tokens[2], "add")) { // Must be at least 6 tokens... if (tokens.size() < 6) { - fmt::print(stderr, fg(fmt::color::red), + fmt::print(stderr, +#if !defined __NVCC__ + fg(fmt::color::red), +#endif "ERROR: ATTRIBUTE Command does not have enough tokens to be valid.\n" "\t\t{}\n", fmt::join(tokens, " ")); @@ -1086,7 +1089,10 @@ namespace { // Must be at least 4 tokens... if (tokens.size() < 4) { - fmt::print(stderr, fg(fmt::color::red), + fmt::print(stderr, +#if !defined __NVCC__ + fg(fmt::color::red), +#endif "ERROR: RENAME Command does not have enough tokens to be valid.\n" "\t\t{}\n", fmt::join(tokens, " ")); @@ -1123,7 +1129,11 @@ namespace { } } else { - fmt::print(stderr, fg(fmt::color::yellow), "\tWARNING: Unrecognized rename syntax '{}'\n", + fmt::print(stderr, +#if !defined __NVCC__ + fg(fmt::color::yellow), +#endif + "\tWARNING: Unrecognized rename syntax '{}'\n", fmt::join(tokens, " ")); handle_help("rename"); } @@ -1203,7 +1213,10 @@ namespace { // TIME SCALE {{scale}} // TIME OFFSET {{offset} if (tokens.size() < 3) { - fmt::print(stderr, fg(fmt::color::red), + fmt::print(stderr, +#if !defined __NVCC__ + fg(fmt::color::red), +#endif "ERROR: TIME Command does not have enough tokens to be valid.\n" "\t\t{}\n", fmt::join(tokens, " ")); @@ -1238,7 +1251,10 @@ namespace { // GEOMETRY OFFSET {{ELEMENTBLOCKS|BLOCKS|ASSEMBLY}} {{names}} {{X|Y|Z}} {{offset}} ... if (tokens.size() < 4) { - fmt::print(stderr, fg(fmt::color::red), + fmt::print(stderr, +#if !defined __NVCC__ + fg(fmt::color::red), +#endif "ERROR: GEOMETRY Command does not have enough tokens to be valid.\n" "\t\t{}\n", fmt::join(tokens, " ")); From dea1ac01def9fd1eed07fec7ba86372bd81cca6e Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 30 Oct 2023 16:07:35 -0600 Subject: [PATCH 003/110] IOSS: iwyu --- .../ioss/src/exodus/Ioex_BaseDatabaseIO.C | 22 ++++------------- .../ioss/src/exodus/Ioex_BaseDatabaseIO.h | 14 +++++++---- .../ioss/src/exodus/Ioex_DatabaseIO.C | 24 +++++++------------ .../ioss/src/exodus/Ioex_DatabaseIO.h | 18 ++++++++------ .../ioss/src/exodus/Ioex_DecompositionData.h | 4 ++-- .../ioss/src/exodus/Ioex_IOFactory.C | 7 +----- .../ioss/src/exodus/Ioex_IOFactory.h | 9 +++---- .../ioss/src/exodus/Ioex_Internals.C | 12 +++++----- .../ioss/src/exodus/Ioex_Internals.h | 13 ++++++---- .../ioss/src/exodus/Ioex_ParallelDatabaseIO.h | 5 ++-- .../ioss/src/exodus/Ioex_SuperElement.C | 12 +++++----- .../ioss/src/exodus/Ioex_SuperElement.h | 9 +++---- .../libraries/ioss/src/exodus/Ioex_Utils.C | 15 ++++++++++-- .../libraries/ioss/src/exodus/Ioex_Utils.h | 17 ++++++++++--- 14 files changed, 96 insertions(+), 85 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C index 06416b377e..a80d3965d1 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C @@ -5,40 +5,30 @@ // See packages/seacas/LICENSE for details #include -#include #include #include #include #include -#include #include -#include #include #include -#include -#include -#include #include #include #include #include #include -#include #include +#include #include -#include -#include #include -#include +#include #include #include -#include #include +#include "Ioex_Utils.h" #include "Ioss_Assembly.h" #include "Ioss_Blob.h" -#include "Ioss_CommSet.h" -#include "Ioss_CoordinateFrame.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" #include "Ioss_EdgeBlock.h" @@ -46,24 +36,22 @@ #include "Ioss_ElementBlock.h" #include "Ioss_ElementSet.h" #include "Ioss_EntityBlock.h" -#include "Ioss_EntitySet.h" #include "Ioss_EntityType.h" #include "Ioss_FaceBlock.h" #include "Ioss_FaceSet.h" #include "Ioss_Field.h" #include "Ioss_GroupingEntity.h" #include "Ioss_Map.h" +#include "Ioss_MeshType.h" #include "Ioss_NodeBlock.h" #include "Ioss_NodeSet.h" #include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" #include "Ioss_Region.h" #include "Ioss_SideBlock.h" #include "Ioss_SideSet.h" #include "Ioss_SmartAssert.h" #include "Ioss_State.h" -#include "Ioss_VariableType.h" - -#include "Ioex_Utils.h" // Transitioning from treating global variables as Ioss::Field::TRANSIENT // to Ioss::Field::REDUCTION. To get the old behavior, define the value diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h index 9d27bb031c..c5a560465e 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h @@ -7,25 +7,26 @@ // -*- Mode: c++ -*- #pragma once -#include "ioex_export.h" - #include #include #include #include #include - -#include - #include #include #include +#include #include #include #include #include #include +#include "Ioss_CodeTypes.h" +#include "Ioss_DataSize.h" +#include "Ioss_State.h" +#include "ioex_export.h" + namespace Ioss { class Assembly; class Blob; @@ -46,6 +47,9 @@ namespace Ioss { class StructuredBlock; class CommSet; class ElementTopology; + class Field; + class Map; + class PropertyManager; } // namespace Ioss /** \brief A namespace for the exodus database format. diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C index f2d16b8b3f..c07081bb23 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C @@ -11,46 +11,36 @@ #include #include #include -#include +#include #include -#include #include -#include -#include -#include #include #include #include #include #include #include +#include #include -#include -#include #include #include #include -#include +#include +#include #include -#include -#include #include -#ifndef _MSC_VER -#include -#endif -#include #include +#include "Ioex_BaseDatabaseIO.h" #include "Ioss_Assembly.h" #include "Ioss_Blob.h" #include "Ioss_CommSet.h" -#include "Ioss_CoordinateFrame.h" #include "Ioss_DBUsage.h" -#include "Ioss_DatabaseIO.h" #include "Ioss_EdgeBlock.h" #include "Ioss_EdgeSet.h" #include "Ioss_ElementBlock.h" #include "Ioss_ElementSet.h" +#include "Ioss_ElementTopology.h" #include "Ioss_EntityBlock.h" #include "Ioss_EntitySet.h" #include "Ioss_EntityType.h" @@ -62,11 +52,13 @@ #include "Ioss_NodeBlock.h" #include "Ioss_NodeSet.h" #include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" #include "Ioss_Region.h" #include "Ioss_SideBlock.h" #include "Ioss_SideSet.h" #include "Ioss_State.h" #include "Ioss_VariableType.h" +#include "hopscotch_hash.h" // ======================================================================== // Static internal helper functions diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h index e01436c9ef..a2fca63746 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2022 National Technology & Engineering Solutions +// Copyright(C) 1999-2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -7,25 +7,24 @@ // -*- Mode: c++ -*- #pragma once -#include "ioex_export.h" - #include #include #include #include -#include - -#include - #include #include #include +#include +#include #include #include #include #include #include +#include "Ioss_CodeTypes.h" +#include "ioex_export.h" + namespace Ioss { class GroupingEntity; class Region; @@ -44,6 +43,11 @@ namespace Ioss { class StructuredBlock; class CommSet; class ElementTopology; + class Assembly; + class Blob; + class Field; + class Map; + class PropertyManager; } // namespace Ioss namespace Ioex { diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h index 72c429fb40..59fbb6b67a 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h @@ -10,10 +10,10 @@ #include #if defined PARALLEL_AWARE_EXODUS -#include "ioex_export.h" - #include #include + +#include "ioex_export.h" #if !defined(NO_PARMETIS_SUPPORT) #include #endif diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.C index a129ea082e..c8a70c026b 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.C @@ -10,11 +10,9 @@ #if defined(PARALLEL_AWARE_EXODUS) // Defined in exodusII.h #include // for Ioex ParallelDatabaseIO #endif -#include - -#include // for nullptr #include #include +#include #include // for string #include "Ioss_CodeTypes.h" // for Ioss_MPI_Comm @@ -24,9 +22,6 @@ #if !defined(NO_PARMETIS_SUPPORT) #include #endif -namespace Ioss { - class DatabaseIO; -} // namespace Ioss #if defined(PARALLEL_AWARE_EXODUS) namespace { diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.h index 9a7794f81e..9206b71e40 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.h @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions +// Copyright(C) 1999-2020, 2022, 2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -6,13 +6,14 @@ #pragma once -#include "ioex_export.h" - -#include "Ioss_DatabaseIO.h" // for DatabaseIO #include #include // for DatabaseUsage #include // for IOFactory #include // for string + +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "ioex_export.h" + namespace Ioss { class PropertyManager; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C index d900548a11..cea2954130 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C @@ -6,20 +6,20 @@ #include // for Internals, ElemBlock, etc #include +#include +#include "Ioss_ElementTopology.h" +#include "Ioss_GroupingEntity.h" #include "exodusII.h" // for ex_err, ex_opts, etc extern "C" { #include } -#include // for size_t -#include // for nullptr -#include // for exit, EXIT_FAILURE -#include // for strlen -#include +#include +#include // for exit, EXIT_FAILURE +#include // for strlen #include // for NC_NOERR, nc_def_var, etc -#include // for operator<<, etc #include // for string, operator==, etc #include // for vector diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.h index cd6671fd22..62bb669632 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.h @@ -8,13 +8,15 @@ #pragma once +#include +#include +#include +#include + +#include "Ioss_ParallelUtils.h" +#include "Ioss_Utils.h" #include "ioex_export.h" -#include "Ioss_ParallelUtils.h" // for ParallelUtils -#include // for int64_t -#include // for MAX_LINE_LENGTH, etc -#include // for string -#include // for vector namespace Ioss { class Assembly; class Blob; @@ -28,6 +30,7 @@ namespace Ioss { class NodeSet; class SideBlock; class SideSet; + class Region; } // namespace Ioss using entity_id = int64_t; diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h index 302980a097..7213cb72ba 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h @@ -7,9 +7,9 @@ // -*- Mode: c++ -*- #pragma once -#include "ioex_export.h" - #include + +#include "ioex_export.h" #if defined PARALLEL_AWARE_EXODUS #include #include // for DatabaseUsage @@ -26,6 +26,7 @@ #include // for nullptr, time_t #include // for pair #include // for vector + namespace Ioex { class DecompositionDataBase; struct BlockFieldData; diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C index b727a14859..450bf5dd66 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C @@ -4,21 +4,21 @@ // // See packages/seacas/LICENSE for details -#include // for SuperElement - #include +#include +#include #include +#include #include - #include #include +#include // for SuperElement #include +#include #include #include -#include -#include -#include +#include "Ioss_CodeTypes.h" namespace { int nc_get_array(int ncid, const char *name, double *data) diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.h index 7461f53e2a..663ee255cc 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.h @@ -5,14 +5,15 @@ // See packages/seacas/LICENSE for details #pragma once -#include "ioex_export.h" - -#include "Ioss_EntityType.h" // for EntityType, etc -#include "Ioss_Property.h" // for Property #include // for GroupingEntity #include // for size_t #include // for int64_t #include // for string + +#include "Ioss_EntityType.h" // for EntityType, etc +#include "Ioss_Property.h" // for Property +#include "ioex_export.h" + namespace Ioss { class Field; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C index 784d2382b7..04c4b39b0b 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C @@ -4,19 +4,30 @@ // // See packages/seacas/LICENSE for details -#include #include #include #include #include #include -#include #include #include #include +#include +#include #include +#include +#include #include +#include "Ioss_CoordinateFrame.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_Field.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Property.h" +#include "exodusII.h" + namespace { size_t match(const std::string &name1, const std::string &name2) { diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h index 61bd2c2ec7..3683c41bbf 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h @@ -7,19 +7,29 @@ */ #pragma once -#include "ioex_export.h" - #include #include #include #include - #include #include +#include #include +#include +#include #include #include +#include "Ioss_CodeTypes.h" +#include "Ioss_EntityType.h" +#include "Ioss_SurfaceSplit.h" +#include "ioex_export.h" + +namespace Ioss { + class ElementBlock; + class Region; +} // namespace Ioss + #define EXU_USE_HOPSCOTCH #if defined EXU_USE_HOPSCOTCH #include @@ -32,6 +42,7 @@ namespace Ioss { class GroupingEntity; + using CoordinateFrameContainer = std::vector; } // namespace Ioss From 5fc96369ade5d04cb8a188944c7ad1fc4066b811 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 30 Oct 2023 16:10:32 -0600 Subject: [PATCH 004/110] IOSS: iwyu null --- .../ioss/src/null/Ionull_DatabaseIO.C | 25 +++++-------------- .../ioss/src/null/Ionull_DatabaseIO.h | 13 +++++++--- .../ioss/src/null/Ionull_IOFactory.C | 10 -------- .../ioss/src/null/Ionull_IOFactory.h | 7 +++--- 4 files changed, 20 insertions(+), 35 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C b/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C index 99aac595b7..ff6d8ccf20 100644 --- a/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C @@ -7,30 +7,17 @@ #include #include -#include "Ioss_Assembly.h" -#include "Ioss_Blob.h" -#include "Ioss_CommSet.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" -#include "Ioss_EdgeBlock.h" -#include "Ioss_EdgeSet.h" -#include "Ioss_ElementBlock.h" -#include "Ioss_ElementSet.h" -#include "Ioss_EntityBlock.h" -#include "Ioss_EntitySet.h" #include "Ioss_EntityType.h" -#include "Ioss_FaceBlock.h" -#include "Ioss_FaceSet.h" #include "Ioss_Field.h" -#include "Ioss_GroupingEntity.h" -#include "Ioss_NodeBlock.h" -#include "Ioss_NodeSet.h" -#include "Ioss_Property.h" -#include "Ioss_Region.h" -#include "Ioss_SideBlock.h" -#include "Ioss_SideSet.h" #include "Ioss_State.h" -#include "Ioss_VariableType.h" + +namespace Ioss { + class Assembly; + class Blob; + class PropertyManager; +} // namespace Ioss namespace Ionull { DatabaseIO::DatabaseIO(Ioss::Region *region, const std::string &filename, diff --git a/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.h b/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.h index c952c363ea..0607bed41a 100644 --- a/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.h @@ -7,13 +7,17 @@ // -*- Mode: c++ -*- #pragma once -#include "ionull_export.h" - #include #include - +#include +#include #include +#include "Ioss_CodeTypes.h" +#include "Ioss_DataSize.h" +#include "Ioss_State.h" +#include "ionull_export.h" + namespace Ioss { class GroupingEntity; class Region; @@ -33,6 +37,9 @@ namespace Ioss { class StructuredBlock; class CommSet; class ElementTopology; + class Assembly; + class Blob; + class PropertyManager; } // namespace Ioss namespace Ionull { diff --git a/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.C b/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.C index 00d2818d23..cec2f7e34a 100644 --- a/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.C @@ -7,20 +7,10 @@ #include #include -#include - -#include // for nullptr -#include -#include // for string - #include "Ioss_CodeTypes.h" // for Ioss_MPI_Comm #include "Ioss_DBUsage.h" // for DatabaseUsage #include "Ioss_IOFactory.h" // for IOFactory -namespace Ioss { - class DatabaseIO; -} // namespace Ioss - namespace Ionull { const IOFactory *IOFactory::factory() diff --git a/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.h b/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.h index 80cb6b6253..d37614cdd7 100644 --- a/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.h @@ -6,13 +6,14 @@ #pragma once -#include "ionull_export.h" - -#include "Ioss_DatabaseIO.h" // for DatabaseIO #include #include // for DatabaseUsage #include // for IOFactory #include // for string + +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "ionull_export.h" + namespace Ioss { class PropertyManager; } // namespace Ioss From 156a2da8ba67d10dd159dd2df0b12af8976c266a Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 30 Oct 2023 16:22:59 -0600 Subject: [PATCH 005/110] IOSS: iwyu exonull --- .../ioss/src/exonull/Ioexnl_BaseDatabaseIO.C | 26 ++++------------ .../ioss/src/exonull/Ioexnl_BaseDatabaseIO.h | 14 +++++---- .../ioss/src/exonull/Ioexnl_DatabaseIO.C | 30 ++++--------------- .../ioss/src/exonull/Ioexnl_DatabaseIO.h | 16 ++++++---- .../src/exonull/Ioexnl_DecompositionData.h | 4 +-- .../ioss/src/exonull/Ioexnl_IOFactory.C | 8 ----- .../ioss/src/exonull/Ioexnl_IOFactory.h | 9 +++--- .../ioss/src/exonull/Ioexnl_Internals.C | 10 ++----- .../ioss/src/exonull/Ioexnl_Internals.h | 13 ++++---- .../src/exonull/Ioexnl_ParallelDatabaseIO.h | 5 ++-- .../ioss/src/exonull/Ioexnl_SuperElement.C | 12 ++++---- .../ioss/src/exonull/Ioexnl_SuperElement.h | 11 +++---- .../libraries/ioss/src/exonull/Ioexnl_Utils.C | 14 +++++++-- .../libraries/ioss/src/exonull/Ioexnl_Utils.h | 17 +++++++++-- 14 files changed, 88 insertions(+), 101 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C index 090f12b453..1b542ef1cf 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C @@ -5,38 +5,24 @@ // See packages/seacas/LICENSE for details #include -#include -#include #include #include -#include #include -#include #include -#include -#include -#include -#include -#include -#include #include #include #include -#include +#include #include -#include -#include #include -#include +#include #include #include -#include #include +#include "Ioexnl_Utils.h" #include "Ioss_Assembly.h" #include "Ioss_Blob.h" -#include "Ioss_CommSet.h" -#include "Ioss_CoordinateFrame.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" #include "Ioss_EdgeBlock.h" @@ -44,24 +30,22 @@ #include "Ioss_ElementBlock.h" #include "Ioss_ElementSet.h" #include "Ioss_EntityBlock.h" -#include "Ioss_EntitySet.h" #include "Ioss_EntityType.h" #include "Ioss_FaceBlock.h" #include "Ioss_FaceSet.h" #include "Ioss_Field.h" #include "Ioss_GroupingEntity.h" #include "Ioss_Map.h" +#include "Ioss_MeshType.h" #include "Ioss_NodeBlock.h" #include "Ioss_NodeSet.h" #include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" #include "Ioss_Region.h" #include "Ioss_SideBlock.h" #include "Ioss_SideSet.h" #include "Ioss_SmartAssert.h" #include "Ioss_State.h" -#include "Ioss_VariableType.h" - -#include "Ioexnl_Utils.h" // Transitioning from treating global variables as Ioss::Field::TRANSIENT // to Ioss::Field::REDUCTION. To get the old behavior, define the value diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.h index 9e239ced59..e8b0e77ffe 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.h @@ -7,25 +7,26 @@ // -*- Mode: c++ -*- #pragma once -#include "ioexnl_export.h" - #include #include #include #include #include - -#include - #include #include #include +#include #include #include #include #include #include +#include "Ioss_CodeTypes.h" +#include "Ioss_DataSize.h" +#include "Ioss_State.h" +#include "ioexnl_export.h" + namespace Ioss { class Assembly; class Blob; @@ -46,6 +47,9 @@ namespace Ioss { class StructuredBlock; class CommSet; class ElementTopology; + class Field; + class Map; + class PropertyManager; } // namespace Ioss /** \brief A namespace for the exodus database format. diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C index 965cdc146d..998e9fd75a 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C @@ -5,52 +5,33 @@ // See packages/seacas/LICENSE for details #include -#include #include #include -#include #include -#include +#include #include -#include -#include -#include -#include -#include -#include #include #include #include #include #include #include -#include -#include -#include #include -#include -#include +#include +#include #include -#include -#include -#include -#ifndef _MSC_VER -#include -#endif -#include #include +#include "Ioexnl_BaseDatabaseIO.h" #include "Ioss_Assembly.h" #include "Ioss_Blob.h" #include "Ioss_CommSet.h" -#include "Ioss_CoordinateFrame.h" #include "Ioss_DBUsage.h" -#include "Ioss_DatabaseIO.h" #include "Ioss_EdgeBlock.h" #include "Ioss_EdgeSet.h" #include "Ioss_ElementBlock.h" #include "Ioss_ElementSet.h" -#include "Ioss_EntityBlock.h" +#include "Ioss_ElementTopology.h" #include "Ioss_EntitySet.h" #include "Ioss_EntityType.h" #include "Ioss_FaceBlock.h" @@ -61,6 +42,7 @@ #include "Ioss_NodeBlock.h" #include "Ioss_NodeSet.h" #include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" #include "Ioss_Region.h" #include "Ioss_SideBlock.h" #include "Ioss_SideSet.h" diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h index 3ccb9020ff..0c2215dcd5 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h @@ -7,25 +7,24 @@ // -*- Mode: c++ -*- #pragma once -#include "ioexnl_export.h" - #include #include #include #include -#include - -#include - #include #include #include +#include +#include #include #include #include #include #include +#include "Ioss_CodeTypes.h" +#include "ioexnl_export.h" + namespace Ioss { class GroupingEntity; class Region; @@ -44,6 +43,11 @@ namespace Ioss { class StructuredBlock; class CommSet; class ElementTopology; + class Assembly; + class Blob; + class Field; + class Map; + class PropertyManager; } // namespace Ioss namespace Ioexnl { diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.h index 1ea33a77d3..632599f37a 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.h @@ -10,10 +10,10 @@ #include #if defined PARALLEL_AWARE_EXODUS -#include "ioexnl_export.h" - #include #include + +#include "ioexnl_export.h" #if !defined(NO_PARMETIS_SUPPORT) #include #endif diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.C index a5d44abcc8..e9d8e795fa 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.C @@ -10,11 +10,6 @@ #if defined(PARALLEL_AWARE_EXODUS) // Defined in exodusII.h #include // for Ioexnl ParallelDatabaseIO #endif -#include - -#include // for nullptr -#include -#include #include // for string #include "Ioss_CodeTypes.h" // for Ioss_MPI_Comm @@ -24,9 +19,6 @@ #if !defined(NO_PARMETIS_SUPPORT) #include #endif -namespace Ioss { - class DatabaseIO; -} // namespace Ioss #if defined(PARALLEL_AWARE_EXODUS) namespace { diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.h index 803f248a50..a3e38102d4 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.h @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions +// Copyright(C) 1999-2020, 2022, 2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -6,13 +6,14 @@ #pragma once -#include "ioexnl_export.h" - -#include "Ioss_DatabaseIO.h" // for DatabaseIO #include #include // for DatabaseUsage #include // for IOFactory #include // for string + +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "ioexnl_export.h" + namespace Ioss { class PropertyManager; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.C index 4c59966da9..7028b35973 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.C @@ -7,19 +7,11 @@ #include // for Internals, ElemBlock, etc #include -#include "exodusII.h" // for ex_err, ex_opts, etc - extern "C" { -#include } #include // for assert -#include // for size_t -#include // for nullptr -#include // for exit, EXIT_FAILURE #include // for strlen -#include -#include // for operator<<, etc #include // for string, operator==, etc #include // for vector @@ -29,9 +21,11 @@ extern "C" { #include "Ioss_EdgeSet.h" #include "Ioss_ElementBlock.h" #include "Ioss_ElementSet.h" +#include "Ioss_ElementTopology.h" #include "Ioss_FaceBlock.h" #include "Ioss_FaceSet.h" #include "Ioss_Field.h" +#include "Ioss_GroupingEntity.h" #include "Ioss_NodeBlock.h" #include "Ioss_NodeSet.h" #include "Ioss_Property.h" diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.h index c1f9e314a6..729a3f98b0 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.h @@ -8,13 +8,15 @@ #pragma once -#include "ioexnl_export.h" +#include // for int64_t +#include // for MAX_LINE_LENGTH, etc +#include // for string +#include // for vector #include "Ioss_ParallelUtils.h" // for ParallelUtils -#include // for int64_t -#include // for MAX_LINE_LENGTH, etc -#include // for string -#include // for vector +#include "Ioss_Utils.h" +#include "ioexnl_export.h" + namespace Ioss { class Assembly; class Blob; @@ -28,6 +30,7 @@ namespace Ioss { class NodeSet; class SideBlock; class SideSet; + class Region; } // namespace Ioss using entity_id = int64_t; diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h index 39b46bd1da..9e7ad4301e 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h @@ -7,9 +7,9 @@ // -*- Mode: c++ -*- #pragma once -#include "ioexnl_export.h" - #include + +#include "ioexnl_export.h" #if defined PARALLEL_AWARE_EXODUS #include #include // for DatabaseUsage @@ -26,6 +26,7 @@ #include // for nullptr, time_t #include // for pair #include // for vector + namespace Ioexnl { class DecompositionDataBase; } diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.C index bc0fcabf91..8231d69ed9 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.C @@ -4,21 +4,21 @@ // // See packages/seacas/LICENSE for details -#include // for SuperElement - #include +#include +#include #include +#include #include - #include #include +#include // for SuperElement #include +#include #include #include -#include -#include -#include +#include "Ioss_CodeTypes.h" namespace { int nc_get_array(int ncid, const char *name, double *data) diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.h index 6d3a75035a..7faf1f6277 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.h @@ -1,18 +1,19 @@ -// Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions +// Copyright(C) 1999-2020, 2022, 2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // // See packages/seacas/LICENSE for details #pragma once -#include "ioexnl_export.h" - -#include "Ioss_EntityType.h" // for EntityType, etc -#include "Ioss_Property.h" // for Property #include // for GroupingEntity #include // for size_t #include // for int64_t #include // for string + +#include "Ioss_EntityType.h" // for EntityType, etc +#include "Ioss_Property.h" // for Property +#include "ioexnl_export.h" + namespace Ioss { class Field; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.C index 0c7af15061..1f5f14a92f 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.C @@ -4,20 +4,30 @@ // // See packages/seacas/LICENSE for details -#include #include #include #include #include #include -#include #include #include #include #include +#include +#include #include +#include +#include #include +#include "Ioss_CoordinateFrame.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_Field.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Property.h" + namespace { size_t match(const std::string &name1, const std::string &name2) { diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.h index bb033ae3bd..679b83c5ae 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.h @@ -7,19 +7,29 @@ */ #pragma once -#include "ioexnl_export.h" - #include #include #include #include - #include #include +#include #include +#include +#include #include #include +#include "Ioss_CodeTypes.h" +#include "Ioss_EntityType.h" +#include "Ioss_SurfaceSplit.h" +#include "ioexnl_export.h" + +namespace Ioss { + class ElementBlock; + class Region; +} // namespace Ioss + #define EXU_USE_HOPSCOTCH #if defined EXU_USE_HOPSCOTCH #include @@ -32,6 +42,7 @@ namespace Ioss { class GroupingEntity; + using CoordinateFrameContainer = std::vector; } // namespace Ioss From 508665fd83da6d5c80f14cf35d89838767549a55 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 30 Oct 2023 16:26:09 -0600 Subject: [PATCH 006/110] IOSS: iwyu elements --- .../seacas/libraries/ioss/src/elements/Ioss_Beam2.C | 8 +++++--- .../seacas/libraries/ioss/src/elements/Ioss_Beam3.C | 8 +++++--- .../seacas/libraries/ioss/src/elements/Ioss_Beam4.C | 8 +++++--- .../seacas/libraries/ioss/src/elements/Ioss_Edge2.C | 8 +++++--- .../libraries/ioss/src/elements/Ioss_Edge2D2.C | 8 +++++--- .../libraries/ioss/src/elements/Ioss_Edge2D3.C | 8 +++++--- .../seacas/libraries/ioss/src/elements/Ioss_Edge3.C | 8 +++++--- .../seacas/libraries/ioss/src/elements/Ioss_Edge4.C | 8 +++++--- .../seacas/libraries/ioss/src/elements/Ioss_Hex16.C | 6 ++++-- .../seacas/libraries/ioss/src/elements/Ioss_Hex20.C | 7 +++++-- .../seacas/libraries/ioss/src/elements/Ioss_Hex27.C | 7 +++++-- .../seacas/libraries/ioss/src/elements/Ioss_Hex32.C | 7 +++++-- .../seacas/libraries/ioss/src/elements/Ioss_Hex64.C | 7 +++++-- .../seacas/libraries/ioss/src/elements/Ioss_Hex8.C | 7 +++++-- .../seacas/libraries/ioss/src/elements/Ioss_Hex9.C | 7 +++++-- .../seacas/libraries/ioss/src/elements/Ioss_Node.C | 13 +++++++------ .../libraries/ioss/src/elements/Ioss_Pyramid13.C | 12 +++++++----- .../libraries/ioss/src/elements/Ioss_Pyramid14.C | 12 +++++++----- .../libraries/ioss/src/elements/Ioss_Pyramid18.C | 12 +++++++----- .../libraries/ioss/src/elements/Ioss_Pyramid19.C | 12 +++++++----- .../libraries/ioss/src/elements/Ioss_Pyramid5.C | 12 +++++++----- .../libraries/ioss/src/elements/Ioss_Pyramid5.h | 4 ++-- .../libraries/ioss/src/elements/Ioss_Quad12.C | 12 +++++++----- .../libraries/ioss/src/elements/Ioss_Quad16.C | 12 +++++++----- .../seacas/libraries/ioss/src/elements/Ioss_Quad4.C | 12 +++++++----- .../seacas/libraries/ioss/src/elements/Ioss_Quad6.C | 11 ++++++----- .../seacas/libraries/ioss/src/elements/Ioss_Quad8.C | 12 +++++++----- .../seacas/libraries/ioss/src/elements/Ioss_Quad9.C | 12 +++++++----- .../libraries/ioss/src/elements/Ioss_Shell4.C | 11 +++++++---- .../libraries/ioss/src/elements/Ioss_Shell8.C | 11 +++++++---- .../libraries/ioss/src/elements/Ioss_Shell9.C | 7 +++++-- .../libraries/ioss/src/elements/Ioss_ShellLine2D2.C | 8 +++++--- .../libraries/ioss/src/elements/Ioss_ShellLine2D3.C | 8 +++++--- .../libraries/ioss/src/elements/Ioss_Sphere.C | 9 +++++---- .../libraries/ioss/src/elements/Ioss_Sphere.h | 7 ++++--- .../libraries/ioss/src/elements/Ioss_Spring2.C | 9 +++++---- .../libraries/ioss/src/elements/Ioss_Spring3.C | 9 +++++---- .../seacas/libraries/ioss/src/elements/Ioss_Super.C | 8 ++++---- .../seacas/libraries/ioss/src/elements/Ioss_Super.h | 8 +++++--- .../seacas/libraries/ioss/src/elements/Ioss_Tet10.C | 7 +++++-- .../seacas/libraries/ioss/src/elements/Ioss_Tet11.C | 7 +++++-- .../seacas/libraries/ioss/src/elements/Ioss_Tet14.C | 7 +++++-- .../seacas/libraries/ioss/src/elements/Ioss_Tet15.C | 7 +++++-- .../seacas/libraries/ioss/src/elements/Ioss_Tet16.C | 7 +++++-- .../seacas/libraries/ioss/src/elements/Ioss_Tet4.C | 7 +++++-- .../seacas/libraries/ioss/src/elements/Ioss_Tet4.h | 4 ++-- .../seacas/libraries/ioss/src/elements/Ioss_Tet40.C | 7 +++++-- .../seacas/libraries/ioss/src/elements/Ioss_Tet7.C | 7 ++++--- .../seacas/libraries/ioss/src/elements/Ioss_Tet8.C | 7 +++++-- .../seacas/libraries/ioss/src/elements/Ioss_Tri13.C | 12 +++++++----- .../seacas/libraries/ioss/src/elements/Ioss_Tri3.C | 8 +++++--- .../seacas/libraries/ioss/src/elements/Ioss_Tri4.C | 8 +++++--- .../seacas/libraries/ioss/src/elements/Ioss_Tri4a.C | 7 ++++--- .../seacas/libraries/ioss/src/elements/Ioss_Tri6.C | 12 +++++++----- .../seacas/libraries/ioss/src/elements/Ioss_Tri7.C | 12 +++++++----- .../seacas/libraries/ioss/src/elements/Ioss_Tri9.C | 12 +++++++----- .../libraries/ioss/src/elements/Ioss_TriShell3.C | 7 +++++-- .../libraries/ioss/src/elements/Ioss_TriShell4.C | 7 +++++-- .../libraries/ioss/src/elements/Ioss_TriShell6.C | 7 +++++-- .../libraries/ioss/src/elements/Ioss_TriShell7.C | 7 +++++-- .../libraries/ioss/src/elements/Ioss_Unknown.C | 7 +++++-- .../libraries/ioss/src/elements/Ioss_Wedge12.C | 7 ++++--- .../libraries/ioss/src/elements/Ioss_Wedge15.C | 8 +++++--- .../libraries/ioss/src/elements/Ioss_Wedge16.C | 8 +++++--- .../libraries/ioss/src/elements/Ioss_Wedge18.C | 8 +++++--- .../libraries/ioss/src/elements/Ioss_Wedge20.C | 8 +++++--- .../libraries/ioss/src/elements/Ioss_Wedge21.C | 8 +++++--- .../libraries/ioss/src/elements/Ioss_Wedge24.C | 8 +++++--- .../libraries/ioss/src/elements/Ioss_Wedge52.C | 8 +++++--- .../libraries/ioss/src/elements/Ioss_Wedge6.C | 8 +++++--- 70 files changed, 373 insertions(+), 226 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam2.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam2.C index a197ad05d8..07a5e0717e 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam2.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam2.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include #include // for ElementVariableType #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam3.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam3.C index 40af44e1f2..9af78ef56c 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam3.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam3.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include #include // for ElementVariableType #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam4.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam4.C index 3fc615d1f0..6ce1592c37 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam4.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam4.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include #include // for ElementVariableType #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2.C index 3e2edcd97c..9eb2a76430 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include #include // for ElementVariableType #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D2.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D2.C index 29c94724db..0bc5e938d3 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D2.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D2.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include #include // for ElementVariableType #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D3.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D3.C index 46acdf6d56..45e3b52a95 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D3.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D3.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include #include // for ElementVariableType #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge3.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge3.C index bd567ac084..f3f5cc9db7 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge3.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge3.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include #include // for ElementVariableType #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge4.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge4.C index 3b837f5cff..8156635bd3 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge4.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge4.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include #include // for ElementVariableType #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex16.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex16.C index 5b684a41e6..3e5514cd1d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex16.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex16.C @@ -4,11 +4,13 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex20.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex20.C index 528f9cd48b..4cf7029aeb 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex20.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex20.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex27.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex27.C index 78d4ca3bcc..e32df851b9 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex27.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex27.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex32.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex32.C index 602b9dd0c7..b43affe4d4 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex32.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex32.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex64.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex64.C index 6a93a37b16..5430a73e84 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex64.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex64.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.C index 82833db646..8486e2be58 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex9.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex9.C index bae552e21c..42b6835a48 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex9.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex9.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Node.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Node.C index cda854523c..98e406dc12 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Node.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Node.C @@ -4,15 +4,16 @@ // // See packages/seacas/LICENSE for details -//------------------------------------------------------------------------ -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementPermutation.h" // for ElementPermutation -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +//------------------------------------------------------------------------ +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Node::name = "node"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid13.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid13.C index 2fee79d1b9..a447d944aa 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid13.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid13.C @@ -4,14 +4,16 @@ // // See packages/seacas/LICENSE for details -//------------------------------------------------------------------------ -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +//------------------------------------------------------------------------ +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Pyramid13::name = "pyramid13"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid14.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid14.C index 5c6dca902f..952926d7b4 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid14.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid14.C @@ -4,14 +4,16 @@ // // See packages/seacas/LICENSE for details -//------------------------------------------------------------------------ -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +//------------------------------------------------------------------------ +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Pyramid14::name = "pyramid14"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid18.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid18.C index 29a36b885d..08be32e56e 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid18.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid18.C @@ -4,14 +4,16 @@ // // See packages/seacas/LICENSE for details -//------------------------------------------------------------------------ -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +//------------------------------------------------------------------------ +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Pyramid18::name = "pyramid18"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid19.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid19.C index c02c91f47c..cf44b381bf 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid19.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid19.C @@ -4,14 +4,16 @@ // // See packages/seacas/LICENSE for details -//------------------------------------------------------------------------ -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +//------------------------------------------------------------------------ +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Pyramid19::name = "pyramid19"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.C index 2140f2ff77..8c2a92a9df 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.C @@ -4,14 +4,16 @@ // // See packages/seacas/LICENSE for details -//------------------------------------------------------------------------ -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +//------------------------------------------------------------------------ +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Pyramid5::name = "pyramid5"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.h index a3973ae000..787d08bbe9 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.h @@ -6,12 +6,12 @@ #pragma once -#include "ioss_export.h" - #include // for IntVector #include // for ElementPermutation #include // for ElementTopology +#include "ioss_export.h" + // STL Includes namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad12.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad12.C index c83a06938d..23ff90c75e 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad12.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad12.C @@ -4,14 +4,16 @@ // // See packages/seacas/LICENSE for details -//------------------------------------------------------------------------ -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +//------------------------------------------------------------------------ +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Quad12::name = "quad12"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad16.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad16.C index 640db82b18..9406ca8413 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad16.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad16.C @@ -4,14 +4,16 @@ // // See packages/seacas/LICENSE for details -//------------------------------------------------------------------------ -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +//------------------------------------------------------------------------ +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Quad16::name = "quad16"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad4.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad4.C index 9d21b279da..0847e98597 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad4.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad4.C @@ -4,14 +4,16 @@ // // See packages/seacas/LICENSE for details -//------------------------------------------------------------------------ -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +//------------------------------------------------------------------------ +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Quad4::name = "quad4"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad6.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad6.C index 41c64947a4..724817235c 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad6.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad6.C @@ -4,14 +4,15 @@ // // See packages/seacas/LICENSE for details -//------------------------------------------------------------------------ -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +//------------------------------------------------------------------------ +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology namespace Ioss { const char *Quad6::name = "quad6"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad8.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad8.C index 2de583c1fa..0cc55cadde 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad8.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad8.C @@ -4,14 +4,16 @@ // // See packages/seacas/LICENSE for details -//------------------------------------------------------------------------ -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +//------------------------------------------------------------------------ +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Quad8::name = "quad8"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad9.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad9.C index f87bd1f4b5..31905d8fe6 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad9.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad9.C @@ -4,14 +4,16 @@ // // See packages/seacas/LICENSE for details -//------------------------------------------------------------------------ -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +//------------------------------------------------------------------------ +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Quad9::name = "quad9"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell4.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell4.C index 6fac572207..2dc016a95c 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell4.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell4.C @@ -4,13 +4,16 @@ // // See packages/seacas/LICENSE for details -//------------------------------------------------------------------------ -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +//------------------------------------------------------------------------ +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Shell4::name = "shell4"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell8.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell8.C index 30560beaba..855a9ec543 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell8.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell8.C @@ -4,13 +4,16 @@ // // See packages/seacas/LICENSE for details -//------------------------------------------------------------------------ -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +//------------------------------------------------------------------------ +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Shell8::name = "shell8"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell9.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell9.C index 6352197ba1..fd34aaf0cb 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell9.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell9.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D2.C b/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D2.C index 01a4aed302..429f5e915d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D2.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D2.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D3.C b/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D3.C index c88268bd44..0a7743f59c 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D3.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D3.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.C index 9213e47ce7..9c8ac30280 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.C @@ -4,13 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementPermutation.h" // for ElementPermutation -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementPermutation.h" // for ElementPermutation +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.h index 22ad255787..1dd1d8623b 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.h @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2022 National Technology & Engineering Solutions +// Copyright(C) 1999-2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -6,10 +6,11 @@ #pragma once -#include "ioss_export.h" - #include // for IntVector #include // for ElementTopology +#include + +#include "ioss_export.h" // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Spring2.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Spring2.C index c50b91704a..5ac6d92035 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Spring2.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Spring2.C @@ -4,13 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementPermutation.h" // for ElementPermutation -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Spring3.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Spring3.C index 58d3780141..2405d2cb75 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Spring3.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Spring3.C @@ -4,13 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementPermutation.h" // for ElementPermutation -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Super.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Super.C index 4944034051..9ba332132e 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Super.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Super.C @@ -4,14 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include -#include // for size_t -#include #include // for string +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" + //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Super.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Super.h index ccc729382c..c74d847038 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Super.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Super.h @@ -6,12 +6,14 @@ #pragma once -#include "ioss_export.h" - -#include "Ioss_Super.h" #include // for IntVector #include // for ElementPermutation #include // for string + +#include "Ioss_ElementTopology.h" +#include "Ioss_Super.h" +#include "ioss_export.h" + namespace Ioss { class ElementVariableType; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet10.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet10.C index 8dee05174b..66636bf41e 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet10.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet10.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet11.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet11.C index 1d2b6880a2..c76aa4e7cc 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet11.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet11.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet14.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet14.C index 67bc074f3e..75e6f67af5 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet14.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet14.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet15.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet15.C index 4063807044..1e06c62627 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet15.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet15.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet16.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet16.C index 7aee7e6f55..9c30f82240 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet16.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet16.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.C index 757a71b722..f176d57aba 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.h index baf96f4eb5..dcc664e0ba 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.h @@ -6,12 +6,12 @@ #pragma once -#include "ioss_export.h" - #include // for IntVector #include // for ElementPermutatio #include // for ElementTopology +#include "ioss_export.h" + // STL Includes namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet40.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet40.C index 2f20069a5b..fc84e785fc 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet40.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet40.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet7.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet7.C index 82e96925d4..7db8141b79 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet7.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet7.C @@ -4,12 +4,13 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet8.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet8.C index bc6b8ed8d3..0d1c262347 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet8.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet8.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri13.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri13.C index b8f50e6a0b..634eb2c7be 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri13.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri13.C @@ -4,14 +4,16 @@ // // See packages/seacas/LICENSE for details -// ======================================================================== -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +// ======================================================================== +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Tri13::name = "tri13"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri3.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri3.C index ba64fe1658..40fe2944fe 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri3.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri3.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" // ======================================================================== // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4.C index 98a9ef4688..36b480f413 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" // ======================================================================== // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4a.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4a.C index 0109ad88f2..709e9144c4 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4a.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4a.C @@ -4,12 +4,13 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // ======================================================================== // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri6.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri6.C index 9c01da3b78..c3cd3b5f94 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri6.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri6.C @@ -4,14 +4,16 @@ // // See packages/seacas/LICENSE for details -// ======================================================================== -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +// ======================================================================== +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Tri6::name = "tri6"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri7.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri7.C index 9676036a4d..43d37608e5 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri7.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri7.C @@ -4,14 +4,16 @@ // // See packages/seacas/LICENSE for details -// ======================================================================== -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +// ======================================================================== +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Tri7::name = "tri7"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri9.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri9.C index 12c54c5daa..0ca50fcd67 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri9.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri9.C @@ -4,14 +4,16 @@ // // See packages/seacas/LICENSE for details -// ======================================================================== -// Define a variable type for storage of this elements connectivity -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +// ======================================================================== +// Define a variable type for storage of this elements connectivity +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" namespace Ioss { const char *Tri9::name = "tri9"; diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell3.C b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell3.C index f4760225b5..d568d5b961 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell3.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell3.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell4.C b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell4.C index 791b392627..59210de98a 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell4.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell4.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell6.C b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell6.C index db0a4c682b..b37aebcebb 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell6.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell6.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell7.C b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell7.C index 7888a06bed..e0d857be4a 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell7.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell7.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Unknown.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Unknown.C index 99c14e7e68..226b1fa6d0 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Unknown.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Unknown.C @@ -4,11 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" // ======================================================================== namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge12.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge12.C index 8d7da4054b..8faaa61df6 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge12.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge12.C @@ -4,12 +4,13 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge15.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge15.C index 89dc931a43..0c389fc076 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge15.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge15.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge16.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge16.C index c273278490..7a14418994 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge16.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge16.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge18.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge18.C index 8191499514..74cc7771fe 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge18.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge18.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge20.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge20.C index c41cb87440..0ae781bb73 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge20.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge20.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge21.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge21.C index 966c9de63f..1005372836 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge21.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge21.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge24.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge24.C index f5a7630a6c..a1b2a82706 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge24.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge24.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge52.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge52.C index d448ef5086..521537dd32 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge52.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge52.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge6.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge6.C index 8654cd5c29..115e142e10 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge6.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge6.C @@ -4,12 +4,14 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for IntVector -#include "Ioss_ElementTopology.h" // for ElementTopology #include // for ElementVariableType #include #include // for assert -#include // for nullptr +#include + +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Utils.h" //------------------------------------------------------------------------ // Define a variable type for storage of this elements connectivity From ed22dbee13188e70a235119b56e8b169825669ce Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 30 Oct 2023 16:46:45 -0600 Subject: [PATCH 007/110] IOSS: iwyu ioss/src --- .../seacas/libraries/ioss/src/Ioss_Assembly.C | 7 +- .../seacas/libraries/ioss/src/Ioss_Assembly.h | 10 +-- .../seacas/libraries/ioss/src/Ioss_Blob.C | 6 -- .../seacas/libraries/ioss/src/Ioss_Blob.h | 10 +-- .../libraries/ioss/src/Ioss_ChainGenerator.C | 14 ++-- .../libraries/ioss/src/Ioss_ChainGenerator.h | 3 + .../seacas/libraries/ioss/src/Ioss_Compare.C | 34 ++++++++-- .../ioss/src/Ioss_CompositeVariableType.C | 3 - .../ioss/src/Ioss_ConcreteVariableType.C | 3 +- .../ioss/src/Ioss_ConstructedVariableType.C | 1 - .../libraries/ioss/src/Ioss_CoordinateFrame.h | 4 +- .../libraries/ioss/src/Ioss_CopyDatabase.C | 45 +++++++++++-- .../libraries/ioss/src/Ioss_DatabaseIO.C | 36 ++++++++-- .../libraries/ioss/src/Ioss_DatabaseIO.h | 5 +- .../seacas/libraries/ioss/src/Ioss_EdgeSet.C | 2 - .../libraries/ioss/src/Ioss_ElementBlock.C | 10 +-- .../libraries/ioss/src/Ioss_ElementBlock.h | 9 ++- .../ioss/src/Ioss_ElementPermutation.C | 9 +-- .../ioss/src/Ioss_ElementPermutation.h | 7 +- .../libraries/ioss/src/Ioss_ElementSet.C | 2 - .../libraries/ioss/src/Ioss_ElementTopology.h | 4 +- .../libraries/ioss/src/Ioss_EntityBlock.h | 5 +- .../libraries/ioss/src/Ioss_EntitySet.C | 1 - .../libraries/ioss/src/Ioss_EntitySet.h | 5 +- .../libraries/ioss/src/Ioss_FaceGenerator.C | 19 ++---- .../libraries/ioss/src/Ioss_FaceGenerator.h | 6 +- .../seacas/libraries/ioss/src/Ioss_FaceSet.C | 2 - .../seacas/libraries/ioss/src/Ioss_Field.h | 10 +-- .../libraries/ioss/src/Ioss_FieldManager.C | 7 +- .../libraries/ioss/src/Ioss_FieldManager.h | 4 +- .../seacas/libraries/ioss/src/Ioss_FileInfo.C | 9 ++- .../libraries/ioss/src/Ioss_GetLongOpt.C | 4 +- .../libraries/ioss/src/Ioss_GetLongOpt.h | 5 +- .../seacas/libraries/ioss/src/Ioss_Getline.C | 8 +-- .../seacas/libraries/ioss/src/Ioss_Glob.h | 7 +- .../libraries/ioss/src/Ioss_GroupingEntity.C | 2 +- .../libraries/ioss/src/Ioss_IOFactory.C | 12 ++-- .../libraries/ioss/src/Ioss_Initializer.C | 66 ++++++++++++++++++- packages/seacas/libraries/ioss/src/Ioss_Map.C | 7 +- packages/seacas/libraries/ioss/src/Ioss_Map.h | 4 +- .../libraries/ioss/src/Ioss_MemoryUtils.C | 8 ++- .../libraries/ioss/src/Ioss_NodeBlock.C | 2 + .../libraries/ioss/src/Ioss_NodeBlock.h | 7 +- .../seacas/libraries/ioss/src/Ioss_NodeSet.C | 2 - .../libraries/ioss/src/Ioss_NullEntity.h | 9 ++- .../libraries/ioss/src/Ioss_ParallelUtils.C | 7 +- .../libraries/ioss/src/Ioss_ParallelUtils.h | 10 +-- .../seacas/libraries/ioss/src/Ioss_Property.C | 3 +- .../libraries/ioss/src/Ioss_PropertyManager.C | 5 +- .../libraries/ioss/src/Ioss_PropertyManager.h | 9 +-- .../seacas/libraries/ioss/src/Ioss_Region.C | 20 +++--- .../seacas/libraries/ioss/src/Ioss_Region.h | 21 +++--- .../libraries/ioss/src/Ioss_SerializeIO.C | 5 +- .../libraries/ioss/src/Ioss_SerializeIO.h | 4 +- .../libraries/ioss/src/Ioss_SideBlock.C | 3 +- .../libraries/ioss/src/Ioss_SideBlock.h | 6 +- .../seacas/libraries/ioss/src/Ioss_SideSet.C | 4 +- .../libraries/ioss/src/Ioss_SmartAssert.C | 3 - .../libraries/ioss/src/Ioss_StructuredBlock.C | 18 +++-- .../libraries/ioss/src/Ioss_StructuredBlock.h | 13 +++- .../seacas/libraries/ioss/src/Ioss_Tracer.C | 1 - .../libraries/ioss/src/Ioss_Transform.C | 1 - .../libraries/ioss/src/Ioss_Transform.h | 6 +- .../seacas/libraries/ioss/src/Ioss_Utils.C | 25 +++++-- .../seacas/libraries/ioss/src/Ioss_Utils.h | 6 +- .../libraries/ioss/src/Ioss_VariableType.C | 9 ++- .../libraries/ioss/src/Ioss_VariableType.h | 4 +- .../ioss/src/Ioss_ZoneConnectivity.C | 4 +- .../ioss/src/Ioss_ZoneConnectivity.h | 11 +++- 69 files changed, 418 insertions(+), 215 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_Assembly.C b/packages/seacas/libraries/ioss/src/Ioss_Assembly.C index 468567a5b6..7aa22daa8b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Assembly.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Assembly.C @@ -9,12 +9,13 @@ #include #include #include -#include -#include #include #include +#include #include -#include + +#include "Ioss_CodeTypes.h" +#include "Ioss_Utils.h" namespace { std::string id_str() { return {"id"}; } diff --git a/packages/seacas/libraries/ioss/src/Ioss_Assembly.h b/packages/seacas/libraries/ioss/src/Ioss_Assembly.h index a4d7a039cd..5824826ecb 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Assembly.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Assembly.h @@ -6,14 +6,16 @@ #pragma once -#include "ioss_export.h" - -#include "Ioss_EntityType.h" // for EntityType, etc -#include "Ioss_Property.h" // for Property #include #include // for size_t #include // for int64_t #include // for string +#include + +#include "Ioss_EntityType.h" // for EntityType, etc +#include "Ioss_Property.h" // for Property +#include "ioss_export.h" + namespace Ioss { class DatabaseIO; class Field; diff --git a/packages/seacas/libraries/ioss/src/Ioss_Blob.C b/packages/seacas/libraries/ioss/src/Ioss_Blob.C index fccef9d31c..0a8463e01b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Blob.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Blob.C @@ -8,13 +8,7 @@ #include #include #include -#include -#include -#include #include -#include -#include -#include namespace Ioss { class Field; diff --git a/packages/seacas/libraries/ioss/src/Ioss_Blob.h b/packages/seacas/libraries/ioss/src/Ioss_Blob.h index d6842a9e7e..32c45df3a2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Blob.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Blob.h @@ -6,14 +6,16 @@ #pragma once -#include "ioss_export.h" - -#include "Ioss_EntityType.h" // for EntityType, etc -#include "Ioss_Property.h" // for Property #include #include // for size_t #include // for int64_t #include // for string +#include + +#include "Ioss_EntityType.h" // for EntityType, etc +#include "Ioss_Property.h" // for Property +#include "ioss_export.h" + namespace Ioss { class DatabaseIO; class Field; diff --git a/packages/seacas/libraries/ioss/src/Ioss_ChainGenerator.C b/packages/seacas/libraries/ioss/src/Ioss_ChainGenerator.C index 5d1501cca0..f37e59d507 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ChainGenerator.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ChainGenerator.C @@ -4,14 +4,14 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "Ioss_ChainGenerator.h" - -#include "Ioss_CodeTypes.h" -#include "Ioss_DatabaseIO.h" #include "Ioss_ElementBlock.h" #include "Ioss_ElementTopology.h" #include "Ioss_FaceGenerator.h" @@ -20,6 +20,8 @@ #include "Ioss_SideBlock.h" #include "Ioss_SideSet.h" #include "Ioss_Utils.h" +#include "ioss_export.h" +#include "robin_hash.h" #include "tokenize.h" // ======================================================================== diff --git a/packages/seacas/libraries/ioss/src/Ioss_ChainGenerator.h b/packages/seacas/libraries/ioss/src/Ioss_ChainGenerator.h index 45912f09d3..f8f1338c9b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ChainGenerator.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ChainGenerator.h @@ -6,12 +6,15 @@ #pragma once +#include #include #include #include "Ioss_Region.h" namespace Ioss { + class Region; + template struct chain_entry_t { bool operator==(const chain_entry_t &other) const { return (other.element == element); } diff --git a/packages/seacas/libraries/ioss/src/Ioss_Compare.C b/packages/seacas/libraries/ioss/src/Ioss_Compare.C index 4b752bfba0..4ba7b3710e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Compare.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Compare.C @@ -6,11 +6,37 @@ #include #include -#include - -#include -#include +#include +#include #include +#include +#include +#include +#include +#include + +#include "Ioss_CommSet.h" +#include "Ioss_Compare.h" +#include "Ioss_CoordinateFrame.h" +#include "Ioss_EdgeBlock.h" +#include "Ioss_EdgeSet.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementSet.h" +#include "Ioss_EntityType.h" +#include "Ioss_FaceBlock.h" +#include "Ioss_FaceSet.h" +#include "Ioss_Field.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_IOFactory.h" +#include "Ioss_MeshType.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_Property.h" +#include "Ioss_Region.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_StructuredBlock.h" +#include "Ioss_Utils.h" /* These messages indicate a structural difference between the files * being compared. Use Ioss::WarnOut(). diff --git a/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.C b/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.C index 0bb7b3b18a..41ec213945 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.C +++ b/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.C @@ -5,13 +5,10 @@ // See packages/seacas/LICENSE for details #include -#include #include #include -#include #include #include -#include namespace Ioss { std::string CompositeVariableType::composite_name(const std::string &base, int copies) diff --git a/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.C b/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.C index 66d7351ccd..feacd738ca 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.C @@ -6,10 +6,11 @@ #include #include - #include #include +#include "Ioss_CodeTypes.h" + namespace { std::string X() { return {"x"}; } std::string Y() { return {"y"}; } diff --git a/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.C b/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.C index f51a511ccb..29045d3a14 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.C @@ -5,7 +5,6 @@ // See packages/seacas/LICENSE for details #include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.h b/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.h index bf64e03073..371cc9cd91 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.h +++ b/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.h @@ -6,11 +6,11 @@ #pragma once -#include "ioss_export.h" - #include // for int64_t #include // for vector +#include "ioss_export.h" + namespace Ioss { class DatabaseIO; diff --git a/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C b/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C index b5875cb7aa..61fd393d2b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C +++ b/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C @@ -4,19 +4,52 @@ // // See packages/seacas/LICENSE for details -#include #include #include #include #include -#include - +#include +#include +#include +#include +#include #include +#include #include - -// For Sleep... -#include +#include +#include #include +#include + +#include "Ioss_Assembly.h" +#include "Ioss_Blob.h" +#include "Ioss_CommSet.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_EdgeBlock.h" +#include "Ioss_EdgeSet.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementSet.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_EntityBlock.h" +#include "Ioss_EntityType.h" +#include "Ioss_FaceBlock.h" +#include "Ioss_FaceSet.h" +#include "Ioss_Field.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_IOFactory.h" +#include "Ioss_MeshType.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Property.h" +#include "Ioss_Region.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_State.h" +#include "Ioss_StructuredBlock.h" +#include "Ioss_Utils.h" +#include "robin_hash.h" // For copy_database... namespace { diff --git a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C index 5606d5bf66..4222f2bdea 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C @@ -11,24 +11,50 @@ #include #include #include -#include -#include #include #include #include #include #include -#include #include -#include #include -#include +#include #include +#include #include #include #include #include +#include "Ioss_Assembly.h" +#include "Ioss_Blob.h" +#include "Ioss_CommSet.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DataSize.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_EdgeBlock.h" +#include "Ioss_EdgeSet.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementSet.h" +#include "Ioss_EntityType.h" +#include "Ioss_FaceBlock.h" +#include "Ioss_FaceSet.h" +#include "Ioss_Field.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_Map.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Region.h" +#include "Ioss_SerializeIO.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_StructuredBlock.h" +#include "Ioss_SurfaceSplit.h" +#include "Ioss_Utils.h" +#include "Ioss_VariableType.h" + #if defined SEACAS_HAVE_DATAWARP extern "C" { #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h index f5843af844..682bdf0521 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h @@ -6,8 +6,6 @@ #pragma once -#include "ioss_export.h" - #include #include #include // for DatabaseUsage, etc @@ -26,6 +24,9 @@ #include // for pair #include // for vector +#include "Ioss_Field.h" +#include "ioss_export.h" + namespace Ioss { class Assembly; class Blob; diff --git a/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.C b/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.C index 95033b376d..3b8f49e47e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.C @@ -9,12 +9,10 @@ #include #include #include -#include #include #include "Ioss_EntitySet.h" #include "Ioss_FieldManager.h" -#include "Ioss_GroupingEntity.h" Ioss::EdgeSet::EdgeSet() : Ioss::EntitySet(nullptr, "invalid", 0) {} diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.C b/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.C index 5b82fe1a58..d5782721f0 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.C @@ -4,10 +4,7 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_BoundingBox.h" // for AxisAlignedBoundingBox -#include "Ioss_EntityBlock.h" // for EntityBlock -#include "Ioss_FieldManager.h" // for FieldManager -#include // for DatabaseIO +#include // for DatabaseIO #include #include // for Field, etc #include // for Property @@ -15,8 +12,11 @@ #include // for string #include // for vector +#include "Ioss_BoundingBox.h" // for AxisAlignedBoundingBox +#include "Ioss_EntityBlock.h" // for EntityBlock +#include "Ioss_FieldManager.h" // for FieldManager + namespace Ioss { - class Field; /** \brief Create an element block. * diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.h b/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.h index 541db19b82..51ec92782f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.h @@ -6,17 +6,22 @@ #pragma once -#include "ioss_export.h" - #include #include #include #include #include +#include +#include #include +#include + +#include "Ioss_EntityType.h" +#include "ioss_export.h" namespace Ioss { class DatabaseIO; + class Field; /** \brief A collection of elements having the same topology. */ diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.C b/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.C index 1829af7b4a..72eaf86847 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.C @@ -6,18 +6,13 @@ #include // for IntVector #include -#include #include - -#include // for assert -#include // for size_t +#include +#include #include // for basic_ostream, etc #include // for string, char_traits, etc -#include // for pair #include // for vector -#include - namespace Ioss { void EPRegistry::insert(const Ioss::EPM_VP &value, bool delete_me) { diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.h b/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.h index c3c7e83d6f..8045d31b32 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.h @@ -6,15 +6,16 @@ #pragma once -#include "ioss_export.h" - #include #include #include -#include // for map, map<>::value_compare +#include // for map, map<>::value_compare +#include #include // for string, operator< #include // for vector +#include "ioss_export.h" + namespace Ioss { class ElementTopology; class ElementPermutation; diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementSet.C b/packages/seacas/libraries/ioss/src/Ioss_ElementSet.C index ddae72558e..c002c1f762 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementSet.C @@ -8,11 +8,9 @@ #include #include #include -#include #include #include "Ioss_EntitySet.h" -#include "Ioss_GroupingEntity.h" namespace Ioss { class Field; diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h b/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h index 202a25ec99..516a8009fc 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h @@ -6,8 +6,6 @@ #pragma once -#include "ioss_export.h" - #include #include // for ElementPermutation #include // for map, map<>::value_compare @@ -15,6 +13,8 @@ #include // for string, operator< #include // for vector +#include "ioss_export.h" + namespace Ioss { class ElementTopology; class ElementPermutation; diff --git a/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.h b/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.h index 347b4f1db4..a6aa0e239c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.h @@ -6,12 +6,13 @@ #pragma once -#include "ioss_export.h" - #include // for GroupingEntity #include // for Property #include // for size_t #include // for string + +#include "ioss_export.h" + namespace Ioss { class DatabaseIO; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/Ioss_EntitySet.C b/packages/seacas/libraries/ioss/src/Ioss_EntitySet.C index c344a7e02d..98ca8a337c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EntitySet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_EntitySet.C @@ -8,7 +8,6 @@ #include #include #include -#include #include "Ioss_FieldManager.h" #include "Ioss_GroupingEntity.h" diff --git a/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h b/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h index 3e1d186a60..c119694b98 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h @@ -6,12 +6,13 @@ #pragma once -#include "ioss_export.h" - #include // for GroupingEntity #include // for Property #include // for size_t #include // for string + +#include "ioss_export.h" + namespace Ioss { class DatabaseIO; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C index c12b948725..2b5d41f8d2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C @@ -5,27 +5,20 @@ // See packages/seacas/LICENSE for details #include - -#include -#include -#include #include #include #include -#include #include -#include #include #include - -#include -#include -#include +#include #include -#include +#include #include -#include -#include +#include + +#include "Ioss_Utils.h" +#include "robin_set.h" // Options for generating hash function key... #define USE_MURMUR diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.h b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.h index 81e4e7eb22..6ac121bd19 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.h +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.h @@ -6,13 +6,15 @@ #pragma once -#include "ioss_export.h" - #include #include #include #include #include +#include +#include + +#include "ioss_export.h" #define FG_USE_ROBIN #if defined FG_USE_STD diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceSet.C b/packages/seacas/libraries/ioss/src/Ioss_FaceSet.C index 54a89146fa..e4636add9d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceSet.C @@ -9,12 +9,10 @@ #include #include #include -#include #include #include "Ioss_EntitySet.h" #include "Ioss_FieldManager.h" -#include "Ioss_GroupingEntity.h" Ioss::FaceSet::FaceSet() : Ioss::EntitySet(nullptr, "invalid", 0) {} diff --git a/packages/seacas/libraries/ioss/src/Ioss_Field.h b/packages/seacas/libraries/ioss/src/Ioss_Field.h index 6b64a68323..22683efd07 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Field.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Field.h @@ -6,12 +6,14 @@ #pragma once -#include "ioss_export.h" - #include #include // for size_t -#include // for string -#include // for vector +#include +#include // for string +#include // for vector + +#include "ioss_export.h" + namespace Ioss { class GroupingEntity; class Transform; diff --git a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C index 572348937f..0205cee5fc 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C @@ -8,13 +8,12 @@ #include #include #include - #include #include -#include -#include #include -#include + +#include "Ioss_CodeTypes.h" +#include "robin_hash.h" /** \brief Add a field to the field manager. * diff --git a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h index 9a6d13787b..6b775ece53 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h +++ b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h @@ -6,14 +6,14 @@ #pragma once -#include "ioss_export.h" - #include #include // for Field, Field::RoleType #include // for size_t #include // for string #include // for vector +#include "ioss_export.h" + #define USE_ROBIN_MAP #if defined USE_ROBIN_MAP #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C b/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C index 46272e1378..1716faaa99 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C @@ -6,16 +6,20 @@ #include #include -#include #include -#include #include +#include +#include #include +#include +#include #include +#include #if defined(__IOSS_WINDOWS__) #include #include + #define access _access #define R_OK 4 /* Test for read permission. */ #define W_OK 2 /* Test for write permission. */ @@ -29,7 +33,6 @@ #include #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) #include -#include #elif defined(__OpenBSD__) #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C b/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C index d9f33ad006..96d380aa0d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C +++ b/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2021 National Technology & Engineering Solutions +// Copyright(C) 1999-2021, 2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -8,8 +8,10 @@ #include #include #include +#include #include #include +#include namespace Ioss { /** \brief Create an empty options database. diff --git a/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.h b/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.h index c6ba735f28..b43a539ce7 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.h +++ b/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.h @@ -9,10 +9,11 @@ #pragma once -#include "ioss_export.h" - #include #include +#include + +#include "ioss_export.h" namespace Ioss { /** \brief A database of program command line and environment variable options and methods for diff --git a/packages/seacas/libraries/ioss/src/Ioss_Getline.C b/packages/seacas/libraries/ioss/src/Ioss_Getline.C index 79d1a24c50..d0749c15ea 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Getline.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Getline.C @@ -24,8 +24,10 @@ #define __windows__ 1 #include #include + #define NOMINMAX #include + #define sleep(a) Sleep(a * 1000) #ifndef write #define write _write @@ -38,11 +40,10 @@ #endif #endif +#include +#include /********************* C library headers ********************************/ #include -#include -#include -#include #include #include #ifndef _MSC_VER @@ -120,7 +121,6 @@ namespace { namespace { #ifdef __unix__ -#include struct termios io_new_termios; struct termios io_old_termios; #endif diff --git a/packages/seacas/libraries/ioss/src/Ioss_Glob.h b/packages/seacas/libraries/ioss/src/Ioss_Glob.h index c627960c4a..78c575b25b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Glob.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Glob.h @@ -5,14 +5,16 @@ #pragma once -#include "ioss_export.h" - +#include #include #include +#include #include #include #include +#include "ioss_export.h" + namespace Ioss::glob { template using String = std::basic_string; @@ -804,6 +806,7 @@ namespace Ioss::glob { // declare all classes used for nodes #define DECLARE_TYPE_CLASS(type) template class type; GLOB_AST_NODE_LIST(DECLARE_TYPE_CLASS) + #undef DECLARE_TYPE_CLASS template class AstNode diff --git a/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.C b/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.C index 0f6324fee6..392bb85d0b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.C +++ b/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.C @@ -15,12 +15,12 @@ #include #include #include -#include #include "Ioss_CodeTypes.h" #include "Ioss_EntityType.h" #include "Ioss_Field.h" #include "Ioss_FieldManager.h" +#include "Ioss_ParallelUtils.h" #include "Ioss_PropertyManager.h" #include "Ioss_State.h" diff --git a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C index ef20a45c4c..2c6111dcc5 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C @@ -4,18 +4,20 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_DBUsage.h" // for DatabaseUsage #include #include #include // for IOSS_ERROR #include -#include // for nullptr +#include #include #include // for _Rb_tree_iterator, etc #include // for basic_ostream, etc #include -#include // for char_traits, string, etc -#include // for pair +#include // for char_traits, string, etc + +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_PropertyManager.h" #if defined(SEACAS_HAVE_MPI) #include #endif @@ -39,7 +41,7 @@ namespace { namespace Ioss { class DatabaseIO; - class PropertyManager; + using IOFactoryValuePair = IOFactoryMap::value_type; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/Ioss_Initializer.C b/packages/seacas/libraries/ioss/src/Ioss_Initializer.C index b1cbb23a8c..7df801f45c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Initializer.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Initializer.C @@ -4,9 +4,71 @@ // // See packages/seacas/LICENSE for details -#include #include -#include + +#include "Ioss_Beam2.h" +#include "Ioss_Beam3.h" +#include "Ioss_Beam4.h" +#include "Ioss_Edge2.h" +#include "Ioss_Edge3.h" +#include "Ioss_Edge4.h" +#include "Ioss_Hex16.h" +#include "Ioss_Hex20.h" +#include "Ioss_Hex27.h" +#include "Ioss_Hex32.h" +#include "Ioss_Hex64.h" +#include "Ioss_Hex8.h" +#include "Ioss_Hex9.h" +#include "Ioss_Initializer.h" +#include "Ioss_Node.h" +#include "Ioss_Pyramid13.h" +#include "Ioss_Pyramid14.h" +#include "Ioss_Pyramid18.h" +#include "Ioss_Pyramid19.h" +#include "Ioss_Pyramid5.h" +#include "Ioss_Quad12.h" +#include "Ioss_Quad16.h" +#include "Ioss_Quad4.h" +#include "Ioss_Quad6.h" +#include "Ioss_Quad8.h" +#include "Ioss_Quad9.h" +#include "Ioss_Shell4.h" +#include "Ioss_Shell8.h" +#include "Ioss_Shell9.h" +#include "Ioss_ShellLine2D2.h" +#include "Ioss_ShellLine2D3.h" +#include "Ioss_Sphere.h" +#include "Ioss_Spring2.h" +#include "Ioss_Spring3.h" +#include "Ioss_Super.h" +#include "Ioss_Tet10.h" +#include "Ioss_Tet11.h" +#include "Ioss_Tet14.h" +#include "Ioss_Tet15.h" +#include "Ioss_Tet16.h" +#include "Ioss_Tet4.h" +#include "Ioss_Tet40.h" +#include "Ioss_Tet8.h" +#include "Ioss_Tri13.h" +#include "Ioss_Tri3.h" +#include "Ioss_Tri4.h" +#include "Ioss_Tri6.h" +#include "Ioss_Tri7.h" +#include "Ioss_Tri9.h" +#include "Ioss_TriShell3.h" +#include "Ioss_TriShell4.h" +#include "Ioss_TriShell6.h" +#include "Ioss_TriShell7.h" +#include "Ioss_Unknown.h" +#include "Ioss_Wedge12.h" +#include "Ioss_Wedge15.h" +#include "Ioss_Wedge16.h" +#include "Ioss_Wedge18.h" +#include "Ioss_Wedge20.h" +#include "Ioss_Wedge21.h" +#include "Ioss_Wedge24.h" +#include "Ioss_Wedge52.h" +#include "Ioss_Wedge6.h" #if defined IOSS_THREADSAFE #include #endif diff --git a/packages/seacas/libraries/ioss/src/Ioss_Map.C b/packages/seacas/libraries/ioss/src/Ioss_Map.C index b7636889ae..ecb85d3728 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Map.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Map.C @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2022 National Technology & Engineering Solutions +// Copyright(C) 1999-2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -7,16 +7,15 @@ #include // for Field, etc #include #include -#include #include // for IOSS_ERROR #include // for size_t #include -#include // for insert_iterator, inserter #include #include -#include #include // for vector, vector<>::iterator, etc +#include "Ioss_CodeTypes.h" + // If defined, then only build m_reverseMap when it is used. #undef USE_LAZY_REVERSE diff --git a/packages/seacas/libraries/ioss/src/Ioss_Map.h b/packages/seacas/libraries/ioss/src/Ioss_Map.h index 809bfde44c..43c6231586 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Map.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Map.h @@ -6,8 +6,6 @@ #pragma once -#include "ioss_export.h" - #include #include #include // for size_t @@ -15,6 +13,8 @@ #include // for string #include // for vector +#include "ioss_export.h" + #define MAP_USE_STD #if defined MAP_USE_STD #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C b/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C index c6d89ecae8..02e615a58c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C @@ -5,6 +5,12 @@ // See packages/seacas/LICENSE for details #include +#include +#include +#include +#include +#include +#include // For memory utilities... #if defined(__IOSS_WINDOWS__) @@ -12,10 +18,8 @@ #elif defined(__unix__) || defined(__unix) || defined(unix) || \ (defined(__APPLE__) && defined(__MACH__)) #include -#include #if defined(__APPLE__) && defined(__MACH__) -#include #elif (defined(_AIX) || defined(__TOS__AIX__)) || \ (defined(__sun__) || defined(__sun) || defined(sun) && (defined(__SVR4) || defined(__svr4__))) diff --git a/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.C b/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.C index 181d268979..03621d6cea 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.C @@ -12,6 +12,8 @@ #include #include +#include "Ioss_BoundingBox.h" +#include "Ioss_CodeTypes.h" #include "Ioss_EntityBlock.h" #include "Ioss_FieldManager.h" #include "Ioss_PropertyManager.h" diff --git a/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.h b/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.h index 105079d105..84b2fd1e7b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.h @@ -6,8 +6,6 @@ #pragma once -#include "ioss_export.h" - #include #include #include // for EntityType, etc @@ -15,6 +13,11 @@ #include // for size_t #include // for int64_t #include // for string + +#include "Ioss_GroupingEntity.h" +#include "Ioss_PropertyManager.h" +#include "ioss_export.h" + namespace Ioss { class DatabaseIO; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/Ioss_NodeSet.C b/packages/seacas/libraries/ioss/src/Ioss_NodeSet.C index 79861d08a5..cebf6cf432 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NodeSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_NodeSet.C @@ -8,10 +8,8 @@ #include #include #include -#include #include "Ioss_EntitySet.h" -#include "Ioss_GroupingEntity.h" namespace Ioss { class Field; diff --git a/packages/seacas/libraries/ioss/src/Ioss_NullEntity.h b/packages/seacas/libraries/ioss/src/Ioss_NullEntity.h index 58de53d1db..dd150f8c35 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NullEntity.h +++ b/packages/seacas/libraries/ioss/src/Ioss_NullEntity.h @@ -6,14 +6,19 @@ #pragma once -#include "ioss_export.h" - #include #include +#include +#include #include +#include "Ioss_EntityType.h" +#include "Ioss_Property.h" +#include "ioss_export.h" + namespace Ioss { class DatabaseIO; + class Field; class IOSS_EXPORT NullEntity : public GroupingEntity { diff --git a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C index 8d94677091..f5e353cdca 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C @@ -9,17 +9,16 @@ #include #include #include -#include -#include #include #include -#include #include -#include +#include #include #include #include +#include "Ioss_Property.h" + #ifdef SEACAS_HAVE_MPI #include #endif diff --git a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h index d370f87638..b0553c0446 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h @@ -6,14 +6,15 @@ #pragma once -#include "ioss_export.h" - #include // for Int64Vector, IntVector #include #include #include // for size_t -#include // for string -#include // for vector +#include +#include // for string +#include // for vector + +#include "ioss_export.h" #if IOSS_DEBUG_OUTPUT #include #include @@ -24,6 +25,7 @@ #endif namespace Ioss { + class PropertyManager; class IOSS_EXPORT ParallelUtils { diff --git a/packages/seacas/libraries/ioss/src/Ioss_Property.C b/packages/seacas/libraries/ioss/src/Ioss_Property.C index f5858906f2..c32d16ab79 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Property.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Property.C @@ -6,8 +6,7 @@ #include #include #include -#include -#include +#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C b/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C index a9797beb73..4e5c3d09f0 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C +++ b/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C @@ -9,10 +9,11 @@ #include #include #include -#include #include #include -#include + +#include "Ioss_CodeTypes.h" +#include "robin_hash.h" Ioss::PropertyManager::~PropertyManager() { diff --git a/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.h b/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.h index 453aba7480..69757bc966 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.h +++ b/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.h @@ -6,13 +6,14 @@ #pragma once -#include "ioss_export.h" - #include #include // for Property #include // for size_t -#include // for string, operator< -#include // for vector +#include +#include // for string, operator< +#include // for vector + +#include "ioss_export.h" #define USE_ROBIN_MAP #if defined USE_ROBIN_MAP diff --git a/packages/seacas/libraries/ioss/src/Ioss_Region.C b/packages/seacas/libraries/ioss/src/Ioss_Region.C index 9faa37d063..f11e089936 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Region.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Region.C @@ -4,10 +4,9 @@ // // See packages/seacas/LICENSE for details -#include - #include #include +#include #include #include #include @@ -16,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -34,22 +32,20 @@ #include #include #include - -#include -#include +#include #include #include +#include +#include #include -#include -#include #include #include -#ifndef _MSC_VER -#include -#endif -#include +#include #include +#include "Ioss_MeshType.h" +#include "Ioss_ParallelUtils.h" + namespace { std::string id_str() { return {"id"}; } std::string db_name_str() { return {"db_name"}; } diff --git a/packages/seacas/libraries/ioss/src/Ioss_Region.h b/packages/seacas/libraries/ioss/src/Ioss_Region.h index 7b63763ad1..21726d04e3 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Region.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Region.h @@ -6,8 +6,6 @@ #pragma once -#include "ioss_export.h" - #include // for CoordinateFrame #include // for DatabaseIO #include // for EntityType, etc @@ -16,8 +14,14 @@ #include #include // for Property #include // for State -#include // for size_t, nullptr -#include // for int64_t +#include +#include // for size_t, nullptr +#include // for int64_t + +#include "Ioss_CodeTypes.h" +#include "Ioss_Utils.h" +#include "Ioss_VariableType.h" +#include "ioss_export.h" #if !defined BUILT_IN_SIERRA #include #endif @@ -51,6 +55,7 @@ namespace Ioss { namespace Ioss { class CoordinateFrame; + enum class MeshType; using AssemblyContainer = std::vector; using BlobContainer = std::vector; @@ -430,9 +435,9 @@ namespace Ioss { if (found && field.get_role() != role) { std::ostringstream errmsg; #if defined BUILT_IN_SIERRA - errmsg << "ERROR: Field " << field.get_name() << " with role " << field.role_string() - << " on entity " << entity->name() << " does not match previously found role " - << Ioss::Field::role_string(role) << ".\n", + errmsg << "ERROR: Field " << field.get_name() << " with role " << field.role_string() + << " on entity " << entity->name() << " does not match previously found role " + << Ioss::Field::role_string(role) << ".\n", #else fmt::print(errmsg, "ERROR: Field {} with role {} on entity {} does not match previously found " @@ -440,7 +445,7 @@ namespace Ioss { field.get_name(), field.role_string(), entity->name(), Ioss::Field::role_string(role)); #endif - IOSS_ERROR(errmsg); + IOSS_ERROR(errmsg); } found = true; diff --git a/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C b/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C index ac8c2a5df4..9950678193 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C +++ b/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C @@ -3,14 +3,13 @@ // NTESS, the U.S. Government retains certain rights in this software. // // See packages/seacas/LICENSE for details -#include "Ioss_CodeTypes.h" // for SEACAS_HAVE_MPI #include // for DatabaseIO #include // for ParallelUtils #include #include // for IOSS_ERROR, Ioss::WarnOut() #include -#include // for operator<<, etc -#include // for char_traits + +#include "Ioss_CodeTypes.h" // for SEACAS_HAVE_MPI namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.h b/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.h index 0f07521dd3..0a16f9038c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.h +++ b/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.h @@ -5,10 +5,10 @@ // See packages/seacas/LICENSE for details #pragma once -#include "ioss_export.h" - #include +#include "ioss_export.h" + namespace Ioss { class DatabaseIO; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/Ioss_SideBlock.C b/packages/seacas/libraries/ioss/src/Ioss_SideBlock.C index 422f62a1c7..bed6c6314c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SideBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_SideBlock.C @@ -5,7 +5,6 @@ // See packages/seacas/LICENSE for details #include -#include #include #include #include @@ -14,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -21,6 +21,7 @@ #include "Ioss_FieldManager.h" #include "Ioss_ParallelUtils.h" #include "Ioss_PropertyManager.h" +#include "Ioss_Utils.h" /** \brief Create a side block. * diff --git a/packages/seacas/libraries/ioss/src/Ioss_SideBlock.h b/packages/seacas/libraries/ioss/src/Ioss_SideBlock.h index c304ba40bb..fb3924f653 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SideBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_SideBlock.h @@ -6,8 +6,6 @@ #pragma once -#include "ioss_export.h" - #include #include // for EntityBlock #include // for EntityType, etc @@ -17,6 +15,10 @@ #include // for int64_t #include // for string #include // for vector + +#include "Ioss_GroupingEntity.h" +#include "ioss_export.h" + namespace Ioss { class DatabaseIO; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/Ioss_SideSet.C b/packages/seacas/libraries/ioss/src/Ioss_SideSet.C index ef9cbe3bce..77c980e16a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SideSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_SideSet.C @@ -10,14 +10,16 @@ #include #include #include -#include #include #include +#include #include #include +#include "Ioss_CodeTypes.h" #include "Ioss_GroupingEntity.h" #include "Ioss_PropertyManager.h" +#include "Ioss_Utils.h" namespace { std::string id_str() { return {"id"}; } diff --git a/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.C b/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.C index 1c72ff43f3..769a65170a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.C +++ b/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.C @@ -5,11 +5,8 @@ // See packages/seacas/LICENSE for details #include - #include #include -#include -#include #include namespace { diff --git a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C index 999a2dd7eb..fa7dd752f2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C @@ -10,16 +10,25 @@ #include // for FieldManager #include #include // for Property -#include #include #include -#include - +#include #include // for size_t -#include +#include +#include +#include +#include #include // for string #include // for vector +#include "Ioss_CodeTypes.h" +#include "Ioss_EntityBlock.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Utils.h" +#include "Ioss_ZoneConnectivity.h" + namespace { template bool vec_equal(const std::vector &lhs, const std::vector &rhs) { @@ -81,7 +90,6 @@ namespace { } // namespace namespace Ioss { - class Field; /** \brief Create a structured block. * diff --git a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h index 5e4bb07405..1a0ee76ec7 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h @@ -6,8 +6,6 @@ #pragma once -#include "ioss_export.h" - #include #include #include @@ -16,11 +14,21 @@ #include #include #include +#include #include +#include +#include +#include #include +#include + +#include "Ioss_EntityType.h" +#include "SEACASIoss_config.h" +#include "ioss_export.h" #if defined(SEACAS_HAVE_CGNS) && !defined(BUILT_IN_SIERRA) #include + using IOSS_SB_INT = cgsize_t; #else // If this is not being built with CGNS, then default to using 32-bit integers. @@ -31,6 +39,7 @@ using IOSS_SB_INT = int; namespace Ioss { class Region; + class Field; struct IOSS_EXPORT BoundaryCondition { diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tracer.C b/packages/seacas/libraries/ioss/src/Ioss_Tracer.C index 6c3a990b7e..9b2107219b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tracer.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tracer.C @@ -8,7 +8,6 @@ #include #include #include -#include namespace Ioss { int Tracer::level; diff --git a/packages/seacas/libraries/ioss/src/Ioss_Transform.C b/packages/seacas/libraries/ioss/src/Ioss_Transform.C index bafd02406f..b7e9766836 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Transform.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Transform.C @@ -5,7 +5,6 @@ // See packages/seacas/LICENSE for details #include -#include #include namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/Ioss_Transform.h b/packages/seacas/libraries/ioss/src/Ioss_Transform.h index 486d7dc47e..b597ac3f3b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Transform.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Transform.h @@ -6,13 +6,13 @@ #pragma once -#include "ioss_export.h" - #include - +#include #include #include +#include "ioss_export.h" + namespace Ioss { class Field; class VariableType; diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.C b/packages/seacas/libraries/ioss/src/Ioss_Utils.C index fa64c33959..22e32ed1ef 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.C @@ -7,22 +7,18 @@ #include #include #include -#include #include - -#include #include #include -#include #include -#include #include +#include #include +#include #include #include -#include -#include #include +#include #include #include @@ -36,8 +32,23 @@ #endif #include +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_EntityType.h" +#include "Ioss_Field.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_IOFactory.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Region.h" +#include "Ioss_SideBlock.h" +#include "Ioss_State.h" +#include "Ioss_VariableType.h" + #if defined(__IOSS_WINDOWS__) #include + #define isatty _isatty #define WIN32_LEAN_AND_MEAN #ifndef NOMINMAX diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.h b/packages/seacas/libraries/ioss/src/Ioss_Utils.h index f1a320f278..3d4fa7dc2c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.h @@ -6,8 +6,6 @@ #pragma once -#include "ioss_export.h" - #include #include #include @@ -24,6 +22,9 @@ #include // for runtime_error #include // for string #include // for vector + +#include "ioss_export.h" + namespace Ioss { class DatabaseIO; class Field; @@ -31,6 +32,7 @@ namespace Ioss { class Region; class SideBlock; class PropertyManager; + enum class ElementShape : unsigned int; } // namespace Ioss [[noreturn]] inline void IOSS_ERROR(const std::ostringstream &errmsg) diff --git a/packages/seacas/libraries/ioss/src/Ioss_VariableType.C b/packages/seacas/libraries/ioss/src/Ioss_VariableType.C index c881ceee26..dacff0c500 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_VariableType.C +++ b/packages/seacas/libraries/ioss/src/Ioss_VariableType.C @@ -9,20 +9,19 @@ #include #include #include -#include #include -#include -#include -#include #include #include +#include +#include #include #include #include #include -#include #include +#include "Ioss_CodeTypes.h" + namespace Ioss { void Registry::insert(const VTM_ValuePair &value, bool delete_me) { diff --git a/packages/seacas/libraries/ioss/src/Ioss_VariableType.h b/packages/seacas/libraries/ioss/src/Ioss_VariableType.h index ec74a3ca1b..a1997c01d3 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_VariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_VariableType.h @@ -6,8 +6,6 @@ #pragma once -#include "ioss_export.h" - #include #include #include // for strncmp @@ -16,6 +14,8 @@ #include // for string, operator< #include // for vector +#include "ioss_export.h" + namespace Ioss { class VariableType; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C index b6d19b0164..12988e663c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C @@ -6,11 +6,13 @@ #include #include -#include // for size_t +#include #include #include // for string #include // for vector +#include "Ioss_CodeTypes.h" + namespace { int sign(int value) { return value < 0 ? -1 : 1; } diff --git a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h index 81a48eeb00..8c22f34d8e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h @@ -6,16 +6,23 @@ #pragma once -#include "ioss_export.h" - #include #include #include +#include +#include #include +#include +#include #include +#include + +#include "SEACASIoss_config.h" +#include "ioss_export.h" #if defined(SEACAS_HAVE_CGNS) && !defined(BUILT_IN_SIERRA) #include + using IOSS_ZC_INT = cgsize_t; #else // If this is not being built with CGNS, then default to using 32-bit integers. From 960d5661cde5c0379a6c027eee48405c10a8c935 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 30 Oct 2023 17:18:16 -0600 Subject: [PATCH 008/110] IOSS: More iwyu --- .../ioss/src/cgns/Iocgns_DatabaseIO.C | 47 +++++++++--- .../ioss/src/cgns/Iocgns_DatabaseIO.h | 17 +++-- .../ioss/src/cgns/Iocgns_IOFactory.C | 11 ++- .../ioss/src/cgns/Iocgns_IOFactory.h | 6 +- .../ioss/src/cgns/Iocgns_StructuredZoneData.C | 8 +- .../ioss/src/cgns/Iocgns_StructuredZoneData.h | 7 +- .../libraries/ioss/src/cgns/Iocgns_Utils.C | 43 ++++++++--- .../libraries/ioss/src/cgns/Iocgns_Utils.h | 23 +++++- .../ioss/src/exodus/Ioex_DatabaseIO.C | 1 + .../ioss/src/gen_struc/Iogs_DatabaseIO.C | 38 +++------- .../ioss/src/gen_struc/Iogs_DatabaseIO.h | 9 ++- .../ioss/src/gen_struc/Iogs_GeneratedMesh.C | 7 +- .../ioss/src/gen_struc/Iogs_GeneratedMesh.h | 4 +- .../ioss/src/generated/Iogn_DashSurfaceMesh.C | 3 +- .../ioss/src/generated/Iogn_DashSurfaceMesh.h | 4 +- .../ioss/src/generated/Iogn_DatabaseIO.C | 41 +++++----- .../ioss/src/generated/Iogn_DatabaseIO.h | 9 ++- .../ioss/src/generated/Iogn_GeneratedMesh.C | 10 +-- .../ioss/src/generated/Iogn_GeneratedMesh.h | 4 +- .../ioss/src/heartbeat/Iohb_DatabaseIO.C | 24 +----- .../ioss/src/heartbeat/Iohb_DatabaseIO.h | 7 +- .../ioss/src/heartbeat/Iohb_Layout.h | 5 +- .../ioss/src/init/Ionit_Initializer.C | 5 +- .../libraries/ioss/src/main/cgns_decomp.C | 50 +++++-------- .../ioss/src/main/cth_pressure_map.C | 8 +- .../libraries/ioss/src/main/info_interface.C | 18 ++--- .../libraries/ioss/src/main/info_interface.h | 6 +- .../seacas/libraries/ioss/src/main/io_info.C | 47 +++++++++++- .../seacas/libraries/ioss/src/main/io_info.h | 16 ++-- .../libraries/ioss/src/main/io_info_main.C | 11 ++- .../libraries/ioss/src/main/io_modify.C | 75 ++++++++----------- .../seacas/libraries/ioss/src/main/io_shell.C | 30 +++++--- .../ioss/src/main/modify_interface.C | 14 ++-- .../libraries/ioss/src/main/shell_interface.C | 19 +++-- .../libraries/ioss/src/main/shell_interface.h | 4 +- .../libraries/ioss/src/main/shell_to_hex.C | 8 +- .../seacas/libraries/ioss/src/main/skinner.C | 27 ++++--- .../ioss/src/main/skinner_interface.C | 13 ++-- .../ioss/src/main/skinner_interface.h | 7 +- .../seacas/libraries/ioss/src/main/sphgen.C | 10 +-- .../ioss/src/main/struc_to_unstruc.C | 37 ++++++--- .../seacas/libraries/ioss/src/main/volume.C | 16 ++-- .../ioss/src/text_mesh/Iotm_DatabaseIO.C | 36 +++++---- .../ioss/src/text_mesh/Iotm_DatabaseIO.h | 15 ++-- .../ioss/src/text_mesh/Iotm_TextMesh.C | 11 +-- .../ioss/src/text_mesh/Iotm_TextMesh.h | 19 +++-- .../ioss/src/transform/Iotr_Factory.C | 12 +-- .../ioss/src/transform/Iotr_Factory.h | 9 ++- .../ioss/src/transform/Iotr_MinMax.C | 9 ++- .../ioss/src/transform/Iotr_MinMax.h | 6 +- .../ioss/src/transform/Iotr_Offset.C | 3 +- .../ioss/src/transform/Iotr_Offset.h | 7 +- .../ioss/src/transform/Iotr_Offset3D.C | 3 +- .../ioss/src/transform/Iotr_Offset3D.h | 8 +- .../libraries/ioss/src/transform/Iotr_Scale.C | 3 +- .../libraries/ioss/src/transform/Iotr_Scale.h | 6 +- .../ioss/src/transform/Iotr_Scale3D.C | 3 +- .../ioss/src/transform/Iotr_Scale3D.h | 9 ++- .../ioss/src/transform/Iotr_Tensor.C | 1 + .../ioss/src/transform/Iotr_Tensor.h | 6 +- .../ioss/src/transform/Iotr_VectorMagnitude.C | 2 +- .../ioss/src/transform/Iotr_VectorMagnitude.h | 6 +- .../ioss/src/utest/Utst_IofxDatabaseIO.C | 19 +++-- .../ioss/src/utest/Utst_blob_write_read.C | 17 +++-- .../libraries/ioss/src/utest/Utst_heartbeat.C | 20 +++-- .../libraries/ioss/src/utest/Utst_ioel.C | 9 +-- .../libraries/ioss/src/utest/Utst_map.C | 9 +-- .../libraries/ioss/src/utest/Utst_sort.C | 6 +- .../ioss/src/utest/Utst_structured_decomp.C | 13 +++- .../src/utest/Utst_structured_decomp_herron.C | 9 ++- .../src/utest/Utst_structured_decomp_rocket.C | 7 ++ .../ioss/src/utest/Utst_superelement.C | 9 ++- .../libraries/ioss/src/utest/Utst_utils.C | 12 +-- 73 files changed, 610 insertions(+), 443 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C index ef8d7a45b3..4339abc0a2 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C @@ -11,25 +11,19 @@ // See packages/seacas/LICENSE for details #include -#include #include +#include #include #include #include +#include #include -#include +#include #include -#include #include #include #include -#if !defined(__IOSS_WINDOWS__) -#include -#endif -#include #include - -#include #ifndef CG_BUILD_PARALLEL #include #endif @@ -43,11 +37,40 @@ #error "Could not include cgnslib.h" #endif +#include "Ioss_CommSet.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DataSize.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_EdgeBlock.h" +#include "Ioss_EdgeSet.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementSet.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_EntityBlock.h" +#include "Ioss_EntityType.h" +#include "Ioss_FaceBlock.h" +#include "Ioss_FaceGenerator.h" +#include "Ioss_FaceSet.h" +#include "Ioss_Field.h" #include "Ioss_FileInfo.h" -#include "Ioss_Hex8.h" -#include "Ioss_Quad4.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_Map.h" +#include "Ioss_MeshType.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Region.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" #include "Ioss_SmartAssert.h" -#include "Ioss_SubSystem.h" +#include "Ioss_State.h" +#include "Ioss_StructuredBlock.h" +#include "Ioss_VariableType.h" +#include "Ioss_ZoneConnectivity.h" +#include "robin_hash.h" +#include "robin_set.h" // extern char hdf5_access[64]; diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h index c7ff45c0f3..49a2aa8959 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h @@ -6,8 +6,6 @@ #pragma once -#include "iocgns_export.h" - #include #include // for DatabaseUsage #include // for DatabaseIO @@ -15,14 +13,17 @@ #include // for IOFactory #include // for Map #include // for State -#include // for size_t -#include // for int64_t -#include // for ostream +#include +#include +#include +#include // for size_t +#include // for int64_t +#include // for ostream #include #include // for string +#include -#include -#include +#include "iocgns_export.h" namespace Ioss { class Assembly; @@ -44,6 +45,8 @@ namespace Ioss { class SideSet; class EntityBlock; class StructuredBlock; + class Map; + class PropertyManager; } // namespace Ioss /** \brief A namespace for the CGNS database format. diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.C index c293788844..3e8e3b2fe7 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.C @@ -4,16 +4,15 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_DBUsage.h" // for DatabaseUsage -#include "Ioss_IOFactory.h" // for IOFactory #include // for DatabaseIO -- serial #include #include -#include // for nullptr -#include // for string -#include +#include +#include // for string -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_IOFactory.h" // for IOFactory #if CG_BUILD_PARALLEL #include // for DatabaseIO -- parallel #endif diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.h index 6772123ea6..6469f63cc2 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.h @@ -6,14 +6,14 @@ #pragma once -#include "iocgns_export.h" - -#include "Ioss_DatabaseIO.h" // for DatabaseIO #include #include // for DatabaseUsage #include // for IOFactory #include // for string +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "iocgns_export.h" + namespace Ioss { class PropertyManager; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C index b1a70ebc1d..61de238c1b 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C @@ -6,15 +6,21 @@ #include #include -#include +#include #include +#include +#include +#include #if !defined __NVCC__ #include #endif +#include #include #include #include +#include "Ioss_Utils.h" + namespace { struct Range { diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.h index 0f82638405..379f74c7b9 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.h @@ -7,13 +7,16 @@ */ #pragma once -#include "iocgns_export.h" - #include #include #include #include +#include #include +#include + +#include "Ioss_ZoneConnectivity.h" +#include "iocgns_export.h" namespace Iocgns { enum Ordinal { diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C index bd558c1d23..db97aced5a 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C @@ -27,29 +27,52 @@ #include #include #include -#include #include #include #include #include #include #include - +#include #include +#include +#include +#include +#include #if !defined __NVCC__ #include #endif +#include +#include +#include +#include +#include +#include #include +#include #include +#include #include #include #include -#include -#include - -#include -#include +#include "Ioss_DatabaseIO.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_EntityBlock.h" +#include "Ioss_EntityType.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_MeshType.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Property.h" +#include "Ioss_Region.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_VariableType.h" +#include "Ioss_ZoneConnectivity.h" +#include "robin_hash.h" +#include "robin_set.h" #if CG_BUILD_PARALLEL #include #else @@ -2567,10 +2590,10 @@ void Iocgns::Utils::decompose_model(std::vector &z fmt::print(Ioss::DebugOut(), "{}", fmt::format( #if !defined __NVCC__ - fg(fmt::color::red), + fg(fmt::color::red), #endif - "\nProcessor {} work: {}, workload ratio: {} (exceeds)", i, - fmt::group_digits(work_vector[i]), workload_ratio)); + "\nProcessor {} work: {}, workload ratio: {} (exceeds)", i, + fmt::group_digits(work_vector[i]), workload_ratio)); } } else { diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h index 950b16e298..06a1d2ab6b 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h @@ -6,8 +6,6 @@ #pragma once -#include "iocgns_export.h" - #include #include #include @@ -17,10 +15,31 @@ #include #include #include +#include #include #include +#include +#include #include +#include #include +#include + +#include "Ioss_Field.h" +#include "iocgns_export.h" + +namespace Iocgns { + class Utils; +} // namespace Iocgns +namespace Ioss { + class Assembly; + class DatabaseIO; + class EntityBlock; + class GroupingEntity; + class Region; + class StructuredBlock; + enum class MeshType; +} // namespace Ioss // Used in Iocgns_DatabaseIO.C and Iocgns_ParallelDatabase.C // non-Member function -- can't access m_cgnsFilePtr; make sure cgns_file_ptr is passed in... diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C index c07081bb23..fea712ed91 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C index 6f7c05bf2d..4a3eba6cfb 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C @@ -4,10 +4,20 @@ // // See packages/seacas/LICENSE for details +#include // for Int64Vector, IntVector +#include // for SideBlock +#include // for Utils, IOSS_ERROR +#include // for assert +#include // for sqrt +#include +#include // for GeneratedMesh +#include // for ostringstream, operator<<, etc +#include +#include // for string, operator==, etc + #include "Ioss_CommSet.h" // for CommSet #include "Ioss_DBUsage.h" // for DatabaseUsage #include "Ioss_DatabaseIO.h" // for DatabaseIO -#include "Ioss_ElementBlock.h" // for ElementBlock #include "Ioss_EntityType.h" // for EntityType, etc #include "Ioss_Field.h" // for Field, etc #include "Ioss_GroupingEntity.h" // for GroupingEntity @@ -21,32 +31,6 @@ #include "Ioss_SideSet.h" // for SideSet #include "Ioss_StructuredBlock.h" #include "Ioss_VariableType.h" // for VariableType -#include // for Int64Vector, IntVector -#include // for SideBlock -#include // for Utils, IOSS_ERROR -#include // for copy -#include // for assert -#include // for sqrt -#include -#include // for GeneratedMesh -#include // for ostringstream, operator<<, etc -#include // for string, operator==, etc -#include // for pair -namespace Ioss { - class EdgeBlock; -} // namespace Ioss -namespace Ioss { - class EdgeSet; -} // namespace Ioss -namespace Ioss { - class ElementSet; -} // namespace Ioss -namespace Ioss { - class FaceBlock; -} // namespace Ioss -namespace Ioss { - class FaceSet; -} // namespace Ioss namespace { template diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h index fc8e83fc0d..b0abf6befe 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h @@ -6,9 +6,6 @@ #pragma once -#include "iogs_export.h" - -#include "Ioss_State.h" // for State #include #include // for DatabaseUsage #include // for DatabaseIO @@ -19,6 +16,9 @@ #include // for string #include // for vector +#include "Ioss_State.h" // for State +#include "iogs_export.h" + namespace Iogs { class GeneratedMesh; } // namespace Iogs @@ -43,6 +43,9 @@ namespace Ioss { namespace Ioss { class EntityBlock; + class Assembly; + class Blob; + class Map; } // namespace Ioss /** \brief A namespace for the gen_struc database format. diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C index ccebb67bcc..01e3bc01a8 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C @@ -7,17 +7,20 @@ #include // for EntityType, etc #include #include -#include #include // for assert #include // for atan2, cos, sin -#include // for nullptr, exit, etc +#include +#include #include #include +#include #include #include #include // for tokenize #include // for vector +#include "Ioss_CodeTypes.h" + namespace Iogs { GeneratedMesh::GeneratedMesh(int64_t /*num_x */, int64_t /* num_y */, int64_t /* num_z */, int proc_count, int my_proc) diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.h b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.h index 98616c1cda..7a7cbf60bc 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.h +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.h @@ -6,8 +6,6 @@ #pragma once -#include "iogs_export.h" - #include #include // for EntityType #include @@ -18,6 +16,8 @@ #include // for pair #include // for vector +#include "iogs_export.h" + namespace Iogs { class IOGS_EXPORT GeneratedMesh { diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.C b/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.C index bd5382201a..6d157e65a3 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.C +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.C @@ -4,10 +4,11 @@ // // See packages/seacas/LICENSE for details -#include // for copy #include #include // for vector +#include "Ioss_CodeTypes.h" + namespace Iogn { int64_t DashSurfaceMesh::node_count() const { return mDashSurfaceData.globalNumberOfNodes; } diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h b/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h index e3184db19d..ade5c4ee20 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h @@ -6,8 +6,6 @@ #pragma once -#include "iogn_export.h" - #include #include #include @@ -19,6 +17,8 @@ #include // for pair #include // for vector +#include "iogn_export.h" + namespace Iogn { enum { INVALID = -1, NUMBER_OF_SURFACES = 2, SPATIAL_DIMENSION = 3, NUM_NODES_PER_QUAD_FACE = 4 }; diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C index abbcf8b490..c34a425de6 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C @@ -4,15 +4,26 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_CommSet.h" // for CommSet -#include "Ioss_DBUsage.h" // for DatabaseUsage -#include "Ioss_DatabaseIO.h" // for DatabaseIO -#include "Ioss_ElementBlock.h" // for ElementBlock -#include "Ioss_ElementTopology.h" -#include "Ioss_EntityType.h" // for EntityType, etc -#include "Ioss_Field.h" // for Field, etc -#include "Ioss_GroupingEntity.h" // for GroupingEntity -#include "Ioss_Hex8.h" +#include // for Int64Vector, IntVector +#include // for SideBlock +#include // for Utils, IOSS_ERROR +#include // for assert +#include // for sqrt +#include +#include +#include +#include // for GeneratedMesh +#include // for ostringstream +#include +#include // for string, operator==, etc + +#include "Ioss_CommSet.h" // for CommSet +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_ElementBlock.h" // for ElementBlock +#include "Ioss_EntityType.h" // for EntityType, etc +#include "Ioss_Field.h" // for Field, etc +#include "Ioss_GroupingEntity.h" // for GroupingEntity #include "Ioss_IOFactory.h" // for IOFactory #include "Ioss_Map.h" // for Map, MapContainer #include "Ioss_NodeBlock.h" // for NodeBlock @@ -23,18 +34,6 @@ #include "Ioss_Region.h" // for Region #include "Ioss_SideSet.h" // for SideSet #include "Ioss_VariableType.h" // for VariableType -#include // for Int64Vector, IntVector -#include // for SideBlock -#include // for Utils, IOSS_ERROR -#include // for copy -#include // for assert -#include // for sqrt -#include -#include -#include // for GeneratedMesh -#include // for ostringstream -#include // for string, operator==, etc -#include // for pair namespace { template diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h index cbe008647e..bb8d471773 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h @@ -6,9 +6,6 @@ #pragma once -#include "iogn_export.h" - -#include "Ioss_State.h" // for State #include #include // for DatabaseUsage #include // for DatabaseIO @@ -19,6 +16,9 @@ #include // for string #include // for vector +#include "Ioss_State.h" // for State +#include "iogn_export.h" + namespace Iogn { class GeneratedMesh; } // namespace Iogn @@ -43,6 +43,9 @@ namespace Ioss { namespace Ioss { class EntityBlock; + class Assembly; + class Blob; + class Map; } // namespace Ioss /** \brief A namespace for the generated database format. diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C index 6ec3a48b19..6cdac2efee 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C @@ -4,26 +4,26 @@ // // See packages/seacas/LICENSE for details -#include - #include #include #include #include #include #include - -#include #include // for assert #include // for atan2, cos, sin -#include // for nullptr, exit, etc +#include #include +#include #include #include #include #include // for tokenize #include // for vector +#include "Ioss_CodeTypes.h" +#include "Ioss_EntityType.h" + namespace { void output_help(std::ostream &output) { diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.h b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.h index 2addc90067..06aef29799 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.h +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.h @@ -6,8 +6,6 @@ #pragma once -#include "iogn_export.h" - #include #include // for EntityType #include @@ -18,6 +16,8 @@ #include // for pair #include // for vector +#include "iogn_export.h" + namespace Iogn { class IOGN_EXPORT GeneratedMesh { diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C index 2d250e84fa..e65999842e 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C @@ -5,15 +5,13 @@ // See packages/seacas/LICENSE for details #include -#include - #include #include #include #include -#include +#include +#include #include - #include #include "Ioss_DBUsage.h" @@ -23,25 +21,9 @@ #include "Ioss_IOFactory.h" #include "Ioss_ParallelUtils.h" #include "Ioss_Property.h" -#include "Ioss_Region.h" +#include "Ioss_PropertyManager.h" #include "Ioss_State.h" #include "Ioss_Utils.h" -#include "Ioss_VariableType.h" -#include - -namespace Ioss { - class CommSet; - class EdgeBlock; - class EdgeSet; - class ElementBlock; - class ElementSet; - class FaceBlock; - class FaceSet; - class NodeBlock; - class NodeSet; - class SideBlock; - class SideSet; -} // namespace Ioss namespace { std::string time_stamp(const std::string &format) diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h index 44a87cf0bb..f66138a311 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h @@ -6,8 +6,6 @@ #pragma once -#include "iohb_export.h" - #include #include #include @@ -18,6 +16,9 @@ #include #include #include +#include + +#include "iohb_export.h" namespace Ioss { class GroupingEntity; @@ -37,6 +38,8 @@ namespace Ioss { class SideBlock; class SideSet; class StructuredBlock; + class Assembly; + class Blob; } // namespace Ioss /** \brief A namespace for the heartbeat database format. diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h index cffcb426c2..15979fddbd 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h @@ -6,13 +6,14 @@ #pragma once -#include "iohb_export.h" - +#include #include #include #include #include +#include "iohb_export.h" + namespace Iohb { class IOHB_EXPORT Layout { diff --git a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C index 8b107a77d1..eb0fb9af8c 100644 --- a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C +++ b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C @@ -5,6 +5,7 @@ // See packages/seacas/LICENSE for details #include "Ionit_Initializer.h" + #include #if defined(SEACAS_HAVE_EXODUS) @@ -39,11 +40,13 @@ #include #include +#include #include #include #include -#include +#include "Ioss_IOFactory.h" +#include "SEACASIoss_config.h" namespace { #if defined(IOSS_THREADSAFE) diff --git a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C index 79aaa878b7..0e0006d26d 100644 --- a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C +++ b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C @@ -8,43 +8,34 @@ #undef NDEBUG #include - -#include #include #include #include #include #include -#include #include #include #include - +#include #include #include - -#include -#include #include -#include #include #include -#include -#include -#include +#include #include #include #include #include -#include +#include #include -#if !defined(__IOSS_WINDOWS__) -#include -#endif -#include -#include #include +#include "Ioss_DBUsage.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_StructuredBlock.h" + #if !defined __NVCC__ #include #endif @@ -393,9 +384,9 @@ namespace { auto search = comms.find(std::make_pair(value, key)); if (search == comms.end()) { valid = false; - fmt::print(stderr, + fmt::print(stderr, #if !defined __NVCC__ - fg(fmt::color::red), + fg(fmt::color::red), #endif "ERROR: Could not find matching ZGC for {}, proc {} -> {}, proc {}\n", key.first, key.second, value.first, value.second); @@ -449,10 +440,9 @@ namespace { // From decomposition fmt::print( #if !defined __NVCC__ - fg(fmt::color::yellow), + fg(fmt::color::yellow), #endif - "[{:{}}->{:{}}] ", proc.first, pw, -proc.second, - pw); + "[{:{}}->{:{}}] ", proc.first, pw, -proc.second, pw); } else { // Zone to Zone @@ -646,18 +636,18 @@ namespace { if (proc_work[i] == max_work) { fmt::print( #if !defined __NVCC__ - fg(fmt::color::red), + fg(fmt::color::red), #endif - format, i, proc_width, fmt::group_digits(proc_work[i]), - work_width, proc_work[i] / avg_work, stars); + format, i, proc_width, fmt::group_digits(proc_work[i]), work_width, + proc_work[i] / avg_work, stars); } else if (proc_work[i] == min_work) { fmt::print( #if !defined __NVCC__ - fg(fmt::color::green), + fg(fmt::color::green), #endif - format, i, proc_width, - fmt::group_digits(proc_work[i]), work_width, proc_work[i] / avg_work, stars); + format, i, proc_width, fmt::group_digits(proc_work[i]), work_width, + proc_work[i] / avg_work, stars); } else { fmt::print(format, i, proc_width, fmt::group_digits(proc_work[i]), work_width, @@ -805,9 +795,9 @@ int main(int argc, char *argv[]) auto valid = validate_symmetric_communications(zones); if (!valid) { - fmt::print(stderr, + fmt::print(stderr, #if !defined __NVCC__ - fg(fmt::color::red), + fg(fmt::color::red), #endif "\nERROR: Zone Grid Communication interfaces are not symmetric. There is an error " "in the decomposition.\n"); diff --git a/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C b/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C index edf5f8656d..ed4424d199 100644 --- a/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C +++ b/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C @@ -5,20 +5,15 @@ // See packages/seacas/LICENSE for details #include -#include #include -#include #include -#include #include #include -#include #include #include #include #include #include -#include #include #include "Ioss_CommSet.h" @@ -26,14 +21,15 @@ #include "Ioss_DatabaseIO.h" #include "Ioss_ElementBlock.h" #include "Ioss_ElementTopology.h" +#include "Ioss_EntityType.h" #include "Ioss_Field.h" #include "Ioss_GroupingEntity.h" #include "Ioss_IOFactory.h" #include "Ioss_NodeBlock.h" #include "Ioss_NodeSet.h" +#include "Ioss_ParallelUtils.h" #include "Ioss_Property.h" #include "Ioss_Region.h" -#include "Ioss_ScopeGuard.h" #include "Ioss_SideBlock.h" #include "Ioss_SideSet.h" #include "Ioss_State.h" diff --git a/packages/seacas/libraries/ioss/src/main/info_interface.C b/packages/seacas/libraries/ioss/src/main/info_interface.C index 7f05aac03e..69a969ff27 100644 --- a/packages/seacas/libraries/ioss/src/main/info_interface.C +++ b/packages/seacas/libraries/ioss/src/main/info_interface.C @@ -5,20 +5,18 @@ * * See packages/seacas/LICENSE for details */ -#include "Ioss_CodeTypes.h" +#include // for exit, EXIT_SUCCESS, getenv +#include +#include +#include // for operator<<, basic_ostream, etc +#include +#include // for char_traits, string + #include "Ioss_GetLongOpt.h" // for GetLongOption, etc #include "Ioss_Utils.h" -#include "fmt/ostream.h" +#include "SEACASIoss_config.h" #include "info_interface.h" -#include // for nullptr -#include // for exit, EXIT_SUCCESS, getenv -#include // for operator<<, basic_ostream, etc -#include // for char_traits, string - -namespace { -} // namespace - Info::Interface::Interface() { enroll_options(); } Info::Interface::~Interface() = default; diff --git a/packages/seacas/libraries/ioss/src/main/info_interface.h b/packages/seacas/libraries/ioss/src/main/info_interface.h index 71f6e397e8..a7701a2c5f 100644 --- a/packages/seacas/libraries/ioss/src/main/info_interface.h +++ b/packages/seacas/libraries/ioss/src/main/info_interface.h @@ -7,11 +7,11 @@ */ #pragma once -#include "io_info_lib_export.h" +#include // for ostream +#include // for string #include "Ioss_GetLongOpt.h" // for GetLongOption -#include // for ostream -#include // for string +#include "io_info_lib_export.h" /** \brief A special namespace for the io_info demonstration program interFace. */ diff --git a/packages/seacas/libraries/ioss/src/main/io_info.C b/packages/seacas/libraries/ioss/src/main/io_info.C index 22377e5c68..62f0d46bf4 100644 --- a/packages/seacas/libraries/ioss/src/main/io_info.C +++ b/packages/seacas/libraries/ioss/src/main/io_info.C @@ -5,14 +5,53 @@ // See packages/seacas/LICENSE for details #include "io_info.h" + #include #include #include #include +#include +#include #include + #define FMT_DEPRECATED_OSTREAM +#include +#include #include -#include +#include +#include +#include + +#include "Ioss_Assembly.h" +#include "Ioss_Blob.h" +#include "Ioss_BoundingBox.h" +#include "Ioss_CoordinateFrame.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DataSize.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_EdgeBlock.h" +#include "Ioss_EdgeSet.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementSet.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_FaceBlock.h" +#include "Ioss_FaceSet.h" +#include "Ioss_Field.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_IOFactory.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Region.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_SurfaceSplit.h" +#include "Ioss_Utils.h" +#include "Ioss_VariableType.h" +#include "exodusII.h" +#include "info_interface.h" #if defined(SEACAS_HAVE_CGNS) #include #endif @@ -266,9 +305,9 @@ namespace { fmt::print("\tConnectivity with other blocks:\n"); for (const auto &zgc : sb->m_zoneConnectivity) { #if defined __NVCC__ - std::cout << zgc << "\n"; + std::cout << zgc << "\n"; #else - fmt::print("{}\n", zgc); + fmt::print("{}\n", zgc); #endif } } @@ -284,7 +323,7 @@ namespace { for (const auto &bc : sb_bc) { #if defined __NVCC__ - std::cout << bc << "\n"; + std::cout << bc << "\n"; #else fmt::print("{}\n", bc); #endif diff --git a/packages/seacas/libraries/ioss/src/main/io_info.h b/packages/seacas/libraries/ioss/src/main/io_info.h index 542ffd9a45..b8eb542fe1 100644 --- a/packages/seacas/libraries/ioss/src/main/io_info.h +++ b/packages/seacas/libraries/ioss/src/main/io_info.h @@ -7,10 +7,6 @@ */ #pragma once -#include "io_info_lib_export.h" - -#include "info_interface.h" - #include #include #include @@ -23,10 +19,16 @@ #include #include #include + +#include "SEACASIoss_config.h" +#include "info_interface.h" +#include "io_info_lib_export.h" #if defined(SEACAS_HAVE_EXODUS) #include #endif +#include + #include "Ioss_Assembly.h" #include "Ioss_Blob.h" #include "Ioss_CommSet.h" @@ -52,9 +54,13 @@ #include "Ioss_StructuredBlock.h" #include "Ioss_VariableType.h" -#include +namespace Info { + class Interface; +} // namespace Info namespace Ioss { + class DatabaseIO; + class Region; // internal to io_info IO_INFO_LIB_EXPORT void io_info_file_info(const Info::Interface &interFace); diff --git a/packages/seacas/libraries/ioss/src/main/io_info_main.C b/packages/seacas/libraries/ioss/src/main/io_info_main.C index dbc880a01d..f09274aef3 100644 --- a/packages/seacas/libraries/ioss/src/main/io_info_main.C +++ b/packages/seacas/libraries/ioss/src/main/io_info_main.C @@ -6,9 +6,16 @@ * See packages/seacas/LICENSE for details */ -#include "fmt/format.h" +#include +#include +#include +#include + +#include "Ionit_Initializer.h" +#include "Ioss_IOFactory.h" +#include "Ioss_Utils.h" +#include "info_interface.h" #include "io_info.h" -#include // ======================================================================== diff --git a/packages/seacas/libraries/ioss/src/main/io_modify.C b/packages/seacas/libraries/ioss/src/main/io_modify.C index cbe5b2a6e7..91392a0793 100644 --- a/packages/seacas/libraries/ioss/src/main/io_modify.C +++ b/packages/seacas/libraries/ioss/src/main/io_modify.C @@ -4,40 +4,13 @@ // // See packages/seacas/LICENSE for details -#include "modify_interface.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include #include -#include -#include -#include #include #include -#include -#include #include -#include #include -#include -#include -#include #include #include #include @@ -47,17 +20,35 @@ #include #include #include -#include #include #include #include #include -#include -#include - +#include +#include +#include +#include +#include +#include #include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "Ioss_EntityType.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_State.h" +#include "SEACASIoss_config.h" +#include "modify_interface.h" #if defined(SEACAS_HAVE_EXODUS) #include @@ -71,6 +62,7 @@ #if defined(__IOSS_WINDOWS__) #include + #define isatty _isatty #endif // ======================================================================== @@ -967,9 +959,9 @@ namespace { if (Ioss::Utils::substr_equal(tokens[2], "add")) { // Must be at least 6 tokens... if (tokens.size() < 6) { - fmt::print(stderr, + fmt::print(stderr, #if !defined __NVCC__ - fg(fmt::color::red), + fg(fmt::color::red), #endif "ERROR: ATTRIBUTE Command does not have enough tokens to be valid.\n" "\t\t{}\n", @@ -1091,7 +1083,7 @@ namespace { if (tokens.size() < 4) { fmt::print(stderr, #if !defined __NVCC__ - fg(fmt::color::red), + fg(fmt::color::red), #endif "ERROR: RENAME Command does not have enough tokens to be valid.\n" "\t\t{}\n", @@ -1129,12 +1121,11 @@ namespace { } } else { - fmt::print(stderr, + fmt::print(stderr, #if !defined __NVCC__ - fg(fmt::color::yellow), + fg(fmt::color::yellow), #endif - "\tWARNING: Unrecognized rename syntax '{}'\n", - fmt::join(tokens, " ")); + "\tWARNING: Unrecognized rename syntax '{}'\n", fmt::join(tokens, " ")); handle_help("rename"); } @@ -1213,9 +1204,9 @@ namespace { // TIME SCALE {{scale}} // TIME OFFSET {{offset} if (tokens.size() < 3) { - fmt::print(stderr, + fmt::print(stderr, #if !defined __NVCC__ - fg(fmt::color::red), + fg(fmt::color::red), #endif "ERROR: TIME Command does not have enough tokens to be valid.\n" "\t\t{}\n", @@ -1251,9 +1242,9 @@ namespace { // GEOMETRY OFFSET {{ELEMENTBLOCKS|BLOCKS|ASSEMBLY}} {{names}} {{X|Y|Z}} {{offset}} ... if (tokens.size() < 4) { - fmt::print(stderr, + fmt::print(stderr, #if !defined __NVCC__ - fg(fmt::color::red), + fg(fmt::color::red), #endif "ERROR: GEOMETRY Command does not have enough tokens to be valid.\n" "\t\t{}\n", diff --git a/packages/seacas/libraries/ioss/src/main/io_shell.C b/packages/seacas/libraries/ioss/src/main/io_shell.C index 15e754e68b..9a60b40fb0 100644 --- a/packages/seacas/libraries/ioss/src/main/io_shell.C +++ b/packages/seacas/libraries/ioss/src/main/io_shell.C @@ -5,7 +5,6 @@ // See packages/seacas/LICENSE for details #include -#include #include #include #include @@ -13,22 +12,29 @@ #include #include #include -#include #include -#include #include #include -#include -#include - -#include -#include #include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include - +#include +#include + +#include "Ioss_DBUsage.h" +#include "Ioss_DataSize.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_GetLongOpt.h" +#include "Ioss_IOFactory.h" +#include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Region.h" +#include "Ioss_VariableType.h" #include "shell_interface.h" // ======================================================================== diff --git a/packages/seacas/libraries/ioss/src/main/modify_interface.C b/packages/seacas/libraries/ioss/src/main/modify_interface.C index ac36f17dbf..24306c47aa 100644 --- a/packages/seacas/libraries/ioss/src/main/modify_interface.C +++ b/packages/seacas/libraries/ioss/src/main/modify_interface.C @@ -6,17 +6,17 @@ * See packages/seacas/LICENSE for details */ -#include "Ioss_CodeTypes.h" +#include // for exit, EXIT_SUCCESS, getenv +#include +#include // for operator<<, basic_ostream, etc +#include +#include // for char_traits, string + #include "Ioss_GetLongOpt.h" #include "Ioss_Utils.h" -#include "fmt/ostream.h" +#include "SEACASIoss_config.h" #include "modify_interface.h" -#include // for nullptr -#include // for exit, EXIT_SUCCESS, getenv -#include // for operator<<, basic_ostream, etc -#include // for char_traits, string - Modify::Interface::Interface() { enroll_options(); } Modify::Interface::~Interface() = default; diff --git a/packages/seacas/libraries/ioss/src/main/shell_interface.C b/packages/seacas/libraries/ioss/src/main/shell_interface.C index 4c1ff94e6e..b1bb4cc93f 100644 --- a/packages/seacas/libraries/ioss/src/main/shell_interface.C +++ b/packages/seacas/libraries/ioss/src/main/shell_interface.C @@ -5,22 +5,21 @@ * * See packages/seacas/LICENSE for details */ -#include "Ioss_CodeTypes.h" +#include // for exit, strtod, EXIT_SUCCESS, etc +#include // for strcmp +#include +#include // for operator<<, basic_ostream, etc +#include +#include // for string, char_traits +#include // for vector + #include "Ioss_GetLongOpt.h" // for GetLongOption, etc #include "Ioss_Sort.h" #include "Ioss_Utils.h" // for Utils +#include "SEACASIoss_config.h" #include "shell_interface.h" #include "tokenize.h" -#include // for tolower -#include // for nullptr -#include // for exit, strtod, EXIT_SUCCESS, etc -#include // for strcmp -#include -#include // for operator<<, basic_ostream, etc -#include // for string, char_traits -#include // for vector - IOShell::Interface::Interface(std::string app_version) : version(std::move(app_version)) { enroll_options(); diff --git a/packages/seacas/libraries/ioss/src/main/shell_interface.h b/packages/seacas/libraries/ioss/src/main/shell_interface.h index e7b6d88468..17f2e7a37f 100644 --- a/packages/seacas/libraries/ioss/src/main/shell_interface.h +++ b/packages/seacas/libraries/ioss/src/main/shell_interface.h @@ -7,13 +7,13 @@ */ #pragma once -#include "Ioss_GetLongOpt.h" - #include #include #include #include +#include "Ioss_GetLongOpt.h" + /** \brief A special namespace for the io_shell demonstration program interFace. */ namespace IOShell { diff --git a/packages/seacas/libraries/ioss/src/main/shell_to_hex.C b/packages/seacas/libraries/ioss/src/main/shell_to_hex.C index f42257caa6..d332659ba6 100644 --- a/packages/seacas/libraries/ioss/src/main/shell_to_hex.C +++ b/packages/seacas/libraries/ioss/src/main/shell_to_hex.C @@ -4,19 +4,15 @@ // // See packages/seacas/LICENSE for details -#include - #include #include #include -#include #include -#include #include #include -#include #include #include +#include #include #include @@ -27,9 +23,9 @@ #include "Ioss_GroupingEntity.h" #include "Ioss_IOFactory.h" #include "Ioss_NodeBlock.h" +#include "Ioss_ParallelUtils.h" #include "Ioss_Property.h" #include "Ioss_Region.h" -#include "Ioss_ScopeGuard.h" #include "Ioss_State.h" #include "Ioss_Utils.h" #include "vector3d.h" diff --git a/packages/seacas/libraries/ioss/src/main/skinner.C b/packages/seacas/libraries/ioss/src/main/skinner.C index 43bc4c0008..e13a6c9b5b 100644 --- a/packages/seacas/libraries/ioss/src/main/skinner.C +++ b/packages/seacas/libraries/ioss/src/main/skinner.C @@ -4,36 +4,43 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include +#include +#include #include -#include +#include +#include #include #include -#include +#include +#include +#include #include +#include +#include #include -#include #include #include "Ionit_Initializer.h" -#include "Ioss_CodeTypes.h" #include "Ioss_DBUsage.h" +#include "Ioss_DataSize.h" #include "Ioss_DatabaseIO.h" #include "Ioss_ElementBlock.h" #include "Ioss_ElementTopology.h" +#include "Ioss_EntityBlock.h" #include "Ioss_FaceGenerator.h" +#include "Ioss_Field.h" #include "Ioss_FileInfo.h" +#include "Ioss_GroupingEntity.h" #include "Ioss_IOFactory.h" #include "Ioss_NodeBlock.h" #include "Ioss_ParallelUtils.h" #include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" #include "Ioss_Region.h" -#include "Ioss_ScopeGuard.h" +#include "Ioss_State.h" #include "Ioss_Utils.h" - -#include - +#include "robin_hash.h" #include "skinner_interface.h" // ======================================================================== diff --git a/packages/seacas/libraries/ioss/src/main/skinner_interface.C b/packages/seacas/libraries/ioss/src/main/skinner_interface.C index 47a91d4cae..fafebe8b97 100644 --- a/packages/seacas/libraries/ioss/src/main/skinner_interface.C +++ b/packages/seacas/libraries/ioss/src/main/skinner_interface.C @@ -5,15 +5,18 @@ * * See packages/seacas/LICENSE for details */ +#include // for exit, EXIT_SUCCESS, getenv +#include +#include // for operator<<, basic_ostream, etc +#include +#include // for char_traits, string + #include "Ioss_GetLongOpt.h" // for GetLongOption, etc +#include "Ioss_Sort.h" #include "Ioss_Utils.h" +#include "SEACASIoss_config.h" #include "skinner_interface.h" #include "tokenize.h" -#include // for nullptr -#include // for exit, EXIT_SUCCESS, getenv -#include -#include // for operator<<, basic_ostream, etc -#include // for char_traits, string Skinner::Interface::Interface() { enroll_options(); } diff --git a/packages/seacas/libraries/ioss/src/main/skinner_interface.h b/packages/seacas/libraries/ioss/src/main/skinner_interface.h index 7051da4e94..16f8a9bf7a 100644 --- a/packages/seacas/libraries/ioss/src/main/skinner_interface.h +++ b/packages/seacas/libraries/ioss/src/main/skinner_interface.h @@ -7,9 +7,12 @@ */ #pragma once +#include // for ostream +#include +#include // for string +#include + #include "Ioss_GetLongOpt.h" // for GetLongOption -#include // for ostream -#include // for string /** \brief A special namespace for the skinner demonstration program interFace. */ diff --git a/packages/seacas/libraries/ioss/src/main/sphgen.C b/packages/seacas/libraries/ioss/src/main/sphgen.C index 776236b3fc..9a3f4d62cd 100644 --- a/packages/seacas/libraries/ioss/src/main/sphgen.C +++ b/packages/seacas/libraries/ioss/src/main/sphgen.C @@ -5,16 +5,14 @@ // See packages/seacas/LICENSE for details #include -#include #include #include -#include #include -#include #include #include -#include -#include +#include +#include +#include #include #include @@ -26,9 +24,9 @@ #include "Ioss_IOFactory.h" #include "Ioss_NodeBlock.h" #include "Ioss_NodeSet.h" +#include "Ioss_ParallelUtils.h" #include "Ioss_Property.h" #include "Ioss_Region.h" -#include "Ioss_ScopeGuard.h" #include "Ioss_State.h" // ======================================================================== diff --git a/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C b/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C index f67e857960..d6eab0fd68 100644 --- a/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C +++ b/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C @@ -9,23 +9,36 @@ #include #include #include -#include -#include -#include #include -#include -#include -#include - -#include #include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include #include +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_EntityBlock.h" +#include "Ioss_EntityType.h" +#include "Ioss_Field.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_IOFactory.h" +#include "Ioss_MeshType.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Region.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_State.h" +#include "Ioss_StructuredBlock.h" +#include "Ioss_VariableType.h" + namespace { int rank = 0; diff --git a/packages/seacas/libraries/ioss/src/main/volume.C b/packages/seacas/libraries/ioss/src/main/volume.C index da892d672d..d4c7916c5d 100644 --- a/packages/seacas/libraries/ioss/src/main/volume.C +++ b/packages/seacas/libraries/ioss/src/main/volume.C @@ -4,17 +4,15 @@ // // See packages/seacas/LICENSE for details +#include // for size_t, nullptr +#include +#include +#include +#include // for vector + #include "Ioss_DatabaseIO.h" // for DatabaseIO #include "Ioss_ElementBlock.h" // for ElementBlock -#include "Ioss_Property.h" // for Property -#include // for max_element, min_element -#include // for size_t, nullptr -#include -#include // for operator<<, setw -#include // for operator<<, basic_ostream, etc -#include // for char_traits, operator<< -#include // for int64_t -#include // for vector +#include "Ioss_Utils.h" namespace { void comp_grad12x(double *const grad_ptr, const double *const x, const double *const y, diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C index 089c3db081..fe7c1b2d03 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C @@ -9,26 +9,23 @@ #include // for Int64Vector, IntVector #include // for SideBlock #include -#include // for Utils, IOSS_ERROR +#include // for assert +#include // for sqrt +#include #include - -#include // for copy -#include // for assert -#include // for sqrt -#include // for ostringstream -#include // for string, operator==, etc -#include // for pair - -#include "Ioss_Assembly.h" // for Assembly -#include "Ioss_CommSet.h" // for CommSet -#include "Ioss_DBUsage.h" // for DatabaseUsage -#include "Ioss_DatabaseIO.h" // for DatabaseIO -#include "Ioss_ElementBlock.h" // for ElementBlock -#include "Ioss_ElementTopology.h" -#include "Ioss_EntityType.h" // for EntityType, etc -#include "Ioss_Field.h" // for Field, etc -#include "Ioss_GroupingEntity.h" // for GroupingEntity -#include "Ioss_Hex8.h" +#include // for ostringstream +#include +#include // for string, operator==, etc +#include + +#include "Ioss_Assembly.h" // for Assembly +#include "Ioss_CommSet.h" // for CommSet +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_ElementBlock.h" // for ElementBlock +#include "Ioss_EntityType.h" // for EntityType, etc +#include "Ioss_Field.h" // for Field, etc +#include "Ioss_GroupingEntity.h" // for GroupingEntity #include "Ioss_IOFactory.h" // for IOFactory #include "Ioss_Map.h" // for Map, MapContainer #include "Ioss_NodeBlock.h" // for NodeBlock @@ -42,6 +39,7 @@ #include "Ioss_Utils.h" #include "Ioss_VariableType.h" // for VariableType #include "Iotm_TextMesh.h" // for TextMesh +#include "Iotm_TextMeshSidesetSplitter.h" namespace { template diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.h index bf79fbdc23..fc5cabf629 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.h @@ -6,20 +6,18 @@ #pragma once -#include "iotm_export.h" - #include #include // for DatabaseUsage #include // for DatabaseIO #include // for IOFactory #include // for Map - -#include // for size_t -#include // for int64_t -#include // for string -#include // for vector +#include // for size_t +#include // for int64_t +#include // for string +#include // for vector #include "Ioss_State.h" // for State +#include "iotm_export.h" namespace Iotm { class TextMesh; @@ -45,6 +43,9 @@ namespace Ioss { namespace Ioss { class EntityBlock; + class Assembly; + class Blob; + class Map; } // namespace Ioss /** \brief A namespace for the generated database format. diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C index e950fd9374..33cf23b954 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C +++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C @@ -8,17 +8,14 @@ #include #include - -#include -#include -#include // for assert -#include // for atan2, cos, sin -#include // for nullptr, exit, etc #include -#include +#include #include #include // for vector +#include "Ioss_CodeTypes.h" +#include "Ioss_EntityType.h" + #define ThrowRequireMsg(expr, message) \ do { \ if (!(expr)) { \ diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.h index cd896eb3be..b4b9dff00b 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.h +++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.h @@ -6,24 +6,27 @@ #pragma once -#include "iotm_export.h" - #include #include // for EntityType - -#include // for size_t -#include // for int64_t -#include // for map, etc -#include // for string +#include // for size_t +#include // for int64_t +#include // for map, etc +#include +#include // for string #include #include // for pair #include // for vector #include "Ioss_ElementTopology.h" #include "Ioss_StandardElementTypes.h" - +#include "Iotm_TextMeshAssembly.h" +#include "Iotm_TextMeshDataTypes.h" +#include "Iotm_TextMeshNodeset.h" +#include "Iotm_TextMeshSideset.h" +#include "Iotm_TextMeshSidesetSplitter.h" #include "Iotm_TextMeshTopologyMapping.h" #include "Iotm_TextMeshUtils.h" +#include "iotm_export.h" namespace Iotm { using Topology = TopologyMapEntry; diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C index 0c6ee1c21a..0e2cb5de94 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C @@ -4,15 +4,17 @@ // // See packages/seacas/LICENSE for details -#include #include -#include - -#include #include #include #include -#include +#include + +#include "Ioss_CodeTypes.h" + +namespace Ioss { + class Transform; +} // namespace Ioss namespace Iotr { diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.h index 6e78f33403..36a5b49cdf 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.h @@ -6,15 +6,20 @@ #pragma once -#include "iotr_export.h" - #include #include #include #include +#include "iotr_export.h" + +namespace Ioss { + class Transform; +} // namespace Ioss + namespace Iotr { class Factory; + using FactoryMap = std::map>; class IOTR_EXPORT Factory diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C index c0b701cec6..60250b8871 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C @@ -4,16 +4,17 @@ // // See packages/seacas/LICENSE for details -#include "Ioss_Transform.h" // for Factory, Transform #include // for Field, etc #include // for VariableType -#include // for max_element, min_element #include // for fabs #include // for size_t -#include // for abs -#include // for operator==, string +#include +#include // for operator==, string #include +#include "Ioss_Transform.h" // for Factory, Transform +#include "Iotr_Factory.h" + namespace Iotr { const MinMax_Factory *MinMax_Factory::factory() diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h index f9f1d5365a..16f1439acf 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h @@ -6,13 +6,13 @@ #pragma once -#include "iotr_export.h" - #include // for Transform, Factory #include // for VariableType +#include +#include // for string #include -#include // for string +#include "iotr_export.h" namespace Ioss { class Field; diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C index d7701fd660..e3adba362e 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C @@ -7,10 +7,11 @@ #include #include #include -#include +#include #include #include "Ioss_Transform.h" +#include "Iotr_Factory.h" namespace Iotr { diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h index 4cc18845e6..af9417a4c9 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h @@ -6,12 +6,13 @@ #pragma once -#include "iotr_export.h" - #include // for Transform, Factory +#include +#include // for string #include -#include // for string +#include "Ioss_VariableType.h" +#include "iotr_export.h" namespace Ioss { class Field; diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C index f98169fe45..9bdbeb82c6 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C @@ -8,11 +8,12 @@ #include #include #include -#include +#include #include #include #include "Ioss_Transform.h" +#include "Iotr_Factory.h" namespace Iotr { diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h index ed383098c0..2d15cf1f8d 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h @@ -6,15 +6,15 @@ #pragma once -#include "iotr_export.h" - #include // for Transform, Factory #include // for VariableType -#include - +#include #include // for string +#include #include // for vector +#include "iotr_export.h" + namespace Ioss { class Field; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C index d031c32bf2..8c9fb74b8d 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C @@ -7,10 +7,11 @@ #include #include #include -#include +#include #include #include "Ioss_Transform.h" +#include "Iotr_Factory.h" namespace Iotr { diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h index 7288381767..c005d71707 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h @@ -6,13 +6,13 @@ #pragma once -#include "iotr_export.h" - #include #include +#include +#include #include -#include +#include "iotr_export.h" namespace Ioss { class Field; diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C index 51a3660028..1d465efc02 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C @@ -8,11 +8,12 @@ #include #include #include -#include +#include #include #include #include "Ioss_Transform.h" +#include "Iotr_Factory.h" namespace Iotr { diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h index fe97ab697c..1987e7efcc 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h @@ -6,14 +6,15 @@ #pragma once -#include "iotr_export.h" - #include // for Transform, Factory #include // for VariableType -#include - +#include #include +#include #include + +#include "iotr_export.h" + namespace Ioss { class Field; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C index 148752819c..70625a1a1e 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C @@ -12,6 +12,7 @@ #include #include "Ioss_Transform.h" +#include "Iotr_Factory.h" namespace Iotr { diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h index e71cbc9aef..8b0efe7129 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h @@ -6,13 +6,13 @@ #pragma once -#include "iotr_export.h" - #include // for Transform, Factory #include // for VariableType +#include +#include // for string #include -#include // for string +#include "iotr_export.h" namespace Ioss { class Field; diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C index 2eb481370d..d7edac940f 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C @@ -8,10 +8,10 @@ #include #include #include -#include #include #include "Ioss_Transform.h" +#include "Iotr_Factory.h" namespace Iotr { diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h index dc0d9e8bd6..bd2a35a2cf 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h @@ -6,13 +6,13 @@ #pragma once -#include "iotr_export.h" - #include // for Transform, Factory #include // for VariableType +#include +#include // for string #include -#include // for string +#include "iotr_export.h" namespace Ioss { class Field; diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C b/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C index e5a6a3b7ec..76434cdabe 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C @@ -7,9 +7,6 @@ #define DOCTEST_CONFIG_IMPLEMENT #define DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS -#include -#include - #include #include #include @@ -19,13 +16,23 @@ #include #include #include -#include #include #include #include +#include #include - -#include +#include +#include +#include +#include +#include + +#include "Ioss_CodeTypes.h" +#include "Ioss_Field.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Property.h" +#include "Ioss_State.h" +#include "Ioss_SurfaceSplit.h" namespace { std::string input_filename = "ADeDA.e"; diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C b/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C index fb03e9c17c..2d0c316740 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C @@ -4,21 +4,28 @@ // // See packages/seacas/LICENSE for details +#include #include #include #include #include #include -#include #include #include - -#include - -#include +#include +#include +#include #include #include +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" +#include "Ioss_Field.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_State.h" +#include "Ioss_VariableType.h" + //-------------------------------------------------------------------- /*---------------------------------------------------------------------- * IOSS Blob Example diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C b/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C index 20fa58d687..42082cc73e 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C @@ -1,14 +1,24 @@ #define DOCTEST_CONFIG_IMPLEMENT #define DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS +#include +#include #include +#include +#include #include +#include -#include -#include -#include - -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_Field.h" +#include "Ioss_IOFactory.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Region.h" +#include "Ioss_State.h" namespace { std::string tst_filename = "test.hb"; diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_ioel.C b/packages/seacas/libraries/ioss/src/utest/Utst_ioel.C index 7f2dcb558f..f98f6f4951 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_ioel.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_ioel.C @@ -5,7 +5,6 @@ // See packages/seacas/LICENSE for details #include - #include #include #include @@ -13,11 +12,9 @@ #include #include #include - -#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_map.C b/packages/seacas/libraries/ioss/src/utest/Utst_map.C index 3ab1a1b1ef..8188e535de 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_map.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_map.C @@ -8,16 +8,15 @@ #define DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS #define DOCTEST_CONFIG_NO_MULTITHREADING -#include - -#include #include #include #include -#include -#include +#include +#include #include #include +#include +#include #include template void initialize_data(std::vector &init) diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_sort.C b/packages/seacas/libraries/ioss/src/utest/Utst_sort.C index 5dec169f23..e85a3b6ab4 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_sort.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_sort.C @@ -1,14 +1,16 @@ -// Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions +// Copyright(C) 1999-2020, 2022, 2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // // See packages/seacas/LICENSE for details #include -#include #include #include #include +#include +#include +#include namespace { template bool verify_sorted(const std::vector &v) diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C index 761c406724..ed12ccc9a4 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C @@ -8,17 +8,22 @@ #define DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS #define DOCTEST_CONFIG_NO_MULTITHREADING -#include - #include +#include #include #include -#include -#include +#include #include #include +#include +#include +#include +#include #include +#include "Ioss_CodeTypes.h" +#include "Ioss_Utils.h" + namespace { int64_t generate_guid(size_t id, int rank, int proc_count) { diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_herron.C b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_herron.C index 9356939711..69a418ae62 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_herron.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_herron.C @@ -4,8 +4,15 @@ // // See packages/seacas/LICENSE for details -#include "Utst_structured_decomp.h" #include +#include +#include +#include + +#include "Iocgns_StructuredZoneData.h" +#include "Ioss_CodeTypes.h" +#include "Ioss_ZoneConnectivity.h" +#include "Utst_structured_decomp.h" // Disable these tests on NVCC. It tries to optimize and takes forever to build... #if !defined(__NVCC__) diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_rocket.C b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_rocket.C index dfcc6a1fc7..3545a88779 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_rocket.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_rocket.C @@ -4,11 +4,18 @@ // // See packages/seacas/LICENSE for details +#include "Iocgns_StructuredZoneData.h" +#include "Ioss_CodeTypes.h" +#include "Ioss_ZoneConnectivity.h" #include "Utst_structured_decomp.h" + #define DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS #define DOCTEST_CONFIG_NO_MULTITHREADING #include +#include +#include +#include // Disable these tests on NVCC. It tries to optimize and takes forever to build... #if !defined(__NVCC__) && !defined(__IOSS_WINDOWS__) diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C b/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C index c22a8f279a..b1484b4ecd 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C @@ -4,9 +4,6 @@ // // See packages/seacas/LICENSE for details -#include - -#include #include #include #include @@ -17,9 +14,13 @@ #undef NDEBUG #include -#include #include #include +#include + +#include "Ioss_Field.h" +#include "Ioss_Property.h" +#include "Ioss_Utils.h" int main(int argc, char *argv[]) { diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_utils.C b/packages/seacas/libraries/ioss/src/utest/Utst_utils.C index 1aace4b725..b8c8159751 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_utils.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_utils.C @@ -9,14 +9,16 @@ #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS #define DOCTEST_CONFIG_NO_MULTITHREADING #include - -#include -#include -#include -#include #include +#include +#include +#include #include +#include "Ioss_ConcreteVariableType.h" +#include "Ioss_Field.h" +#include "Ioss_Utils.h" + DOCTEST_TEST_CASE("number_width") { DOCTEST_SUBCASE("single digit") From 7f6212e872baf8a8b2e5ecc8306f01e9f4e7e06c Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 30 Oct 2023 17:41:53 -0600 Subject: [PATCH 009/110] IOSS: Parallel fixes for iwyu commit --- packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C | 1 + packages/seacas/libraries/ioss/src/Ioss_FileInfo.C | 1 + packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C | 1 + packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C | 4 ++++ .../seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C | 1 + packages/seacas/libraries/ioss/src/main/cgns_decomp.C | 1 + packages/seacas/libraries/ioss/src/main/cth_pressure_map.C | 1 + packages/seacas/libraries/ioss/src/main/io_info_main.C | 3 ++- packages/seacas/libraries/ioss/src/main/io_modify.C | 1 + packages/seacas/libraries/ioss/src/main/io_shell.C | 1 + packages/seacas/libraries/ioss/src/main/shell_to_hex.C | 1 + packages/seacas/libraries/ioss/src/main/skinner.C | 1 + packages/seacas/libraries/ioss/src/main/sphgen.C | 1 + packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C | 1 + .../seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C | 1 + .../seacas/libraries/ioss/src/utest/Utst_blob_write_read.C | 1 + packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C | 1 + packages/seacas/libraries/ioss/src/utest/Utst_superelement.C | 1 + 18 files changed, 22 insertions(+), 1 deletion(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C index 2b5d41f8d2..61aafdc059 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C @@ -5,6 +5,7 @@ // See packages/seacas/LICENSE for details #include +#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C b/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C index 1716faaa99..47f790477d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C index f5e353cdca..4000c664b6 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C index 4339abc0a2..d582ca22ac 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C @@ -37,6 +37,8 @@ #error "Could not include cgnslib.h" #endif +#include "tokenize.h" +#include "Ioss_Assembly.h" #include "Ioss_CommSet.h" #include "Ioss_DBUsage.h" #include "Ioss_DataSize.h" @@ -58,6 +60,8 @@ #include "Ioss_MeshType.h" #include "Ioss_NodeBlock.h" #include "Ioss_NodeSet.h" +#include "Ioss_Quad4.h" +#include "Ioss_Hex8.h" #include "Ioss_ParallelUtils.h" #include "Ioss_Property.h" #include "Ioss_PropertyManager.h" diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C index 1b542ef1cf..146482acea 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C @@ -34,6 +34,7 @@ #include "Ioss_FaceBlock.h" #include "Ioss_FaceSet.h" #include "Ioss_Field.h" +#include "Ioss_FileInfo.h" #include "Ioss_GroupingEntity.h" #include "Ioss_Map.h" #include "Ioss_MeshType.h" diff --git a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C index 0e0006d26d..c3bff98f79 100644 --- a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C +++ b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C @@ -31,6 +31,7 @@ #include #include +#include "Ioss_ScopeGuard.h" #include "Ioss_DBUsage.h" #include "Ioss_ParallelUtils.h" #include "Ioss_PropertyManager.h" diff --git a/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C b/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C index ed4424d199..d86e751fb4 100644 --- a/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C +++ b/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C @@ -16,6 +16,7 @@ #include #include +#include "Ioss_ScopeGuard.h" #include "Ioss_CommSet.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" diff --git a/packages/seacas/libraries/ioss/src/main/io_info_main.C b/packages/seacas/libraries/ioss/src/main/io_info_main.C index f09274aef3..079b365742 100644 --- a/packages/seacas/libraries/ioss/src/main/io_info_main.C +++ b/packages/seacas/libraries/ioss/src/main/io_info_main.C @@ -1,5 +1,5 @@ /* - * Copyright(C) 1999-2020 National Technology & Engineering Solutions + * Copyright(C) 1999-2020, 2023 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. * @@ -11,6 +11,7 @@ #include #include +#include "Ioss_ScopeGuard.h" #include "Ionit_Initializer.h" #include "Ioss_IOFactory.h" #include "Ioss_Utils.h" diff --git a/packages/seacas/libraries/ioss/src/main/io_modify.C b/packages/seacas/libraries/ioss/src/main/io_modify.C index 91392a0793..8eb1104eaa 100644 --- a/packages/seacas/libraries/ioss/src/main/io_modify.C +++ b/packages/seacas/libraries/ioss/src/main/io_modify.C @@ -43,6 +43,7 @@ #include #include +#include "Ioss_ScopeGuard.h" #include "Ioss_EntityType.h" #include "Ioss_ParallelUtils.h" #include "Ioss_PropertyManager.h" diff --git a/packages/seacas/libraries/ioss/src/main/io_shell.C b/packages/seacas/libraries/ioss/src/main/io_shell.C index 9a60b40fb0..d1c5bfd831 100644 --- a/packages/seacas/libraries/ioss/src/main/io_shell.C +++ b/packages/seacas/libraries/ioss/src/main/io_shell.C @@ -26,6 +26,7 @@ #include #include +#include "Ioss_ScopeGuard.h" #include "Ioss_DBUsage.h" #include "Ioss_DataSize.h" #include "Ioss_DatabaseIO.h" diff --git a/packages/seacas/libraries/ioss/src/main/shell_to_hex.C b/packages/seacas/libraries/ioss/src/main/shell_to_hex.C index d332659ba6..0e14088325 100644 --- a/packages/seacas/libraries/ioss/src/main/shell_to_hex.C +++ b/packages/seacas/libraries/ioss/src/main/shell_to_hex.C @@ -16,6 +16,7 @@ #include #include +#include "Ioss_ScopeGuard.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" #include "Ioss_ElementBlock.h" diff --git a/packages/seacas/libraries/ioss/src/main/skinner.C b/packages/seacas/libraries/ioss/src/main/skinner.C index e13a6c9b5b..9764715163 100644 --- a/packages/seacas/libraries/ioss/src/main/skinner.C +++ b/packages/seacas/libraries/ioss/src/main/skinner.C @@ -21,6 +21,7 @@ #include #include +#include "Ioss_ScopeGuard.h" #include "Ionit_Initializer.h" #include "Ioss_DBUsage.h" #include "Ioss_DataSize.h" diff --git a/packages/seacas/libraries/ioss/src/main/sphgen.C b/packages/seacas/libraries/ioss/src/main/sphgen.C index 9a3f4d62cd..4d4b19532e 100644 --- a/packages/seacas/libraries/ioss/src/main/sphgen.C +++ b/packages/seacas/libraries/ioss/src/main/sphgen.C @@ -16,6 +16,7 @@ #include #include +#include "Ioss_ScopeGuard.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" #include "Ioss_ElementBlock.h" diff --git a/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C b/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C index d6eab0fd68..dd50499476 100644 --- a/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C +++ b/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C @@ -19,6 +19,7 @@ #include #include +#include "Ioss_ScopeGuard.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" #include "Ioss_ElementBlock.h" diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C b/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C index 76434cdabe..a55d9936f2 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C @@ -27,6 +27,7 @@ #include #include +#include "Ioss_ScopeGuard.h" #include "Ioss_CodeTypes.h" #include "Ioss_Field.h" #include "Ioss_ParallelUtils.h" diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C b/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C index 2d0c316740..2e9a26acc8 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C @@ -18,6 +18,7 @@ #include #include +#include "Ioss_ScopeGuard.h" #include "Ioss_CodeTypes.h" #include "Ioss_DBUsage.h" #include "Ioss_Field.h" diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C b/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C index 42082cc73e..b7de61dacb 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C @@ -9,6 +9,7 @@ #include #include +#include "Ioss_ScopeGuard.h" #include "Ioss_CodeTypes.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C b/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C index b1484b4ecd..73e222b7da 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C @@ -18,6 +18,7 @@ #include #include +#include "Ioss_ScopeGuard.h" #include "Ioss_Field.h" #include "Ioss_Property.h" #include "Ioss_Utils.h" From 69aa877b4ea9c23ba12af36dc0ae0a2d25a2b360 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 30 Oct 2023 17:49:03 -0600 Subject: [PATCH 010/110] IOSS: Another missing include --- packages/seacas/libraries/ioss/src/Ioss_Getline.C | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/seacas/libraries/ioss/src/Ioss_Getline.C b/packages/seacas/libraries/ioss/src/Ioss_Getline.C index d0749c15ea..b3e826c854 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Getline.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Getline.C @@ -43,6 +43,7 @@ #include #include /********************* C library headers ********************************/ +#include #include #include #include From 4e86ef1c14674fac965ac836a3fb4711b59c43c0 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 30 Oct 2023 18:21:59 -0600 Subject: [PATCH 011/110] IOSS: Fix iwyu mac-specific includes --- .../seacas/libraries/ioss/src/Ioss_MemoryUtils.C | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C b/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C index 02e615a58c..3caebb9f3a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C @@ -5,12 +5,6 @@ // See packages/seacas/LICENSE for details #include -#include -#include -#include -#include -#include -#include // For memory utilities... #if defined(__IOSS_WINDOWS__) @@ -18,8 +12,15 @@ #elif defined(__unix__) || defined(__unix) || defined(unix) || \ (defined(__APPLE__) && defined(__MACH__)) #include +#include #if defined(__APPLE__) && defined(__MACH__) +#include +#include +#include +#include +#include +#include #elif (defined(_AIX) || defined(__TOS__AIX__)) || \ (defined(__sun__) || defined(__sun) || defined(sun) && (defined(__SVR4) || defined(__svr4__))) From 1b71c6c2ee61b6f3e6a522298b83aec9c3451a7f Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 30 Oct 2023 18:24:28 -0600 Subject: [PATCH 012/110] IOSS: Any one more ... --- packages/seacas/libraries/ioss/src/Ioss_Utils.C | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.C b/packages/seacas/libraries/ioss/src/Ioss_Utils.C index 22e32ed1ef..c84e3227a4 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.C @@ -18,7 +18,6 @@ #include #include #include -#include #include #include From 20b4a5f3f852d904d6d7e9fcc0c488271f050529 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 31 Oct 2023 09:58:28 -0600 Subject: [PATCH 013/110] IOSS: Remove cgnslib.h include --- packages/seacas/libraries/ioss/src/main/io_modify.C | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/seacas/libraries/ioss/src/main/io_modify.C b/packages/seacas/libraries/ioss/src/main/io_modify.C index 8eb1104eaa..86d9c03075 100644 --- a/packages/seacas/libraries/ioss/src/main/io_modify.C +++ b/packages/seacas/libraries/ioss/src/main/io_modify.C @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include From 6b5834d7f4efb51144cc987dce63270a7d1a287a Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 31 Oct 2023 10:05:09 -0600 Subject: [PATCH 014/110] IOSS: Protect some non-windows includes --- packages/seacas/libraries/ioss/src/Ioss_FileInfo.C | 2 -- packages/seacas/libraries/ioss/src/Ioss_Getline.C | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C b/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C index 47f790477d..8cb2145aa4 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C @@ -12,8 +12,6 @@ #include #include #include -#include -#include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Getline.C b/packages/seacas/libraries/ioss/src/Ioss_Getline.C index b3e826c854..3dae4a3ad0 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Getline.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Getline.C @@ -37,16 +37,15 @@ #ifndef __unix__ #define __unix__ 1 +#include #endif #endif -#include -#include /********************* C library headers ********************************/ -#include #include #include #include +#include #ifndef _MSC_VER #include #endif @@ -122,6 +121,7 @@ namespace { namespace { #ifdef __unix__ +#include struct termios io_new_termios; struct termios io_old_termios; #endif From 8b9c2b88799c5cdac7e7dc9e0870cb6a3aaa7bae Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 31 Oct 2023 11:11:52 -0600 Subject: [PATCH 015/110] IOSS: Fix include placement --- packages/seacas/libraries/ioss/src/Ioss_Getline.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_Getline.C b/packages/seacas/libraries/ioss/src/Ioss_Getline.C index 3dae4a3ad0..37d31d6658 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Getline.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Getline.C @@ -37,7 +37,6 @@ #ifndef __unix__ #define __unix__ 1 -#include #endif #endif @@ -47,6 +46,7 @@ #include #include #ifndef _MSC_VER +#include #include #endif From ece5bcf94d1ce8b8df012786b237aae3dc37e378 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 31 Oct 2023 13:31:02 -0600 Subject: [PATCH 016/110] IOSS: Add missing *stream includes --- packages/seacas/libraries/ioss/src/Ioss_Utils.C | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.C b/packages/seacas/libraries/ioss/src/Ioss_Utils.C index c84e3227a4..071f39a30e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.C @@ -17,6 +17,9 @@ #include #include #include +#include +#include +#include #include #include #include From c7b5802defb9e63e41125ebb7ff0a01c63045010 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 31 Oct 2023 13:33:15 -0600 Subject: [PATCH 017/110] IOSS: Fix misplaced unix-only include --- packages/seacas/libraries/ioss/src/Ioss_Getline.C | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_Getline.C b/packages/seacas/libraries/ioss/src/Ioss_Getline.C index 37d31d6658..9aa94226b3 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Getline.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Getline.C @@ -46,9 +46,11 @@ #include #include #ifndef _MSC_VER -#include #include #endif +#ifdef __unix__ +#include +#endif #include "Ioss_Getline.h" From 23ad1e80ef187c31eeb6a32037153f253f25346c Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 31 Oct 2023 15:28:50 -0600 Subject: [PATCH 018/110] IOSS: And another stream include... --- packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C index e65999842e..fb0e1ebfe4 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include From 05ac5def52cd366a15e3bdd6fee6c7600dac3e96 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 31 Oct 2023 16:01:39 -0600 Subject: [PATCH 019/110] IOSS: Address codacy issues --- packages/seacas/libraries/ioss/src/Ioss_Compare.C | 2 -- packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C | 4 ++-- packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h | 4 ++-- packages/seacas/libraries/ioss/src/Ioss_Utils.C | 5 +---- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_Compare.C b/packages/seacas/libraries/ioss/src/Ioss_Compare.C index 4ba7b3710e..84858cd73f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Compare.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Compare.C @@ -945,7 +945,6 @@ namespace { bool overall_result = true; Ioss::NameList ige_properties_1 = ige_1->property_describe(); - Ioss::NameList ige_properties_2 = ige_2->property_describe(); for (const auto &property : ige_properties_1) { if (!ige_2->property_exists(property)) { @@ -1563,7 +1562,6 @@ namespace { // Iterate through the `role` fields of the input // database and compare to second database. Ioss::NameList in_state_fields_1 = ige_1->field_describe(role); - Ioss::NameList in_state_fields_2 = ige_2->field_describe(role); for (const auto &field_name : in_state_fields_1) { // All of the 'Ioss::EntityBlock' derived classes have a diff --git a/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C b/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C index 61fd393d2b..4461e0e12c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C +++ b/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C @@ -837,11 +837,11 @@ namespace { if (options.debug && rank == 0) { fmt::print(Ioss::DebugOut(), "{}, ", name); } - size_t num_nodes = inb->entity_count(); - size_t degree = inb->get_property("component_degree").get_int(); if (options.output_summary && rank == 0) { + size_t degree = inb->get_property("component_degree").get_int(); fmt::print(Ioss::DebugOut(), " Number of Coordinates per Node = {:14}\n", fmt::group_digits(degree)); + size_t num_nodes = inb->entity_count(); fmt::print(Ioss::DebugOut(), " Number of Nodes = {:14}\n", fmt::group_digits(num_nodes)); } diff --git a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h index b0553c0446..cc99e4d82a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2022 National Technology & Engineering Solutions +// Copyright(C) 1999-2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -191,12 +191,12 @@ namespace Ioss { for (size_t i = 1; i < pow_2; i++) { MPI_Status status{}; - int tag = 24713; size_t exchange_proc = i ^ my_processor; if (exchange_proc < static_cast(processor_count)) { int snd_cnt = static_cast( sendcounts[exchange_proc]); // Converts from int64_t to int as needed by mpi int rcv_cnt = static_cast(recvcounts[exchange_proc]); + int tag = 24713; if (static_cast(my_processor) < exchange_proc) { MPI_Send((void *)&sendbuf[senddisp[exchange_proc]], snd_cnt, mpi_type(T(0)), exchange_proc, tag, comm); diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.C b/packages/seacas/libraries/ioss/src/Ioss_Utils.C index 071f39a30e..1f34711c14 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.C @@ -1367,10 +1367,7 @@ void Ioss::Utils::info_fields(const Ioss::GroupingEntity *ige, Ioss::Field::Role max_width = max_width > field_name.length() ? max_width : field_name.length(); } - size_t width = Ioss::Utils::term_width(); - if (width == 0) { - width = 80; - } + size_t width = Ioss::Utils::term_width(); size_t cur_out = 8; // Tab width... if (!header.empty()) { cur_out = header.size() + suffix.size() + 16; // Assume 2 tabs... From c7a5fa11e824a0a54f7455b332f74ebc751b636a Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 31 Oct 2023 16:38:30 -0600 Subject: [PATCH 020/110] IOSS: A few more fstream includes --- packages/seacas/libraries/ioss/src/main/cth_pressure_map.C | 1 + packages/seacas/libraries/ioss/src/main/io_modify.C | 1 + packages/seacas/libraries/ioss/src/main/io_shell_ts.C | 1 - packages/seacas/libraries/ioss/src/main/shell_to_hex.C | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C b/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C index d86e751fb4..d9ca82a841 100644 --- a/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C +++ b/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/io_modify.C b/packages/seacas/libraries/ioss/src/main/io_modify.C index 86d9c03075..1df14c3b5a 100644 --- a/packages/seacas/libraries/ioss/src/main/io_modify.C +++ b/packages/seacas/libraries/ioss/src/main/io_modify.C @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/io_shell_ts.C b/packages/seacas/libraries/ioss/src/main/io_shell_ts.C index f3d6c0efb0..6f6d589914 100644 --- a/packages/seacas/libraries/ioss/src/main/io_shell_ts.C +++ b/packages/seacas/libraries/ioss/src/main/io_shell_ts.C @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/shell_to_hex.C b/packages/seacas/libraries/ioss/src/main/shell_to_hex.C index 0e14088325..87f3767c67 100644 --- a/packages/seacas/libraries/ioss/src/main/shell_to_hex.C +++ b/packages/seacas/libraries/ioss/src/main/shell_to_hex.C @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include From 3b4dc928ee4ef61364782b4dfbaebb9ab2a0cc4e Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 6 Nov 2023 13:06:04 -0700 Subject: [PATCH 021/110] SCRIPTS: Update gnu-getopt instructions [ci skip] --- packages/seacas/scripts/decomp | 5 ++++- packages/seacas/scripts/decomp.in | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/seacas/scripts/decomp b/packages/seacas/scripts/decomp index 4ef4a9944a..e2479440c0 100755 --- a/packages/seacas/scripts/decomp +++ b/packages/seacas/scripts/decomp @@ -132,7 +132,10 @@ If possible, you should update your getopt to a newer version and make sure that the new getopt is in your path. Below are some options for getting the current getopt version: -* If on a Mac: "sudo port install getopt" or "brew install gnu-getopt" +* If on a Mac: + * "sudo port install getopt" or + *"brew install gnu-getopt" + * You may have to add to your `.bash_profile` if using the brew option * Search the internet for "getopt-1.1.5" or "getopt-1.1.4"; download and build Enter "-h" for the modified options that this version supports. diff --git a/packages/seacas/scripts/decomp.in b/packages/seacas/scripts/decomp.in index e8969ee525..10b2b5e4e8 100644 --- a/packages/seacas/scripts/decomp.in +++ b/packages/seacas/scripts/decomp.in @@ -128,7 +128,10 @@ If possible, you should update your getopt to a newer version and make sure that the new getopt is in your path. Below are some options for getting the current getopt version: -* If on a Mac: "sudo port install getopt" or "brew install gnu-getopt" +* If on a Mac: + * "sudo port install getopt" or + *"brew install gnu-getopt" + * You may have to add to your `.bash_profile` if using the brew option * Search the internet for "getopt-1.1.5" or "getopt-1.1.4"; download and build Enter "-h" for the modified options that this version supports. From 393656a2a0c64faef4e003ef057544f6346a203a Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 7 Nov 2023 08:22:33 -0700 Subject: [PATCH 022/110] BUILD: Enable build/install of hdf5 c++ library [ci skip] --- README.md | 3 ++- TPL/hdf5/runcmake.sh | 4 +--- install-tpl.sh | 8 ++++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b72db76dcc..495eeee1de 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,8 @@ manually as detailed in | KOKKOS | YES, NO | NO | Should Kokkos TPL be built. | | GNU_PARALLEL | YES, NO | YES | Should GNU parallel script be built. | | FMT | YES, NO | YES | Should Lib::FMT TPL be built. | -| H5VERSION | V114, V110, V18 | V110 | Use HDF5-1.14.X, HDF5-1.10.X or HDF5-1.8.X | +| H5VERSION | V114, V110, V18 | V114 | Use HDF5-1.14.X, HDF5-1.10.X or HDF5-1.8.X | +| H5CPP | YES, NO | NO | Should the HDF5 C++ library be built/installed | | BB | YES, NO | NO | Enable Burst Buffer support in PnetCDF | | JOBS | {count} | 2 | Number of "jobs" used for simultaneous compiles | | SUDO | "" or sudo | "" | If need to be superuser to install | diff --git a/TPL/hdf5/runcmake.sh b/TPL/hdf5/runcmake.sh index 43ad4bb936..048a19cff3 100644 --- a/TPL/hdf5/runcmake.sh +++ b/TPL/hdf5/runcmake.sh @@ -7,8 +7,6 @@ if [ "X$ACCESS" == "X" ] ; then fi INSTALL_PATH=${INSTALL_PATH:-${ACCESS}} -H5VERSION=${H5VERSION:-V110} - DEBUG="${DEBUG:-NO}" if [ "$DEBUG" == "YES" ] then @@ -65,7 +63,7 @@ cmake .. -DCMAKE_C_COMPILER:FILEPATH=${CC} \ -DDEFAULT_API_VERSION=V18 \ -DHDF5_ENABLE_PARALLEL:BOOL=${MPI} \ -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON \ - -DHDF5_BUILD_CPP_LIB:BOOL=OFF \ + -DHDF5_BUILD_CPP_LIB:BOOL=${H5CPP} \ -DHDF5_BUILD_FORTRAN:BOOL=OFF \ -DHDF5_BUILD_HL_LIB:BOOL=ON \ -DHDF5_DISABLE_COMPILER_WARNINGS:BOOL=ON \ diff --git a/install-tpl.sh b/install-tpl.sh index e0c922b27d..d7fe2335f7 100755 --- a/install-tpl.sh +++ b/install-tpl.sh @@ -123,6 +123,9 @@ KOKKOS=${KOKKOS:-NO} KOKKOS=$(check_valid KOKKOS) H5VERSION=${H5VERSION:-V114} +# Build/Install the HDF5 C++ library? +H5CPP=${H5CPP:-NO} +H5CPP=$(check_valid H5CPP) FAODEL=${FAODEL:-NO} FAODEL=$(check_valid FAODEL) @@ -200,6 +203,7 @@ if [ $# -gt 0 ]; then echo " PNETCDF = ${PNETCDF}" echo " HDF5 = ${HDF5}" echo " H5VERSION = ${H5VERSION}" + echo " H5CPP = ${H5CPP}" echo " CGNS = ${CGNS}" echo " MATIO = ${MATIO}" echo " METIS = ${METIS}" @@ -459,7 +463,7 @@ then rm -rf build mkdir build cd build || exit - CRAY=${CRAY} H5VERSION=${H5VERSION} DEBUG=${DEBUG} SHARED=${SHARED} NEEDS_ZLIB=${NEEDS_ZLIB} NEEDS_SZIP=${NEEDS_SZIP} MPI=${MPI} bash -x ../../runcmake.sh + CRAY=${CRAY} H5CPP=${H5CPP} H5VERSION=${H5VERSION} DEBUG=${DEBUG} SHARED=${SHARED} NEEDS_ZLIB=${NEEDS_ZLIB} NEEDS_SZIP=${NEEDS_SZIP} MPI=${MPI} bash -x ../../runcmake.sh #CRAY=${CRAY} H5VERSION=${H5VERSION} DEBUG=${DEBUG} SHARED=${SHARED} NEEDS_ZLIB=${NEEDS_ZLIB} NEEDS_SZIP=${NEEDS_SZIP} MPI=${MPI} bash ../runconfigure.sh if [[ $? != 0 ]] then @@ -779,7 +783,7 @@ then then echo "${txtgrn}+++ Configuring, Building, and Installing...${txtrst}" cd fmt || exit - git checkout ${fmt_version} +# git checkout ${fmt_version} rm -rf build mkdir build cd build || exit From c633fc72382beafc59c0c00c3d6c19e7c50b7144 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 7 Nov 2023 11:05:40 -0700 Subject: [PATCH 023/110] CI: Use new version of hdf5 and cgns --- .github/workflows/build_test.yml | 8 ++++---- .github/workflows/build_variant.yml | 8 ++++---- .github/workflows/coverity-scan.yml | 8 ++++---- .github/workflows/intel-build.yml | 8 ++++---- install-tpl.sh | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index bbdb278731..d551e210a3 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -23,7 +23,7 @@ jobs: compiler: [ gnu, clang, mpi ] hdf5: [ V18, V110, V114 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] steps: - uses: actions/checkout@v3 @@ -40,7 +40,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v4-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Build TPL-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} if: steps.cache-TPL.outputs.cache-hit != 'true' @@ -64,7 +64,7 @@ jobs: compiler: [ gnu, clang, mpi ] hdf5: [ V18, V110, V114 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] steps: - uses: actions/checkout@v3 @@ -78,7 +78,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v4-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Check Cache shell: bash -l {0} diff --git a/.github/workflows/build_variant.yml b/.github/workflows/build_variant.yml index 853b327978..7e663b1df6 100644 --- a/.github/workflows/build_variant.yml +++ b/.github/workflows/build_variant.yml @@ -24,7 +24,7 @@ jobs: compiler: [ gnu, clang, mpi ] hdf5: [ V110 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] steps: - uses: actions/checkout@v3 @@ -41,7 +41,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v4-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Build TPL-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} if: steps.cache-TPL.outputs.cache-hit != 'true' @@ -62,7 +62,7 @@ jobs: matrix: hdf5: [ V110 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] config: - { name: "Debug serial build", @@ -317,7 +317,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v4-${{ runner.os }}-${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1-${{ runner.os }}-${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Check Cache shell: bash -l {0} diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index e3b633a02f..22e2fc02ed 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -14,7 +14,7 @@ jobs: compiler: [ gnu ] hdf5: [ V110 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] steps: - uses: actions/checkout@v3 @@ -31,7 +31,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v2-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Build TPL-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} if: steps.cache-TPL.outputs.cache-hit != 'true' @@ -55,7 +55,7 @@ jobs: compiler: [ gnu ] hdf5: [ V110 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] steps: - uses: actions/checkout@v3 @@ -69,7 +69,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v2-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Check Cache shell: bash -l {0} diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml index f4e6378c55..b91f27756a 100644 --- a/.github/workflows/intel-build.yml +++ b/.github/workflows/intel-build.yml @@ -23,7 +23,7 @@ jobs: compiler: [ intel, mpi ] hdf5: [ V114 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] defaults: run: @@ -67,7 +67,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v5intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Build TPL-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} if: steps.cache-TPL.outputs.cache-hit != 'true' @@ -89,7 +89,7 @@ jobs: compiler: [ intel, mpi ] hdf5: [ V114 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] steps: - name: Maximize build space @@ -126,7 +126,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v5intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Check Cache shell: bash -l {0} diff --git a/install-tpl.sh b/install-tpl.sh index d7fe2335f7..363131298e 100755 --- a/install-tpl.sh +++ b/install-tpl.sh @@ -427,7 +427,7 @@ then hdf_version="1.13.1" hdf_base="1.13" elif [ "${H5VERSION}" == "V114" ]; then - hdf_version="1.14.2" + hdf_version="1.14.3" hdf_base="1.14" hdf_suffix="" elif [ "${H5VERSION}" == "develop" ]; then From 536dc7f945a094c810530ba96f31cc0921d069fe Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 7 Nov 2023 12:02:58 -0700 Subject: [PATCH 024/110] CI: Use released version of fmt; accidentally comitted trunk --- install-tpl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-tpl.sh b/install-tpl.sh index 363131298e..00d852a2e9 100755 --- a/install-tpl.sh +++ b/install-tpl.sh @@ -783,7 +783,7 @@ then then echo "${txtgrn}+++ Configuring, Building, and Installing...${txtrst}" cd fmt || exit -# git checkout ${fmt_version} + git checkout ${fmt_version} rm -rf build mkdir build cd build || exit From 2959602dfa892a110ad18ef566cc05cf31f70cce Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 7 Nov 2023 13:20:25 -0700 Subject: [PATCH 025/110] CI: Use release version of fmt for intel build --- .github/workflows/intel-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml index b91f27756a..7070447ce1 100644 --- a/.github/workflows/intel-build.yml +++ b/.github/workflows/intel-build.yml @@ -67,7 +67,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v1intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v2intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Build TPL-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} if: steps.cache-TPL.outputs.cache-hit != 'true' @@ -126,7 +126,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v1intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v2intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Check Cache shell: bash -l {0} From b40650b494a0cee49847938f32a163efc39f07ef Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 7 Nov 2023 16:44:32 -0700 Subject: [PATCH 026/110] IOSS: Refactor io_shell compare functionality; add basic assembly --- .../seacas/libraries/ioss/src/Ioss_Compare.C | 317 +++++++----------- 1 file changed, 118 insertions(+), 199 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_Compare.C b/packages/seacas/libraries/ioss/src/Ioss_Compare.C index 84858cd73f..92c53d8d1c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Compare.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Compare.C @@ -4,8 +4,6 @@ // // See packages/seacas/LICENSE for details -#include -#include #include #include #include @@ -15,9 +13,11 @@ #include #include +#include "Ioss_Assembly.h" #include "Ioss_CommSet.h" #include "Ioss_Compare.h" #include "Ioss_CoordinateFrame.h" +#include "Ioss_DataPool.h" #include "Ioss_EdgeBlock.h" #include "Ioss_EdgeSet.h" #include "Ioss_ElementBlock.h" @@ -28,6 +28,7 @@ #include "Ioss_Field.h" #include "Ioss_GroupingEntity.h" #include "Ioss_IOFactory.h" +#include "Ioss_MeshCopyOptions.h" #include "Ioss_MeshType.h" #include "Ioss_NodeBlock.h" #include "Ioss_NodeSet.h" @@ -69,32 +70,22 @@ namespace { std::ostringstream &buf); bool compare_qa_info(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, std::ostringstream &buf); - bool compare_nodeblock(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf); - bool compare_elementblocks(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf); - bool compare_edgeblocks(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf); - bool compare_faceblocks(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf); - bool compare_structuredblocks(const Ioss::Region &input_region_1, - const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf); - bool compare_nodesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf); - bool compare_edgesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf); - bool compare_facesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf); - bool compare_elemsets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf); - bool compare_sidesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf); - bool compare_commsets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf); - bool compare_coordinate_frames(const Ioss::Region &input_region_1, - const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf); + bool compare_nodeblock(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2); + bool compare_assemblies(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2); + bool compare_elementblocks(const Ioss::Region &input_region_1, + const Ioss::Region &input_region_2); + bool compare_edgeblocks(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2); + bool compare_faceblocks(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2); + bool compare_structuredblocks(const Ioss::Region &input_region_1, + const Ioss::Region &input_region_2); + bool compare_nodesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2); + bool compare_edgesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2); + bool compare_facesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2); + bool compare_elemsets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2); + bool compare_sidesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2); + bool compare_commsets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2); + bool compare_coordinate_frames(const Ioss::Region &input_region_1, + const Ioss::Region &input_region_2); template bool compare_fields(const std::vector &in_entities_1, const std::vector &in_entities_2, Ioss::Field::RoleType role, std::ostringstream &buf); @@ -157,7 +148,7 @@ bool Ioss::Compare::compare_database(Ioss::Region &input_region_1, Ioss::Region { std::ostringstream buf; fmt::print(buf, "\nNODEBLOCK mismatch\n"); - if (!compare_nodeblock(input_region_1, input_region_2, options, buf)) { + if (!compare_nodeblock(input_region_1, input_region_2)) { overall_result = false; fmt::print(Ioss::OUTPUT(), "{}", buf.str()); } @@ -166,7 +157,7 @@ bool Ioss::Compare::compare_database(Ioss::Region &input_region_1, Ioss::Region { std::ostringstream buf; fmt::print(buf, "\nEDGEBLOCK mismatch\n"); - if (!compare_edgeblocks(input_region_1, input_region_2, options, buf)) { + if (!compare_edgeblocks(input_region_1, input_region_2)) { overall_result = false; fmt::print(Ioss::OUTPUT(), "{}", buf.str()); } @@ -174,7 +165,7 @@ bool Ioss::Compare::compare_database(Ioss::Region &input_region_1, Ioss::Region { std::ostringstream buf; fmt::print(buf, "\nFACEBLOCK mismatch\n"); - if (!compare_faceblocks(input_region_1, input_region_2, options, buf)) { + if (!compare_faceblocks(input_region_1, input_region_2)) { overall_result = false; fmt::print(Ioss::OUTPUT(), "{}", buf.str()); } @@ -182,7 +173,7 @@ bool Ioss::Compare::compare_database(Ioss::Region &input_region_1, Ioss::Region { std::ostringstream buf; fmt::print(buf, "\nELEMENTBLOCK mismatch\n"); - if (!compare_elementblocks(input_region_1, input_region_2, options, buf)) { + if (!compare_elementblocks(input_region_1, input_region_2)) { overall_result = false; fmt::print(Ioss::OUTPUT(), "{}", buf.str()); } @@ -191,7 +182,7 @@ bool Ioss::Compare::compare_database(Ioss::Region &input_region_1, Ioss::Region { std::ostringstream buf; fmt::print(buf, "\nSTRUCTUREDBLOCK mismatch\n"); - if (!compare_structuredblocks(input_region_1, input_region_2, options, buf)) { + if (!compare_structuredblocks(input_region_1, input_region_2)) { overall_result = false; fmt::print(Ioss::OUTPUT(), "{}", buf.str()); } @@ -200,7 +191,7 @@ bool Ioss::Compare::compare_database(Ioss::Region &input_region_1, Ioss::Region { std::ostringstream buf; fmt::print(buf, "\nNODESET mismatch\n"); - if (!compare_nodesets(input_region_1, input_region_2, options, buf)) { + if (!compare_nodesets(input_region_1, input_region_2)) { overall_result = false; fmt::print(Ioss::OUTPUT(), "{}", buf.str()); } @@ -209,7 +200,7 @@ bool Ioss::Compare::compare_database(Ioss::Region &input_region_1, Ioss::Region { std::ostringstream buf; fmt::print(buf, "\nEDGESET mismatch\n"); - if (!compare_edgesets(input_region_1, input_region_2, options, buf)) { + if (!compare_edgesets(input_region_1, input_region_2)) { overall_result = false; fmt::print(Ioss::OUTPUT(), "{}", buf.str()); } @@ -218,7 +209,7 @@ bool Ioss::Compare::compare_database(Ioss::Region &input_region_1, Ioss::Region { std::ostringstream buf; fmt::print(buf, "\nFACESET mismatch\n"); - if (!compare_facesets(input_region_1, input_region_2, options, buf)) { + if (!compare_facesets(input_region_1, input_region_2)) { overall_result = false; fmt::print(Ioss::OUTPUT(), "{}", buf.str()); } @@ -227,7 +218,7 @@ bool Ioss::Compare::compare_database(Ioss::Region &input_region_1, Ioss::Region { std::ostringstream buf; fmt::print(buf, "\nELEMSET mismatch\n"); - if (!compare_elemsets(input_region_1, input_region_2, options, buf)) { + if (!compare_elemsets(input_region_1, input_region_2)) { overall_result = false; fmt::print(Ioss::OUTPUT(), "{}", buf.str()); } @@ -236,7 +227,7 @@ bool Ioss::Compare::compare_database(Ioss::Region &input_region_1, Ioss::Region { std::ostringstream buf; fmt::print(buf, "\nSIDESET mismatch\n"); - if (!compare_sidesets(input_region_1, input_region_2, options, buf)) { + if (!compare_sidesets(input_region_1, input_region_2)) { overall_result = false; fmt::print(Ioss::OUTPUT(), "{}", buf.str()); } @@ -245,7 +236,7 @@ bool Ioss::Compare::compare_database(Ioss::Region &input_region_1, Ioss::Region { std::ostringstream buf; fmt::print(buf, "\nCOMMSET mismatch\n"); - if (!compare_commsets(input_region_1, input_region_2, options, buf)) { + if (!compare_commsets(input_region_1, input_region_2)) { overall_result = false; fmt::print(Ioss::OUTPUT(), "{}", buf.str()); } @@ -254,7 +245,16 @@ bool Ioss::Compare::compare_database(Ioss::Region &input_region_1, Ioss::Region { std::ostringstream buf; fmt::print(buf, "\nCOORDINATE FRAME mismatch\n"); - if (!compare_coordinate_frames(input_region_1, input_region_2, options, buf)) { + if (!compare_coordinate_frames(input_region_1, input_region_2)) { + overall_result = false; + fmt::print(Ioss::OUTPUT(), "{}", buf.str()); + } + } + + { + std::ostringstream buf; + fmt::print(buf, "\nASSEMBLY mismatch\n"); + if (!compare_assemblies(input_region_1, input_region_2)) { overall_result = false; fmt::print(Ioss::OUTPUT(), "{}", buf.str()); } @@ -1066,114 +1066,100 @@ namespace { return overall_result; } - bool compare_nodeblock(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions & /* options */, std::ostringstream &buf) + template + bool compare_entities(const std::vector &in_sets_1, const std::vector &in_sets_2, + const std::string &uc_type, const std::string &type) { bool overall_result = true; - const Ioss::NodeBlockContainer &in_nbs_1 = input_region_1.get_node_blocks(); - const Ioss::NodeBlockContainer &in_nbs_2 = input_region_2.get_node_blocks(); - - if (in_nbs_1.size() != in_nbs_2.size()) { - fmt::print(Ioss::WarnOut(), COUNT_MISMATCH, "NODEBLOCK", in_nbs_1.size(), in_nbs_2.size()); + if (in_sets_1.size() != in_sets_2.size()) { + fmt::print(Ioss::WarnOut(), COUNT_MISMATCH, uc_type, in_sets_1.size(), in_sets_2.size()); return false; } - for (const auto &inb : in_nbs_1) { - auto *nb2 = input_region_2.get_node_block(inb->name()); - if (nb2 == nullptr) { - fmt::print(Ioss::WarnOut(), NOTFOUND_2, "NODEBLOCK", inb->name()); - overall_result = false; + if (!in_sets_1.empty()) { + bool name_not_found = false; + for (const auto &in_set_1 : in_sets_1) { + const auto &name = in_set_1->name(); + // find a set in `in_sets_2` with the same name. + // if found, compare for equality... + bool found = false; + for (const auto &in_set_2 : in_sets_2) { + if (in_set_2->name() == name) { + found = true; + if (!in_set_1->equal(*in_set_2)) { + overall_result = false; + } + break; + } + } + if (!found) { + name_not_found = true; + fmt::print(Ioss::WarnOut(), NOTFOUND_2, type, in_set_1->name()); + overall_result = false; + } } - else if (!inb->equal(*nb2)) { - fmt::print(buf, "NODEBLOCK {} mismatch", inb->name()); - overall_result = false; + if (name_not_found) { + // If get here, then there is at least one entity in set 1 which is not in set 2. + // Since set_1.size() == set_2.size(), then there is at least one entity in set 2 which is + // not in set_1. Find it/them and print out the namns... + for (const auto &in_set_2 : in_sets_2) { + const auto &name = in_set_2->name(); + // find a set in `in_sets_1` with the same name. + bool found = false; + for (const auto &in_set_1 : in_sets_1) { + if (in_set_1->name() == name) { + found = true; + break; + } + } + if (!found) { + name_not_found = true; + fmt::print(Ioss::WarnOut(), NOTFOUND_1, type, in_set_2->name()); + overall_result = false; + } + } } } return overall_result; } - template - bool compare_blocks(const std::vector &in_blocks_1, const std::vector &in_blocks_2, - const Ioss::MeshCopyOptions & /* options */, std::ostringstream & /* buf */) + bool compare_nodeblock(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2) { - bool overall_result = true; - - if (in_blocks_1.size() != in_blocks_2.size()) { - fmt::print(Ioss::WarnOut(), COUNT_MISMATCH, "BLOCK", in_blocks_1.size(), in_blocks_2.size()); - return false; - } - - for (const auto &in_block_1 : in_blocks_1) { - const auto &name = in_block_1->name(); - bool found = false; - for (const auto &in_block_2 : in_blocks_2) { - if (in_block_2->name() == name) { - found = true; - if (!in_block_1->equal(*in_block_2)) { - overall_result = false; - } - break; - } - } - if (!found) { - fmt::print(Ioss::WarnOut(), NOTFOUND_2, "BLOCK", in_block_1->name()); - overall_result = false; - } - } - return overall_result; + const Ioss::NodeBlockContainer &in_nbs_1 = input_region_1.get_node_blocks(); + const Ioss::NodeBlockContainer &in_nbs_2 = input_region_2.get_node_blocks(); + return compare_entities(in_nbs_1, in_nbs_2, "NODEBLOCK", "nodeblock"); } - bool compare_elementblocks(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf) + bool compare_elementblocks(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2) { const auto &in_ebs_1 = input_region_1.get_element_blocks(); const auto &in_ebs_2 = input_region_2.get_element_blocks(); - if (!compare_blocks(in_ebs_1, in_ebs_2, options, buf)) { - fmt::print(buf, "\nELEMENTBLOCKS mismatch\n"); - return false; - } - return true; + return compare_entities(in_ebs_1, in_ebs_2, "ELEMENTBLOCK", "element block"); } - bool compare_edgeblocks(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf) + bool compare_edgeblocks(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2) { const auto &in_ebs_1 = input_region_1.get_edge_blocks(); const auto &in_ebs_2 = input_region_2.get_edge_blocks(); - if (!compare_blocks(in_ebs_1, in_ebs_2, options, buf)) { - fmt::print(buf, "\nEDGEBLOCKS mismatch\n"); - return false; - } - return true; + return compare_entities(in_ebs_1, in_ebs_2, "EDGEBLOCK", "edge block"); } - bool compare_faceblocks(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf) + bool compare_faceblocks(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2) { const auto &in_fbs_1 = input_region_1.get_face_blocks(); const auto &in_fbs_2 = input_region_2.get_face_blocks(); - if (!compare_blocks(in_fbs_1, in_fbs_2, options, buf)) { - fmt::print(buf, "\nFACEBLOCKS mismatch\n"); - return false; - } - return true; + return compare_entities(in_fbs_1, in_fbs_2, "FACEBLOCK", "face block"); } bool compare_structuredblocks(const Ioss::Region &input_region_1, - const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions & /* options */, - std::ostringstream & /* buf */) + const Ioss::Region &input_region_2) { bool overall_result = true; - const auto &in_blocks_1 = input_region_1.get_structured_blocks(); - const auto &in_blocks_orig_2 = input_region_2.get_structured_blocks(); - - // COPY the const input vector so that we can remove elements as they're matched without - // affecting the original data structure. - std::vector in_blocks_2 = in_blocks_orig_2; + const auto &in_blocks_1 = input_region_1.get_structured_blocks(); + const auto &in_blocks_2 = input_region_2.get_structured_blocks(); if (in_blocks_1.size() != in_blocks_2.size()) { fmt::print(Ioss::WarnOut(), COUNT_MISMATCH, "STRUCTUREDBLOCK", in_blocks_1.size(), @@ -1206,124 +1192,57 @@ namespace { return overall_result; } - template - bool compare_sets(const std::vector &in_sets_1, const std::vector &in_sets_2, - const Ioss::MeshCopyOptions & /* options */, std::ostringstream & /* buf */) - { - bool overall_result = true; - - if (in_sets_1.size() != in_sets_2.size()) { - fmt::print(Ioss::WarnOut(), COUNT_MISMATCH, "set", in_sets_1.size(), in_sets_2.size()); - return false; - } - - if (!in_sets_1.empty()) { - for (const auto &in_set_1 : in_sets_1) { - const auto &name = in_set_1->name(); - // find a set in `in_sets_2` with the same name. - // if found, compare for equality... - bool found = false; - for (const auto &in_set_2 : in_sets_2) { - if (in_set_2->name() == name) { - found = true; - if (!in_set_1->equal(*in_set_2)) { - overall_result = false; - } - break; - } - } - if (!found) { - fmt::print(Ioss::WarnOut(), NOTFOUND_2, "set", in_set_1->name()); - overall_result = false; - } - } - } - - return overall_result; - } - - bool compare_nodesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf) + bool compare_nodesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2) { const auto &in_nss_1 = input_region_1.get_nodesets(); const auto &in_nss_2 = input_region_2.get_nodesets(); - bool rc = compare_sets(in_nss_1, in_nss_2, options, buf); - if (!rc) { - fmt::print(buf, "\nNODESET mismatch\n"); - } - - return rc; + return compare_entities(in_nss_1, in_nss_2, "NODESET", "nodeset"); } - bool compare_edgesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf) + bool compare_edgesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2) { const auto &in_ess_1 = input_region_1.get_edgesets(); const auto &in_ess_2 = input_region_2.get_edgesets(); - bool rc = compare_sets(in_ess_1, in_ess_2, options, buf); - if (!rc) { - fmt::print(buf, "\nEDGESET mismatch\n"); - } - - return rc; + return compare_entities(in_ess_1, in_ess_2, "EDGESET", "edgeset"); } - bool compare_facesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf) + bool compare_facesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2) { const auto &in_fss_1 = input_region_1.get_facesets(); const auto &in_fss_2 = input_region_2.get_facesets(); - bool rc = compare_sets(in_fss_1, in_fss_2, options, buf); - if (!rc) { - fmt::print(buf, "\nFACESET mismatch\n"); - } - - return rc; + return compare_entities(in_fss_1, in_fss_2, "FACESET", "faceset"); } - bool compare_elemsets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf) + bool compare_elemsets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2) { const auto &in_ess_1 = input_region_1.get_elementsets(); const auto &in_ess_2 = input_region_2.get_elementsets(); - bool rc = compare_sets(in_ess_1, in_ess_2, options, buf); - if (!rc) { - fmt::print(buf, "\nELEMSET mismatch\n"); - } - - return rc; + return compare_entities(in_ess_1, in_ess_2, "ELEMSET", "elemset"); } - bool compare_sidesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf) + bool compare_sidesets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2) { const auto &in_sss_1 = input_region_1.get_sidesets(); const auto &in_sss_2 = input_region_2.get_sidesets(); - bool rc = compare_sets(in_sss_1, in_sss_2, options, buf); - if (!rc) { - fmt::print(buf, "\nSIDESET mismatch\n"); - } - - return rc; + return compare_entities(in_sss_1, in_sss_2, "SIDESET", "sideset"); } - bool compare_commsets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions &options, std::ostringstream &buf) + bool compare_commsets(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2) { const auto &in_css_1 = input_region_1.get_commsets(); const auto &in_css_2 = input_region_2.get_commsets(); + return compare_entities(in_css_1, in_css_2, "COMMSET", "commset"); + } - bool rc = compare_sets(in_css_1, in_css_2, options, buf); - if (!rc) { - fmt::print(buf, "\nCOMMSET mismatch\n"); - } - return rc; + bool compare_assemblies(const Ioss::Region &input_region_1, const Ioss::Region &input_region_2) + { + const auto &in_assem_1 = input_region_1.get_assemblies(); + const auto &in_assem_2 = input_region_2.get_assemblies(); + return compare_entities(in_assem_1, in_assem_2, "ASSEMBLY", "assembly"); } bool compare_coordinate_frames(const Ioss::Region &input_region_1, - const Ioss::Region &input_region_2, - const Ioss::MeshCopyOptions & /* options */, - std::ostringstream & /* buf */) + const Ioss::Region &input_region_2) { bool overall_result = true; From 71f302dfe7394361a2f017c1619e48217abd01d9 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 7 Nov 2023 16:45:20 -0700 Subject: [PATCH 027/110] EXODIFF: Add minimal assembly support (no diff; summary only) --- packages/seacas/applications/exodiff/exoII_read.C | 1 + packages/seacas/applications/exodiff/exoII_read.h | 2 ++ packages/seacas/applications/exodiff/exodiff.C | 12 ++++++------ packages/seacas/applications/exodiff/map.C | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/seacas/applications/exodiff/exoII_read.C b/packages/seacas/applications/exodiff/exoII_read.C index b55bd3ec70..ba97684ac0 100644 --- a/packages/seacas/applications/exodiff/exoII_read.C +++ b/packages/seacas/applications/exodiff/exoII_read.C @@ -965,6 +965,7 @@ template void ExoII_Read::Get_Init_Data() num_side_sets = info.num_side_sets; num_edge_blocks = info.num_edge_blk; num_face_blocks = info.num_face_blk; + num_assemblies = info.num_assembly; title = info.title; if (err > 0 && !interFace.quiet_flag) { diff --git a/packages/seacas/applications/exodiff/exoII_read.h b/packages/seacas/applications/exodiff/exoII_read.h index 3cef8ec061..31038805b8 100644 --- a/packages/seacas/applications/exodiff/exoII_read.h +++ b/packages/seacas/applications/exodiff/exoII_read.h @@ -60,6 +60,7 @@ template class ExoII_Read size_t Num_Elements() const { return num_elmts; } size_t Num_Faces() const { return num_faces; } size_t Num_Edges() const { return num_edges; } + size_t Num_Assemblies() const { return num_assemblies; } size_t Num_Node_Sets() const { return num_node_sets; } size_t Num_Side_Sets() const { return num_side_sets; } size_t Num_Edge_Blocks() const { return num_edge_blocks; } @@ -204,6 +205,7 @@ template class ExoII_Read size_t num_side_sets{0}; size_t num_edge_blocks{0}; size_t num_face_blocks{0}; + size_t num_assemblies{0}; float db_version{0.0}; float api_version{0.0}; int io_word_size{0}; // Note: The "compute word size" is always 8. diff --git a/packages/seacas/applications/exodiff/exodiff.C b/packages/seacas/applications/exodiff/exodiff.C index 6398c0d50f..7342fc84c9 100644 --- a/packages/seacas/applications/exodiff/exodiff.C +++ b/packages/seacas/applications/exodiff/exodiff.C @@ -56,15 +56,15 @@ struct TimeInterp std::string Date() { - time_t calendar_time = time(nullptr); + time_t calendar_time = time(nullptr); #if defined __NVCC__ char tbuf[32]; - struct tm *local_time = localtime(&calendar_time); + struct tm *local_time = localtime(&calendar_time); strftime(tbuf, 32, "%Y/%m/%d %H:%M:%S %Z", local_time); std::string time_string(tbuf); #else - auto const local_time = fmt::localtime(calendar_time); - auto time_string = fmt::format("{:%Y/%m/%d %H:%M:%S %Z}", local_time); + auto const local_time = fmt::localtime(calendar_time); + auto time_string = fmt::format("{:%Y/%m/%d %H:%M:%S %Z}", local_time); #endif return time_string; } @@ -300,7 +300,7 @@ namespace { "{0} Title: {2}\n" "{0} Dim = {3}, Nodes = {5}, Elements = {6}, Faces = {20}, Edges = {21}\n" "{0} Element Blocks = {4}, Face Blocks = {10}, Edge Blocks = {9}, Nodesets = {7}, " - "Sidesets = {8}\n" + "Sidesets = {8}, Assemblies = {22}\n" "{0} Vars: Global = {11}, Nodal = {12}, Element = {13}, Face = {17}, Edge = {18}, " "Nodeset = {14}, Sideset = {15}, Times = {16}\n\n", prefix, fi.realpath(), file.Title(), file.Dimension(), file.Num_Element_Blocks(), @@ -308,7 +308,7 @@ namespace { file.Num_Edge_Blocks(), file.Num_Face_Blocks(), file.Num_Global_Vars(), file.Num_Nodal_Vars(), file.Num_Element_Vars(), file.Num_NS_Vars(), file.Num_SS_Vars(), file.Num_Times(), file.Num_FB_Vars(), file.Num_EB_Vars(), count, file.Num_Faces(), - file.Num_Edges()); + file.Num_Edges(), file.Num_Assemblies()); } void initialize(std::vector &mm_entity, size_t size, const ToleranceType &ttype) diff --git a/packages/seacas/applications/exodiff/map.C b/packages/seacas/applications/exodiff/map.C index 2c29f7d4a1..297ba7057d 100644 --- a/packages/seacas/applications/exodiff/map.C +++ b/packages/seacas/applications/exodiff/map.C @@ -619,7 +619,7 @@ namespace { } else { Error(fmt::format("Unable to match {0} {1} in first file with {0} in second file.\n", type, - file1_id_map[id1[i]])); + fmt::group_digits(file1_id_map[id1[i]]))); } } From aa79d2537c731b45ab434ba769f0ea5dbe5cca1e Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 8 Nov 2023 09:31:09 -0700 Subject: [PATCH 028/110] Patches for latest llvm --- .../seacas/applications/nem_slice/fix_column_partitions.C | 1 + packages/seacas/applications/nem_spread/pe_load_lb_info.C | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/seacas/applications/nem_slice/fix_column_partitions.C b/packages/seacas/applications/nem_slice/fix_column_partitions.C index fe202b6fbc..dd269cab67 100644 --- a/packages/seacas/applications/nem_slice/fix_column_partitions.C +++ b/packages/seacas/applications/nem_slice/fix_column_partitions.C @@ -12,6 +12,7 @@ #include "fix_column_partitions.h" #include #include +#include #include #include #include diff --git a/packages/seacas/applications/nem_spread/pe_load_lb_info.C b/packages/seacas/applications/nem_spread/pe_load_lb_info.C index 3f90da10e2..4013ee2d9a 100644 --- a/packages/seacas/applications/nem_spread/pe_load_lb_info.C +++ b/packages/seacas/applications/nem_spread/pe_load_lb_info.C @@ -5,7 +5,8 @@ * * See packages/seacas/LICENSE for details */ -#include "exodusII.h" // for ex_inquire, ex_opts, etc +#include "el_check_monot.h" // for check_monot +#include "exodusII.h" // for ex_inquire, ex_opts, etc #include "fmt/ostream.h" #include "globals.h" // for ELEM_COMM_MAP, etc #include "nem_spread.h" // for NemSpread, etc @@ -232,7 +233,7 @@ template void NemSpread::load_lb_info() /* Check that globals.GNodes is monotonic, from i = 0 to Num_Internal_Nodes */ #ifdef DEBUG - assert(check_monot(globals.GNodes[iproc], globals.Num_Internal_Nodes[iproc])); + assert(check_monot(&globals.GNodes[iproc], globals.Num_Internal_Nodes[iproc])); /* * Check that globals.GNodes is monotonic, from i = Num_Internal_Nodes to From bcc295250d5f90cd8262a5da37dab1a3410b5e2d Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 8 Nov 2023 10:42:50 -0700 Subject: [PATCH 029/110] EXODIFF: Support for assembly metadata --- .../applications/exodiff/CMakeLists.txt | 1 + .../seacas/applications/exodiff/ED_Version.h | 4 +- packages/seacas/applications/exodiff/check.C | 137 ++++++++++++++++-- .../seacas/applications/exodiff/exoII_read.C | 75 +++++++++- .../seacas/applications/exodiff/exoII_read.h | 7 + .../seacas/applications/exodiff/exo_entity.C | 69 ++++----- 6 files changed, 248 insertions(+), 45 deletions(-) diff --git a/packages/seacas/applications/exodiff/CMakeLists.txt b/packages/seacas/applications/exodiff/CMakeLists.txt index aff6048a14..c508246c13 100644 --- a/packages/seacas/applications/exodiff/CMakeLists.txt +++ b/packages/seacas/applications/exodiff/CMakeLists.txt @@ -11,6 +11,7 @@ SET(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/ED_SystemInterface.C ${CMAKE_CURRENT_SOURCE_DIR}/exodiff.C ${CMAKE_CURRENT_SOURCE_DIR}/Tolerance.C ${CMAKE_CURRENT_SOURCE_DIR}/face_block.C + ${CMAKE_CURRENT_SOURCE_DIR}/assembly.C ${CMAKE_CURRENT_SOURCE_DIR}/check.C ${CMAKE_CURRENT_SOURCE_DIR}/map.C ${CMAKE_CURRENT_SOURCE_DIR}/create_file.C diff --git a/packages/seacas/applications/exodiff/ED_Version.h b/packages/seacas/applications/exodiff/ED_Version.h index 6fa19b28f2..64e837111a 100644 --- a/packages/seacas/applications/exodiff/ED_Version.h +++ b/packages/seacas/applications/exodiff/ED_Version.h @@ -5,5 +5,5 @@ // See packages/seacas/LICENSE for details #pragma once -static std::string version("3.26"); -static std::string verdate("2023-05-01"); +static std::string version("3.27"); +static std::string verdate("2023-11-08"); diff --git a/packages/seacas/applications/exodiff/check.C b/packages/seacas/applications/exodiff/check.C index d6f9a2e5f4..d90ea6a253 100644 --- a/packages/seacas/applications/exodiff/check.C +++ b/packages/seacas/applications/exodiff/check.C @@ -10,6 +10,7 @@ #include "ED_SystemInterface.h" #include "Tolerance.h" +#include "assembly.h" #include "exoII_read.h" #include "exo_block.h" #include "exodusII.h" @@ -40,6 +41,9 @@ namespace { bool Check_Element_Block_Connectivity(Exo_Block *block1, Exo_Block *block2, const std::vector &elmt_map, const std::vector &node_map); + template bool Check_Assembly(ExoII_Read &file1, ExoII_Read &file2); + template + bool Check_Assembly_Params(const Assembly *assembly1, const Assembly *assembly2); bool close_compare(const std::string &st1, const std::string &st2); } // namespace @@ -102,6 +106,14 @@ void Check_Compatible_Meshes(ExoII_Read &file1, ExoII_Read &file2, boo is_diff = true; } + if (!Check_Assembly(file1, file2)) { + Warning(fmt::format(".. Differences found in assembly metadata or assembly entity lists. {}\n", + interFace.pedantic ? "" : "[ignored]")); + if (interFace.pedantic) { + is_diff = true; + } + } + if (is_diff) { Warning(".. Differences found in mesh (non-transient) data. Aborting...\n"); exit(1); @@ -230,6 +242,70 @@ namespace { return is_same; } + template bool Check_Assembly(ExoII_Read &file1, ExoII_Read &file2) + { + bool is_same = true; + if (file1.Num_Assembly() != file2.Num_Assembly()) { + Warning(fmt::format(".. The number of assemblies ({}) in the first file does not match the " + "number ({}) in the second file.\n", + file1.Num_Assembly(), file2.Num_Assembly())); + is_same = false; + } + + // Verify that assemblies match in the two files... + size_t matched = 0; + for (size_t b = 0; b < file1.Num_Assembly(); ++b) { + Assembly *assembly1 = file1.Get_Assembly_by_Index(b); + Assembly *assembly2 = nullptr; + if (assembly1 != nullptr) { + if (interFace.by_name) { + assembly2 = file2.Get_Assembly_by_Name(assembly1->Name()); + } + else { + assembly2 = file2.Get_Assembly_by_Id(assembly1->Id()); + } + if (assembly2 == nullptr) { + Warning(fmt::format(".. Assembly '{}' with id {} exists in first " + "file but not the second.\n", + assembly1->Name(), assembly1->Id())); + is_same = false; + } + else { + matched++; + if (!Check_Assembly_Params(assembly1, assembly2)) { + is_same = false; + } + } + } + } + if (matched != file2.Num_Assembly()) { + for (size_t b = 0; b < file2.Num_Assembly(); ++b) { + Assembly *assembly2 = file2.Get_Assembly_by_Index(b); + Assembly *assembly1 = nullptr; + if (assembly2 != nullptr) { + if (interFace.by_name) { + assembly1 = file1.Get_Assembly_by_Name(assembly2->Name()); + } + else { + assembly1 = file1.Get_Assembly_by_Id(assembly2->Id()); + } + if (assembly1 == nullptr) { + Warning(fmt::format(".. Assembly '{}' with id {} exists in second " + "file but not the first.\n", + assembly2->Name(), assembly2->Id())); + is_same = false; + } + else { + if (!Check_Assembly_Params(assembly2, assembly1)) { + is_same = false; + } + } + } + } + } + return is_same; + } + template bool Check_Element_Block_Connectivity(Exo_Block *block1, Exo_Block *block2, const std::vector &elmt_map, @@ -313,44 +389,87 @@ namespace { return is_same; } + template + bool Check_Assembly_Params(const Assembly *assembly1, const Assembly *assembly2) + { + bool is_same = true; + SMART_ASSERT(assembly1 && assembly2); + + if (interFace.by_name && assembly1->Id() != assembly2->Id()) { + Warning(fmt::format(".. Assembly '{}' ids don't agree ({} != {}).\n", assembly1->Name(), + assembly1->Id(), assembly2->Id())); + is_same = false; + } + if (!interFace.by_name && assembly1->Name() != assembly2->Name()) { + Warning(fmt::format(".. Assembly {} names don't agree ('{}' != '{}').\n", assembly1->Id(), + assembly1->Name(), assembly2->Name())); + is_same = false; + } + if (assembly1->Type() != assembly2->Type()) { + Warning(fmt::format(".. Assembly '{}': entity types don't agree ({} != {}).\n", + assembly1->Name(), ex_name_of_object(assembly1->Type()), + ex_name_of_object(assembly2->Type()))); + is_same = false; + } + if (assembly1->Size() != assembly2->Size()) { + Warning(fmt::format(".. Assembly '{}': number of entities doesn't agree ({} != {}).\n", + assembly1->Name(), assembly1->Size(), assembly2->Size())); + is_same = false; + } + if ((assembly1->Type() == assembly2->Type()) && (assembly1->Size() == assembly2->Size())) { + // Check membership of the entities list... + if (!std::is_permutation(assembly1->Entities().begin(), assembly1->Entities().end(), + assembly2->Entities().begin())) { + Warning(fmt::format(".. Assembly '{}': entity list on first file ({}) does not match " + "entity list on second file ({}).\n", + assembly1->Name(), fmt::join(assembly1->Entities(), ", "), + fmt::join(assembly2->Entities(), ", "))); + is_same = false; + } + } + + return is_same; + } + template bool Check_Element_Block_Params(const Exo_Block *block1, const Exo_Block *block2) { bool is_same = true; SMART_ASSERT(block1 && block2); - if (!interFace.by_name && block1->Id() != block2->Id()) { - Warning(fmt::format(".. Block ids don't agree ({} != {}\n", block1->Id(), block2->Id())); + if (interFace.by_name && block1->Id() != block2->Id()) { + Warning(fmt::format(".. Block '{}' ids don't agree ({} != {}).\n", block1->Name(), + block1->Id(), block2->Id())); is_same = false; } - if (interFace.by_name && block1->Name() != block2->Name()) { - Warning( - fmt::format(".. Block names don't agree ({} != {}).\n", block1->Name(), block2->Name())); + if (!interFace.by_name && block1->Name() != block2->Name()) { + Warning(fmt::format(".. Block {} names don't agree ({} != {}).\n", block1->Id(), + block1->Name(), block2->Name())); is_same = false; } if (!(no_case_equals(block1->Element_Type(), block2->Element_Type()))) { if (!interFace.short_block_check || !close_compare(block1->Element_Type(), block2->Element_Type())) { - Warning(fmt::format(".. Block {}: element types don't agree ({} != {}).\n", block1->Id(), + Warning(fmt::format(".. Block {}: element types don't agree ({} != {}).\n", block1->Name(), block1->Element_Type(), block2->Element_Type())); is_same = false; } } if (block1->Size() != block2->Size()) { Warning(fmt::format(".. Block {}: number of elements doesn't agree ({} != {}).\n", - block1->Id(), block1->Size(), block2->Size())); + block1->Name(), block1->Size(), block2->Size())); is_same = false; } if (block1->Num_Nodes_per_Element() != block2->Num_Nodes_per_Element()) { Warning(fmt::format(".. Block {}: number of nodes per element doesn't agree ({} != {}).\n", - block1->Id(), block1->Num_Nodes_per_Element(), + block1->Name(), block1->Num_Nodes_per_Element(), block2->Num_Nodes_per_Element())); is_same = false; } #if 0 if (block1->Num_Attributes() != block2->Num_Attributes()) { Warning(fmt::format(".. Block {}: number of attributes doesn't agree ({} != {}).\n" - block1->Id(), block1->Num_Attributes(), block2->Num_Attributes()); + block1->Name(), block1->Num_Attributes(), block2->Num_Attributes()); is_same = false; } #endif diff --git a/packages/seacas/applications/exodiff/exoII_read.C b/packages/seacas/applications/exodiff/exoII_read.C index ba97684ac0..3fb42b2096 100644 --- a/packages/seacas/applications/exodiff/exoII_read.C +++ b/packages/seacas/applications/exodiff/exoII_read.C @@ -5,7 +5,8 @@ // See packages/seacas/LICENSE for details #include "ED_SystemInterface.h" // for SystemInterface, etc -#include "edge_block.h" // for Edge_Block +#include "assembly.h" +#include "edge_block.h" // for Edge_Block #include "exoII_read.h" #include "exo_block.h" // for Exo_Block #include "exodusII.h" // for ex_init_params, ex_opts, etc @@ -188,6 +189,37 @@ Exo_Block *ExoII_Read::Get_Element_Block_by_Name(const std::string &na return nullptr; } +template +Assembly *ExoII_Read::Get_Assembly_by_Index(size_t block_index) const +{ + SMART_ASSERT(Check_State()); + SMART_ASSERT(block_index < num_assemblies); + return &assemblies[block_index]; +} + +template +Assembly *ExoII_Read::Get_Assembly_by_Name(const std::string &name) const +{ + SMART_ASSERT(Check_State()); + for (size_t i = 0; i < num_assemblies; i++) { + if (assemblies[i].Name() == name) { + return &assemblies[i]; + } + } + return nullptr; +} + +template Assembly *ExoII_Read::Get_Assembly_by_Id(size_t set_id) const +{ + SMART_ASSERT(Check_State()); + for (size_t i = 0; i < num_assemblies; i++) { + if (assemblies[i].Id() == set_id) { + return &assemblies[i]; + } + } + return nullptr; +} + template Exo_Entity *ExoII_Read::Get_Entity_by_Index(EXOTYPE type, size_t block_index) const { @@ -199,6 +231,7 @@ Exo_Entity *ExoII_Read::Get_Entity_by_Index(EXOTYPE type, size_t block_inde case EX_SIDE_SET: SMART_ASSERT(block_index < num_side_sets); return &ssets[block_index]; case EX_EDGE_BLOCK: SMART_ASSERT(block_index < num_edge_blocks); return &edge_blocks[block_index]; case EX_FACE_BLOCK: SMART_ASSERT(block_index < num_face_blocks); return &face_blocks[block_index]; + case EX_ASSEMBLY: SMART_ASSERT(block_index < num_assemblies); return &assemblies[block_index]; default: return nullptr; } } @@ -242,6 +275,13 @@ template Exo_Entity *ExoII_Read::Get_Entity_by_Id(EXOTYPE ty } } break; + case EX_ASSEMBLY: + for (size_t i = 0; i < num_assemblies; i++) { + if (assemblies[i].Id() == id) { + return &assemblies[i]; + } + } + break; default: return nullptr; } return nullptr; @@ -287,6 +327,13 @@ Exo_Entity *ExoII_Read::Get_Entity_by_Name(EXOTYPE type, const std::string } } break; + case EX_ASSEMBLY: + for (size_t i = 0; i < num_assemblies; i++) { + if (assemblies[i].Name() == name) { + return &assemblies[i]; + } + } + break; default: return nullptr; } return nullptr; @@ -1012,6 +1059,32 @@ template void ExoII_Read::Get_Init_Data() } free_name_array(coords, 3); + // Assembly Data... + delete[] assemblies; + assemblies = nullptr; + if (num_assemblies > 0) { + assemblies = new Assembly[num_assemblies]; + SMART_ASSERT(assemblies != nullptr); + std::vector ids(num_assemblies); + + err = ex_get_ids(file_id, EX_ASSEMBLY, ids.data()); + + if (err < 0) { + Error("Failed to get assembly ids! Aborting...\n"); + } + + for (size_t b = 0; b < num_assemblies; ++b) { + if (ids[b] <= EX_INVALID_ID) { + fmt::print(stderr, + "EXODIFF WARNING: Assembly Id " + "for assembly index {} is {} which is negative. This was returned by call to " + "ex_get_ids().\n", + b, ids[b]); + } + + assemblies[b].initialize(file_id, ids[b]); + } + } // Element Block Data... delete[] eblocks; diff --git a/packages/seacas/applications/exodiff/exoII_read.h b/packages/seacas/applications/exodiff/exoII_read.h index 31038805b8..3b0e359e18 100644 --- a/packages/seacas/applications/exodiff/exoII_read.h +++ b/packages/seacas/applications/exodiff/exoII_read.h @@ -27,6 +27,7 @@ template class Side_Set; template class Edge_Block; template class Face_Block; +template class Assembly; template class ExoII_Read { @@ -65,6 +66,7 @@ template class ExoII_Read size_t Num_Side_Sets() const { return num_side_sets; } size_t Num_Edge_Blocks() const { return num_edge_blocks; } size_t Num_Face_Blocks() const { return num_face_blocks; } + size_t Num_Assembly() const { return num_assemblies; } // Times: @@ -160,6 +162,10 @@ template class ExoII_Read Exo_Entity *Get_Entity_by_Id(EXOTYPE type, size_t id) const; Exo_Entity *Get_Entity_by_Name(EXOTYPE type, const std::string &name) const; + Assembly *Get_Assembly_by_Id(size_t id) const; + Assembly *Get_Assembly_by_Index(size_t assembly_index) const; + Assembly *Get_Assembly_by_Name(const std::string &name) const; + size_t Block_Id(size_t block_index) const; // Returns associated block id. Exo_Block *Get_Element_Block_by_Id(size_t id) const; Exo_Block *Get_Element_Block_by_Index(size_t block_index) const; @@ -215,6 +221,7 @@ template class ExoII_Read Side_Set *ssets{nullptr}; // Array. Edge_Block *edge_blocks{nullptr}; // Array. Face_Block *face_blocks{nullptr}; // Array. + Assembly *assemblies{nullptr}; double *nodes{nullptr}; // Matrix; dimension by num_nodes (row major form). // I.e., all x's then all y's, etc. diff --git a/packages/seacas/applications/exodiff/exo_entity.C b/packages/seacas/applications/exodiff/exo_entity.C index f005bf6798..007ce6918c 100644 --- a/packages/seacas/applications/exodiff/exo_entity.C +++ b/packages/seacas/applications/exodiff/exo_entity.C @@ -348,44 +348,46 @@ void Exo_Entity::internal_load_params() } } - numAttr = get_num_attributes(fileId, exodus_type(), id_, label()); - if (numAttr != 0) { - attributes_.resize(numAttr); + if (exodus_type() != EX_ASSEMBLY) { + numAttr = get_num_attributes(fileId, exodus_type(), id_, label()); + if (numAttr != 0) { + attributes_.resize(numAttr); - char **names = get_name_array(numAttr, name_size); - int err = ex_get_attr_names(fileId, exodus_type(), id_, names); - if (err < 0) { - Error(fmt::format( - "ExoII_Read::Get_Init_Data(): Failed to get {} attribute names! Aborting...\n", - label())); - } - - for (int vg = 0; vg < numAttr; ++vg) { - SMART_ASSERT(names[vg] != nullptr); - if (std::strlen(names[vg]) == 0) { - std::string name = "attribute_" + std::to_string(vg + 1); - attributeNames.push_back(name); + char **names = get_name_array(numAttr, name_size); + int err = ex_get_attr_names(fileId, exodus_type(), id_, names); + if (err < 0) { + Error(fmt::format( + "ExoII_Read::Get_Init_Data(): Failed to get {} attribute names! Aborting...\n", + label())); } - else if (static_cast(std::strlen(names[vg])) > name_size) { - fmt::print(stderr, fmt::fg(fmt::color::red), - "exodiff: ERROR: {} attribute names appear corrupt\n" - " A length is 0 or greater than name_size({})\n" - " Here are the names that I received from" - " a call to ex_get_attr_names(...):\n", - label(), name_size); - for (int k = 1; k <= numAttr; ++k) { - fmt::print(stderr, fmt::fg(fmt::color::red), "\t\t{}) \"{}\"\n", k, names[k - 1]); + + for (int vg = 0; vg < numAttr; ++vg) { + SMART_ASSERT(names[vg] != nullptr); + if (std::strlen(names[vg]) == 0) { + std::string name = "attribute_" + std::to_string(vg + 1); + attributeNames.push_back(name); + } + else if (static_cast(std::strlen(names[vg])) > name_size) { + fmt::print(stderr, fmt::fg(fmt::color::red), + "exodiff: ERROR: {} attribute names appear corrupt\n" + " A length is 0 or greater than name_size({})\n" + " Here are the names that I received from" + " a call to ex_get_attr_names(...):\n", + label(), name_size); + for (int k = 1; k <= numAttr; ++k) { + fmt::print(stderr, fmt::fg(fmt::color::red), "\t\t{}) \"{}\"\n", k, names[k - 1]); + } + fmt::print(stderr, fmt::fg(fmt::color::red), " Aborting...\n"); + exit(1); + } + else { + std::string n(names[vg]); + to_lower(n); + attributeNames.push_back(n); } - fmt::print(stderr, fmt::fg(fmt::color::red), " Aborting...\n"); - exit(1); - } - else { - std::string n(names[vg]); - to_lower(n); - attributeNames.push_back(n); } + free_name_array(names, numAttr); } - free_name_array(names, numAttr); } } @@ -423,6 +425,7 @@ namespace { { ex_inquiry inquiry = EX_INQ_INVALID; switch (exo_type) { + case EX_ASSEMBLY: inquiry = EX_INQ_ASSEMBLY; break; case EX_ELEM_BLOCK: inquiry = EX_INQ_ELEM_BLK; break; case EX_NODE_SET: inquiry = EX_INQ_NODE_SETS; break; case EX_SIDE_SET: inquiry = EX_INQ_SIDE_SETS; break; From 6b3128024966c1c85b1d23864c13395160736fd3 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 8 Nov 2023 10:43:36 -0700 Subject: [PATCH 030/110] EXODUS: use ex_entity_id instead of int64_t where appropriate --- .../libraries/exodus/include/exodusII.h | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/seacas/libraries/exodus/include/exodusII.h b/packages/seacas/libraries/exodus/include/exodusII.h index b386c6af66..2b6388ca43 100644 --- a/packages/seacas/libraries/exodus/include/exodusII.h +++ b/packages/seacas/libraries/exodus/include/exodusII.h @@ -368,7 +368,7 @@ typedef enum ex_type ex_type; typedef struct ex_attribute { ex_entity_type entity_type; - int64_t entity_id; + ex_entity_id entity_id; char name[NC_MAX_NAME + 1]; ex_type type; /* int, double, text */ size_t value_count; @@ -377,23 +377,23 @@ typedef struct ex_attribute typedef struct ex_blob { - int64_t id; - char *name; - int64_t num_entry; + ex_entity_id id; + char *name; + int64_t num_entry; } ex_blob; typedef struct ex_assembly { - int64_t id; + ex_entity_id id; char *name; ex_entity_type type; /* EX_ELEM_BLOCK or EX_ASSEMBLY */ int entity_count; - int64_t *entity_list; + ex_entity_id *entity_list; } ex_assembly; typedef struct ex_block { - int64_t id; + ex_entity_id id; ex_entity_type type; char topology[MAX_STR_LENGTH + 1]; int64_t num_entry; @@ -405,7 +405,7 @@ typedef struct ex_block typedef struct ex_set { - int64_t id; + ex_entity_id id; ex_entity_type type; int64_t num_entry; int64_t num_distribution_factor; @@ -642,8 +642,9 @@ EXODUS_EXPORT int ex_get_var_multi_time(int exoid, ex_entity_type var_type, int int beg_time_step, int end_time_step, void *var_vals); /* Read Edge Face or Element Variable Values Defined On Blocks or Sets Through Time */ -EXODUS_EXPORT int ex_get_var_time(int exoid, ex_entity_type var_type, int var_index, int64_t id, - int beg_time_step, int end_time_step, void *var_vals); +EXODUS_EXPORT int ex_get_var_time(int exoid, ex_entity_type var_type, int var_index, + ex_entity_id id, int beg_time_step, int end_time_step, + void *var_vals); /* Read Partial Edge Face or Element Variable Values on Blocks or Sets at a Time Step */ EXODUS_EXPORT int ex_get_partial_var(int exoid, int time_step, ex_entity_type var_type, From e4c56f1b8c288991f2c71d206e320d5550d41719 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 8 Nov 2023 10:46:36 -0700 Subject: [PATCH 031/110] EXODIFF: Add missing files --- .../seacas/applications/exodiff/assembly.C | 59 +++++++++++++++++++ .../seacas/applications/exodiff/assembly.h | 40 +++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 packages/seacas/applications/exodiff/assembly.C create mode 100644 packages/seacas/applications/exodiff/assembly.h diff --git a/packages/seacas/applications/exodiff/assembly.C b/packages/seacas/applications/exodiff/assembly.C new file mode 100644 index 0000000000..072ea43525 --- /dev/null +++ b/packages/seacas/applications/exodiff/assembly.C @@ -0,0 +1,59 @@ +// Copyright(C) 1999-2023 National Technology & Engineering Solutions +// of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with +// NTESS, the U.S. Government retains certain rights in this software. +// +// See packages/seacas/LICENSE for details + +#include "ED_SystemInterface.h" // for SystemInterface, interFace +#include "assembly.h" +#include "exodusII.h" // for ex_block, etc +#include "fmt/ostream.h" +#include "smart_assert.h" // for SMART_ASSERT +#include // for exit, nullptr +#include // for string, char_traits + +template Assembly::Assembly() : Exo_Entity() {} + +template +Assembly::Assembly(int file_id, size_t assembly_id) : Exo_Entity(file_id, assembly_id) +{ + SMART_ASSERT(file_id >= 0); + SMART_ASSERT((int)assembly_id > EX_INVALID_ID); + + initialize(file_id, assembly_id); +} + +template EXOTYPE Assembly::exodus_type() const { return EX_ASSEMBLY; } + +template void Assembly::entity_load_params() +{ + ex_assembly assembly{}; + assembly.id = id_; + int err = ex_get_assembly(fileId, &assembly); + + if (err < 0) { + Error("Assembly::entity_load_params(): Failed to get assembly" + " parameters! Aborting...\n"); + } + + entity_count = assembly.entity_count; + assembly_type = assembly.type; + entities.resize(entity_count); + + // Now fill in the entities list. + assembly.entity_list = entities.data(); + err = ex_get_assembly(fileId, &assembly); + + if (err < 0) { + Error("Assembly::entity_load_params(): Failed to get assembly" + " parameters! Aborting...\n"); + } +} + +template int Assembly::Check_State() const +{ + SMART_ASSERT(id_ >= EX_INVALID_ID); + return 1; +} +template class Assembly; +template class Assembly; diff --git a/packages/seacas/applications/exodiff/assembly.h b/packages/seacas/applications/exodiff/assembly.h new file mode 100644 index 0000000000..1554d6734a --- /dev/null +++ b/packages/seacas/applications/exodiff/assembly.h @@ -0,0 +1,40 @@ +// Copyright(C) 1999-2023 National Technology & Engineering Solutions +// of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with +// NTESS, the U.S. Government retains certain rights in this software. +// +// See packages/seacas/LICENSE for details +#pragma once + +#include "exo_entity.h" +#include + +#include + +template class ExoII_Read; + +template class Assembly : public Exo_Entity +{ +public: + Assembly(); + Assembly(int file_id, size_t assembly_id); + ~Assembly() override = default; + Assembly(const Assembly &) = delete; + const Assembly &operator=(const Assembly &) = delete; + + ex_entity_type Type() const { return assembly_type; } + const std::vector &Entities() const { return entities; } + +private: + int Check_State() const override; + void entity_load_params() override; + + EXOTYPE exodus_type() const override; + const char *label() const override { return "Assembly"; } + const char *short_label() const override { return "assembly"; } + + int entity_count{0}; + ex_entity_type assembly_type{EX_INVALID}; + std::vector entities{}; + + friend class ExoII_Read; +}; From 8f22a63c2f34f50ec42c4b6abb58917988ce30b4 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 8 Nov 2023 11:22:33 -0700 Subject: [PATCH 032/110] Update gold file now that exodiff checks assmeblies --- .../ioss/src/main/test/exodus_bc_parents.gold | Bin 276656 -> 463844 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/main/test/exodus_bc_parents.gold b/packages/seacas/libraries/ioss/src/main/test/exodus_bc_parents.gold index 1f7522188d8c07873f2ff91570e5b14a46bc654f..d85243b1b39782c661ecea47fd8f0cb2306268ec 100644 GIT binary patch literal 463844 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%0DHA$&(44+^NUT+ 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 literal 276656 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 QU@!xN85qpK|4at{56HWiApigX From 939e20418637bcb321118970300415dc48387773 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 8 Nov 2023 11:42:21 -0700 Subject: [PATCH 033/110] Another gold file missing assembly --- .../libraries/ioss/src/main/test/8-block.g | Bin 197044 -> 204068 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/main/test/8-block.g b/packages/seacas/libraries/ioss/src/main/test/8-block.g index 01501ed26074c1ffada4c2a61c9308637e8bd3fd..9b7bfc6a077af1adff89a8bd296bc8f64dc854bc 100644 GIT binary patch delta 5705 zcmeI0&2tmy9mi#ZgJT5Pc#U5on+I^ffGkV0{DR^JWJ$&XSu)o05<(-^*4o~%UMZ`! z!IajS8p4}Nj2~Yz!!$W?=)s3{$V{dk4*3Jpz)>KDu<#LtX zjWv5%o@R{ZaeW+=>#C8}HA6-E#2<3CrDblGOTRCz^F%fx>2htFQq7{4H(0t1l(2mI zy!5M?DqSgB*^8!TS*XR*CRi=_y#-1R|MAN&zxwgVeKcq_+`Gsc*XE*CG8-|EvWf4pNwxP13_8~90^9X&h;lL=n$aryZ8~L1?Wuu)? z3bU6Nu3qZq6|HXh zs7#mESNmo9e0?<`)1J51t@)Ttudc5im+7PR)uc?NP3zV?Ak%Z}t0|e@-xRcmo(a*v zh~#Mxb(izp4>!^yBKgr%YKi3VGX1?sjy|N1Me^hOwDN5pX3Wu;NSYSCB$89-=#ofY zj?pI~`5P~lDvsHGNXztmMaoVNKB3=KblS<^O7w|aqAx0T^GlhM%|cnEgIgr3Zx+fj zofpciM8AjfSSYjdf}4lTE>izii6-4VWOkVrgmP6vixPb(l&dmYO7x0QK9lL!ji; z=DK8$^V~LG+jW_K>L`o$I3GF6GJPhL8Is(ku!9%{_hMwEOEBgZGI0`rPk)yyIq0Dnbdun;iJj|)( zwas%wmmCG=2<0v})KkY}?!ufp9&?u)I_D@bM<@&2&=*2kfIIa(W`P^3*YnyI;EqtJ zZRlemP-71<|>(+~;Pu}_au0%SMAxUl6 zRLp5|ioegvJ`6h8>ThoibnHX-{Pmg1LLqNjXga4@%CJ&Yi8WnNi(#nUGh_sr`ZV77 zBV$Is%I79ohMk?uk9r9Xq7+Lx1=gNjtD3{BeWH*rY8JjT$b@Q*=X1sIiaRVt z)1EyuBz{JY52YeWFG(g+@yL*u3`7RKs%>#o8XFkFtT~H0ea;8GQfUna_3d+a@Wek=H6bGe%^RcI7$WTPCGa(4PS|NSvwIpy z^l0iQ_Jm2u*ABUB7a=iqRGHK*q8XMtrkbRvT~>)!B%PtwVa@U}^J)mmjN}XOE{>0$ zB2f)xSXZgiSVspv&2@xCF~bV(sEn02F{ZTzc2yCAE-SjO>T8vjT0;6`eH|h`d$nM%6QNsX+ptZ)3T~sZSO3NfNrD!_q zCoAXklDK^*IfjsKU$6tN;mZsWIdW`LpC-X>FJTWW0^VJ}(-^NjZmLR-WRy|WZfnhi zpyQa-0zN4fcDwgY8t8Z4C=$i#5$X@rkd$iS!}?{1LcT*j_9XXg!F;YvikM~Z&rQ`{ zLeA>iux*2>7TE_iX<73Ux4?)VQ>UQ zKrdil%4};Z4*I}RwD0OiA_0zp;~)tJKnkS6AUFYrKnBR*Bsc|5gEQa*a29+B&VgTo zk3bfj2MQPlBOnLZ&f+K-V>OH;p@EM9+gH@V1TX;G*kt>Cp8ylEokj~xf+=tjTmsYJ xGWZp^0)9Qie~v%+p{ufWR#LA^YRPw!TKe_9e*wWMWzGNq delta 1742 zcmai!O>7fa5XaXOn|wLoBunBXCW)3+L4>Bpg%{LTY9vfc+o+_pQY%!|PS^#T_$#&( z94Qi3iPRo)NHdk%L!|n!2M#_^B~nq91BX3u=z&8H95@8DsyO68RSq0DF!LUkXx)z| zjpz5~z5RRkFYP$L2Dfem<7eXU`7}-Ir0Ad+p=ir3WE1J!Q#@aYKzoHQ%bHMRstn;_@2bAJw$sD(>-N4I_cqVB{vA zqjY!;%ao2(uof7Hu_W#UCc6D8yKFqkYl-~UwpHn)sj3?V;@Vm(ZSvQI^JjW*1H6xOkC^Lak|TZl!dptbzEh1r1D)x zkCX+ZO;Xiya=!s-ODZojI#T&IqesdDuA1xANA!RJS1qZWVRWSOO-7HD1?|P2`SxXAP!{|ui3ZqBD z0&=Eo_X$;UmJ~kTOX#q0ipe8k0eMrlyGxb4C5?#agv#PC7(J}&0t(9FdsHbXi-QLV zmBr^6JuDm)Ft0qmLzQ{u@pDGy@##K750iZYipt|#R4FQt_ZXGONBapqobDG;k{;Kn zP*NU0U{oH5!-O7Ah6R+B$7@t6E02F;R35ht5PBFL5U`*;u2N+|dc4h~JbuRL;pm`% zMd>jX1`SwLCf6C2$&VR53=Ijmrc6!_8E{RRyum0XM+8)q$I}r5Di&5EW3(Jmhs4FNu(`GlKG4`fkb(!z|)i#-{Cq(Ad#ENzO2hJb>5QC zw#)mCv+HWgb=es^OT%__Hj}@^qmUMhg*0tqgYw@SYz$idqhX4FYw#|e{bz&mS32~c zU9@>R|Fy&aZ?KM!M*j3^oAt=54}%wuZ1%qu9vI}-cr^23-l_?7l)KRo;c4sV9O X_V+Y?qU|?Us^6?seZQ Date: Thu, 9 Nov 2023 11:43:34 -0700 Subject: [PATCH 034/110] EXODUS: Add double compute convert to float output test --- .../libraries/exodus/test/CMakeLists.txt | 1 + .../seacas/libraries/exodus/test/testall.in | 10 +- .../libraries/exodus/test/testwtd-to-f.c | 564 ++++++++++++++++++ 3 files changed, 574 insertions(+), 1 deletion(-) create mode 100644 packages/seacas/libraries/exodus/test/testwtd-to-f.c diff --git a/packages/seacas/libraries/exodus/test/CMakeLists.txt b/packages/seacas/libraries/exodus/test/CMakeLists.txt index 399f26ada9..1e8eea43c6 100644 --- a/packages/seacas/libraries/exodus/test/CMakeLists.txt +++ b/packages/seacas/libraries/exodus/test/CMakeLists.txt @@ -68,6 +68,7 @@ IF ( NETCDF_NCDUMP_BINARY ) SET( cbind_OLDTESTS testwt testwtd + testwtd-to-f testrd testrd1 testrdd diff --git a/packages/seacas/libraries/exodus/test/testall.in b/packages/seacas/libraries/exodus/test/testall.in index a0edf9a4cb..45d0a2e86f 100755 --- a/packages/seacas/libraries/exodus/test/testall.in +++ b/packages/seacas/libraries/exodus/test/testall.in @@ -1,5 +1,5 @@ #! /usr/bin/env bash -# Copyright(C) 1999-2021 National Technology & Engineering Solutions +# Copyright(C) 1999-2021, 2023 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. # @@ -120,6 +120,14 @@ ${NCDUMP} -d5,5 testcp.exo | grep -v version | grep -v int64_status| grep -v _Fi ret_status=$((ret_status+${PIPESTATUS[0]}+${PIPESTATUS[3]})) echo "end testcp_ds, status = $ret_status" >> test.output +echo "testwtd-to-f - double precision compute, convert to single precision on disk..." +echo "begin testwtd-to-f" >> test.output +${PREFIX} ${BINDIR}/testwtd-to-f${SUFFIX} >> test.output +ret_status=$((ret_status+$?)) +${NCDUMP} -d5,5 test.exo | grep -v version | grep -v int64_status| grep -v _FillValue |grep -v word_size|grep -v maximum_name_length | ${DIFF} - ${SRCDIR}/test.dmp | tee testwtd-to-f.res +ret_status=$((ret_status+${PIPESTATUS[0]}+${PIPESTATUS[5]})) +echo "end testwtd-to-f, status = $ret_status" >> test.output + echo "testwt1 - single precision write files with several side sets..." echo "testwt1 ... [Expect WEDGE6 warning from this test]" echo "begin testwt1" >> test.output diff --git a/packages/seacas/libraries/exodus/test/testwtd-to-f.c b/packages/seacas/libraries/exodus/test/testwtd-to-f.c new file mode 100644 index 0000000000..085a8b2d54 --- /dev/null +++ b/packages/seacas/libraries/exodus/test/testwtd-to-f.c @@ -0,0 +1,564 @@ +/* + * Copyright(C) 1999-2023 National Technology & Engineering Solutions + * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with + * NTESS, the U.S. Government retains certain rights in this software. + * + * See packages/seacas/LICENSE for details + */ +/***************************************************************************** + * + * testwt - test write an ExodusII database file + * + * This is a test program for the C binding of the EXODUS II + * database write routines. + * + *****************************************************************************/ + +#include +#include +#include + +#include "exodusII.h" +#include "exodusII_int.h" + +#define STRINGIFY(x) #x +#define TOSTRING(x) STRINGIFY(x) + +#define EXCHECK(funcall) \ + do { \ + int f_error = (funcall); \ + printf("after %s, error = %d\n", TOSTRING(funcall), f_error); \ + if (f_error != EX_NOERR && f_error != EX_WARN) { \ + fprintf(stderr, "Error calling %s\n", TOSTRING(funcall)); \ + ex_close(exoid); \ + exit(-1); \ + } \ + } while (0) + +int main(int argc, char **argv) +{ + ex_opts(EX_VERBOSE); + + /* Specify compute and i/o word size */ + int CPU_word_size = 8; /* sizeof(double) */ + int IO_word_size = 4; /* (4 bytes) */ + + /* create EXODUS II file */ + int exoid = ex_create("test.exo", /* filename path */ + EX_CLOBBER, /* create mode */ + &CPU_word_size, /* CPU double word size in bytes */ + &IO_word_size); /* I/O double word size in bytes */ + printf("after ex_create for test.exo, exoid = %d\n", exoid); + printf(" cpu word size: %d io word size: %d\n", CPU_word_size, IO_word_size); + + /* initialize file with parameters */ + int num_dim = 3; + int num_nodes = 33; + int num_elem = 7; + int num_elem_blk = 7; + int num_node_sets = 2; + int num_side_sets = 5; + + char *title = "This is a test"; + EXCHECK(ex_put_init(exoid, title, num_dim, num_nodes, num_elem, num_elem_blk, num_node_sets, + num_side_sets)); + + /* clang-format off */ + /* write nodal coordinates values and names to database */ + + /* Quad #1 */ + double x[100], y[100], z[100]; + x[0] = 0.0; y[0] = 0.0; z[0] = 0.0; + x[1] = 1.0; y[1] = 0.0; z[1] = 0.0; + x[2] = 1.0; y[2] = 1.0; z[2] = 0.0; + x[3] = 0.0; y[3] = 1.0; z[3] = 0.0; + + /* Quad #2 */ + x[4] = 1.0; y[4] = 0.0; z[4] = 0.0; + x[5] = 2.0; y[5] = 0.0; z[5] = 0.0; + x[6] = 2.0; y[6] = 1.0; z[6] = 0.0; + x[7] = 1.0; y[7] = 1.0; z[7] = 0.0; + + /* Hex #1 */ + x[8] = 0.0; y[8] = 0.0; z[8] = 0.0; + x[9] = 10.0; y[9] = 0.0; z[9] = 0.0; + x[10] = 10.0; y[10] = 0.0; z[10] = -10.0; + x[11] = 1.0; y[11] = 0.0; z[11] = -10.0; + x[12] = 1.0; y[12] = 10.0; z[12] = 0.0; + x[13] = 10.0; y[13] = 10.0; z[13] = 0.0; + x[14] = 10.0; y[14] = 10.0; z[14] = -10.0; + x[15] = 1.0; y[15] = 10.0; z[15] = -10.0; + + /* Tetra #1 */ + x[16] = 0.0; y[16] = 0.0; z[16] = 0.0; + x[17] = 1.0; y[17] = 0.0; z[17] = 5.0; + x[18] = 10.0; y[18] = 0.0; z[18] = 2.0; + x[19] = 7.0; y[19] = 5.0; z[19] = 3.0; + + /* Wedge #1 */ + x[20] = 3.0; y[20] = 0.0; z[20] = 6.0; + x[21] = 6.0; y[21] = 0.0; z[21] = 0.0; + x[22] = 0.0; y[22] = 0.0; z[22] = 0.0; + x[23] = 3.0; y[23] = 2.0; z[23] = 6.0; + x[24] = 6.0; y[24] = 2.0; z[24] = 2.0; + x[25] = 0.0; y[25] = 2.0; z[25] = 0.0; + + /* Tetra #2 */ + x[26] = 2.7; y[26] = 1.7; z[26] = 2.7; + x[27] = 6.0; y[27] = 1.7; z[27] = 3.3; + x[28] = 5.7; y[28] = 1.7; z[28] = 1.7; + x[29] = 3.7; y[29] = 0.0; z[29] = 2.3; + + /* 3d Tri */ + x[30] = 0.0; y[30] = 0.0; z[30] = 0.0; + x[31] = 10.0; y[31] = 0.0; z[31] = 0.0; + x[32] = 10.0; y[32] = 10.0; z[32] = 10.0; + /* clang-format on */ + + EXCHECK(ex_put_coord(exoid, x, y, z)); + + char *coord_names[] = {"xcoor", "ycoor", "zcoor"}; + EXCHECK(ex_put_coord_names(exoid, coord_names)); + + /* Add nodal attributes */ + EXCHECK(ex_put_attr_param(exoid, EX_NODAL, 0, 2)); + EXCHECK(ex_put_one_attr(exoid, EX_NODAL, 0, 1, x)); + EXCHECK(ex_put_one_attr(exoid, EX_NODAL, 0, 2, y)); + + { + char *attrib_names[] = {"Node_attr_1", "Node_attr_2"}; + EXCHECK(ex_put_attr_names(exoid, EX_NODAL, 0, attrib_names)); + } + + /* write element id map */ + int *elem_map = (int *)calloc(num_elem, sizeof(int)); + for (int i = 1; i <= num_elem; i++) { + elem_map[i - 1] = i * 10; + } + + EXCHECK(ex_put_id_map(exoid, EX_ELEM_MAP, elem_map)); + + free(elem_map); + + /* write element block parameters */ + struct ex_block blocks[10]; + for (int i = 0; i < 10; i++) { + blocks[i].type = EX_ELEM_BLOCK; + blocks[i].id = 0; + blocks[i].num_entry = 0; + blocks[i].num_nodes_per_entry = 0; + blocks[i].num_edges_per_entry = 0; + blocks[i].num_faces_per_entry = 0; + blocks[i].num_attribute = 0; + } + + char *block_names[10]; + block_names[0] = "block_1"; + block_names[1] = "block_2"; + block_names[2] = "block_3"; + block_names[3] = "block_4"; + block_names[4] = "block_5"; + block_names[5] = "block_6"; + block_names[6] = "block_7"; + + ex_copy_string(blocks[0].topology, "quad", MAX_STR_LENGTH + 1); + ex_copy_string(blocks[1].topology, "quad", MAX_STR_LENGTH + 1); + ex_copy_string(blocks[2].topology, "hex", MAX_STR_LENGTH + 1); + ex_copy_string(blocks[3].topology, "tetra", MAX_STR_LENGTH + 1); + ex_copy_string(blocks[4].topology, "wedge", MAX_STR_LENGTH + 1); + ex_copy_string(blocks[5].topology, "tetra", MAX_STR_LENGTH + 1); + ex_copy_string(blocks[6].topology, "tri", MAX_STR_LENGTH + 1); + + blocks[0].num_entry = 1; + blocks[1].num_entry = 1; + blocks[2].num_entry = 1; + blocks[3].num_entry = 1; + blocks[4].num_entry = 1; + blocks[5].num_entry = 1; + blocks[6].num_entry = 1; + + blocks[0].num_attribute = 1; + blocks[1].num_attribute = 1; + blocks[2].num_attribute = 1; + blocks[3].num_attribute = 1; + blocks[4].num_attribute = 1; + blocks[5].num_attribute = 1; + blocks[6].num_attribute = 1; + + blocks[0].num_nodes_per_entry = 4; /* elements in block #1 are 4-node quads */ + blocks[1].num_nodes_per_entry = 4; /* elements in block #2 are 4-node quads */ + blocks[2].num_nodes_per_entry = 8; /* elements in block #3 are 8-node hexes */ + blocks[3].num_nodes_per_entry = 4; /* elements in block #4 are 4-node tetras */ + blocks[4].num_nodes_per_entry = 6; /* elements in block #5 are 6-node wedges */ + blocks[5].num_nodes_per_entry = 8; /* elements in block #6 are 8-node tetras */ + blocks[6].num_nodes_per_entry = 3; /* elements in block #7 are 3-node tris */ + + blocks[0].id = 10; + blocks[1].id = 11; + blocks[2].id = 12; + blocks[3].id = 13; + blocks[4].id = 14; + blocks[5].id = 15; + blocks[6].id = 16; + + /* Generate an error that name is not found since blocks have not + yet been defined + */ + int error = ex_put_name(exoid, EX_ELEM_BLOCK, blocks[0].id, block_names[0]); + printf("after ex_put_name, error = %d\n", error); + + EXCHECK(ex_put_block_params(exoid, num_elem_blk, blocks)); + + /* Write element block names */ + for (int i = 0; i < num_elem_blk; i++) { + EXCHECK(ex_put_name(exoid, EX_ELEM_BLOCK, blocks[i].id, block_names[i])); + } + + /* write element block properties */ + /* 12345678901234567890123456789012 */ + char *prop_names[2]; + prop_names[0] = "MATERIAL_PROPERTY_LONG_NAME_32CH"; + prop_names[1] = "DENSITY"; + + EXCHECK(ex_put_prop_names(exoid, EX_ELEM_BLOCK, 2, prop_names)); + EXCHECK(ex_put_prop(exoid, EX_ELEM_BLOCK, blocks[0].id, prop_names[0], 10)); + EXCHECK(ex_put_prop(exoid, EX_ELEM_BLOCK, blocks[1].id, prop_names[0], 20)); + EXCHECK(ex_put_prop(exoid, EX_ELEM_BLOCK, blocks[2].id, prop_names[0], 30)); + EXCHECK(ex_put_prop(exoid, EX_ELEM_BLOCK, blocks[3].id, prop_names[0], 40)); + EXCHECK(ex_put_prop(exoid, EX_ELEM_BLOCK, blocks[4].id, prop_names[0], 50)); + EXCHECK(ex_put_prop(exoid, EX_ELEM_BLOCK, blocks[5].id, prop_names[0], 60)); + EXCHECK(ex_put_prop(exoid, EX_ELEM_BLOCK, blocks[6].id, prop_names[0], 70)); + + /* write element connectivity */ + { + int connect[] = {1, 2, 3, 4}; + EXCHECK(ex_put_conn(exoid, EX_ELEM_BLOCK, blocks[0].id, connect, NULL, NULL)); + } + + { + int connect[] = {5, 6, 7, 8}; + EXCHECK(ex_put_conn(exoid, EX_ELEM_BLOCK, blocks[1].id, connect, NULL, NULL)); + } + + { + int connect[] = {9, 10, 11, 12, 13, 14, 15, 16}; + EXCHECK(ex_put_conn(exoid, EX_ELEM_BLOCK, blocks[2].id, connect, NULL, NULL)); + } + + { + int connect[] = {17, 18, 19, 20}; + EXCHECK(ex_put_conn(exoid, EX_ELEM_BLOCK, blocks[3].id, connect, NULL, NULL)); + } + + { + int connect[] = {21, 22, 23, 24, 25, 26}; + EXCHECK(ex_put_conn(exoid, EX_ELEM_BLOCK, blocks[4].id, connect, NULL, NULL)); + } + + { + int connect[] = {17, 18, 19, 20, 27, 28, 30, 29}; + EXCHECK(ex_put_conn(exoid, EX_ELEM_BLOCK, blocks[5].id, connect, NULL, NULL)); + } + + { + int connect[] = {31, 32, 33}; + EXCHECK(ex_put_conn(exoid, EX_ELEM_BLOCK, blocks[6].id, connect, NULL, NULL)); + } + + /* write element block attributes */ + double attrib[1]; + attrib[0] = 3.14159; + EXCHECK(ex_put_attr(exoid, EX_ELEM_BLOCK, blocks[0].id, attrib)); + EXCHECK(ex_put_attr(exoid, EX_ELEM_BLOCK, blocks[0].id, attrib)); + + attrib[0] = 6.14159; + EXCHECK(ex_put_attr(exoid, EX_ELEM_BLOCK, blocks[1].id, attrib)); + EXCHECK(ex_put_attr(exoid, EX_ELEM_BLOCK, blocks[2].id, attrib)); + EXCHECK(ex_put_attr(exoid, EX_ELEM_BLOCK, blocks[3].id, attrib)); + EXCHECK(ex_put_attr(exoid, EX_ELEM_BLOCK, blocks[4].id, attrib)); + EXCHECK(ex_put_attr(exoid, EX_ELEM_BLOCK, blocks[5].id, attrib)); + EXCHECK(ex_put_attr(exoid, EX_ELEM_BLOCK, blocks[6].id, attrib)); + + { + char *attrib_names[] = {"THICKNESS"}; + for (int i = 0; i < num_elem_blk; i++) { + EXCHECK(ex_put_attr_names(exoid, EX_ELEM_BLOCK, blocks[i].id, attrib_names)); + } + } + + /* write individual node sets */ + int num_nodes_in_nset[] = {5, 3}; + int nsids[] = {20, 21}; + + { + EXCHECK(ex_put_set_param(exoid, EX_NODE_SET, nsids[0], 5, 5)); + + int node_list[] = {10, 11, 12, 13, 14}; + double dist_fact[] = {1.0, 2.0, 3.0, 4.0, 5.0}; + + EXCHECK(ex_put_set(exoid, EX_NODE_SET, nsids[0], node_list, NULL)); + EXCHECK(ex_put_set_dist_fact(exoid, EX_NODE_SET, nsids[0], dist_fact)); + } + + { + EXCHECK(ex_put_set_param(exoid, EX_NODE_SET, nsids[1], 3, 3)); + + int node_list[] = {20, 21, 22}; + double dist_fact[] = {1.1, 2.1, 3.1}; + + EXCHECK(ex_put_set(exoid, EX_NODE_SET, nsids[1], node_list, NULL)); + EXCHECK(ex_put_set_dist_fact(exoid, EX_NODE_SET, nsids[1], dist_fact)); + } + + /* Write node set names */ + char *nset_names[] = {"nset_1", "nset_2"}; + EXCHECK(ex_put_names(exoid, EX_NODE_SET, nset_names)); + EXCHECK(ex_put_prop(exoid, EX_NODE_SET, nsids[0], "FACE", 4)); + EXCHECK(ex_put_prop(exoid, EX_NODE_SET, nsids[1], "FACE", 5)); + + int prop_array[] = {1000, 2000}; + EXCHECK(ex_put_prop_array(exoid, EX_NODE_SET, "VELOCITY", prop_array)); + + /* Add nodeset attributes */ + EXCHECK(ex_put_attr_param(exoid, EX_NODE_SET, nsids[0], 1)); + EXCHECK(ex_put_attr(exoid, EX_NODE_SET, nsids[0], x)); + + { + char *attrib_names[] = {"Nodeset_attribute"}; + EXCHECK(ex_put_attr_names(exoid, EX_NODE_SET, nsids[0], attrib_names)); + } + + /* write individual side sets */ + int num_face_in_sset[] = {2, 2, 7, 8, 10}; + int ssids[] = {30, 31, 32, 33, 34}; + + { + /* side set #1 - quad */ + EXCHECK(ex_put_set_param(exoid, EX_SIDE_SET, ssids[0], 2, 4)); + + int elem_list[] = {2, 2}; + int side_list[] = {4, 2}; + double dist_fact[] = {30.0, 30.1, 30.2, 30.3}; + + EXCHECK(ex_put_set(exoid, EX_SIDE_SET, 30, elem_list, side_list)); + EXCHECK(ex_put_set_dist_fact(exoid, EX_SIDE_SET, 30, dist_fact)); + } + + { + /* side set #2 - quad, spanning 2 elements */ + EXCHECK(ex_put_set_param(exoid, EX_SIDE_SET, 31, 2, 4)); + + int elem_list[] = {1, 2}; + int side_list[] = {2, 3}; + double dist_fact[] = {31.0, 31.1, 31.2, 31.3}; + + EXCHECK(ex_put_set(exoid, EX_SIDE_SET, 31, elem_list, side_list)); + EXCHECK(ex_put_set_dist_fact(exoid, EX_SIDE_SET, 31, dist_fact)); + } + + { + /* side set #3 - hex */ + EXCHECK(ex_put_set_param(exoid, EX_SIDE_SET, 32, 7, 0)); + + int elem_list[] = {3, 3, 3, 3, 3, 3, 3}; + int side_list[] = {5, 3, 3, 2, 4, 1, 6}; + + EXCHECK(ex_put_set(exoid, EX_SIDE_SET, 32, elem_list, side_list)); + } + + { + /* side set #4 - tetras */ + EXCHECK(ex_put_set_param(exoid, EX_SIDE_SET, 33, 8, 0)); + + int elem_list[] = {4, 4, 4, 4, 6, 6, 6, 6}; + int side_list[] = {1, 2, 3, 4, 1, 2, 3, 4}; + + EXCHECK(ex_put_set(exoid, EX_SIDE_SET, 33, elem_list, side_list)); + } + + { + /* side set #5 - wedges and tris */ + EXCHECK(ex_put_set_param(exoid, EX_SIDE_SET, 34, 10, 0)); + + int elem_list[] = {5, 5, 5, 5, 5, 7, 7, 7, 7, 7}; + int side_list[] = {1, 2, 3, 4, 5, 1, 2, 3, 4, 5}; + + EXCHECK(ex_put_set(exoid, EX_SIDE_SET, 34, elem_list, side_list)); + } + + /* Write side set names */ + char *sset_names[] = {"sset_1", "sset_2", "sset_3", "sset_4", "sset_5"}; + EXCHECK(ex_put_names(exoid, EX_SIDE_SET, sset_names)); + EXCHECK(ex_put_prop(exoid, EX_SIDE_SET, 30, "COLOR", 100)); + EXCHECK(ex_put_prop(exoid, EX_SIDE_SET, 31, "COLOR", 101)); + + /* write QA records; test empty and just blank-filled records */ + int num_qa_rec = 2; + char *qa_record[2][4]; + qa_record[0][0] = "TESTWT"; + qa_record[0][1] = "testwt"; + qa_record[0][2] = "07/07/93"; + qa_record[0][3] = "15:41:33"; + qa_record[1][0] = "Thirty-Two character QA Record|"; + qa_record[1][1] = " "; + qa_record[1][2] = ""; + qa_record[1][3] = " "; + + EXCHECK(ex_put_qa(exoid, num_qa_rec, qa_record)); + + /* write information records; test empty and just blank-filled records */ + char *info[3]; + info[0] = "This is the first information record."; + info[1] = ""; + info[2] = "This info record is exactly 80 characters long. last character should be pipe |"; + + int num_info = 3; + EXCHECK(ex_put_info(exoid, num_info, info)); + + /* write results variables parameters and names */ + int num_glo_vars = 1; + { + char *var_names[] = {"glo_vars"}; + + EXCHECK(ex_put_variable_param(exoid, EX_GLOBAL, num_glo_vars)); + EXCHECK(ex_put_variable_names(exoid, EX_GLOBAL, num_glo_vars, var_names)); + } + + int num_nod_vars = 2; + { + /* 12345678901234567890123456789012 */ + char *var_names[] = {"node_variable_a_very_long_name_0", "nod_var1"}; + + EXCHECK(ex_put_variable_param(exoid, EX_NODAL, num_nod_vars)); + EXCHECK(ex_put_variable_names(exoid, EX_NODAL, num_nod_vars, var_names)); + } + + int num_ele_vars = 3; + { + /* 0 1 2 3 */ + /* 12345678901234567890123456789012 */ + char *var_names[] = {"this_variable_name_is_short", "this_variable_name_is_just_right", + "this_variable_name_is_tooooo_long"}; + + EXCHECK(ex_put_variable_param(exoid, EX_ELEM_BLOCK, num_ele_vars)); + EXCHECK(ex_put_variable_names(exoid, EX_ELEM_BLOCK, num_ele_vars, var_names)); + } + + int num_nset_vars = 3; + { + char *var_names[] = {"ns_var0", "ns_var1", "ns_var2"}; + + EXCHECK(ex_put_variable_param(exoid, EX_NODE_SET, num_nset_vars)); + EXCHECK(ex_put_variable_names(exoid, EX_NODE_SET, num_nset_vars, var_names)); + } + + int num_sset_vars = 3; + { + char *var_names[] = {"ss_var0", "ss_var1", "ss_var2"}; + + EXCHECK(ex_put_variable_param(exoid, EX_SIDE_SET, num_sset_vars)); + EXCHECK(ex_put_variable_names(exoid, EX_SIDE_SET, num_sset_vars, var_names)); + } + + /* write element variable truth table */ + int *truth_tab = (int *)calloc((num_elem_blk * num_ele_vars), sizeof(int)); + + { + int k = 0; + for (int i = 0; i < num_elem_blk; i++) { + for (int j = 0; j < num_ele_vars; j++) { + truth_tab[k++] = 1; + } + } + } + + EXCHECK(ex_put_truth_table(exoid, EX_ELEM_BLOCK, num_elem_blk, num_ele_vars, truth_tab)); + + free(truth_tab); + + /* for each time step, write the analysis results; + * the code below fills the arrays glob_var_vals, + * nodal_var_vals, and elem_var_vals with values for debugging purposes; + * obviously the analysis code will populate these arrays + */ + + double *glob_var_vals = (double *)calloc(num_glo_vars, CPU_word_size); + double *nodal_var_vals = (double *)calloc(num_nodes, CPU_word_size); + double *elem_var_vals = (double *)calloc(num_ele_vars, CPU_word_size); + double *sset_var_vals = (double *)calloc(10, CPU_word_size); /* max sides_in_sset */ + double *nset_var_vals = (double *)calloc(5, CPU_word_size); /* max nodes_in_nset */ + + int num_time_steps = 10; + for (int i = 0; i < num_time_steps; i++) { + int whole_time_step = i + 1; + double time_value = (double)(i + 1) / 100.; + + /* write time value */ + EXCHECK(ex_put_time(exoid, whole_time_step, &time_value)); + + /* write global variables */ + for (int j = 0; j < num_glo_vars; j++) { + glob_var_vals[j] = (double)(j + 2) * time_value; + } + EXCHECK(ex_put_var(exoid, whole_time_step, EX_GLOBAL, 1, 1, num_glo_vars, glob_var_vals)); + + /* write nodal variables */ + for (int k = 1; k <= num_nod_vars; k++) { + for (int j = 0; j < num_nodes; j++) { + nodal_var_vals[j] = (double)k + ((double)(j + 1) * time_value); + } + EXCHECK(ex_put_var(exoid, whole_time_step, EX_NODAL, k, 1, num_nodes, nodal_var_vals)); + } + + /* write element variables */ + for (int k = 1; k <= num_ele_vars; k++) { + for (int j = 0; j < num_elem_blk; j++) { + for (int m = 0; m < blocks[j].num_entry; m++) { + elem_var_vals[m] = (double)(k + 1) + (double)(j + 2) + ((double)(m + 1) * time_value); + /* printf("elem_var_vals[%d]: %f\n",m,elem_var_vals[m]); */ + } + EXCHECK(ex_put_var(exoid, whole_time_step, EX_ELEM_BLOCK, k, blocks[j].id, + blocks[j].num_entry, elem_var_vals)); + } + } + + /* write sideset variables */ + for (int k = 1; k <= num_sset_vars; k++) { + for (int j = 0; j < num_side_sets; j++) { + for (int m = 0; m < num_face_in_sset[j]; m++) { + sset_var_vals[m] = (double)(k + 2) + (double)(j + 3) + ((double)(m + 1) * time_value); + /* printf("sset_var_vals[%d]: %f\n",m,sset_var_vals[m]); */ + } + EXCHECK(ex_put_var(exoid, whole_time_step, EX_SIDE_SET, k, ssids[j], num_face_in_sset[j], + sset_var_vals)); + } + } + + /* write nodeset variables */ + for (int k = 1; k <= num_nset_vars; k++) { + for (int j = 0; j < num_node_sets; j++) { + for (int m = 0; m < num_nodes_in_nset[j]; m++) { + nset_var_vals[m] = (double)(k + 3) + (double)(j + 4) + ((double)(m + 1) * time_value); + /* printf("nset_var_vals[%d]: %f\n",m,nset_var_vals[m]); */ + } + EXCHECK(ex_put_var(exoid, whole_time_step, EX_NODE_SET, k, nsids[j], num_nodes_in_nset[j], + nset_var_vals)); + } + } + + /* update the data file; this should be done at the end of every time step + * to ensure that no data is lost if the analysis dies + */ + EXCHECK(ex_update(exoid)); + } + free(glob_var_vals); + free(nodal_var_vals); + free(elem_var_vals); + free(sset_var_vals); + free(nset_var_vals); + + /* close the EXODUS files + */ + EXCHECK(ex_close(exoid)); + return 0; +} From 999262fd5a7fc5af29b9054e710ab4575ca58307 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 9 Nov 2023 13:40:43 -0700 Subject: [PATCH 035/110] EXODIFF: Eliminate memory leak --- packages/seacas/applications/exodiff/exoII_read.C | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/seacas/applications/exodiff/exoII_read.C b/packages/seacas/applications/exodiff/exoII_read.C index 3fb42b2096..4905394503 100644 --- a/packages/seacas/applications/exodiff/exoII_read.C +++ b/packages/seacas/applications/exodiff/exoII_read.C @@ -57,6 +57,7 @@ template ExoII_Read::~ExoII_Read() delete[] times; delete[] edge_blocks; delete[] face_blocks; + delete[] assemblies; if (results) { for (unsigned i = 0; i < nodal_vars.size(); ++i) { From 6d5edb93139e98f0fe8d50573c5d9065824c8cb6 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Fri, 10 Nov 2023 08:35:44 -0700 Subject: [PATCH 036/110] IOSS: Move some functions using reserved ids to private --- .../libraries/ioss/src/cgns/Iocgns_DatabaseIO.h | 9 +++++---- .../ioss/src/cgns/Iocgns_ParallelDatabaseIO.h | 13 +++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h index 49a2aa8959..f4d0661be1 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h @@ -67,9 +67,6 @@ namespace Iocgns { // database supports that type (e.g. return_value & Ioss::FACESET) unsigned entity_field_support() const override; - int64_t node_global_to_local__(int64_t global, bool must_exist) const override; - int64_t element_global_to_local__(int64_t global) const override; - ~DatabaseIO() override; std::string get_format() const override { return "CGNS"; } @@ -81,13 +78,17 @@ namespace Iocgns { bool node_major() const override { return false; } // Metadata-related functions. - void read_meta_data__() override; void write_meta_data(); void write_results_meta_data(); int get_file_pointer() const override; private: + int64_t node_global_to_local__(int64_t global, bool must_exist) const override; + int64_t element_global_to_local__(int64_t global) const override; + + void read_meta_data__() override; + void open_state_file(int state); void free_state_pointer(); diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h index c36e6381f3..f506e0385d 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h @@ -71,11 +71,6 @@ namespace Iocgns { // database supports that type (e.g. return_value & Ioss::FACESET) unsigned entity_field_support() const override; - int64_t node_global_to_local__(int64_t global, bool must_exist) const override; - int64_t element_global_to_local__(int64_t global) const override; - - void release_memory__() override; - int get_file_pointer() const override; bool node_major() const override { return false; } @@ -87,11 +82,17 @@ namespace Iocgns { int int_byte_size_db() const override { return CG_SIZEOF_SIZE; } // Metadata-related functions. - void read_meta_data__() override; void write_meta_data(); void write_results_meta_data(); private: + void read_meta_data__() override; + + int64_t node_global_to_local__(int64_t global, bool must_exist) const override; + int64_t element_global_to_local__(int64_t global) const override; + + void release_memory__() override; + void open_state_file(int state); void free_state_pointer(); From 43bc54d0368cbc4e06cdb6c10bc1d2110b8cb8c9 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Fri, 10 Nov 2023 09:22:33 -0700 Subject: [PATCH 037/110] EXODIFF: Add missing include (not related to pr) --- packages/seacas/applications/exodiff/check.C | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/seacas/applications/exodiff/check.C b/packages/seacas/applications/exodiff/check.C index d90ea6a253..7dca3c8ba4 100644 --- a/packages/seacas/applications/exodiff/check.C +++ b/packages/seacas/applications/exodiff/check.C @@ -4,6 +4,7 @@ // // See packages/seacas/LICENSE for details +#include #include #include #include From 1c5f97790fc80927a1c835ab8188c42fa7bd6489 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Fri, 10 Nov 2023 09:23:06 -0700 Subject: [PATCH 038/110] EXODIFF: Add missing include --- packages/seacas/applications/exodiff/check.C | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/seacas/applications/exodiff/check.C b/packages/seacas/applications/exodiff/check.C index d90ea6a253..7dca3c8ba4 100644 --- a/packages/seacas/applications/exodiff/check.C +++ b/packages/seacas/applications/exodiff/check.C @@ -4,6 +4,7 @@ // // See packages/seacas/LICENSE for details +#include #include #include #include From 7da2cf76619df668d9301c4ec9ed907a0d063e7c Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Fri, 10 Nov 2023 11:34:33 -0700 Subject: [PATCH 039/110] EXODUS: Change internal funcions from ex__ to exi_ --- .../applications/conjoin/CJ_Internals.C | 38 +- .../seacas/applications/ejoin/EJ_index_sort.C | 6 +- .../seacas/applications/epu/EP_Internals.C | 50 +-- .../libraries/exoIIv2for32/src/exo_jack_32.c | 4 +- .../libraries/exodus/include/exodusII_int.h | 404 +++++++++--------- .../exodus/src/ex__get_glob_vars_multi_time.c | 8 +- .../exodus/src/ex__get_nodal_var_multi_time.c | 12 +- .../src/ex__put_homogenous_block_params.c | 14 +- .../exodus/src/ex__put_nodal_var_multi_time.c | 10 +- .../seacas/libraries/exodus/src/ex_add_attr.c | 12 +- .../seacas/libraries/exodus/src/ex_close.c | 64 +-- .../seacas/libraries/exodus/src/ex_conv.c | 60 +-- .../seacas/libraries/exodus/src/ex_copy.c | 62 +-- .../seacas/libraries/exodus/src/ex_create.c | 8 +- .../libraries/exodus/src/ex_create_group.c | 4 +- .../libraries/exodus/src/ex_create_par.c | 8 +- .../exodus/src/ex_cvt_nodes_to_sides.c | 12 +- packages/seacas/libraries/exodus/src/ex_err.c | 6 +- .../libraries/exodus/src/ex_get_all_times.c | 4 +- .../libraries/exodus/src/ex_get_assembly.c | 4 +- .../seacas/libraries/exodus/src/ex_get_attr.c | 6 +- .../libraries/exodus/src/ex_get_attr_names.c | 6 +- .../libraries/exodus/src/ex_get_attr_param.c | 4 +- .../libraries/exodus/src/ex_get_attribute.c | 26 +- .../seacas/libraries/exodus/src/ex_get_blob.c | 4 +- .../exodus/src/ex_get_block_id_map.c | 4 +- .../libraries/exodus/src/ex_get_block_param.c | 6 +- .../libraries/exodus/src/ex_get_cmap_params.c | 2 +- .../libraries/exodus/src/ex_get_concat_sets.c | 8 +- .../src/ex_get_concat_side_set_node_count.c | 12 +- .../seacas/libraries/exodus/src/ex_get_conn.c | 6 +- .../libraries/exodus/src/ex_get_coord.c | 14 +- .../libraries/exodus/src/ex_get_coord_names.c | 4 +- .../exodus/src/ex_get_coordinate_frames.c | 4 +- .../exodus/src/ex_get_eb_info_global.c | 2 +- .../libraries/exodus/src/ex_get_elem_cmap.c | 2 +- .../libraries/exodus/src/ex_get_elem_type.c | 4 +- .../src/ex_get_entity_count_per_polyhedra.c | 6 +- .../exodus/src/ex_get_glob_var_time_int.c | 8 +- .../exodus/src/ex_get_glob_vars_int.c | 8 +- .../libraries/exodus/src/ex_get_group_ids.c | 2 +- .../libraries/exodus/src/ex_get_id_map.c | 2 +- .../seacas/libraries/exodus/src/ex_get_ids.c | 6 +- .../seacas/libraries/exodus/src/ex_get_info.c | 6 +- .../seacas/libraries/exodus/src/ex_get_init.c | 2 +- .../libraries/exodus/src/ex_get_init_ext.c | 10 +- .../libraries/exodus/src/ex_get_init_global.c | 2 +- .../libraries/exodus/src/ex_get_init_info.c | 4 +- .../exodus/src/ex_get_loadbal_param.c | 4 +- .../seacas/libraries/exodus/src/ex_get_map.c | 2 +- .../libraries/exodus/src/ex_get_map_param.c | 2 +- .../seacas/libraries/exodus/src/ex_get_name.c | 6 +- .../libraries/exodus/src/ex_get_names.c | 30 +- .../exodus/src/ex_get_nodal_var_time_int.c | 8 +- .../libraries/exodus/src/ex_get_node_cmap.c | 2 +- .../exodus/src/ex_get_ns_param_global.c | 2 +- .../libraries/exodus/src/ex_get_num_map.c | 6 +- .../exodus/src/ex_get_object_truth_vector.c | 26 +- .../libraries/exodus/src/ex_get_one_attr.c | 12 +- .../exodus/src/ex_get_partial_attr.c | 12 +- .../exodus/src/ex_get_partial_conn.c | 6 +- .../exodus/src/ex_get_partial_coord.c | 14 +- .../src/ex_get_partial_coord_component.c | 10 +- .../exodus/src/ex_get_partial_id_map.c | 2 +- .../exodus/src/ex_get_partial_nodal_var_int.c | 8 +- .../exodus/src/ex_get_partial_num_map.c | 6 +- .../exodus/src/ex_get_partial_one_attr.c | 12 +- .../libraries/exodus/src/ex_get_partial_set.c | 12 +- .../exodus/src/ex_get_partial_set_dist_fact.c | 10 +- .../libraries/exodus/src/ex_get_partial_var.c | 14 +- .../exodus/src/ex_get_processor_elem_maps.c | 4 +- .../exodus/src/ex_get_processor_node_maps.c | 4 +- .../seacas/libraries/exodus/src/ex_get_prop.c | 6 +- .../libraries/exodus/src/ex_get_prop_array.c | 2 +- .../libraries/exodus/src/ex_get_prop_names.c | 2 +- .../seacas/libraries/exodus/src/ex_get_qa.c | 6 +- .../src/ex_get_reduction_variable_name.c | 4 +- .../src/ex_get_reduction_variable_names.c | 4 +- .../src/ex_get_reduction_variable_param.c | 2 +- .../exodus/src/ex_get_reduction_vars.c | 12 +- .../seacas/libraries/exodus/src/ex_get_set.c | 8 +- .../exodus/src/ex_get_set_dist_fact.c | 8 +- .../libraries/exodus/src/ex_get_set_param.c | 8 +- .../seacas/libraries/exodus/src/ex_get_sets.c | 4 +- .../exodus/src/ex_get_side_set_node_count.c | 14 +- .../exodus/src/ex_get_side_set_node_list.c | 14 +- .../src/ex_get_side_set_node_list_len.c | 12 +- .../exodus/src/ex_get_ss_param_global.c | 2 +- .../seacas/libraries/exodus/src/ex_get_time.c | 8 +- .../libraries/exodus/src/ex_get_truth_table.c | 26 +- .../seacas/libraries/exodus/src/ex_get_var.c | 2 +- .../exodus/src/ex_get_var_multi_time.c | 14 +- .../libraries/exodus/src/ex_get_var_time.c | 16 +- .../exodus/src/ex_get_variable_name.c | 4 +- .../exodus/src/ex_get_variable_names.c | 4 +- .../exodus/src/ex_get_variable_param.c | 2 +- .../seacas/libraries/exodus/src/ex_inquire.c | 54 +-- .../exodus/src/ex_int_get_block_param.c | 8 +- .../seacas/libraries/exodus/src/ex_ne_util.c | 10 +- .../seacas/libraries/exodus/src/ex_open.c | 16 +- .../seacas/libraries/exodus/src/ex_open_par.c | 18 +- .../seacas/libraries/exodus/src/ex_opts.c | 2 +- .../exodus/src/ex_put_all_var_param_ext.c | 24 +- .../libraries/exodus/src/ex_put_assemblies.c | 12 +- .../seacas/libraries/exodus/src/ex_put_attr.c | 8 +- .../libraries/exodus/src/ex_put_attr_names.c | 8 +- .../libraries/exodus/src/ex_put_attr_param.c | 10 +- .../libraries/exodus/src/ex_put_attribute.c | 30 +- .../libraries/exodus/src/ex_put_blobs.c | 10 +- .../exodus/src/ex_put_block_params.c | 26 +- .../libraries/exodus/src/ex_put_cmap_params.c | 36 +- .../exodus/src/ex_put_cmap_params_cc.c | 34 +- .../exodus/src/ex_put_concat_all_blocks.c | 34 +- .../exodus/src/ex_put_concat_elem_block.c | 18 +- .../libraries/exodus/src/ex_put_concat_sets.c | 34 +- .../seacas/libraries/exodus/src/ex_put_conn.c | 6 +- .../libraries/exodus/src/ex_put_coord.c | 4 +- .../libraries/exodus/src/ex_put_coord_names.c | 4 +- .../exodus/src/ex_put_coordinate_frames.c | 8 +- .../exodus/src/ex_put_eb_info_global.c | 2 +- .../libraries/exodus/src/ex_put_elem_cmap.c | 2 +- .../src/ex_put_entity_count_per_polyhedra.c | 6 +- .../libraries/exodus/src/ex_put_id_map.c | 8 +- .../seacas/libraries/exodus/src/ex_put_info.c | 10 +- .../libraries/exodus/src/ex_put_init_ext.c | 24 +- .../libraries/exodus/src/ex_put_init_global.c | 34 +- .../libraries/exodus/src/ex_put_init_info.c | 12 +- .../exodus/src/ex_put_loadbal_param.c | 78 ++-- .../exodus/src/ex_put_loadbal_param_cc.c | 86 ++-- .../seacas/libraries/exodus/src/ex_put_map.c | 8 +- .../libraries/exodus/src/ex_put_map_param.c | 10 +- .../seacas/libraries/exodus/src/ex_put_name.c | 18 +- .../libraries/exodus/src/ex_put_names.c | 6 +- .../libraries/exodus/src/ex_put_nodal_var.c | 2 +- .../libraries/exodus/src/ex_put_node_cmap.c | 2 +- .../exodus/src/ex_put_ns_param_global.c | 2 +- .../libraries/exodus/src/ex_put_num_map.c | 16 +- .../libraries/exodus/src/ex_put_one_attr.c | 12 +- .../exodus/src/ex_put_partial_attr.c | 8 +- .../exodus/src/ex_put_partial_conn.c | 6 +- .../exodus/src/ex_put_partial_coord.c | 6 +- .../src/ex_put_partial_coord_component.c | 6 +- .../exodus/src/ex_put_partial_id_map.c | 10 +- .../exodus/src/ex_put_partial_nodal_var_int.c | 8 +- .../exodus/src/ex_put_partial_node_cmap.c | 2 +- .../exodus/src/ex_put_partial_num_map.c | 14 +- .../exodus/src/ex_put_partial_one_attr.c | 12 +- .../libraries/exodus/src/ex_put_partial_set.c | 12 +- .../exodus/src/ex_put_partial_set_dist_fact.c | 10 +- .../libraries/exodus/src/ex_put_partial_var.c | 50 +-- .../exodus/src/ex_put_processor_elem_maps.c | 4 +- .../exodus/src/ex_put_processor_node_maps.c | 4 +- .../seacas/libraries/exodus/src/ex_put_prop.c | 16 +- .../libraries/exodus/src/ex_put_prop_array.c | 8 +- .../libraries/exodus/src/ex_put_prop_names.c | 10 +- .../seacas/libraries/exodus/src/ex_put_qa.c | 10 +- .../src/ex_put_reduction_variable_name.c | 4 +- .../src/ex_put_reduction_variable_names.c | 4 +- .../src/ex_put_reduction_variable_param.c | 34 +- .../exodus/src/ex_put_reduction_vars.c | 42 +- .../seacas/libraries/exodus/src/ex_put_set.c | 8 +- .../exodus/src/ex_put_set_dist_fact.c | 8 +- .../seacas/libraries/exodus/src/ex_put_sets.c | 22 +- .../exodus/src/ex_put_ss_param_global.c | 2 +- .../seacas/libraries/exodus/src/ex_put_time.c | 8 +- .../libraries/exodus/src/ex_put_truth_table.c | 34 +- .../exodus/src/ex_put_var_multi_time.c | 48 +-- .../exodus/src/ex_put_variable_name.c | 4 +- .../exodus/src/ex_put_variable_names.c | 4 +- .../exodus/src/ex_put_variable_param.c | 16 +- .../libraries/exodus/src/ex_threadsafe.c | 6 +- .../seacas/libraries/exodus/src/ex_update.c | 2 +- .../seacas/libraries/exodus/src/ex_utils.c | 216 +++++----- .../exodus_for/src/exo_jack-windows.c | 2 +- .../libraries/exodus_for/src/exo_jack.c | 4 +- .../ioss/src/exodus/Ioex_Internals.C | 148 +++---- .../libraries/nemesis/nemesis_wrapper.c | 70 +-- 177 files changed, 1496 insertions(+), 1496 deletions(-) diff --git a/packages/seacas/applications/conjoin/CJ_Internals.C b/packages/seacas/applications/conjoin/CJ_Internals.C index 47355c2c26..0c2f0927a7 100644 --- a/packages/seacas/applications/conjoin/CJ_Internals.C +++ b/packages/seacas/applications/conjoin/CJ_Internals.C @@ -318,12 +318,12 @@ int Excn::Internals::put_metadata(const Mesh &mesh, const CommunicationMeta return EX_FATAL; } - struct ex__file_item *file = ex__find_file_item(exodusFilePtr); + struct exi_file_item *file = exi_find_file_item(exodusFilePtr); if (file) { file->time_varid = varid; } - ex__compress_variable(exodusFilePtr, varid, -2); /* don't compress, but do set collective io */ + exi_compress_variable(exodusFilePtr, varid, -2); /* don't compress, but do set collective io */ } int map_type = get_type(exodusFilePtr, EX_MAPS_INT64_DB); @@ -355,7 +355,7 @@ int Excn::Internals::put_metadata(const Mesh &mesh, const CommunicationMeta } return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); } if (mesh.elementCount > 0) { @@ -387,7 +387,7 @@ int Excn::Internals::put_metadata(const Mesh &mesh, const CommunicationMeta } return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); } if (mesh.blockCount > 0) { @@ -468,7 +468,7 @@ int Excn::Internals::put_metadata(const std::vector &blocks) // Iterate over element blocks ... for (size_t iblk = 0; iblk < num_elem_blk; iblk++) { - ex__inc_file_item(exodusFilePtr, ex__get_counter_list(EX_ELEM_BLOCK)); + exi_inc_file_item(exodusFilePtr, exi_get_counter_list(EX_ELEM_BLOCK)); if (blocks[iblk].elementCount == 0) { continue; @@ -533,7 +533,7 @@ int Excn::Internals::put_metadata(const std::vector &blocks) ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); // Attribute name array... std::array adims{numattrdim, namestrdim}; @@ -563,7 +563,7 @@ int Excn::Internals::put_metadata(const std::vector &blocks) ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return EX_FATAL; } - ex__compress_variable(exodusFilePtr, connid, 1); + exi_compress_variable(exodusFilePtr, connid, 1); // store element type as attribute of connectivity variable status = nc_put_att_text(exodusFilePtr, connid, ATT_NAME_ELB, @@ -648,9 +648,9 @@ template int Excn::Internals::put_metadata(const std::vector int Excn::Internals::put_metadata(const std::vector 0) { @@ -726,7 +726,7 @@ template int Excn::Internals::put_metadata(const std::vector int Excn::Internals::put_metadata(const std::vector int Excn::Internals::put_metadata(const std::vector int Excn::Internals::put_metadata(const std::vector 0) { @@ -900,7 +900,7 @@ template int Excn::Internals::put_metadata(const std::vector 1) { @@ -1034,7 +1034,7 @@ namespace { ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } if (dimension > 2) { @@ -1047,7 +1047,7 @@ namespace { ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } } diff --git a/packages/seacas/applications/ejoin/EJ_index_sort.C b/packages/seacas/applications/ejoin/EJ_index_sort.C index b693a0e12f..5630f80dd1 100644 --- a/packages/seacas/applications/ejoin/EJ_index_sort.C +++ b/packages/seacas/applications/ejoin/EJ_index_sort.C @@ -110,7 +110,7 @@ namespace { } } - template void ex__iqsort(T *v, INT iv[], size_t N) + template void exi_iqsort(T *v, INT iv[], size_t N) { if (N <= 1) { return; @@ -138,14 +138,14 @@ void index_coord_sort(const std::vector &xyz, std::vector &index, i for (size_t i = axis; i < xyz.size(); i += 3) { comp[j++] = xyz[i]; } - ex__iqsort(comp.data(), index.data(), index.size()); + exi_iqsort(comp.data(), index.data(), index.size()); } template void index_sort(const std::vector &ids, std::vector &index) { index.resize(ids.size()); std::iota(index.begin(), index.end(), (INT)0); - ex__iqsort(ids.data(), index.data(), index.size()); + exi_iqsort(ids.data(), index.data(), index.size()); } template void index_coord_sort(const std::vector &xyz, std::vector &index, int axis); diff --git a/packages/seacas/applications/epu/EP_Internals.C b/packages/seacas/applications/epu/EP_Internals.C index 848152ba16..7e47b9f329 100644 --- a/packages/seacas/applications/epu/EP_Internals.C +++ b/packages/seacas/applications/epu/EP_Internals.C @@ -485,12 +485,12 @@ int Excn::Internals::put_metadata(const Mesh &mesh, const CommunicationMeta return EX_FATAL; } - struct ex__file_item *file = ex__find_file_item(exodusFilePtr); + struct exi_file_item *file = exi_find_file_item(exodusFilePtr); if (file) { file->time_varid = varid; } - ex__compress_variable(exodusFilePtr, varid, -2); /* don't compress, but do set collective io */ + exi_compress_variable(exodusFilePtr, varid, -2); /* don't compress, but do set collective io */ } if (mesh.nodeCount > 0) { @@ -521,7 +521,7 @@ int Excn::Internals::put_metadata(const Mesh &mesh, const CommunicationMeta } return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); } } @@ -555,7 +555,7 @@ int Excn::Internals::put_metadata(const Mesh &mesh, const CommunicationMeta } return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); } } @@ -658,7 +658,7 @@ template int Excn::Internals::put_metadata(const std::vector // Iterate over element blocks ... for (size_t iblk = 0; iblk < num_elem_blk; iblk++) { - ex__inc_file_item(exodusFilePtr, ex__get_counter_list(EX_ELEM_BLOCK)); + exi_inc_file_item(exodusFilePtr, exi_get_counter_list(EX_ELEM_BLOCK)); if (blocks[iblk].elementCount == 0) { continue; @@ -723,7 +723,7 @@ template int Excn::Internals::put_metadata(const std::vector ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); // Attribute name array... dims[0] = numattrdim; @@ -753,7 +753,7 @@ template int Excn::Internals::put_metadata(const std::vector ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return EX_FATAL; } - ex__compress_variable(exodusFilePtr, connid, 1); + exi_compress_variable(exodusFilePtr, connid, 1); // store element type as attribute of connectivity variable status = nc_put_att_text(exodusFilePtr, connid, ATT_NAME_ELB, @@ -843,10 +843,10 @@ int Excn::Internals::put_metadata(const std::vector> &nodesets for (int i = 0; i < num_node_sets; i++) { - // NOTE: ex__inc_file_item is used to find the number of node sets + // NOTE: exi_inc_file_item is used to find the number of node sets // for a specific file and returns that value incremented. int cur_num_node_sets = - (int)ex__inc_file_item(exodusFilePtr, ex__get_counter_list(EX_NODE_SET)); + (int)exi_inc_file_item(exodusFilePtr, exi_get_counter_list(EX_NODE_SET)); if (nodesets[i].nodeCount == 0) { continue; @@ -888,7 +888,7 @@ int Excn::Internals::put_metadata(const std::vector> &nodesets } return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); // Create variable for distribution factors if required if (nodesets[i].dfCount > 0) { @@ -921,7 +921,7 @@ int Excn::Internals::put_metadata(const std::vector> &nodesets } return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } } return EX_NOERR; @@ -994,10 +994,10 @@ int Excn::Internals::put_metadata(const std::vector> &sidesets for (size_t i = 0; i < num_side_sets; i++) { - // NOTE: ex__inc_file_item is used to find the number of side sets + // NOTE: exi_inc_file_item is used to find the number of side sets // for a specific file and returns that value incremented. int cur_num_side_sets = - (int)ex__inc_file_item(exodusFilePtr, ex__get_counter_list(EX_SIDE_SET)); + (int)exi_inc_file_item(exodusFilePtr, exi_get_counter_list(EX_SIDE_SET)); if (sidesets[i].sideCount == 0) { continue; @@ -1038,7 +1038,7 @@ int Excn::Internals::put_metadata(const std::vector> &sidesets } return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); // create side list variable for side set status = nc_def_var(exodusFilePtr, VAR_SIDE_SS(cur_num_side_sets + 1), bulk_type, 1, @@ -1057,7 +1057,7 @@ int Excn::Internals::put_metadata(const std::vector> &sidesets } return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); // Create variable for distribution factors if required if (sidesets[i].dfCount > 0) { @@ -1098,7 +1098,7 @@ int Excn::Internals::put_metadata(const std::vector> &sidesets } return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } } return EX_NOERR; @@ -1171,10 +1171,10 @@ int Excn::Internals::put_metadata(const std::vector> &edgebl for (size_t i = 0; i < num_edge_blocks; i++) { - // NOTE: ex__inc_file_item is used to find the number of edge blocks + // NOTE: exi_inc_file_item is used to find the number of edge blocks // for a specific file and returns that value incremented. int cur_num_edge_blocks = - (int)ex__inc_file_item(exodusFilePtr, ex__get_counter_list(EX_EDGE_BLOCK)); + (int)exi_inc_file_item(exodusFilePtr, exi_get_counter_list(EX_EDGE_BLOCK)); if (edgeblocks[i].edgeCount == 0) { continue; @@ -1224,7 +1224,7 @@ int Excn::Internals::put_metadata(const std::vector> &edgebl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return EX_FATAL; } - ex__compress_variable(exodusFilePtr, connid, 1); + exi_compress_variable(exodusFilePtr, connid, 1); // store edge type as attribute of connectivity variable status = nc_put_att_text(exodusFilePtr, connid, ATT_NAME_ELB, @@ -1308,10 +1308,10 @@ int Excn::Internals::put_metadata(const std::vector> &facebl for (size_t i = 0; i < num_face_blocks; i++) { - // NOTE: ex__inc_file_item is used to find the number of face blocks + // NOTE: exi_inc_file_item is used to find the number of face blocks // for a specific file and returns that value incremented. int cur_num_face_blocks = - (int)ex__inc_file_item(exodusFilePtr, ex__get_counter_list(EX_FACE_BLOCK)); + (int)exi_inc_file_item(exodusFilePtr, exi_get_counter_list(EX_FACE_BLOCK)); if (faceblocks[i].faceCount == 0) { continue; @@ -1362,7 +1362,7 @@ int Excn::Internals::put_metadata(const std::vector> &facebl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return EX_FATAL; } - ex__compress_variable(exodusFilePtr, connid, 1); + exi_compress_variable(exodusFilePtr, connid, 1); // store face type as attribute of connectivity variable status = nc_put_att_text(exodusFilePtr, connid, ATT_NAME_ELB, @@ -1503,7 +1503,7 @@ namespace { ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } if (dimension > 1) { @@ -1516,7 +1516,7 @@ namespace { ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } if (dimension > 2) { @@ -1529,7 +1529,7 @@ namespace { ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return EX_FATAL; } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } } diff --git a/packages/seacas/libraries/exoIIv2for32/src/exo_jack_32.c b/packages/seacas/libraries/exoIIv2for32/src/exo_jack_32.c index 7a8ddfd8ea..b091bcc3b1 100644 --- a/packages/seacas/libraries/exoIIv2for32/src/exo_jack_32.c +++ b/packages/seacas/libraries/exoIIv2for32/src/exo_jack_32.c @@ -2424,9 +2424,9 @@ void F2C(expfrm, EXPFRM)(int *idexo, int *nframe, void_int *cfids, real *coord, /*! * Routine to return floating point word size - * \sa ex__get_cpu_ws() + * \sa exi_get_cpu_ws() */ -int F2C(excpws, EXCPWS)(void) { return (ex__get_cpu_ws()); } +int F2C(excpws, EXCPWS)(void) { return (exi_get_cpu_ws()); } /*! * Routine to return large model setting diff --git a/packages/seacas/libraries/exodus/include/exodusII_int.h b/packages/seacas/libraries/exodus/include/exodusII_int.h index aa0c7c9652..ac61ca8a3a 100644 --- a/packages/seacas/libraries/exodus/include/exodusII_int.h +++ b/packages/seacas/libraries/exodus/include/exodusII_int.h @@ -88,7 +88,7 @@ extern "C" { #define EX_FILE_ID_MASK (0xffff0000) /**< Must match FILE_ID_MASK in NetCDF nc4internal.h */ #define EX_GRP_ID_MASK (0x0000ffff) /**< Must match GRP_ID_MASK in NetCDF nc4internal.h */ -void ex__reset_error_status(void); +void exi_reset_error_status(void); #if defined(EXODUS_THREADSAFE) #if !defined(exerrval) @@ -114,18 +114,18 @@ typedef struct EX_mutex_struct } EX_mutex_t; extern EX_mutex_t EX_g; -extern int ex__mutex_lock(EX_mutex_t *mutex); -extern int ex__mutex_unlock(EX_mutex_t *mutex, const char *func, int line); -extern void ex__pthread_first_thread_init(void); +extern int exi_mutex_lock(EX_mutex_t *mutex); +extern int exi_mutex_unlock(EX_mutex_t *mutex, const char *func, int line); +extern void exi_pthread_first_thread_init(void); extern EX_errval_t *exerrval_get(); #define EX_FUNC_ENTER() \ do { \ /* Initialize the thread-safe code */ \ - pthread_once(&EX_first_init_g, ex__pthread_first_thread_init); \ + pthread_once(&EX_first_init_g, exi_pthread_first_thread_init); \ \ /* Grab the mutex for the library */ \ - ex__mutex_lock(&EX_g); \ + exi_mutex_lock(&EX_g); \ ex_errval = exerrval_get(); \ exerrval = 0; \ ex_errval->last_err_num = 0; \ @@ -134,28 +134,28 @@ extern EX_errval_t *exerrval_get(); #define EX_FUNC_ENTER_INT() \ do { \ /* Initialize the thread-safe code */ \ - pthread_once(&EX_first_init_g, ex__pthread_first_thread_init); \ + pthread_once(&EX_first_init_g, exi_pthread_first_thread_init); \ \ /* Grab the mutex for the library */ \ - ex__mutex_lock(&EX_g); \ + exi_mutex_lock(&EX_g); \ ex_errval = exerrval_get(); \ } while (0) #define EX_FUNC_LEAVE(error) \ do { \ - ex__mutex_unlock(&EX_g, __func__, __LINE__); \ + exi_mutex_unlock(&EX_g, __func__, __LINE__); \ return error; \ } while (0) #define EX_FUNC_VOID() \ do { \ - ex__mutex_unlock(&EX_g, __func__, __LINE__); \ + exi_mutex_unlock(&EX_g, __func__, __LINE__); \ return; \ } while (0) #define EX_FUNC_UNLOCK() \ do { \ - ex__mutex_unlock(&EX_g, __func__, __LINE__); \ + exi_mutex_unlock(&EX_g, __func__, __LINE__); \ } while (0) #else @@ -165,7 +165,7 @@ extern EX_errval_t *exerrval_get(); EXODUS_EXPORT int indent; #define EX_FUNC_ENTER() \ do { \ - ex__reset_error_status(); \ + exi_reset_error_status(); \ fprintf(stderr, "%d Enter: %s\n", indent, __func__); \ indent++; \ } while (0) @@ -194,7 +194,7 @@ EXODUS_EXPORT int indent; #else #define EX_FUNC_ENTER() \ do { \ - ex__reset_error_status(); \ + exi_reset_error_status(); \ } while (0) #define EX_FUNC_ENTER_INT() #define EX_FUNC_LEAVE(error) return error @@ -276,10 +276,10 @@ EXODUS_EXPORT int indent; #define VAR_ID_EL_BLK "eb_prop1" /**< element block ids props */ #define VAR_ID_ED_BLK "ed_prop1" /**< edge block ids props */ #define VAR_ID_FA_BLK "fa_prop1" /**< face block ids props */ -#define DIM_NUM_ENTITY_ASSEMBLY(num) ex__catstr("num_entity_assembly", num) -#define VAR_ENTITY_ASSEMBLY(num) ex__catstr("assembly_entity", num) -#define DIM_NUM_VALUES_BLOB(num) ex__catstr("num_values_blob", num) -#define VAR_ENTITY_BLOB(num) ex__catstr("blob_entity", num) +#define DIM_NUM_ENTITY_ASSEMBLY(num) exi_catstr("num_entity_assembly", num) +#define VAR_ENTITY_ASSEMBLY(num) exi_catstr("assembly_entity", num) +#define DIM_NUM_VALUES_BLOB(num) exi_catstr("num_values_blob", num) +#define VAR_ENTITY_BLOB(num) exi_catstr("blob_entity", num) #define EX_ATTRIBUTE_TYPE "_type" #define EX_ATTRIBUTE_TYPENAME "_typename" #define EX_ATTRIBUTE_NAME "_name" @@ -288,84 +288,84 @@ EXODUS_EXPORT int indent; /*! element type names for each element block */ #define ATT_NAME_ELB "elem_type" /*! number of elements in element block num */ -#define DIM_NUM_EL_IN_BLK(num) ex__catstr("num_el_in_blk", num) +#define DIM_NUM_EL_IN_BLK(num) exi_catstr("num_el_in_blk", num) /*! number of nodes per element in element block num */ -#define DIM_NUM_NOD_PER_EL(num) ex__catstr("num_nod_per_el", num) +#define DIM_NUM_NOD_PER_EL(num) exi_catstr("num_nod_per_el", num) /*! number of attributes in element block num */ -#define DIM_NUM_ATT_IN_BLK(num) ex__catstr("num_att_in_blk", num) +#define DIM_NUM_ATT_IN_BLK(num) exi_catstr("num_att_in_blk", num) /*! number of edges in edge block num */ -#define DIM_NUM_ED_IN_EBLK(num) ex__catstr("num_ed_in_blk", num) +#define DIM_NUM_ED_IN_EBLK(num) exi_catstr("num_ed_in_blk", num) /*! number of nodes per edge in edge block num */ -#define DIM_NUM_NOD_PER_ED(num) ex__catstr("num_nod_per_ed", num) +#define DIM_NUM_NOD_PER_ED(num) exi_catstr("num_nod_per_ed", num) /*! number of edges per element in element block num */ -#define DIM_NUM_EDG_PER_EL(num) ex__catstr("num_edg_per_el", num) +#define DIM_NUM_EDG_PER_EL(num) exi_catstr("num_edg_per_el", num) /*! number of attributes in edge block num */ -#define DIM_NUM_ATT_IN_EBLK(num) ex__catstr("num_att_in_eblk", num) +#define DIM_NUM_ATT_IN_EBLK(num) exi_catstr("num_att_in_eblk", num) /*! number of faces in face block num */ -#define DIM_NUM_FA_IN_FBLK(num) ex__catstr("num_fa_in_blk", num) +#define DIM_NUM_FA_IN_FBLK(num) exi_catstr("num_fa_in_blk", num) /*! number of nodes per face in face block num */ -#define DIM_NUM_NOD_PER_FA(num) ex__catstr("num_nod_per_fa", num) +#define DIM_NUM_NOD_PER_FA(num) exi_catstr("num_nod_per_fa", num) /*! number of faces per element in element block num */ -#define DIM_NUM_FAC_PER_EL(num) ex__catstr("num_fac_per_el", num) +#define DIM_NUM_FAC_PER_EL(num) exi_catstr("num_fac_per_el", num) /*! number of attributes in face block num */ -#define DIM_NUM_ATT_IN_FBLK(num) ex__catstr("num_att_in_fblk", num) +#define DIM_NUM_ATT_IN_FBLK(num) exi_catstr("num_att_in_fblk", num) /*! element connectivity for element block num */ -#define VAR_CONN(num) ex__catstr("connect", num) +#define VAR_CONN(num) exi_catstr("connect", num) /*! array containing number of entity per */ /* entity for n-sided face/element blocks */ -#define VAR_EBEPEC(num) ex__catstr("ebepecnt", num) +#define VAR_EBEPEC(num) exi_catstr("ebepecnt", num) /*! list of attributes for element block num */ -#define VAR_ATTRIB(num) ex__catstr("attrib", num) +#define VAR_ATTRIB(num) exi_catstr("attrib", num) /*! list of attribute names for element block num */ -#define VAR_NAME_ATTRIB(num) ex__catstr("attrib_name", num) +#define VAR_NAME_ATTRIB(num) exi_catstr("attrib_name", num) /*! list of the numth property for all element blocks */ -#define VAR_EB_PROP(num) ex__catstr("eb_prop", num) +#define VAR_EB_PROP(num) exi_catstr("eb_prop", num) /*! edge connectivity for element block num */ -#define VAR_ECONN(num) ex__catstr("edgconn", num) +#define VAR_ECONN(num) exi_catstr("edgconn", num) /*! edge connectivity for edge block num */ -#define VAR_EBCONN(num) ex__catstr("ebconn", num) +#define VAR_EBCONN(num) exi_catstr("ebconn", num) /*! list of attributes for edge block num */ -#define VAR_EATTRIB(num) ex__catstr("eattrb", num) +#define VAR_EATTRIB(num) exi_catstr("eattrb", num) /*! list of attribute names for edge block num */ -#define VAR_NAME_EATTRIB(num) ex__catstr("eattrib_name", num) +#define VAR_NAME_EATTRIB(num) exi_catstr("eattrib_name", num) #define VAR_NATTRIB "nattrb" #define VAR_NAME_NATTRIB "nattrib_name" #define DIM_NUM_ATT_IN_NBLK "num_att_in_nblk" -#define VAR_NSATTRIB(num) ex__catstr("nsattrb", num) -#define VAR_NAME_NSATTRIB(num) ex__catstr("nsattrib_name", num) -#define DIM_NUM_ATT_IN_NS(num) ex__catstr("num_att_in_ns", num) +#define VAR_NSATTRIB(num) exi_catstr("nsattrb", num) +#define VAR_NAME_NSATTRIB(num) exi_catstr("nsattrib_name", num) +#define DIM_NUM_ATT_IN_NS(num) exi_catstr("num_att_in_ns", num) -#define VAR_SSATTRIB(num) ex__catstr("ssattrb", num) -#define VAR_NAME_SSATTRIB(num) ex__catstr("ssattrib_name", num) -#define DIM_NUM_ATT_IN_SS(num) ex__catstr("num_att_in_ss", num) +#define VAR_SSATTRIB(num) exi_catstr("ssattrb", num) +#define VAR_NAME_SSATTRIB(num) exi_catstr("ssattrib_name", num) +#define DIM_NUM_ATT_IN_SS(num) exi_catstr("num_att_in_ss", num) -#define VAR_ESATTRIB(num) ex__catstr("esattrb", num) -#define VAR_NAME_ESATTRIB(num) ex__catstr("esattrib_name", num) -#define DIM_NUM_ATT_IN_ES(num) ex__catstr("num_att_in_es", num) +#define VAR_ESATTRIB(num) exi_catstr("esattrb", num) +#define VAR_NAME_ESATTRIB(num) exi_catstr("esattrib_name", num) +#define DIM_NUM_ATT_IN_ES(num) exi_catstr("num_att_in_es", num) -#define VAR_FSATTRIB(num) ex__catstr("fsattrb", num) -#define VAR_NAME_FSATTRIB(num) ex__catstr("fsattrib_name", num) -#define DIM_NUM_ATT_IN_FS(num) ex__catstr("num_att_in_fs", num) +#define VAR_FSATTRIB(num) exi_catstr("fsattrb", num) +#define VAR_NAME_FSATTRIB(num) exi_catstr("fsattrib_name", num) +#define DIM_NUM_ATT_IN_FS(num) exi_catstr("num_att_in_fs", num) -#define VAR_ELSATTRIB(num) ex__catstr("elsattrb", num) -#define VAR_NAME_ELSATTRIB(num) ex__catstr("elsattrib_name", num) -#define DIM_NUM_ATT_IN_ELS(num) ex__catstr("num_att_in_els", num) +#define VAR_ELSATTRIB(num) exi_catstr("elsattrb", num) +#define VAR_NAME_ELSATTRIB(num) exi_catstr("elsattrib_name", num) +#define DIM_NUM_ATT_IN_ELS(num) exi_catstr("num_att_in_els", num) /*! list of the numth property for all edge blocks */ -#define VAR_ED_PROP(num) ex__catstr("ed_prop", num) +#define VAR_ED_PROP(num) exi_catstr("ed_prop", num) /*! face connectivity for element block num */ -#define VAR_FCONN(num) ex__catstr("facconn", num) +#define VAR_FCONN(num) exi_catstr("facconn", num) /*! face connectivity for face block num */ -#define VAR_FBCONN(num) ex__catstr("fbconn", num) +#define VAR_FBCONN(num) exi_catstr("fbconn", num) /*! array containing number of entity per entity for n-sided face/element blocks */ -#define VAR_FBEPEC(num) ex__catstr("fbepecnt", num) +#define VAR_FBEPEC(num) exi_catstr("fbepecnt", num) /*! list of attributes for face block num */ -#define VAR_FATTRIB(num) ex__catstr("fattrb", num) +#define VAR_FATTRIB(num) exi_catstr("fattrb", num) /*! list of attribute names for face block num */ -#define VAR_NAME_FATTRIB(num) ex__catstr("fattrib_name", num) +#define VAR_NAME_FATTRIB(num) exi_catstr("fattrib_name", num) /*! list of the numth property for all face blocks */ -#define VAR_FA_PROP(num) ex__catstr("fa_prop", num) +#define VAR_FA_PROP(num) exi_catstr("fa_prop", num) /*! name attached to element block, node set, side set, element map, or map properties */ #define ATT_PROP_NAME "name" @@ -374,73 +374,73 @@ EXODUS_EXPORT int indent; #define VAR_SS_STAT "ss_status" /**< side set status */ #define VAR_SS_IDS "ss_prop1" /**< side set id properties */ /*! number of sides in side set num*/ -#define DIM_NUM_SIDE_SS(num) ex__catstr("num_side_ss", num) +#define DIM_NUM_SIDE_SS(num) exi_catstr("num_side_ss", num) /*! number of distribution factors in side set num */ -#define DIM_NUM_DF_SS(num) ex__catstr("num_df_ss", num) +#define DIM_NUM_DF_SS(num) exi_catstr("num_df_ss", num) /*! the distribution factors for each node in side set num */ -#define VAR_FACT_SS(num) ex__catstr("dist_fact_ss", num) +#define VAR_FACT_SS(num) exi_catstr("dist_fact_ss", num) /*! list of elements in side set num */ -#define VAR_ELEM_SS(num) ex__catstr("elem_ss", num) +#define VAR_ELEM_SS(num) exi_catstr("elem_ss", num) /*! list of sides in side set */ -#define VAR_SIDE_SS(num) ex__catstr("side_ss", num) +#define VAR_SIDE_SS(num) exi_catstr("side_ss", num) /*! list of the numth property for all side sets */ -#define VAR_SS_PROP(num) ex__catstr("ss_prop", num) +#define VAR_SS_PROP(num) exi_catstr("ss_prop", num) #define DIM_NUM_ES "num_edge_sets" /**< number of edge sets */ #define VAR_ES_STAT "es_status" /**< edge set status */ #define VAR_ES_IDS "es_prop1" /**< edge set id properties */ /*! number of edges in edge set num*/ -#define DIM_NUM_EDGE_ES(num) ex__catstr("num_edge_es", num) +#define DIM_NUM_EDGE_ES(num) exi_catstr("num_edge_es", num) /*! number of distribution factors in edge set num */ -#define DIM_NUM_DF_ES(num) ex__catstr("num_df_es", num) +#define DIM_NUM_DF_ES(num) exi_catstr("num_df_es", num) /*! the distribution factors for each node in edge set num */ -#define VAR_FACT_ES(num) ex__catstr("dist_fact_es", num) +#define VAR_FACT_ES(num) exi_catstr("dist_fact_es", num) /*! list of edges in edge set num */ -#define VAR_EDGE_ES(num) ex__catstr("edge_es", num) +#define VAR_EDGE_ES(num) exi_catstr("edge_es", num) /*! list of orientations in the edge set. */ -#define VAR_ORNT_ES(num) ex__catstr("ornt_es", num) +#define VAR_ORNT_ES(num) exi_catstr("ornt_es", num) /*! list of the numth property for all edge sets */ -#define VAR_ES_PROP(num) ex__catstr("es_prop", num) +#define VAR_ES_PROP(num) exi_catstr("es_prop", num) #define DIM_NUM_FS "num_face_sets" /**< number of face sets */ #define VAR_FS_STAT "fs_status" /**< face set status */ #define VAR_FS_IDS "fs_prop1" /**< face set id properties */ /*! number of faces in side set num*/ -#define DIM_NUM_FACE_FS(num) ex__catstr("num_face_fs", num) +#define DIM_NUM_FACE_FS(num) exi_catstr("num_face_fs", num) /*! number of distribution factors in face set num */ -#define DIM_NUM_DF_FS(num) ex__catstr("num_df_fs", num) +#define DIM_NUM_DF_FS(num) exi_catstr("num_df_fs", num) /*! the distribution factors for each node in face set num */ -#define VAR_FACT_FS(num) ex__catstr("dist_fact_fs", num) +#define VAR_FACT_FS(num) exi_catstr("dist_fact_fs", num) /*! list of elements in face set num */ -#define VAR_FACE_FS(num) ex__catstr("face_fs", num) +#define VAR_FACE_FS(num) exi_catstr("face_fs", num) /*! list of sides in side set */ -#define VAR_ORNT_FS(num) ex__catstr("ornt_fs", num) +#define VAR_ORNT_FS(num) exi_catstr("ornt_fs", num) /*! list of the numth property for all face sets */ -#define VAR_FS_PROP(num) ex__catstr("fs_prop", num) +#define VAR_FS_PROP(num) exi_catstr("fs_prop", num) #define DIM_NUM_ELS "num_elem_sets" /**< number of elem sets */ /*! number of elements in elem set num */ -#define DIM_NUM_ELE_ELS(num) ex__catstr("num_ele_els", num) +#define DIM_NUM_ELE_ELS(num) exi_catstr("num_ele_els", num) /*! number of distribution factors in element set num */ -#define DIM_NUM_DF_ELS(num) ex__catstr("num_df_els", num) +#define DIM_NUM_DF_ELS(num) exi_catstr("num_df_els", num) #define VAR_ELS_STAT "els_status" /**< elem set status */ #define VAR_ELS_IDS "els_prop1" /**< elem set id properties */ /*! list of elements in elem set num */ -#define VAR_ELEM_ELS(num) ex__catstr("elem_els", num) +#define VAR_ELEM_ELS(num) exi_catstr("elem_els", num) /*! list of distribution factors in elem set num */ -#define VAR_FACT_ELS(num) ex__catstr("dist_fact_els", num) +#define VAR_FACT_ELS(num) exi_catstr("dist_fact_els", num) /*! list of the numth property for all elem sets */ -#define VAR_ELS_PROP(num) ex__catstr("els_prop", num) +#define VAR_ELS_PROP(num) exi_catstr("els_prop", num) #define DIM_NUM_NS "num_node_sets" /**< number of node sets */ /*! number of nodes in node set num */ -#define DIM_NUM_NOD_NS(num) ex__catstr("num_nod_ns", num) +#define DIM_NUM_NOD_NS(num) exi_catstr("num_nod_ns", num) /*! number of distribution factors in node set num */ -#define DIM_NUM_DF_NS(num) ex__catstr("num_df_ns", num) +#define DIM_NUM_DF_NS(num) exi_catstr("num_df_ns", num) #define VAR_NS_STAT "ns_status" /**< node set status */ #define VAR_NS_IDS "ns_prop1" /**< node set id properties */ /*! list of nodes in node set num */ -#define VAR_NODE_NS(num) ex__catstr("node_ns", num) +#define VAR_NODE_NS(num) exi_catstr("node_ns", num) /*! list of distribution factors in node set num */ -#define VAR_FACT_NS(num) ex__catstr("dist_fact_ns", num) +#define VAR_FACT_NS(num) exi_catstr("dist_fact_ns", num) /*! list of the numth property for all node sets */ -#define VAR_NS_PROP(num) ex__catstr("ns_prop", num) +#define VAR_NS_PROP(num) exi_catstr("ns_prop", num) #define DIM_NUM_QA "num_qa_rec" /**< number of QA records */ #define VAR_QA_TITLE "qa_records" /**< QA records */ #define DIM_NUM_INFO "num_info" /**< number of information records */ @@ -463,49 +463,49 @@ EXODUS_EXPORT int indent; #define VAR_NAME_NOD_VAR "name_nod_var" /**< names of nodal variables */ #define VAR_NOD_VAR "vals_nod_var" /**< values of nodal variables \deprecated */ /*! values of nodal variables */ -#define VAR_NOD_VAR_NEW(num) ex__catstr("vals_nod_var", num) +#define VAR_NOD_VAR_NEW(num) exi_catstr("vals_nod_var", num) #define DIM_NUM_ASSEMBLY_VAR "num_assembly_var" /**< number of assembly variables */ #define VAR_NAME_ASSEMBLY_VAR "name_assembly_var" /**< names of assembly variables*/ -#define VAR_ASSEMBLY_VAR(num1, num2) ex__catstr2("vals_assembly_var", num1, "assembly", num2) +#define VAR_ASSEMBLY_VAR(num1, num2) exi_catstr2("vals_assembly_var", num1, "assembly", num2) #define DIM_NUM_BLOB_VAR "num_blob_var" /**< number of blob variables */ #define VAR_NAME_BLOB_VAR "name_blob_var" /**< names of blob variables*/ -#define VAR_BLOB_VAR(num1, num2) ex__catstr2("vals_blob_var", num1, "blob", num2) +#define VAR_BLOB_VAR(num1, num2) exi_catstr2("vals_blob_var", num1, "blob", num2) #define DIM_NUM_ELE_VAR "num_elem_var" /**< number of element variables */ #define VAR_NAME_ELE_VAR "name_elem_var" /**< names of element variables*/ /*! values of element variable num1 in element block num2 */ -#define VAR_ELEM_VAR(num1, num2) ex__catstr2("vals_elem_var", num1, "eb", num2) +#define VAR_ELEM_VAR(num1, num2) exi_catstr2("vals_elem_var", num1, "eb", num2) #define DIM_NUM_EDG_VAR "num_edge_var" /**< number of edge variables */ #define VAR_NAME_EDG_VAR "name_edge_var" /**< names of edge variables */ /*! values of edge variable num1 in edge block num2 */ -#define VAR_EDGE_VAR(num1, num2) ex__catstr2("vals_edge_var", num1, "eb", num2) +#define VAR_EDGE_VAR(num1, num2) exi_catstr2("vals_edge_var", num1, "eb", num2) #define DIM_NUM_FAC_VAR "num_face_var" /**< number of face variables */ #define VAR_NAME_FAC_VAR "name_face_var" /**< names of face variables */ /*! values of face variable num1 in face block num2 */ -#define VAR_FACE_VAR(num1, num2) ex__catstr2("vals_face_var", num1, "fb", num2) +#define VAR_FACE_VAR(num1, num2) exi_catstr2("vals_face_var", num1, "fb", num2) #define DIM_NUM_NSET_VAR "num_nset_var" /**< number of nodeset variables */ #define VAR_NAME_NSET_VAR "name_nset_var" /**< names of nodeset variables*/ /*! values of nodeset variable num1 in nodeset num2 */ -#define VAR_NS_VAR(num1, num2) ex__catstr2("vals_nset_var", num1, "ns", num2) +#define VAR_NS_VAR(num1, num2) exi_catstr2("vals_nset_var", num1, "ns", num2) #define DIM_NUM_ESET_VAR "num_eset_var" /**< number of edgeset variables */ /*! values of edgeset variable num1 in edgeset num2 */ #define VAR_NAME_ESET_VAR "name_eset_var" /**< names of edgeset variables*/ -#define VAR_ES_VAR(num1, num2) ex__catstr2("vals_eset_var", num1, "es", num2) +#define VAR_ES_VAR(num1, num2) exi_catstr2("vals_eset_var", num1, "es", num2) #define DIM_NUM_FSET_VAR "num_fset_var" /**< number of faceset variables */ #define VAR_NAME_FSET_VAR "name_fset_var" /**< names of faceset variables*/ /*! values of faceset variable num1 in faceset num2 */ -#define VAR_FS_VAR(num1, num2) ex__catstr2("vals_fset_var", num1, "fs", num2) +#define VAR_FS_VAR(num1, num2) exi_catstr2("vals_fset_var", num1, "fs", num2) #define DIM_NUM_SSET_VAR "num_sset_var" /**< number of sideset variables */ #define VAR_NAME_SSET_VAR "name_sset_var" /**< names of sideset variables*/ /*! values of sideset variable num1 in sideset num2 */ -#define VAR_SS_VAR(num1, num2) ex__catstr2("vals_sset_var", num1, "ss", num2) +#define VAR_SS_VAR(num1, num2) exi_catstr2("vals_sset_var", num1, "ss", num2) #define DIM_NUM_ELSET_VAR "num_elset_var" /**< number of element set variables*/ #define VAR_NAME_ELSET_VAR "name_elset_var" /**< names of elemset variables*/ /*! values of elemset variable num1 in elemset num2 */ -#define VAR_ELS_VAR(num1, num2) ex__catstr2("vals_elset_var", num1, "es", num2) +#define VAR_ELS_VAR(num1, num2) exi_catstr2("vals_elset_var", num1, "es", num2) /** * \defgroup ReductionVariables Variables controlling storage of reduction variables @@ -513,51 +513,51 @@ EXODUS_EXPORT int indent; */ #define DIM_NUM_ASSEMBLY_RED_VAR "num_assembly_red_var" /**< number of assembly variables */ #define VAR_NAME_ASSEMBLY_RED_VAR "name_assembly_red_var" /**< names of assembly variables*/ -#define VAR_ASSEMBLY_RED_VAR(num) ex__catstr("vals_red_var_assembly", num) +#define VAR_ASSEMBLY_RED_VAR(num) exi_catstr("vals_red_var_assembly", num) #define DIM_NUM_BLOB_RED_VAR "num_blob_red_var" /**< number of blob variables */ #define VAR_NAME_BLOB_RED_VAR "name_blob_red_var" /**< names of blob variables*/ -#define VAR_BLOB_RED_VAR(num) ex__catstr("vals_red_var_blob", num) +#define VAR_BLOB_RED_VAR(num) exi_catstr("vals_red_var_blob", num) #define DIM_NUM_ELE_RED_VAR "num_elem_red_var" /**< number of element variables */ #define VAR_NAME_ELE_RED_VAR "name_elem_red_var" /**< names of element variables*/ /*! values of element variable num in element block num */ -#define VAR_ELEM_RED_VAR(num) ex__catstr("vals_red_var_eb", num) +#define VAR_ELEM_RED_VAR(num) exi_catstr("vals_red_var_eb", num) #define DIM_NUM_EDG_RED_VAR "num_edge_red_var" /**< number of edge variables */ #define VAR_NAME_EDG_RED_VAR "name_edge_red_var" /**< names of edge variables */ /*! values of edge variable num in edge block num */ -#define VAR_EDGE_RED_VAR(num) ex__catstr("vals_red_var_edb", num) +#define VAR_EDGE_RED_VAR(num) exi_catstr("vals_red_var_edb", num) #define DIM_NUM_FAC_RED_VAR "num_face_red_var" /**< number of face variables */ #define VAR_NAME_FAC_RED_VAR "name_face_red_var" /**< names of face variables */ /*! values of face variable num in face block num */ -#define VAR_FACE_RED_VAR(num) ex__catstr("vals_red_var_fb", num) +#define VAR_FACE_RED_VAR(num) exi_catstr("vals_red_var_fb", num) #define DIM_NUM_NSET_RED_VAR "num_nset_red_var" /**< number of nodeset variables */ #define VAR_NAME_NSET_RED_VAR "name_nset_red_var" /**< names of nodeset variables*/ /*! values of nodeset variable num in nodeset num */ -#define VAR_NS_RED_VAR(num) ex__catstr("vals_red_var_nset", num) +#define VAR_NS_RED_VAR(num) exi_catstr("vals_red_var_nset", num) #define DIM_NUM_ESET_RED_VAR "num_eset_red_var" /**< number of edgeset variables */ /*! values of edgeset variable num in edgeset num */ #define VAR_NAME_ESET_RED_VAR "name_eset_red_var" /**< names of edgeset variables*/ -#define VAR_ES_RED_VAR(num) ex__catstr("vals_red_var_eset", num) +#define VAR_ES_RED_VAR(num) exi_catstr("vals_red_var_eset", num) #define DIM_NUM_FSET_RED_VAR "num_fset_red_var" /**< number of faceset variables */ #define VAR_NAME_FSET_RED_VAR "name_fset_red_var" /**< names of faceset variables*/ /*! values of faceset variable num in faceset num */ -#define VAR_FS_RED_VAR(num) ex__catstr("vals_red_var_fset", num) +#define VAR_FS_RED_VAR(num) exi_catstr("vals_red_var_fset", num) #define DIM_NUM_SSET_RED_VAR "num_sset_red_var" /**< number of sideset variables */ #define VAR_NAME_SSET_RED_VAR "name_sset_red_var" /**< names of sideset variables*/ /*! values of sideset variable num in sideset num */ -#define VAR_SS_RED_VAR(num) ex__catstr("vals_red_var_sset", num) +#define VAR_SS_RED_VAR(num) exi_catstr("vals_red_var_sset", num) #define DIM_NUM_ELSET_RED_VAR "num_elset_red_var" /**< number of element set variables*/ #define VAR_NAME_ELSET_RED_VAR "name_elset_red_var" /**< names of elemset variables*/ /*! values of elemset variable num in elemset num */ -#define VAR_ELS_RED_VAR(num) ex__catstr("vals_red_var_elset", num) +#define VAR_ELS_RED_VAR(num) exi_catstr("vals_red_var_elset", num) /** @}*/ /*! general dimension of length MAX_STR_LENGTH used for some string lengths */ @@ -576,27 +576,27 @@ EXODUS_EXPORT int indent; #define VAR_NODE_NUM_MAP "node_num_map" /**< node numbering map */ #define DIM_NUM_EM "num_elem_maps" /**< number of element maps */ /*! the numth element map */ -#define VAR_ELEM_MAP(num) ex__catstr("elem_map", num) +#define VAR_ELEM_MAP(num) exi_catstr("elem_map", num) /*! list of the numth property for all element maps */ -#define VAR_EM_PROP(num) ex__catstr("em_prop", num) +#define VAR_EM_PROP(num) exi_catstr("em_prop", num) #define DIM_NUM_EDM "num_edge_maps" /**< number of edge maps */ /*! the numth edge map */ -#define VAR_EDGE_MAP(num) ex__catstr("edge_map", num) +#define VAR_EDGE_MAP(num) exi_catstr("edge_map", num) /* list of the numth property for all edge maps */ -#define VAR_EDM_PROP(num) ex__catstr("edm_prop", num) +#define VAR_EDM_PROP(num) exi_catstr("edm_prop", num) #define DIM_NUM_FAM "num_face_maps" /**< number of face maps */ /*! the numth face map */ -#define VAR_FACE_MAP(num) ex__catstr("face_map", num) +#define VAR_FACE_MAP(num) exi_catstr("face_map", num) /*! list of the numth property for all face maps */ -#define VAR_FAM_PROP(num) ex__catstr("fam_prop", num) +#define VAR_FAM_PROP(num) exi_catstr("fam_prop", num) #define DIM_NUM_NM "num_node_maps" /**< number of node maps */ /*! the numth node map */ -#define VAR_NODE_MAP(num) ex__catstr("node_map", num) +#define VAR_NODE_MAP(num) exi_catstr("node_map", num) /*! list of the numth property for all node maps */ -#define VAR_NM_PROP(num) ex__catstr("nm_prop", num) +#define VAR_NM_PROP(num) exi_catstr("nm_prop", num) /*! list of the numth property for all assemblies */ -#define VAR_ASSEMBLY_PROP(num) ex__catstr("assembly_prop", num) -#define VAR_BLOB_PROP(num) ex__catstr("blob_prop", num) +#define VAR_ASSEMBLY_PROP(num) exi_catstr("assembly_prop", num) +#define VAR_BLOB_PROP(num) exi_catstr("blob_prop", num) #define DIM_NUM_CFRAMES "num_cframes" #define DIM_NUM_CFRAME9 "num_cframes_9" @@ -660,7 +660,7 @@ EXODUS_EXPORT int indent; #define DIM_NCNT_CMAP "ncnt_cmap" #define DIM_ECNT_CMAP "ecnt_cmap" -enum ex__element_type { +enum exi_element_type { EX_EL_UNK = -1, /**< unknown entity */ EX_EL_NULL_ELEMENT = 0, EX_EL_TRIANGLE = 1, /**< Triangle entity */ @@ -676,11 +676,11 @@ enum ex__element_type { EX_EL_TRISHELL = 11, /**< Triangular Shell entity */ EX_EL_PYRAMID = 12 /**< Pyramid entity */ }; -typedef enum ex__element_type ex__element_type; +typedef enum exi_element_type exi_element_type; /* Internal structure declarations */ -struct ex__file_item +struct exi_file_item { int file_id; nc_type netcdf_type_code; @@ -705,10 +705,10 @@ struct ex__file_item unsigned int has_edges : 1; /**< for input only at this time */ unsigned int has_faces : 1; /**< for input only at this time */ unsigned int has_elems : 1; /**< for input only at this time */ - struct ex__file_item *next; + struct exi_file_item *next; }; -struct ex__elem_blk_parm +struct exi_elem_blk_parm { char elem_type[33]; int64_t elem_blk_id; @@ -718,25 +718,25 @@ struct ex__elem_blk_parm int num_nodes_per_side[6]; int num_attr; int64_t elem_ctr; - ex__element_type elem_type_val; + exi_element_type elem_type_val; }; /* Used in exo_jack.c for fortran interface */ -enum ex__coordinate_frame_type { +enum exi_coordinate_frame_type { EX_CF_RECTANGULAR = 1, EX_CF_CYLINDRICAL = 2, EX_CF_SPHERICAL = 3 }; -typedef enum ex__coordinate_frame_type ex__coordinate_frame_type; +typedef enum exi_coordinate_frame_type exi_coordinate_frame_type; -struct ex__list_item +struct exi_list_item { /* for use with ex_get_file_item */ int exo_id; int value; - struct ex__list_item *next; + struct exi_list_item *next; }; -struct ex__obj_stats +struct exi_obj_stats { int64_t *id_vals; int *stat_vals; @@ -745,129 +745,129 @@ struct ex__obj_stats char valid_ids; char valid_stat; char sequential; - struct ex__obj_stats *next; + struct exi_obj_stats *next; }; #ifndef EXODUS_EXPORT #define EXODUS_EXPORT extern #endif /* EXODUS_EXPORT */ -EXODUS_EXPORT void ex__iqsort(int v[], int iv[], size_t N); -EXODUS_EXPORT void ex__iqsort64(int64_t v[], int64_t iv[], int64_t N); +EXODUS_EXPORT void exi_iqsort(int v[], int iv[], size_t N); +EXODUS_EXPORT void exi_iqsort64(int64_t v[], int64_t iv[], int64_t N); -EXODUS_EXPORT char *ex__catstr(const char * /*string*/, int /*num*/); -EXODUS_EXPORT char *ex__catstr2(const char * /*string1*/, int /*num1*/, const char * /*string2*/, +EXODUS_EXPORT char *exi_catstr(const char * /*string*/, int /*num*/); +EXODUS_EXPORT char *exi_catstr2(const char * /*string1*/, int /*num1*/, const char * /*string2*/, int /*num2*/); -EXODUS_EXPORT char *ex__dim_num_entries_in_object(ex_entity_type /*obj_type*/, int /*idx*/); -EXODUS_EXPORT char *ex__dim_num_objects(ex_entity_type obj_type); -EXODUS_EXPORT char *ex__name_var_of_object(ex_entity_type /*obj_type*/, int /*i*/, int /*j*/); -EXODUS_EXPORT char *ex__name_red_var_of_object(ex_entity_type /*obj_type*/, int /*indx*/); -EXODUS_EXPORT char *ex__name_of_map(ex_entity_type /*map_type*/, int /*map_index*/); +EXODUS_EXPORT char *exi_dim_num_entries_in_object(ex_entity_type /*obj_type*/, int /*idx*/); +EXODUS_EXPORT char *exi_dim_num_objects(ex_entity_type obj_type); +EXODUS_EXPORT char *exi_name_var_of_object(ex_entity_type /*obj_type*/, int /*i*/, int /*j*/); +EXODUS_EXPORT char *exi_name_red_var_of_object(ex_entity_type /*obj_type*/, int /*indx*/); +EXODUS_EXPORT char *exi_name_of_map(ex_entity_type /*map_type*/, int /*map_index*/); -EXODUS_EXPORT int ex__conv_init(int exoid, int *comp_wordsize, int *io_wordsize, int file_wordsize, +EXODUS_EXPORT int exi_conv_init(int exoid, int *comp_wordsize, int *io_wordsize, int file_wordsize, int int64_status, bool is_parallel, bool is_hdf5, bool is_pnetcdf, bool is_write); -EXODUS_EXPORT void ex__conv_exit(int exoid); +EXODUS_EXPORT void exi_conv_exit(int exoid); EXODUS_EXPORT nc_type nc_flt_code(int exoid); -EXODUS_EXPORT int ex__comp_ws(int exoid); -EXODUS_EXPORT int ex__get_cpu_ws(void); -EXODUS_EXPORT int ex__is_parallel(int exoid); - -EXODUS_EXPORT struct ex__list_item **ex__get_counter_list(ex_entity_type obj_type); -EXODUS_EXPORT int ex__get_file_item(int /*exoid*/, struct ex__list_item **/*list_ptr*/); -EXODUS_EXPORT int ex__inc_file_item(int /*exoid*/, struct ex__list_item **/*list_ptr*/); -EXODUS_EXPORT void ex__rm_file_item(int /*exoid*/, struct ex__list_item ** /*list_ptr*/); - -extern struct ex__obj_stats *exoII_eb; -extern struct ex__obj_stats *exoII_ed; -extern struct ex__obj_stats *exoII_fa; -extern struct ex__obj_stats *exoII_ns; -extern struct ex__obj_stats *exoII_es; -extern struct ex__obj_stats *exoII_fs; -extern struct ex__obj_stats *exoII_ss; -extern struct ex__obj_stats *exoII_els; -extern struct ex__obj_stats *exoII_em; -extern struct ex__obj_stats *exoII_edm; -extern struct ex__obj_stats *exoII_fam; -extern struct ex__obj_stats *exoII_nm; - -struct ex__file_item *ex__find_file_item(int exoid); -struct ex__file_item *ex__add_file_item(int exoid); -struct ex__obj_stats *ex__get_stat_ptr(int exoid, struct ex__obj_stats **obj_ptr); - -EXODUS_EXPORT void ex__rm_stat_ptr(int exoid, struct ex__obj_stats **obj_ptr); - -EXODUS_EXPORT void ex__set_compact_storage(int exoid, int varid); -EXODUS_EXPORT void ex__compress_variable(int exoid, int varid, int type); -EXODUS_EXPORT int ex__id_lkup(int exoid, ex_entity_type id_type, ex_entity_id num); -EXODUS_EXPORT int ex__check_valid_file_id( +EXODUS_EXPORT int exi_comp_ws(int exoid); +EXODUS_EXPORT int exi_get_cpu_ws(void); +EXODUS_EXPORT int exi_is_parallel(int exoid); + +EXODUS_EXPORT struct exi_list_item **exi_get_counter_list(ex_entity_type obj_type); +EXODUS_EXPORT int exi_get_file_item(int /*exoid*/, struct exi_list_item **/*list_ptr*/); +EXODUS_EXPORT int exi_inc_file_item(int /*exoid*/, struct exi_list_item **/*list_ptr*/); +EXODUS_EXPORT void exi_rm_file_item(int /*exoid*/, struct exi_list_item ** /*list_ptr*/); + +extern struct exi_obj_stats *exoII_eb; +extern struct exi_obj_stats *exoII_ed; +extern struct exi_obj_stats *exoII_fa; +extern struct exi_obj_stats *exoII_ns; +extern struct exi_obj_stats *exoII_es; +extern struct exi_obj_stats *exoII_fs; +extern struct exi_obj_stats *exoII_ss; +extern struct exi_obj_stats *exoII_els; +extern struct exi_obj_stats *exoII_em; +extern struct exi_obj_stats *exoII_edm; +extern struct exi_obj_stats *exoII_fam; +extern struct exi_obj_stats *exoII_nm; + +struct exi_file_item *exi_find_file_item(int exoid); +struct exi_file_item *exi_add_file_item(int exoid); +struct exi_obj_stats *exi_get_stat_ptr(int exoid, struct exi_obj_stats **obj_ptr); + +EXODUS_EXPORT void exi_rm_stat_ptr(int exoid, struct exi_obj_stats **obj_ptr); + +EXODUS_EXPORT void exi_set_compact_storage(int exoid, int varid); +EXODUS_EXPORT void exi_compress_variable(int exoid, int varid, int type); +EXODUS_EXPORT int exi_id_lkup(int exoid, ex_entity_type id_type, ex_entity_id num); +EXODUS_EXPORT int exi_check_valid_file_id( int exoid, const char *func); /** Return fatal error if exoid does not refer to valid file */ -EXODUS_EXPORT int ex__check_multiple_open(const char *path, int mode, const char *func); -EXODUS_EXPORT int ex__check_file_type(const char *path, int *type); -EXODUS_EXPORT char *ex__canonicalize_filename(const char *path); -EXODUS_EXPORT int ex__get_dimension(int exoid, const char *DIMENSION, const char *label, +EXODUS_EXPORT int exi_check_multiple_open(const char *path, int mode, const char *func); +EXODUS_EXPORT int exi_check_file_type(const char *path, int *type); +EXODUS_EXPORT char *exi_canonicalize_filename(const char *path); +EXODUS_EXPORT int exi_get_dimension(int exoid, const char *DIMENSION, const char *label, size_t *count, int *dimid, const char *routine); -EXODUS_EXPORT int ex__get_nodal_var_time(int exoid, int nodal_var_index, int64_t node_number, +EXODUS_EXPORT int exi_get_nodal_var_time(int exoid, int nodal_var_index, int64_t node_number, int beg_time_step, int end_time_step, void *nodal_var_vals); -EXODUS_EXPORT int ex__put_nodal_var_multi_time(int exoid, int nodal_var_index, int64_t num_nodes, +EXODUS_EXPORT int exi_put_nodal_var_multi_time(int exoid, int nodal_var_index, int64_t num_nodes, int beg_time_step, int end_time_step, const void *nodal_var_vals); -EXODUS_EXPORT int ex__get_nodal_var_multi_time(int exoid, int nodal_var_index, int64_t node_number, +EXODUS_EXPORT int exi_get_nodal_var_multi_time(int exoid, int nodal_var_index, int64_t node_number, int beg_time_step, int end_time_step, void *nodal_var_vals); -EXODUS_EXPORT int ex__put_nodal_var_time(int exoid, int nodal_var_index, int64_t num_nodes, +EXODUS_EXPORT int exi_put_nodal_var_time(int exoid, int nodal_var_index, int64_t num_nodes, int beg_time_step, int end_time_step, const void *nodal_var_vals); -EXODUS_EXPORT int ex__get_partial_nodal_var(int exoid, int time_step, int nodal_var_index, +EXODUS_EXPORT int exi_get_partial_nodal_var(int exoid, int time_step, int nodal_var_index, int64_t start_node, int64_t num_nodes, void *var_vals); -EXODUS_EXPORT int ex__put_partial_nodal_var(int exoid, int time_step, int nodal_var_index, +EXODUS_EXPORT int exi_put_partial_nodal_var(int exoid, int time_step, int nodal_var_index, int64_t start_node, int64_t num_nodes, const void *nodal_var_vals); -EXODUS_EXPORT int ex__get_glob_vars(int exoid, int time_step, int num_glob_vars, +EXODUS_EXPORT int exi_get_glob_vars(int exoid, int time_step, int num_glob_vars, void *glob_var_vals); -EXODUS_EXPORT int ex__get_glob_vars_multi_time(int exoid, int num_glob_vars, int beg_time_step, +EXODUS_EXPORT int exi_get_glob_vars_multi_time(int exoid, int num_glob_vars, int beg_time_step, int end_time_step, void *glob_var_vals); -EXODUS_EXPORT int ex__get_glob_var_time(int exoid, int glob_var_index, int beg_time_step, +EXODUS_EXPORT int exi_get_glob_var_time(int exoid, int glob_var_index, int beg_time_step, int end_time_step, void *glob_var_vals); -EXODUS_EXPORT int ex__get_name(int exoid, int varid, size_t index, char *name, int name_size, +EXODUS_EXPORT int exi_get_name(int exoid, int varid, size_t index, char *name, int name_size, ex_entity_type obj_type, const char *routine); -EXODUS_EXPORT int ex__get_names(int exoid, int varid, size_t num_entity, char **names, +EXODUS_EXPORT int exi_get_names(int exoid, int varid, size_t num_entity, char **names, ex_entity_type obj_type, const char *routine); -EXODUS_EXPORT int ex__put_name(int exoid, int varid, size_t index, const char *name, +EXODUS_EXPORT int exi_put_name(int exoid, int varid, size_t index, const char *name, ex_entity_type obj_type, const char *subtype, const char *routine); -EXODUS_EXPORT int ex__put_names(int exoid, int varid, size_t num_entity, char *const *names, +EXODUS_EXPORT int exi_put_names(int exoid, int varid, size_t num_entity, char *const *names, ex_entity_type obj_type, const char *subtype, const char *routine); -EXODUS_EXPORT void ex__trim(char *name); -EXODUS_EXPORT void ex__update_max_name_length(int exoid, int length); -EXODUS_EXPORT int ex__leavedef(int exoid, /* NemesisI file ID */ +EXODUS_EXPORT void exi_trim(char *name); +EXODUS_EXPORT void exi_update_max_name_length(int exoid, int length); +EXODUS_EXPORT int exi_leavedef(int exoid, /* NemesisI file ID */ const char *call_rout /* Name of calling function */ ); -EXODUS_EXPORT int ex__check_version(int run_version); -EXODUS_EXPORT int ex__handle_mode(unsigned int my_mode, int is_parallel, int run_version); -EXODUS_EXPORT int ex__populate_header(int exoid, const char *path, int my_mode, int is_parallel, +EXODUS_EXPORT int exi_check_version(int run_version); +EXODUS_EXPORT int exi_handle_mode(unsigned int my_mode, int is_parallel, int run_version); +EXODUS_EXPORT int exi_populate_header(int exoid, const char *path, int my_mode, int is_parallel, int *comp_ws, int *io_ws); -EXODUS_EXPORT int ex__get_block_param(int exoid, ex_entity_id id, int ndim, - struct ex__elem_blk_parm *elem_blk_parm); +EXODUS_EXPORT int exi_get_block_param(int exoid, ex_entity_id id, int ndim, + struct exi_elem_blk_parm *elem_blk_parm); -EXODUS_EXPORT int ex__get_file_type(int exoid, char *ftype); +EXODUS_EXPORT int exi_get_file_type(int exoid, char *ftype); -EXODUS_EXPORT int ex__put_nemesis_version(int exoid); +EXODUS_EXPORT int exi_put_nemesis_version(int exoid); -EXODUS_EXPORT int ex__put_homogenous_block_params(int exoid, size_t block_count, +EXODUS_EXPORT int exi_put_homogenous_block_params(int exoid, size_t block_count, const struct ex_block *blocks); EXODUS_EXPORT int ne__check_file_version(int exoid); @@ -897,7 +897,7 @@ EXODUS_EXPORT int ne__id_lkup(int exoid, /* NetCDF/Exodus file ID * Note that this is a global setting for all databases. If you are * accessing multiple databases, they will all use the same value. */ -EXODUS_EXPORT int ex__default_max_name_length; +EXODUS_EXPORT int exi_default_max_name_length; /*! @} */ #ifdef __cplusplus diff --git a/packages/seacas/libraries/exodus/src/ex__get_glob_vars_multi_time.c b/packages/seacas/libraries/exodus/src/ex__get_glob_vars_multi_time.c index 13f1cbbe00..f5bd51e450 100644 --- a/packages/seacas/libraries/exodus/src/ex__get_glob_vars_multi_time.c +++ b/packages/seacas/libraries/exodus/src/ex__get_glob_vars_multi_time.c @@ -24,13 +24,13 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for ex__comp_ws, EX_FATAL, etc +#include "exodusII_int.h" // for exi_comp_ws, EX_FATAL, etc /*! Internal function. Do not use in client code. */ -int ex__get_glob_vars_multi_time(int exoid, int num_glob_vars, int beg_time_step, int end_time_step, +int exi_get_glob_vars_multi_time(int exoid, int num_glob_vars, int beg_time_step, int end_time_step, void *glob_var_vals) { int varid; @@ -39,7 +39,7 @@ int ex__get_glob_vars_multi_time(int exoid, int num_glob_vars, int beg_time_step char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -58,7 +58,7 @@ int ex__get_glob_vars_multi_time(int exoid, int num_glob_vars, int beg_time_step count[0] = end_time_step - beg_time_step; count[1] = num_glob_vars; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, varid, start, count, glob_var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex__get_nodal_var_multi_time.c b/packages/seacas/libraries/exodus/src/ex__get_nodal_var_multi_time.c index 763b978b36..a9f190b66a 100644 --- a/packages/seacas/libraries/exodus/src/ex__get_nodal_var_multi_time.c +++ b/packages/seacas/libraries/exodus/src/ex__get_nodal_var_multi_time.c @@ -15,7 +15,7 @@ \note This function is called internally by ex_get_var_multi_time() to handle the reading of nodal variable values. -The function ex__get_nodal_var_multi_time() reads the values of a single nodal +The function exi_get_nodal_var_multi_time() reads the values of a single nodal variable for a one or more time steps. Memory must be allocated for the nodal variable values array before this function is invoked. @@ -24,7 +24,7 @@ code must declare the array passed to be the appropriate type (float or double) to match the compute word size passed in ex_create() or ex_open(). -\return In case of an error, ex__get_nodal_var_multi_time() returns a negative +\return In case of an error, exi_get_nodal_var_multi_time() returns a negative number; a warning will return a positive number. Possible causes of errors include: - data file not properly opened with call to ex_create() or ex_open() @@ -58,13 +58,13 @@ time_step = 1; var_index = 2; var_values = (float *) calloc (num_nodes, sizeof(float)); -error = ex__get_nodal_var_multi_time(exoid, var_index, num_nodes, +error = exi_get_nodal_var_multi_time(exoid, var_index, num_nodes, time_step, time_step, var_values); ~~~ */ -int ex__get_nodal_var_multi_time(int exoid, int nodal_var_index, int64_t num_nodes, +int exi_get_nodal_var_multi_time(int exoid, int nodal_var_index, int64_t num_nodes, int beg_time_step, int end_time_step, void *nodal_var_vals) { int varid; @@ -72,7 +72,7 @@ int ex__get_nodal_var_multi_time(int exoid, int nodal_var_index, int64_t num_nod size_t start[3], count[3]; char errmsg[MAX_ERR_LENGTH]; - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -117,7 +117,7 @@ int ex__get_nodal_var_multi_time(int exoid, int nodal_var_index, int64_t num_nod count[1] = num_nodes; } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, varid, start, count, nodal_var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex__put_homogenous_block_params.c b/packages/seacas/libraries/exodus/src/ex__put_homogenous_block_params.c index 73b16afbfe..ed4e31d720 100644 --- a/packages/seacas/libraries/exodus/src/ex__put_homogenous_block_params.c +++ b/packages/seacas/libraries/exodus/src/ex__put_homogenous_block_params.c @@ -15,14 +15,14 @@ * Permits some optimizations and safer for N->1 parallel. * Arbitrary polyhedra are handled in more general routine; not here. */ -int ex__put_homogenous_block_params(int exoid, size_t block_count, const struct ex_block *blocks) +int exi_put_homogenous_block_params(int exoid, size_t block_count, const struct ex_block *blocks) { int status; int varid, dims[2]; char errmsg[MAX_ERR_LENGTH]; - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -133,7 +133,7 @@ int ex__put_homogenous_block_params(int exoid, size_t block_count, const struct } for (size_t i = 0; i < block_count; i++) { - int blk_id_ndx = 1 + ex__inc_file_item(exoid, ex__get_counter_list(blocks[i].type)); + int blk_id_ndx = 1 + exi_inc_file_item(exoid, exi_get_counter_list(blocks[i].type)); if (blocks[i].num_entry == 0) { /* Is this a NULL element block? */ continue; @@ -266,7 +266,7 @@ int ex__put_homogenous_block_params(int exoid, size_t block_count, const struct ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 2); + exi_compress_variable(exoid, varid, 2); /* Attribute names... */ dims[0] = numattrdim; @@ -305,7 +305,7 @@ int ex__put_homogenous_block_params(int exoid, size_t block_count, const struct ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, connid, 1); + exi_compress_variable(exoid, connid, 1); /* store element type as attribute of connectivity variable */ if ((status = nc_put_att_text(exoid, connid, ATT_NAME_ELB, strlen(blocks[i].topology) + 1, @@ -345,7 +345,7 @@ int ex__put_homogenous_block_params(int exoid, size_t block_count, const struct } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode in file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); return (EX_FATAL); @@ -386,6 +386,6 @@ int ex__put_homogenous_block_params(int exoid, size_t block_count, const struct /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); return (EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex__put_nodal_var_multi_time.c b/packages/seacas/libraries/exodus/src/ex__put_nodal_var_multi_time.c index 928909c94a..5f7afbf35c 100644 --- a/packages/seacas/libraries/exodus/src/ex__put_nodal_var_multi_time.c +++ b/packages/seacas/libraries/exodus/src/ex__put_nodal_var_multi_time.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_WARN, ex__comp_ws, etc +#include "exodusII_int.h" // for EX_WARN, exi_comp_ws, etc /*! \internal @@ -15,7 +15,7 @@ \note This function is called internally by ex_put_var_time() to handle the writing of nodal variable values. -The function ex__put_nodal_var_time() writes the values of a single nodal +The function exi_put_nodal_var_time() writes the values of a single nodal variable for multiple time steps. The function ex_put_variable_param() must be invoked before this call is made. @@ -24,7 +24,7 @@ code must declare the array passed to be the appropriate type (float or double) to match the compute word size passed in ex_create() or ex_open(). -\return In case of an error, ex__put_nodal_var() returns a negative number; a +\return In case of an error, exi_put_nodal_var() returns a negative number; a warning will return a positive number. Possible causes of errors include: - data file not properly opened with call to ex_create() or ex_open() @@ -75,7 +75,7 @@ for (k=1; k <= num_nod_vars; k++) { */ -int ex__put_nodal_var_time(int exoid, int nodal_var_index, int64_t num_nodes, int beg_time_step, +int exi_put_nodal_var_time(int exoid, int nodal_var_index, int64_t num_nodes, int beg_time_step, int end_time_step, const void *nodal_var_vals) { @@ -96,7 +96,7 @@ int ex__put_nodal_var_time(int exoid, int nodal_var_index, int64_t num_nodes, in count[0] = end_time_step - beg_time_step; count[1] = num_nodes; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_vara_float(exoid, varid, start, count, nodal_var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_add_attr.c b/packages/seacas/libraries/exodus/src/ex_add_attr.c index 406fccb8fd..5d10849df2 100644 --- a/packages/seacas/libraries/exodus/src/ex_add_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_add_attr.c @@ -25,7 +25,7 @@ int ex_add_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, int64_t int numattrdim; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -38,7 +38,7 @@ int ex_add_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, int64_t obj_id_ndx = 0; } else { - obj_id_ndx = ex__id_lkup(exoid, obj_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, obj_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -137,7 +137,7 @@ int ex_add_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, int64_t goto error_ret; /* exit define mode and return */ } - ex__get_dimension(exoid, dnumobjent, ex_name_of_object(obj_type), &num_obj, &numobjentdim, + exi_get_dimension(exoid, dnumobjent, ex_name_of_object(obj_type), &num_obj, &numobjentdim, __func__); dims[0] = numobjentdim; dims[1] = numattrdim; @@ -149,7 +149,7 @@ int ex_add_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, int64_t ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 2); + exi_compress_variable(exoid, varid, 2); /* inquire previously defined dimensions */ if ((status = nc_inq_dimid(exoid, DIM_STR_NAME, &strdim)) != NC_NOERR) { @@ -172,7 +172,7 @@ int ex_add_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, int64_t /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -199,6 +199,6 @@ int ex_add_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, int64_t /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_close.c b/packages/seacas/libraries/exodus/src/ex_close.c index 27cae705c9..171f9559c9 100644 --- a/packages/seacas/libraries/exodus/src/ex_close.c +++ b/packages/seacas/libraries/exodus/src/ex_close.c @@ -21,7 +21,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for ex__get_counter_list, etc +#include "exodusII_int.h" // for exi_get_counter_list, etc /*! \ingroup Utilities @@ -53,14 +53,14 @@ int ex_close(int exoid) EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* * NOTE: If using netcdf-4, exoid must refer to the root group. * Need to determine whether there are any groups and if so, - * call ex__rm_file_item and ex__rm_stat_ptr on each group. + * call exi_rm_file_item and exi_rm_stat_ptr on each group. */ /* @@ -82,35 +82,35 @@ int ex_close(int exoid) * internal datastructures. */ - ex__rm_file_item(exoid, ex__get_counter_list(EX_ELEM_BLOCK)); - ex__rm_file_item(exoid, ex__get_counter_list(EX_FACE_BLOCK)); - ex__rm_file_item(exoid, ex__get_counter_list(EX_EDGE_BLOCK)); - ex__rm_file_item(exoid, ex__get_counter_list(EX_NODE_SET)); - ex__rm_file_item(exoid, ex__get_counter_list(EX_EDGE_SET)); - ex__rm_file_item(exoid, ex__get_counter_list(EX_FACE_SET)); - ex__rm_file_item(exoid, ex__get_counter_list(EX_SIDE_SET)); - ex__rm_file_item(exoid, ex__get_counter_list(EX_ELEM_SET)); - ex__rm_file_item(exoid, ex__get_counter_list(EX_NODE_MAP)); - ex__rm_file_item(exoid, ex__get_counter_list(EX_EDGE_MAP)); - ex__rm_file_item(exoid, ex__get_counter_list(EX_FACE_MAP)); - ex__rm_file_item(exoid, ex__get_counter_list(EX_ELEM_MAP)); - ex__rm_file_item(exoid, ex__get_counter_list(EX_ASSEMBLY)); - ex__rm_file_item(exoid, ex__get_counter_list(EX_BLOB)); - - ex__rm_stat_ptr(exoid, &exoII_ed); - ex__rm_stat_ptr(exoid, &exoII_fa); - ex__rm_stat_ptr(exoid, &exoII_eb); - ex__rm_stat_ptr(exoid, &exoII_ns); - ex__rm_stat_ptr(exoid, &exoII_es); - ex__rm_stat_ptr(exoid, &exoII_fs); - ex__rm_stat_ptr(exoid, &exoII_ss); - ex__rm_stat_ptr(exoid, &exoII_els); - ex__rm_stat_ptr(exoid, &exoII_nm); - ex__rm_stat_ptr(exoid, &exoII_edm); - ex__rm_stat_ptr(exoid, &exoII_fam); - ex__rm_stat_ptr(exoid, &exoII_em); - - ex__conv_exit(exoid); + exi_rm_file_item(exoid, exi_get_counter_list(EX_ELEM_BLOCK)); + exi_rm_file_item(exoid, exi_get_counter_list(EX_FACE_BLOCK)); + exi_rm_file_item(exoid, exi_get_counter_list(EX_EDGE_BLOCK)); + exi_rm_file_item(exoid, exi_get_counter_list(EX_NODE_SET)); + exi_rm_file_item(exoid, exi_get_counter_list(EX_EDGE_SET)); + exi_rm_file_item(exoid, exi_get_counter_list(EX_FACE_SET)); + exi_rm_file_item(exoid, exi_get_counter_list(EX_SIDE_SET)); + exi_rm_file_item(exoid, exi_get_counter_list(EX_ELEM_SET)); + exi_rm_file_item(exoid, exi_get_counter_list(EX_NODE_MAP)); + exi_rm_file_item(exoid, exi_get_counter_list(EX_EDGE_MAP)); + exi_rm_file_item(exoid, exi_get_counter_list(EX_FACE_MAP)); + exi_rm_file_item(exoid, exi_get_counter_list(EX_ELEM_MAP)); + exi_rm_file_item(exoid, exi_get_counter_list(EX_ASSEMBLY)); + exi_rm_file_item(exoid, exi_get_counter_list(EX_BLOB)); + + exi_rm_stat_ptr(exoid, &exoII_ed); + exi_rm_stat_ptr(exoid, &exoII_fa); + exi_rm_stat_ptr(exoid, &exoII_eb); + exi_rm_stat_ptr(exoid, &exoII_ns); + exi_rm_stat_ptr(exoid, &exoII_es); + exi_rm_stat_ptr(exoid, &exoII_fs); + exi_rm_stat_ptr(exoid, &exoII_ss); + exi_rm_stat_ptr(exoid, &exoII_els); + exi_rm_stat_ptr(exoid, &exoII_nm); + exi_rm_stat_ptr(exoid, &exoII_edm); + exi_rm_stat_ptr(exoid, &exoII_fam); + exi_rm_stat_ptr(exoid, &exoII_em); + + exi_conv_exit(exoid); status = EX_NOERR; if (status1 != NC_NOERR || status2 != NC_NOERR) { diff --git a/packages/seacas/libraries/exodus/src/ex_conv.c b/packages/seacas/libraries/exodus/src/ex_conv.c index abee6d8574..8bc3fe77bb 100644 --- a/packages/seacas/libraries/exodus/src/ex_conv.c +++ b/packages/seacas/libraries/exodus/src/ex_conv.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for ex__file_item, EX_FATAL, etc +#include "exodusII_int.h" // for exi_file_item, EX_FATAL, etc #include "stdbool.h" /*! \file @@ -24,13 +24,13 @@ #define NC_FLOAT_WORDSIZE 4 -static struct ex__file_item *file_list = NULL; +static struct exi_file_item *file_list = NULL; -struct ex__file_item *ex__find_file_item(int exoid) +struct exi_file_item *exi_find_file_item(int exoid) { /* Find base filename in case exoid refers to a group */ int base_exoid = (unsigned)exoid & EX_FILE_ID_MASK; - struct ex__file_item *ptr = file_list; + struct exi_file_item *ptr = file_list; while (ptr) { if (ptr->file_id == base_exoid) { break; @@ -41,13 +41,13 @@ struct ex__file_item *ex__find_file_item(int exoid) } #define EX__MAX_PATHLEN 8192 -int ex__check_multiple_open(const char *path, int mode, const char *func) +int exi_check_multiple_open(const char *path, int mode, const char *func) { EX_FUNC_ENTER(); bool is_write = mode & EX_WRITE; char tmp[EX__MAX_PATHLEN]; size_t pathlen; - struct ex__file_item *ptr = file_list; + struct exi_file_item *ptr = file_list; while (ptr) { nc_inq_path(ptr->file_id, &pathlen, tmp); /* If path is too long, assume it is ok... */ @@ -72,7 +72,7 @@ int ex__check_multiple_open(const char *path, int mode, const char *func) EX_FUNC_LEAVE(EX_NOERR); } -int ex__check_valid_file_id(int exoid, const char *func) +int exi_check_valid_file_id(int exoid, const char *func) { bool error = false; if (exoid <= 0) { @@ -80,7 +80,7 @@ int ex__check_valid_file_id(int exoid, const char *func) } #if !defined BUILT_IN_SIERRA else { - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (!file) { error = true; @@ -107,13 +107,13 @@ int ex__check_valid_file_id(int exoid, const char *func) return EX_NOERR; } -int ex__conv_init(int exoid, int *comp_wordsize, int *io_wordsize, int file_wordsize, +int exi_conv_init(int exoid, int *comp_wordsize, int *io_wordsize, int file_wordsize, int int64_status, bool is_parallel, bool is_hdf5, bool is_pnetcdf, bool is_write) { char errmsg[MAX_ERR_LENGTH]; - struct ex__file_item *new_file = NULL; + struct exi_file_item *new_file = NULL; - /*! ex__conv_init() initializes the floating point conversion process. + /*! exi_conv_init() initializes the floating point conversion process. * * \param exoid an integer uniquely identifying the file of interest. * @@ -222,7 +222,7 @@ int ex__conv_init(int exoid, int *comp_wordsize, int *io_wordsize, int file_word int filetype = 0; nc_inq_format(exoid, &filetype); - if (!(new_file = malloc(sizeof(struct ex__file_item)))) { + if (!(new_file = malloc(sizeof(struct exi_file_item)))) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to allocate memory for internal file " "structure storage file id %d", @@ -234,7 +234,7 @@ int ex__conv_init(int exoid, int *comp_wordsize, int *io_wordsize, int file_word new_file->file_id = exoid; new_file->user_compute_wordsize = *comp_wordsize == 4 ? 0 : 1; new_file->int64_status = int64_status; - new_file->maximum_name_length = ex__default_max_name_length; + new_file->maximum_name_length = exi_default_max_name_length; new_file->time_varid = -1; new_file->compression_algorithm = EX_COMPRESS_GZIP; new_file->assembly_count = 0; @@ -267,20 +267,20 @@ int ex__conv_init(int exoid, int *comp_wordsize, int *io_wordsize, int file_word /*............................................................................*/ /*............................................................................*/ -/*! ex__conv_exit() takes the structure identified by "exoid" out of the linked +/*! exi_conv_exit() takes the structure identified by "exoid" out of the linked * list which describes the files that ex_conv_array() knows how to convert. * - * \note it is absolutely necessary for ex__conv_exit() to be called after + * \note it is absolutely necessary for exi_conv_exit() to be called after * ncclose(), if the parameter used as "exoid" is the id returned from * an ncopen() or nccreate() call, as netCDF reuses file ids! * the best place to do this is ex_close(), which is where I did it. * * \param exoid integer which uniquely identifies the file of interest. */ -void ex__conv_exit(int exoid) +void exi_conv_exit(int exoid) { - struct ex__file_item *file = file_list; - struct ex__file_item *prev = NULL; + struct exi_file_item *file = file_list; + struct exi_file_item *prev = NULL; EX_FUNC_ENTER(); while (file) { @@ -318,13 +318,13 @@ nc_type nc_flt_code(int exoid) /*! * \ingroup Utilities * nc_flt_code() returns either NC_FLOAT or NC_DOUBLE, based on the parameters - * with which ex__conv_init() was called. nc_flt_code() is used as the nc_type + * with which exi_conv_init() was called. nc_flt_code() is used as the nc_type * parameter on ncvardef() calls that define floating point variables. * * "exoid" is some integer which uniquely identifies the file of interest. */ EX_FUNC_ENTER(); - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (!file) { char errmsg[MAX_ERR_LENGTH]; @@ -358,7 +358,7 @@ unsigned ex_int64_status(int exoid) #EX_INQ_INT64_API) | */ EX_FUNC_ENTER(); - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (!file) { char errmsg[MAX_ERR_LENGTH]; @@ -389,7 +389,7 @@ int ex_set_int64_status(int exoid, int mode) #EX_INQ_INT64_API) | */ EX_FUNC_ENTER(); - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (!file) { char errmsg[MAX_ERR_LENGTH]; @@ -413,7 +413,7 @@ int ex_set_int64_status(int exoid, int mode) int ex_set_option(int exoid, ex_option_type option, int option_value) { EX_FUNC_ENTER(); - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (!file) { char errmsg[MAX_ERR_LENGTH]; snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unknown file id %d for ex_set_option().", exoid); @@ -473,14 +473,14 @@ int ex_set_option(int exoid, ex_option_type option, int option_value) /*! * \ingroup Utilities - * ex__comp_ws() returns 4 (i.e. sizeof(float)) or 8 (i.e. sizeof(double)), + * exi_comp_ws() returns 4 (i.e. sizeof(float)) or 8 (i.e. sizeof(double)), * depending on the value of floating point word size used to initialize * the conversion facility for this file id (exoid). * \param exoid integer which uniquely identifies the file of interest. */ -int ex__comp_ws(int exoid) +int exi_comp_ws(int exoid) { - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (!file) { char errmsg[MAX_ERR_LENGTH]; @@ -494,16 +494,16 @@ int ex__comp_ws(int exoid) /*! * \ingroup Utilities - * ex__is_parallel() returns 1 (true) or 0 (false) depending on whether + * exi_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. * \param exoid integer which uniquely identifies the file of interest. */ -int ex__is_parallel(int exoid) +int exi_is_parallel(int exoid) { EX_FUNC_ENTER(); - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (!file) { char errmsg[MAX_ERR_LENGTH]; @@ -532,7 +532,7 @@ int ex__is_parallel(int exoid) int ex_set_parallel(int exoid, int is_parallel) { EX_FUNC_ENTER(); - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (!file) { char errmsg[MAX_ERR_LENGTH]; diff --git a/packages/seacas/libraries/exodus/src/ex_copy.c b/packages/seacas/libraries/exodus/src/ex_copy.c index 1228f734b4..878c9b11f8 100644 --- a/packages/seacas/libraries/exodus/src/ex_copy.c +++ b/packages/seacas/libraries/exodus/src/ex_copy.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for EX_FATAL, exerrval, ex_err, etc -#include "exodusII_int.h" // for ex__get_counter_list, etc +#include "exodusII_int.h" // for exi_get_counter_list, etc #define STRINGIFY(x) #x #define TOSTRING(x) STRINGIFY(x) @@ -59,7 +59,7 @@ static int cpy_coord_def(int in_id, int out_id, int rec_dim_id, char *var_nm, static int cpy_coord_val(int in_id, int out_id, char *var_nm, int in_large); static void update_structs(int out_exoid); static void update_internal_structs(int out_exoid, ex_inquiry inqcode, - struct ex__list_item **ctr_list); + struct exi_list_item **ctr_list); static int is_truth_table_variable(const char *var_name) { @@ -82,10 +82,10 @@ static int is_non_mesh_variable(const char *var_name) static int ex_copy_internal(int in_exoid, int out_exoid, int mesh_only) { EX_FUNC_ENTER(); - if (ex__check_valid_file_id(in_exoid, __func__) != EX_NOERR) { + if (exi_check_valid_file_id(in_exoid, __func__) != EX_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } - if (ex__check_valid_file_id(out_exoid, __func__) != EX_NOERR) { + if (exi_check_valid_file_id(out_exoid, __func__) != EX_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -120,7 +120,7 @@ static int ex_copy_internal(int in_exoid, int out_exoid, int mesh_only) EXCHECK(cpy_variables(in_exoid, out_exoid, in_large, mesh_only)); /* take the output file out of define mode */ - if (ex__leavedef(out_exoid, __func__) != NC_NOERR) { + if (exi_leavedef(out_exoid, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -432,7 +432,7 @@ int cpy_coord_def(int in_id, int out_id, int rec_dim_id, char *var_nm, int in_la int temp; size_t spatial_dim; const char *routine = NULL; - ex__get_dimension(in_id, DIM_NUM_DIM, "dimension", &spatial_dim, &temp, routine); + exi_get_dimension(in_id, DIM_NUM_DIM, "dimension", &spatial_dim, &temp, routine); /* output file will have coordx, coordy, coordz (if 3d). See if they are already defined in output file. Assume either all or @@ -459,16 +459,16 @@ int cpy_coord_def(int in_id, int out_id, int rec_dim_id, char *var_nm, int in_la int nbr_dim = 1; int var_out_id = -1; EXCHECKI(nc_def_var(out_id, VAR_COORD_X, nc_flt_code(out_id), nbr_dim, dim_out_id, &var_out_id)); - ex__compress_variable(out_id, var_out_id, 2); + exi_compress_variable(out_id, var_out_id, 2); if (spatial_dim > 1) { EXCHECKI( nc_def_var(out_id, VAR_COORD_Y, nc_flt_code(out_id), nbr_dim, dim_out_id, &var_out_id)); - ex__compress_variable(out_id, var_out_id, 2); + exi_compress_variable(out_id, var_out_id, 2); } if (spatial_dim > 2) { EXCHECKI( nc_def_var(out_id, VAR_COORD_Z, nc_flt_code(out_id), nbr_dim, dim_out_id, &var_out_id)); - ex__compress_variable(out_id, var_out_id, 2); + exi_compress_variable(out_id, var_out_id, 2); } return var_out_id; /* OK */ @@ -536,11 +536,11 @@ int cpy_var_def(int in_id, int out_id, int rec_dim_id, char *var_nm) if ((var_type == NC_FLOAT) || (var_type == NC_DOUBLE)) { EXCHECKI(nc_def_var(out_id, var_nm, nc_flt_code(out_id), nbr_dim, dim_out_id, &var_out_id)); - ex__compress_variable(out_id, var_out_id, 2); + exi_compress_variable(out_id, var_out_id, 2); } else { EXCHECKI(nc_def_var(out_id, var_nm, var_type, nbr_dim, dim_out_id, &var_out_id)); - ex__compress_variable(out_id, var_out_id, 1); + exi_compress_variable(out_id, var_out_id, 1); } return var_out_id; /* OK */ @@ -744,8 +744,8 @@ int cpy_coord_val(int in_id, int out_id, char *var_nm, int in_large) const char *routine = NULL; int temp; size_t spatial_dim, num_nodes; - ex__get_dimension(in_id, DIM_NUM_DIM, "dimension", &spatial_dim, &temp, routine); - ex__get_dimension(in_id, DIM_NUM_NODES, "nodes", &num_nodes, &temp, routine); + exi_get_dimension(in_id, DIM_NUM_DIM, "dimension", &spatial_dim, &temp, routine); + exi_get_dimension(in_id, DIM_NUM_NODES, "nodes", &num_nodes, &temp, routine); /* output file will have coordx, coordy, coordz (if 3d). */ /* Get the var_id for the requested variable from both files. */ @@ -796,31 +796,31 @@ int cpy_coord_val(int in_id, int out_id, char *var_nm, int in_large) /*! \internal */ void update_structs(int out_exoid) { - update_internal_structs(out_exoid, EX_INQ_EDGE_BLK, ex__get_counter_list(EX_EDGE_BLOCK)); - update_internal_structs(out_exoid, EX_INQ_FACE_BLK, ex__get_counter_list(EX_FACE_BLOCK)); - update_internal_structs(out_exoid, EX_INQ_ELEM_BLK, ex__get_counter_list(EX_ELEM_BLOCK)); - update_internal_structs(out_exoid, EX_INQ_ASSEMBLY, ex__get_counter_list(EX_ASSEMBLY)); - update_internal_structs(out_exoid, EX_INQ_BLOB, ex__get_counter_list(EX_BLOB)); - - update_internal_structs(out_exoid, EX_INQ_NODE_SETS, ex__get_counter_list(EX_NODE_SET)); - update_internal_structs(out_exoid, EX_INQ_EDGE_SETS, ex__get_counter_list(EX_EDGE_SET)); - update_internal_structs(out_exoid, EX_INQ_FACE_SETS, ex__get_counter_list(EX_FACE_SET)); - update_internal_structs(out_exoid, EX_INQ_SIDE_SETS, ex__get_counter_list(EX_SIDE_SET)); - update_internal_structs(out_exoid, EX_INQ_ELEM_SETS, ex__get_counter_list(EX_ELEM_SET)); - - update_internal_structs(out_exoid, EX_INQ_NODE_MAP, ex__get_counter_list(EX_NODE_MAP)); - update_internal_structs(out_exoid, EX_INQ_EDGE_MAP, ex__get_counter_list(EX_EDGE_MAP)); - update_internal_structs(out_exoid, EX_INQ_FACE_MAP, ex__get_counter_list(EX_FACE_MAP)); - update_internal_structs(out_exoid, EX_INQ_ELEM_MAP, ex__get_counter_list(EX_ELEM_MAP)); + update_internal_structs(out_exoid, EX_INQ_EDGE_BLK, exi_get_counter_list(EX_EDGE_BLOCK)); + update_internal_structs(out_exoid, EX_INQ_FACE_BLK, exi_get_counter_list(EX_FACE_BLOCK)); + update_internal_structs(out_exoid, EX_INQ_ELEM_BLK, exi_get_counter_list(EX_ELEM_BLOCK)); + update_internal_structs(out_exoid, EX_INQ_ASSEMBLY, exi_get_counter_list(EX_ASSEMBLY)); + update_internal_structs(out_exoid, EX_INQ_BLOB, exi_get_counter_list(EX_BLOB)); + + update_internal_structs(out_exoid, EX_INQ_NODE_SETS, exi_get_counter_list(EX_NODE_SET)); + update_internal_structs(out_exoid, EX_INQ_EDGE_SETS, exi_get_counter_list(EX_EDGE_SET)); + update_internal_structs(out_exoid, EX_INQ_FACE_SETS, exi_get_counter_list(EX_FACE_SET)); + update_internal_structs(out_exoid, EX_INQ_SIDE_SETS, exi_get_counter_list(EX_SIDE_SET)); + update_internal_structs(out_exoid, EX_INQ_ELEM_SETS, exi_get_counter_list(EX_ELEM_SET)); + + update_internal_structs(out_exoid, EX_INQ_NODE_MAP, exi_get_counter_list(EX_NODE_MAP)); + update_internal_structs(out_exoid, EX_INQ_EDGE_MAP, exi_get_counter_list(EX_EDGE_MAP)); + update_internal_structs(out_exoid, EX_INQ_FACE_MAP, exi_get_counter_list(EX_FACE_MAP)); + update_internal_structs(out_exoid, EX_INQ_ELEM_MAP, exi_get_counter_list(EX_ELEM_MAP)); } /*! \internal */ -void update_internal_structs(int out_exoid, ex_inquiry inqcode, struct ex__list_item **ctr_list) +void update_internal_structs(int out_exoid, ex_inquiry inqcode, struct exi_list_item **ctr_list) { int64_t number = ex_inquire_int(out_exoid, inqcode); if (number > 0) { for (int64_t i = 0; i < number; i++) { - ex__inc_file_item(out_exoid, ctr_list); + exi_inc_file_item(out_exoid, ctr_list); } } } diff --git a/packages/seacas/libraries/exodus/src/ex_create.c b/packages/seacas/libraries/exodus/src/ex_create.c index 28cff55b72..bca2d8b5b7 100644 --- a/packages/seacas/libraries/exodus/src/ex_create.c +++ b/packages/seacas/libraries/exodus/src/ex_create.c @@ -142,7 +142,7 @@ int ex_create_int(const char *path, int cmode, int *comp_ws, int *io_ws, int run EX_FUNC_ENTER(); - nc_mode = ex__handle_mode(my_mode, is_parallel, run_version); + nc_mode = exi_handle_mode(my_mode, is_parallel, run_version); if (!path || strlen(path) == 0) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: Filename is not specified."); @@ -150,14 +150,14 @@ int ex_create_int(const char *path, int cmode, int *comp_ws, int *io_ws, int run EX_FUNC_LEAVE(EX_FATAL); } - char *canon_path = ex__canonicalize_filename(path); + char *canon_path = exi_canonicalize_filename(path); /* Verify that this file is not already open for read or write... In theory, should be ok for the file to be open multiple times for read, but bad things can happen if being read and written at the same time... */ - if (ex__check_multiple_open(canon_path, EX_WRITE, __func__)) { + if (exi_check_multiple_open(canon_path, EX_WRITE, __func__)) { free(canon_path); EX_FUNC_LEAVE(EX_FATAL); } @@ -191,7 +191,7 @@ int ex_create_int(const char *path, int cmode, int *comp_ws, int *io_ws, int run EX_FUNC_LEAVE(EX_FATAL); } - status = ex__populate_header(exoid, canon_path, my_mode, is_parallel, comp_ws, io_ws); + status = exi_populate_header(exoid, canon_path, my_mode, is_parallel, comp_ws, io_ws); if (status != EX_NOERR) { free(canon_path); EX_FUNC_LEAVE(status); diff --git a/packages/seacas/libraries/exodus/src/ex_create_group.c b/packages/seacas/libraries/exodus/src/ex_create_group.c index 0d418c4bb3..3d05f0ce54 100644 --- a/packages/seacas/libraries/exodus/src/ex_create_group.c +++ b/packages/seacas/libraries/exodus/src/ex_create_group.c @@ -22,7 +22,7 @@ int ex_create_group(int parent_id, const char *group_name) int status; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(parent_id, __func__) != EX_NOERR) { + if (exi_check_valid_file_id(parent_id, __func__) != EX_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -39,7 +39,7 @@ int ex_create_group(int parent_id, const char *group_name) EX_FUNC_LEAVE(EX_FATAL); } - if ((status = ex__leavedef(parent_id, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(parent_id, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); diff --git a/packages/seacas/libraries/exodus/src/ex_create_par.c b/packages/seacas/libraries/exodus/src/ex_create_par.c index bb1f27cea3..04821eb03c 100644 --- a/packages/seacas/libraries/exodus/src/ex_create_par.c +++ b/packages/seacas/libraries/exodus/src/ex_create_par.c @@ -164,19 +164,19 @@ int ex_create_par_int(const char *path, int cmode, int *comp_ws, int *io_ws, MPI EX_FUNC_LEAVE(EX_FATAL); } - char *canon_path = ex__canonicalize_filename(path); + char *canon_path = exi_canonicalize_filename(path); /* Verify that this file is not already open for read or write... In theory, should be ok for the file to be open multiple times for read, but bad things can happen if being read and written at the same time... */ - if (ex__check_multiple_open(canon_path, EX_WRITE, __func__)) { + if (exi_check_multiple_open(canon_path, EX_WRITE, __func__)) { free(canon_path); EX_FUNC_LEAVE(EX_FATAL); } - nc_mode = ex__handle_mode(my_mode, is_parallel, run_version); + nc_mode = exi_handle_mode(my_mode, is_parallel, run_version); #if defined NC_NOATTCREORD /* Disable attribute creation order tracking if available... */ @@ -227,7 +227,7 @@ int ex_create_par_int(const char *path, int cmode, int *comp_ws, int *io_ws, MPI EX_FUNC_LEAVE(EX_FATAL); } - status = ex__populate_header(exoid, canon_path, my_mode, is_parallel, comp_ws, io_ws); + status = exi_populate_header(exoid, canon_path, my_mode, is_parallel, comp_ws, io_ws); if (status != EX_NOERR) { free(canon_path); EX_FUNC_LEAVE(status); diff --git a/packages/seacas/libraries/exodus/src/ex_cvt_nodes_to_sides.c b/packages/seacas/libraries/exodus/src/ex_cvt_nodes_to_sides.c index da23e7962f..5da57f6ce0 100644 --- a/packages/seacas/libraries/exodus/src/ex_cvt_nodes_to_sides.c +++ b/packages/seacas/libraries/exodus/src/ex_cvt_nodes_to_sides.c @@ -188,7 +188,7 @@ int ex_cvt_nodes_to_sides(int exoid, void_int *num_elem_per_set, void_int *num_n int int_size; int ids_size; - struct ex__elem_blk_parm *elem_blk_parms = NULL; + struct exi_elem_blk_parm *elem_blk_parms = NULL; int err_stat = EX_NOERR; @@ -206,7 +206,7 @@ int ex_cvt_nodes_to_sides(int exoid, void_int *num_elem_per_set, void_int *num_n char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -282,7 +282,7 @@ int ex_cvt_nodes_to_sides(int exoid, void_int *num_elem_per_set, void_int *num_n for (i = 0; i < tot_num_ss_elem; i++) { elems[i] = i; /* init index array to current position */ } - ex__iqsort64(side_sets_elem_list, elems, tot_num_ss_elem); + exi_iqsort64(side_sets_elem_list, elems, tot_num_ss_elem); } else { /* Sort side set element list into index array - non-destructive */ @@ -290,7 +290,7 @@ int ex_cvt_nodes_to_sides(int exoid, void_int *num_elem_per_set, void_int *num_n for (i = 0; i < tot_num_ss_elem; i++) { elems[i] = i; /* init index array to current position */ } - ex__iqsort(side_sets_elem_list, elems, tot_num_ss_elem); + exi_iqsort(side_sets_elem_list, elems, tot_num_ss_elem); } /* Allocate space for the element block ids */ @@ -315,7 +315,7 @@ int ex_cvt_nodes_to_sides(int exoid, void_int *num_elem_per_set, void_int *num_n } /* Allocate space for the element block params */ - if (!(elem_blk_parms = malloc(num_elem_blks * sizeof(struct ex__elem_blk_parm)))) { + if (!(elem_blk_parms = malloc(num_elem_blks * sizeof(struct exi_elem_blk_parm)))) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to allocate space for element block params " "for file id %d", @@ -334,7 +334,7 @@ int ex_cvt_nodes_to_sides(int exoid, void_int *num_elem_per_set, void_int *num_n id = ((int *)elem_blk_ids)[i]; } - err_stat = ex__get_block_param(exoid, id, ndim, &elem_blk_parms[i]); + err_stat = exi_get_block_param(exoid, id, ndim, &elem_blk_parms[i]); if (err_stat != EX_NOERR) { goto cleanup; } diff --git a/packages/seacas/libraries/exodus/src/ex_err.c b/packages/seacas/libraries/exodus/src/ex_err.c index 0ed67d5185..e3d95e4f01 100644 --- a/packages/seacas/libraries/exodus/src/ex_err.c +++ b/packages/seacas/libraries/exodus/src/ex_err.c @@ -30,7 +30,7 @@ static int last_err_num; \ingroup Utilities \undoc */ -void ex__reset_error_status(void) +void exi_reset_error_status(void) { #if !defined(EXODUS_THREADSAFE) exerrval = 0; @@ -208,7 +208,7 @@ void ex_err_fn(int exoid, const char *module_name, const char *message, int err_ if (err_num == EX_PRTLASTMSG) { fprintf(stderr, "\n[%s] %s\n", EX_PNAME, EX_ERRMSG); - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (file) { size_t pathlen = 0; nc_inq_path(exoid, &pathlen, NULL); @@ -244,7 +244,7 @@ void ex_err_fn(int exoid, const char *module_name, const char *message, int err_ else if (exoptval & EX_VERBOSE) { /* check see if we really want to hear this */ char *path = NULL; - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (file) { size_t pathlen = 0; nc_inq_path(exoid, &pathlen, NULL); diff --git a/packages/seacas/libraries/exodus/src/ex_get_all_times.c b/packages/seacas/libraries/exodus/src/ex_get_all_times.c index bfe0fa04d9..bfb84be8a8 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_all_times.c +++ b/packages/seacas/libraries/exodus/src/ex_get_all_times.c @@ -59,7 +59,7 @@ int ex_get_all_times(int exoid, void *time_values) char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -71,7 +71,7 @@ int ex_get_all_times(int exoid, void *time_values) } /*read time values */ - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_var_float(exoid, varid, time_values); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_assembly.c b/packages/seacas/libraries/exodus/src/ex_get_assembly.c index bd5ffd6b98..78ef6e6666 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_assembly.c +++ b/packages/seacas/libraries/exodus/src/ex_get_assembly.c @@ -17,7 +17,7 @@ int ex_get_assembly(int exoid, ex_assembly *assembly) { - struct ex__file_item *file = NULL; + struct exi_file_item *file = NULL; int status = 0; int dimid = 0; size_t len = 0; @@ -25,7 +25,7 @@ int ex_get_assembly(int exoid, ex_assembly *assembly) EX_FUNC_ENTER(); - file = ex__find_file_item(exoid); + file = exi_find_file_item(exoid); if (!file) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unknown file id %d.", exoid); ex_err_fn(exoid, __func__, errmsg, EX_BADFILEID); diff --git a/packages/seacas/libraries/exodus/src/ex_get_attr.c b/packages/seacas/libraries/exodus/src/ex_get_attr.c index 8d2d8a9df6..45264b387a 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_get_attr.c @@ -39,7 +39,7 @@ int ex_get_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, void *a const char *vattrbname; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -48,7 +48,7 @@ int ex_get_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, void *a obj_id_ndx = 0; } else { - obj_id_ndx = ex__id_lkup(exoid, obj_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, obj_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -97,7 +97,7 @@ int ex_get_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, void *a } /* read in the attributes */ - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_var_float(exoid, attrid, attrib); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_attr_names.c b/packages/seacas/libraries/exodus/src/ex_get_attr_names.c index c3172bb19f..3312df74d2 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_attr_names.c +++ b/packages/seacas/libraries/exodus/src/ex_get_attr_names.c @@ -39,13 +39,13 @@ int ex_get_attr_names(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, c const char *vattrbname; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* Determine index of obj_id in vobjids array */ if (obj_type != EX_NODAL) { - obj_id_ndx = ex__id_lkup(exoid, obj_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, obj_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -138,7 +138,7 @@ int ex_get_attr_names(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, c if (status == NC_NOERR) { /* read the names */ - status = ex__get_names(exoid, varid, num_attr, names, obj_type, __func__); + status = exi_get_names(exoid, varid, num_attr, names, obj_type, __func__); if (status != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_attr_param.c b/packages/seacas/libraries/exodus/src/ex_get_attr_param.c index 15622d9271..1769bef201 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_attr_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_attr_param.c @@ -40,7 +40,7 @@ int ex_get_attr_param(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, i size_t lnum_attr_per_entry; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -49,7 +49,7 @@ int ex_get_attr_param(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, i obj_id_ndx = 0; } else { - obj_id_ndx = ex__id_lkup(exoid, obj_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, obj_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); diff --git a/packages/seacas/libraries/exodus/src/ex_get_attribute.c b/packages/seacas/libraries/exodus/src/ex_get_attribute.c index c08fedaddb..6ac12f47e3 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_attribute.c +++ b/packages/seacas/libraries/exodus/src/ex_get_attribute.c @@ -23,7 +23,7 @@ attributes which are currently supported in Exodus. */ -static bool ex__is_internal_attribute(const char *name, ex_entity_type obj_type) +static bool exi_is_internal_attribute(const char *name, ex_entity_type obj_type) { if (name[0] == '_') { return true; @@ -45,17 +45,17 @@ static bool ex__is_internal_attribute(const char *name, ex_entity_type obj_type) return false; } -static int ex__get_varid(int exoid, ex_entity_type obj_type, ex_entity_id id) +static int exi_get_varid(int exoid, ex_entity_type obj_type, ex_entity_id id) { char errmsg[MAX_ERR_LENGTH]; int status = 0; - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { return (EX_FATAL); } /* First, locate index of this objects id `obj_type` id array */ - int id_ndx = ex__id_lkup(exoid, obj_type, id); + int id_ndx = exi_id_lkup(exoid, obj_type, id); if (id_ndx <= 0) { ex_get_err(NULL, NULL, &status); if (status != 0) { @@ -100,7 +100,7 @@ static int ex__get_varid(int exoid, ex_entity_type obj_type, ex_entity_id id) return varid; } -static int ex__get_attribute_count(int exoid, ex_entity_type obj_type, ex_entity_id id, int *varid) +static int exi_get_attribute_count(int exoid, ex_entity_type obj_type, ex_entity_id id, int *varid) { int att_count = 0; int status; @@ -117,9 +117,9 @@ static int ex__get_attribute_count(int exoid, ex_entity_type obj_type, ex_entity } } else { - *varid = ex__get_varid(exoid, obj_type, id); + *varid = exi_get_varid(exoid, obj_type, id); if (*varid <= 0) { - /* Error message handled in ex__get_varid */ + /* Error message handled in exi_get_varid */ return 0; } @@ -146,7 +146,7 @@ int ex_get_attribute_count(int exoid, ex_entity_type obj_type, ex_entity_id id) EX_FUNC_ENTER(); int varid; - int att_count = ex__get_attribute_count(exoid, obj_type, id, &varid); + int att_count = exi_get_attribute_count(exoid, obj_type, id, &varid); if (att_count < 0) { char errmsg[MAX_ERR_LENGTH]; snprintf(errmsg, MAX_ERR_LENGTH, @@ -169,7 +169,7 @@ int ex_get_attribute_count(int exoid, ex_entity_type obj_type, ex_entity_id id) ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); } - if (ex__is_internal_attribute(name, obj_type)) { + if (exi_is_internal_attribute(name, obj_type)) { att_count--; } } @@ -198,7 +198,7 @@ int ex_get_attribute_param(int exoid, ex_entity_type obj_type, ex_entity_id id, EX_FUNC_ENTER(); - att_count = ex__get_attribute_count(exoid, obj_type, id, &varid); + att_count = exi_get_attribute_count(exoid, obj_type, id, &varid); if (att_count < 0) { EX_FUNC_LEAVE(EX_FATAL); } @@ -217,7 +217,7 @@ int ex_get_attribute_param(int exoid, ex_entity_type obj_type, ex_entity_id id, ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); } - if (!ex__is_internal_attribute(name, obj_type)) { + if (!exi_is_internal_attribute(name, obj_type)) { nc_type type; size_t val_count; @@ -249,9 +249,9 @@ int ex_get_attribute(int exoid, ex_attribute *attr) varid = NC_GLOBAL; } else { - varid = ex__get_varid(exoid, attr->entity_type, attr->entity_id); + varid = exi_get_varid(exoid, attr->entity_type, attr->entity_id); if (varid <= 0) { - /* Error message handled in ex__get_varid */ + /* Error message handled in exi_get_varid */ EX_FUNC_LEAVE(varid); } } diff --git a/packages/seacas/libraries/exodus/src/ex_get_blob.c b/packages/seacas/libraries/exodus/src/ex_get_blob.c index 8541bc7279..be17e7f613 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_blob.c +++ b/packages/seacas/libraries/exodus/src/ex_get_blob.c @@ -17,7 +17,7 @@ int ex_get_blob(int exoid, ex_blob *blob) { - struct ex__file_item *file = NULL; + struct exi_file_item *file = NULL; int status = 0; int dimid = 0; size_t len = 0; @@ -25,7 +25,7 @@ int ex_get_blob(int exoid, ex_blob *blob) EX_FUNC_ENTER(); - file = ex__find_file_item(exoid); + file = exi_find_file_item(exoid); if (!file) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unknown file id %d.", exoid); ex_err_fn(exoid, __func__, errmsg, EX_BADFILEID); diff --git a/packages/seacas/libraries/exodus/src/ex_get_block_id_map.c b/packages/seacas/libraries/exodus/src/ex_get_block_id_map.c index a82ee1631a..3752313ed4 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_block_id_map.c +++ b/packages/seacas/libraries/exodus/src/ex_get_block_id_map.c @@ -34,12 +34,12 @@ int ex_get_block_id_map(int exoid, ex_entity_type obj_type, ex_entity_id entity_ ex_entity_type map_type = EX_INVALID; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* Determine index of entity_id in id array */ - int blk_id_ndx = ex__id_lkup(exoid, obj_type, entity_id); + int blk_id_ndx = exi_id_lkup(exoid, obj_type, entity_id); if (blk_id_ndx <= 0) { /* Empty block */ ex_get_err(NULL, NULL, &status); if (status != 0) { diff --git a/packages/seacas/libraries/exodus/src/ex_get_block_param.c b/packages/seacas/libraries/exodus/src/ex_get_block_param.c index d1aa21d51e..73bf723b15 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_block_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_block_param.c @@ -48,7 +48,7 @@ int ex_get_block_param(int exoid, ex_block *block) EX_FUNC_ENTER(); - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (!file) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unknown file id %d in ex_get_block_param().", exoid); ex_err_fn(exoid, __func__, errmsg, EX_BADFILEID); @@ -56,7 +56,7 @@ int ex_get_block_param(int exoid, ex_block *block) } /* First, locate index of element block id in VAR_ID_EL_BLK array */ - blk_id_ndx = ex__id_lkup(exoid, block->type, block->id); + blk_id_ndx = exi_id_lkup(exoid, block->type, block->id); if (blk_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); if (status != 0) { @@ -254,7 +254,7 @@ int ex_get_block_param(int exoid, ex_block *block) } /* get rid of trailing blanks */ - ex__trim(block->topology); + exi_trim(block->topology); } EX_FUNC_LEAVE(EX_NOERR); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c b/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c index 68447fbe40..388e1c782e 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c +++ b/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c @@ -47,7 +47,7 @@ int ex_get_cmap_params(int exoid, void_int *node_cmap_ids, void_int *node_cmap_n /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_concat_sets.c b/packages/seacas/libraries/exodus/src/ex_get_concat_sets.c index 3aad4a5ad1..2e99ac0ca5 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_concat_sets.c +++ b/packages/seacas/libraries/exodus/src/ex_get_concat_sets.c @@ -27,7 +27,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_set_specs, ex_err, etc -#include "exodusII_int.h" // for ex__check_valid_file_id, etc +#include "exodusII_int.h" // for exi_check_valid_file_id, etc int ex_get_concat_sets(int exoid, ex_entity_type set_type, struct ex_set_specs *set_specs) { @@ -46,7 +46,7 @@ int ex_get_concat_sets(int exoid, ex_entity_type set_type, struct ex_set_specs * ex_inquiry ex_inq_val; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -76,7 +76,7 @@ int ex_get_concat_sets(int exoid, ex_entity_type set_type, struct ex_set_specs * /* first check if any sets are specified */ - if ((status = nc_inq_dimid(exoid, ex__dim_num_objects(set_type), &dimid)) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_dim_num_objects(set_type), &dimid)) != NC_NOERR) { if (status == NC_EBADDIM) { snprintf(errmsg, MAX_ERR_LENGTH, "Warning: no %ss defined for file id %d", ex_name_of_object(set_type), exoid); @@ -199,7 +199,7 @@ int ex_get_concat_sets(int exoid, ex_entity_type set_type, struct ex_set_specs * num_dist = ((int *)num_dist_per_set)[i]; } if (num_dist > 0) { /* only get df if they exist */ - if (ex__comp_ws(exoid) == sizeof(float)) { + if (exi_comp_ws(exoid) == sizeof(float)) { flt_dist_fact = sets_dist_fact; status = ex_get_set_dist_fact(exoid, set_type, set_id, &(flt_dist_fact[df_idx])); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_concat_side_set_node_count.c b/packages/seacas/libraries/exodus/src/ex_get_concat_side_set_node_count.c index 8dba4598d6..8e4d0b1217 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_concat_side_set_node_count.c +++ b/packages/seacas/libraries/exodus/src/ex_get_concat_side_set_node_count.c @@ -38,12 +38,12 @@ int ex_get_concat_side_set_node_count(int exoid, int *side_set_node_cnt_list) size_t elem_ctr; int status; - struct ex__elem_blk_parm *elem_blk_parms = NULL; + struct exi_elem_blk_parm *elem_blk_parms = NULL; char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -111,7 +111,7 @@ int ex_get_concat_side_set_node_count(int exoid, int *side_set_node_cnt_list) } /* Allocate space for the element block params */ - if (!(elem_blk_parms = malloc(num_elem_blks * sizeof(struct ex__elem_blk_parm)))) { + if (!(elem_blk_parms = malloc(num_elem_blks * sizeof(struct exi_elem_blk_parm)))) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to allocate space for element block params " "for file id %d", @@ -130,7 +130,7 @@ int ex_get_concat_side_set_node_count(int exoid, int *side_set_node_cnt_list) id = ((int *)elem_blk_ids)[i]; } - if (ex__get_block_param(exoid, id, ndim, &elem_blk_parms[i]) != EX_NOERR) { + if (exi_get_block_param(exoid, id, ndim, &elem_blk_parms[i]) != EX_NOERR) { goto error_ret; } @@ -233,7 +233,7 @@ int ex_get_concat_side_set_node_count(int exoid, int *side_set_node_cnt_list) for (i = 0; i < tot_num_ss_elem; i++) { elems[i] = i; /* init index array to current position */ } - ex__iqsort64(side_set_elem_list, ss_elem_ndx, tot_num_ss_elem); + exi_iqsort64(side_set_elem_list, ss_elem_ndx, tot_num_ss_elem); } else { /* Sort side set element list into index array - non-destructive */ @@ -241,7 +241,7 @@ int ex_get_concat_side_set_node_count(int exoid, int *side_set_node_cnt_list) for (i = 0; i < tot_num_ss_elem; i++) { elems[i] = i; /* init index array to current position */ } - ex__iqsort(side_set_elem_list, ss_elem_ndx, tot_num_ss_elem); + exi_iqsort(side_set_elem_list, ss_elem_ndx, tot_num_ss_elem); } j = 0; /* The current element block... */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_conn.c b/packages/seacas/libraries/exodus/src/ex_get_conn.c index ce9edddca5..ab046ee3d7 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_conn.c +++ b/packages/seacas/libraries/exodus/src/ex_get_conn.c @@ -24,7 +24,7 @@ * */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__id_lkup, etc +#include "exodusII_int.h" // for EX_FATAL, exi_id_lkup, etc int ex_get_conn(int exoid, ex_entity_type blk_type, ex_entity_id blk_id, void_int *nodeconn, void_int *edgeconn, void_int *faceconn) @@ -53,7 +53,7 @@ int ex_get_conn(int exoid, ex_entity_type blk_type, ex_entity_id blk_id, void_in const char *vfaceconn = NULL; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -67,7 +67,7 @@ int ex_get_conn(int exoid, ex_entity_type blk_type, ex_entity_id blk_id, void_in /* Locate index of element block id in VAR_ID_EL_BLK array */ - blk_id_ndx = ex__id_lkup(exoid, blk_type, blk_id); + blk_id_ndx = exi_id_lkup(exoid, blk_type, blk_id); if (blk_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); if (status != 0) { diff --git a/packages/seacas/libraries/exodus/src/ex_get_coord.c b/packages/seacas/libraries/exodus/src/ex_get_coord.c index 01f4aad4b9..242d32fdcb 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_coord.c +++ b/packages/seacas/libraries/exodus/src/ex_get_coord.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__comp_ws, etc +#include "exodusII_int.h" // for EX_FATAL, exi_comp_ws, etc /*! The function ex_get_coord() reads the nodal coordinates of the @@ -79,13 +79,13 @@ int ex_get_coord(int exoid, void *x_coor, void *y_coor, void *z_coor) char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* inquire id's of previously defined dimensions */ - if (ex__get_dimension(exoid, DIM_NUM_DIM, "dimension count", &num_dim, &ndimdim, __func__) != + if (exi_get_dimension(exoid, DIM_NUM_DIM, "dimension count", &num_dim, &ndimdim, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -123,7 +123,7 @@ int ex_get_coord(int exoid, void *x_coor, void *y_coor, void *z_coor) if (i == 0 && x_coor != NULL) { which = "X"; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, coordid, start, count, x_coor); } else { @@ -132,7 +132,7 @@ int ex_get_coord(int exoid, void *x_coor, void *y_coor, void *z_coor) } else if (i == 1 && y_coor != NULL) { which = "Y"; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, coordid, start, count, y_coor); } else { @@ -141,7 +141,7 @@ int ex_get_coord(int exoid, void *x_coor, void *y_coor, void *z_coor) } else if (i == 2 && z_coor != NULL) { which = "Z"; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, coordid, start, count, z_coor); } else { @@ -211,7 +211,7 @@ int ex_get_coord(int exoid, void *x_coor, void *y_coor, void *z_coor) } if (coor != NULL && coordid != -1) { - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_var_float(exoid, coordid, coor); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_coord_names.c b/packages/seacas/libraries/exodus/src/ex_get_coord_names.c index cb74e47ef0..e80be3ecd7 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_coord_names.c +++ b/packages/seacas/libraries/exodus/src/ex_get_coord_names.c @@ -51,7 +51,7 @@ int ex_get_coord_names(int exoid, char **coord_names) char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -79,7 +79,7 @@ int ex_get_coord_names(int exoid, char **coord_names) } /* read the coordinate names */ - status = ex__get_names(exoid, varid, num_dim, coord_names, EX_COORDINATE, __func__); + status = exi_get_names(exoid, varid, num_dim, coord_names, EX_COORDINATE, __func__); if (status != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_coordinate_frames.c b/packages/seacas/libraries/exodus/src/ex_get_coordinate_frames.c index 5a77da8002..5f06a1d24a 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_coordinate_frames.c +++ b/packages/seacas/libraries/exodus/src/ex_get_coordinate_frames.c @@ -106,7 +106,7 @@ int ex_get_coordinate_frames(int exoid, int *nframes, void_int *cf_ids, void *pt size_t count = 0; /* number vars to put in varput */ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -166,7 +166,7 @@ int ex_get_coordinate_frames(int exoid, int *nframes, void_int *cf_ids, void *pt EX_FUNC_LEAVE(EX_FATAL); } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_var_float(exoid, varids, pt_coordinates); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_eb_info_global.c b/packages/seacas/libraries/exodus/src/ex_get_eb_info_global.c index ef1d6d416d..326809e2bc 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_eb_info_global.c +++ b/packages/seacas/libraries/exodus/src/ex_get_eb_info_global.c @@ -33,7 +33,7 @@ int ex_get_eb_info_global(int exoid, void_int *el_blk_ids, void_int *el_blk_cnts /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c b/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c index 6eee554414..38dc6baa15 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c @@ -42,7 +42,7 @@ int ex_get_elem_cmap(int exoid, ex_entity_id map_id, void_int *elem_ids, void_in /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_elem_type.c b/packages/seacas/libraries/exodus/src/ex_get_elem_type.c index 435b4e3f84..ea02150e66 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_elem_type.c +++ b/packages/seacas/libraries/exodus/src/ex_get_elem_type.c @@ -40,12 +40,12 @@ int ex_get_elem_type(int exoid, ex_entity_id elem_blk_id, char *elem_type) /*****************************************************************************/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* inquire id's of previously defined dimensions */ - if ((el_blk_id_ndx = ex__id_lkup(exoid, EX_ELEM_BLOCK, elem_blk_id)) == -1) { + if ((el_blk_id_ndx = exi_id_lkup(exoid, EX_ELEM_BLOCK, elem_blk_id)) == -1) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find element block ID %" PRId64 " in file %d", elem_blk_id, exoid); ex_err_fn(exoid, __func__, errmsg, EX_LASTERR); diff --git a/packages/seacas/libraries/exodus/src/ex_get_entity_count_per_polyhedra.c b/packages/seacas/libraries/exodus/src/ex_get_entity_count_per_polyhedra.c index d8f01b3b40..a2b0e44b02 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_entity_count_per_polyhedra.c +++ b/packages/seacas/libraries/exodus/src/ex_get_entity_count_per_polyhedra.c @@ -12,7 +12,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__id_lkup, etc +#include "exodusII_int.h" // for EX_FATAL, exi_id_lkup, etc /*! * reads in the number of entities (nodes/faces) per polyhedra @@ -30,11 +30,11 @@ int ex_get_entity_count_per_polyhedra(int exoid, ex_entity_type blk_type, ex_ent char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } - blk_id_ndx = ex__id_lkup(exoid, blk_type, blk_id); + blk_id_ndx = exi_id_lkup(exoid, blk_type, blk_id); if (blk_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); diff --git a/packages/seacas/libraries/exodus/src/ex_get_glob_var_time_int.c b/packages/seacas/libraries/exodus/src/ex_get_glob_var_time_int.c index a116962d04..bd4bce3e87 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_glob_var_time_int.c +++ b/packages/seacas/libraries/exodus/src/ex_get_glob_var_time_int.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for ex__comp_ws, EX_FATAL, etc +#include "exodusII_int.h" // for exi_comp_ws, EX_FATAL, etc /*! The function ex_get_glob_var_time() reads the values of a @@ -71,7 +71,7 @@ error = ex_get_glob_var_time(exoid, var_index, beg_time, */ -int ex__get_glob_var_time(int exoid, int glob_var_index, int beg_time_step, int end_time_step, +int exi_get_glob_var_time(int exoid, int glob_var_index, int beg_time_step, int end_time_step, void *glob_var_vals) { int status; @@ -80,7 +80,7 @@ int ex__get_glob_var_time(int exoid, int glob_var_index, int beg_time_step, int char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -136,7 +136,7 @@ int ex__get_glob_var_time(int exoid, int glob_var_index, int beg_time_step, int EX_FUNC_LEAVE(EX_WARN); } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, varid, start, count, glob_var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_glob_vars_int.c b/packages/seacas/libraries/exodus/src/ex_get_glob_vars_int.c index 556db923b7..021a690040 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_glob_vars_int.c +++ b/packages/seacas/libraries/exodus/src/ex_get_glob_vars_int.c @@ -24,13 +24,13 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for ex__comp_ws, EX_FATAL, etc +#include "exodusII_int.h" // for exi_comp_ws, EX_FATAL, etc /*! Internal function. Do not use in client code. */ -int ex__get_glob_vars(int exoid, int time_step, int num_glob_vars, void *glob_var_vals) +int exi_get_glob_vars(int exoid, int time_step, int num_glob_vars, void *glob_var_vals) { int varid; int status; @@ -38,7 +38,7 @@ int ex__get_glob_vars(int exoid, int time_step, int num_glob_vars, void *glob_va char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -57,7 +57,7 @@ int ex__get_glob_vars(int exoid, int time_step, int num_glob_vars, void *glob_va count[0] = 1; count[1] = num_glob_vars; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, varid, start, count, glob_var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_group_ids.c b/packages/seacas/libraries/exodus/src/ex_get_group_ids.c index 8cf88742eb..596b55bd6c 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_group_ids.c +++ b/packages/seacas/libraries/exodus/src/ex_get_group_ids.c @@ -23,7 +23,7 @@ int ex_get_group_ids(int parent_id, int *num_groups, int *group_ids) int status; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(parent_id, __func__) != EX_NOERR) { + if (exi_check_valid_file_id(parent_id, __func__) != EX_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_id_map.c b/packages/seacas/libraries/exodus/src/ex_get_id_map.c index 0a70456852..21c2bd8de2 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_id_map.c +++ b/packages/seacas/libraries/exodus/src/ex_get_id_map.c @@ -35,7 +35,7 @@ int ex_get_id_map(int exoid, ex_entity_type map_type, void_int *map) const char *tname; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_ids.c b/packages/seacas/libraries/exodus/src/ex_get_ids.c index dab63310f7..01365b7154 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_ids.c +++ b/packages/seacas/libraries/exodus/src/ex_get_ids.c @@ -29,7 +29,7 @@ static int ex_get_nonstandard_ids(int exoid, ex_entity_type obj_type, void_int * { int64_t count = 0; - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (file) { if (obj_type == EX_ASSEMBLY) { count = file->assembly_count; @@ -100,7 +100,7 @@ int ex_get_ids(int exoid, ex_entity_type obj_type, void_int *ids) const char *varidobj; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -133,7 +133,7 @@ int ex_get_ids(int exoid, ex_entity_type obj_type, void_int *ids) } /* Determine if there are any 'obj-type' objects */ - if ((status = nc_inq_dimid(exoid, ex__dim_num_objects(obj_type), &varid)) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_dim_num_objects(obj_type), &varid)) != NC_NOERR) { char errmsg[MAX_ERR_LENGTH]; snprintf(errmsg, MAX_ERR_LENGTH, "Warning: no %s defined in file id %d", ex_name_of_object(obj_type), exoid); diff --git a/packages/seacas/libraries/exodus/src/ex_get_info.c b/packages/seacas/libraries/exodus/src/ex_get_info.c index c839d991b5..5c9d7e2d25 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_info.c +++ b/packages/seacas/libraries/exodus/src/ex_get_info.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__trim, etc +#include "exodusII_int.h" // for EX_FATAL, exi_trim, etc /*! \ingroup Utilities @@ -50,7 +50,7 @@ int ex_get_info(int exoid, char **info) int status; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -98,7 +98,7 @@ int ex_get_info(int exoid, char **info) EX_FUNC_LEAVE(EX_FATAL); } info[i][MAX_LINE_LENGTH] = '\0'; - ex__trim(info[i]); + exi_trim(info[i]); } } EX_FUNC_LEAVE(EX_NOERR); diff --git a/packages/seacas/libraries/exodus/src/ex_get_init.c b/packages/seacas/libraries/exodus/src/ex_get_init.c index d64e0e82c4..aa8dc5aa0a 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_init.c +++ b/packages/seacas/libraries/exodus/src/ex_get_init.c @@ -79,7 +79,7 @@ int ex_get_init(int exoid, char *title, void_int *num_dim, void_int *num_nodes, int errval; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_init_ext.c b/packages/seacas/libraries/exodus/src/ex_get_init_ext.c index 2a432701e7..7be588c2fc 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_init_ext.c +++ b/packages/seacas/libraries/exodus/src/ex_get_init_ext.c @@ -24,7 +24,7 @@ #include "exodusII.h" // for ex_init_params, etc #include "exodusII_int.h" // for EX_FATAL, EX_NOERR, etc -static void ex__get_entity_count(int exoid, ex_init_params *info) +static void exi_get_entity_count(int exoid, ex_init_params *info) { int ndims; nc_inq(exoid, &ndims, NULL, NULL, NULL); @@ -76,7 +76,7 @@ static int ex_get_dim_value(int exoid, const char *name, const char *dimension_n int ex_get_init_ext(int exoid, ex_init_params *info) { EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -109,7 +109,7 @@ int ex_get_init_ext(int exoid, ex_init_params *info) } /* Counts for assemblies and blobs */ - ex__get_entity_count(exoid, info); + exi_get_entity_count(exoid, info); if (ex_get_dim_value(exoid, "edges", DIM_NUM_EDGE, dimid, &info->num_edge) != EX_NOERR) { EX_FUNC_LEAVE(EX_FATAL); @@ -208,9 +208,9 @@ int ex_get_init_ext(int exoid, ex_init_params *info) info->title[0] = '\0'; } - /* Update settings in ex__file_item struct */ + /* Update settings in exi_file_item struct */ { - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (file) { file->has_nodes = info->num_nodes > 0; file->has_edges = info->num_edge > 0; diff --git a/packages/seacas/libraries/exodus/src/ex_get_init_global.c b/packages/seacas/libraries/exodus/src/ex_get_init_global.c index 1031bdeed9..4e98e68a36 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_init_global.c +++ b/packages/seacas/libraries/exodus/src/ex_get_init_global.c @@ -65,7 +65,7 @@ int ex_get_init_global(int exoid, void_int *num_nodes_g, void_int *num_elems_g, void_int *num_side_sets_g) { EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_init_info.c b/packages/seacas/libraries/exodus/src/ex_get_init_info.c index 042fab945f..ca69f4a433 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_init_info.c +++ b/packages/seacas/libraries/exodus/src/ex_get_init_info.c @@ -39,7 +39,7 @@ int ex_get_init_info(int exoid, int *num_proc, int *num_proc_in_f, char *ftype) /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -48,7 +48,7 @@ int ex_get_init_info(int exoid, int *num_proc, int *num_proc_in_f, char *ftype) *num_proc_in_f = 1; /* Get the file type */ - if (ex__get_file_type(exoid, ftype) != EX_NOERR) { + if (exi_get_file_type(exoid, ftype) != EX_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get file type for file ID %d", exoid); ex_err_fn(exoid, __func__, errmsg, EX_LASTERR); diff --git a/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c b/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c index 85c7b25e50..c17423f209 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c @@ -48,7 +48,7 @@ int ex_get_loadbal_param(int exoid, void_int *num_int_nodes, void_int *num_bor_n char errmsg[MAX_ERR_LENGTH]; /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -77,7 +77,7 @@ int ex_get_loadbal_param(int exoid, void_int *num_int_nodes, void_int *num_bor_n } /* Get the file type */ - if (ex__get_file_type(exoid, ftype) != EX_NOERR) { + if (exi_get_file_type(exoid, ftype) != EX_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unable to find file type for file ID %d", exoid); ex_err_fn(exoid, __func__, errmsg, EX_LASTERR); diff --git a/packages/seacas/libraries/exodus/src/ex_get_map.c b/packages/seacas/libraries/exodus/src/ex_get_map.c index fabbbc04b8..151bcac061 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_map.c +++ b/packages/seacas/libraries/exodus/src/ex_get_map.c @@ -46,7 +46,7 @@ int ex_get_map(int exoid, void_int *elem_map) int status; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_map_param.c b/packages/seacas/libraries/exodus/src/ex_get_map_param.c index 0b67ff5be5..1623b7eb94 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_map_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_map_param.c @@ -36,7 +36,7 @@ int ex_get_map_param(int exoid, int *num_node_maps, int *num_elem_maps) char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_name.c b/packages/seacas/libraries/exodus/src/ex_get_name.c index 2a47d1379c..33b7b141e4 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_name.c +++ b/packages/seacas/libraries/exodus/src/ex_get_name.c @@ -34,7 +34,7 @@ int ex_get_name(int exoid, ex_entity_type obj_type, ex_entity_id entity_id, char { EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -70,7 +70,7 @@ int ex_get_name(int exoid, ex_entity_type obj_type, ex_entity_id entity_id, char /* If this is a null entity, then 'ent_ndx' will be negative. * We don't care in this __func__, so make it positive and continue... */ - int ent_ndx = ex__id_lkup(exoid, obj_type, entity_id); + int ent_ndx = exi_id_lkup(exoid, obj_type, entity_id); if (ent_ndx < 0) { ent_ndx = -ent_ndx; } @@ -81,7 +81,7 @@ int ex_get_name(int exoid, ex_entity_type obj_type, ex_entity_id entity_id, char int api_name_size = ex_inquire_int(exoid, EX_INQ_MAX_READ_NAME_LENGTH); int name_size = db_name_size < api_name_size ? db_name_size : api_name_size; - int status = ex__get_name(exoid, varid, ent_ndx - 1, name, name_size, obj_type, __func__); + int status = exi_get_name(exoid, varid, ent_ndx - 1, name, name_size, obj_type, __func__); if (status != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_names.c b/packages/seacas/libraries/exodus/src/ex_get_names.c index 9047358c4d..c71d7abbf6 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_names.c +++ b/packages/seacas/libraries/exodus/src/ex_get_names.c @@ -23,7 +23,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for ex__get_dimension, EX_NOERR, etc +#include "exodusII_int.h" // for exi_get_dimension, EX_NOERR, etc /* * reads the entity names from the database @@ -32,7 +32,7 @@ int ex_get_names(int exoid, ex_entity_type obj_type, char **names) { EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -75,55 +75,55 @@ int ex_get_names(int exoid, ex_entity_type obj_type, char **names) } /* ======== BLOCKS ========= */ case EX_EDGE_BLOCK: - ex__get_dimension(exoid, DIM_NUM_ED_BLK, "edge block", &num_entity, &temp, __func__); + exi_get_dimension(exoid, DIM_NUM_ED_BLK, "edge block", &num_entity, &temp, __func__); status = nc_inq_varid(exoid, VAR_NAME_ED_BLK, &varid); break; case EX_FACE_BLOCK: - ex__get_dimension(exoid, DIM_NUM_FA_BLK, "face block", &num_entity, &temp, __func__); + exi_get_dimension(exoid, DIM_NUM_FA_BLK, "face block", &num_entity, &temp, __func__); status = nc_inq_varid(exoid, VAR_NAME_FA_BLK, &varid); break; case EX_ELEM_BLOCK: - ex__get_dimension(exoid, DIM_NUM_EL_BLK, "element block", &num_entity, &temp, __func__); + exi_get_dimension(exoid, DIM_NUM_EL_BLK, "element block", &num_entity, &temp, __func__); status = nc_inq_varid(exoid, VAR_NAME_EL_BLK, &varid); break; /* ======== SETS ========= */ case EX_NODE_SET: - ex__get_dimension(exoid, DIM_NUM_NS, "nodeset", &num_entity, &temp, __func__); + exi_get_dimension(exoid, DIM_NUM_NS, "nodeset", &num_entity, &temp, __func__); status = nc_inq_varid(exoid, VAR_NAME_NS, &varid); break; case EX_EDGE_SET: - ex__get_dimension(exoid, DIM_NUM_ES, "edgeset", &num_entity, &temp, __func__); + exi_get_dimension(exoid, DIM_NUM_ES, "edgeset", &num_entity, &temp, __func__); status = nc_inq_varid(exoid, VAR_NAME_ES, &varid); break; case EX_FACE_SET: - ex__get_dimension(exoid, DIM_NUM_FS, "faceset", &num_entity, &temp, __func__); + exi_get_dimension(exoid, DIM_NUM_FS, "faceset", &num_entity, &temp, __func__); status = nc_inq_varid(exoid, VAR_NAME_FS, &varid); break; case EX_SIDE_SET: - ex__get_dimension(exoid, DIM_NUM_SS, "sideset", &num_entity, &temp, __func__); + exi_get_dimension(exoid, DIM_NUM_SS, "sideset", &num_entity, &temp, __func__); status = nc_inq_varid(exoid, VAR_NAME_SS, &varid); break; case EX_ELEM_SET: - ex__get_dimension(exoid, DIM_NUM_ELS, "elemset", &num_entity, &temp, __func__); + exi_get_dimension(exoid, DIM_NUM_ELS, "elemset", &num_entity, &temp, __func__); status = nc_inq_varid(exoid, VAR_NAME_ELS, &varid); break; /* ======== MAPS ========= */ case EX_NODE_MAP: - ex__get_dimension(exoid, DIM_NUM_NM, "node map", &num_entity, &temp, __func__); + exi_get_dimension(exoid, DIM_NUM_NM, "node map", &num_entity, &temp, __func__); status = nc_inq_varid(exoid, VAR_NAME_NM, &varid); break; case EX_EDGE_MAP: - ex__get_dimension(exoid, DIM_NUM_EDM, "edge map", &num_entity, &temp, __func__); + exi_get_dimension(exoid, DIM_NUM_EDM, "edge map", &num_entity, &temp, __func__); status = nc_inq_varid(exoid, VAR_NAME_EDM, &varid); break; case EX_FACE_MAP: - ex__get_dimension(exoid, DIM_NUM_FAM, "face map", &num_entity, &temp, __func__); + exi_get_dimension(exoid, DIM_NUM_FAM, "face map", &num_entity, &temp, __func__); status = nc_inq_varid(exoid, VAR_NAME_FAM, &varid); break; case EX_ELEM_MAP: - ex__get_dimension(exoid, DIM_NUM_EM, "element map", &num_entity, &temp, __func__); + exi_get_dimension(exoid, DIM_NUM_EM, "element map", &num_entity, &temp, __func__); status = nc_inq_varid(exoid, VAR_NAME_EM, &varid); break; @@ -137,7 +137,7 @@ int ex_get_names(int exoid, ex_entity_type obj_type, char **names) } if (status == NC_NOERR) { - if ((status = ex__get_names(exoid, varid, num_entity, names, obj_type, "ex_get_names")) != + if ((status = exi_get_names(exoid, varid, num_entity, names, obj_type, "ex_get_names")) != EX_NOERR) { EX_FUNC_LEAVE(status); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_nodal_var_time_int.c b/packages/seacas/libraries/exodus/src/ex_get_nodal_var_time_int.c index 2749a7fa67..cd001d7aed 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_nodal_var_time_int.c +++ b/packages/seacas/libraries/exodus/src/ex_get_nodal_var_time_int.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_WARN, ex__comp_ws, etc +#include "exodusII_int.h" // for EX_WARN, exi_comp_ws, etc /*! The function ex_get_nodal_var_time() reads the values of a nodal @@ -78,7 +78,7 @@ error = ex_get_var_time(exoid, EX_NODAL, var_index, node_num, beg_time, ~~~ */ -int ex__get_nodal_var_time(int exoid, int nodal_var_index, int64_t node_number, int beg_time_step, +int exi_get_nodal_var_time(int exoid, int nodal_var_index, int64_t node_number, int beg_time_step, int end_time_step, void *nodal_var_vals) { int status; @@ -87,7 +87,7 @@ int ex__get_nodal_var_time(int exoid, int nodal_var_index, int64_t node_number, char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* Check that times are in range */ @@ -170,7 +170,7 @@ int ex__get_nodal_var_time(int exoid, int nodal_var_index, int64_t node_number, count[1] = 1; } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, varid, start, count, nodal_var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c b/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c index de65827e41..a36eb19b57 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c @@ -38,7 +38,7 @@ int ex_get_node_cmap(int exoid, ex_entity_id map_id, void_int *node_ids, void_in char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_ns_param_global.c b/packages/seacas/libraries/exodus/src/ex_get_ns_param_global.c index cc9f54eb9c..2014ca5b21 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_ns_param_global.c +++ b/packages/seacas/libraries/exodus/src/ex_get_ns_param_global.c @@ -35,7 +35,7 @@ int ex_get_ns_param_global(int exoid, void_int *global_ids, void_int *node_cnts, /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_num_map.c b/packages/seacas/libraries/exodus/src/ex_get_num_map.c index f7f7a493ae..0f81f29bcd 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_num_map.c +++ b/packages/seacas/libraries/exodus/src/ex_get_num_map.c @@ -38,7 +38,7 @@ int ex_get_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_id, void const char *dim_num_maps; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -79,7 +79,7 @@ int ex_get_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_id, void } /* Lookup index of map id property array */ - id_ndx = ex__id_lkup(exoid, map_type, map_id); + id_ndx = exi_id_lkup(exoid, map_type, map_id); if (id_ndx <= 0) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate %s id %" PRId64 " in id variable in file id %d", @@ -89,7 +89,7 @@ int ex_get_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_id, void } /* inquire id's of previously defined dimensions and variables */ - if ((status = nc_inq_varid(exoid, ex__name_of_map(map_type, id_ndx), &var_id)) != NC_NOERR) { + if ((status = nc_inq_varid(exoid, exi_name_of_map(map_type, id_ndx), &var_id)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate %s %" PRId64 " in file id %d", ex_name_of_object(map_type), map_id, exoid); ex_err_fn(exoid, __func__, errmsg, status); diff --git a/packages/seacas/libraries/exodus/src/ex_get_object_truth_vector.c b/packages/seacas/libraries/exodus/src/ex_get_object_truth_vector.c index 2dc01d8070..34479d6089 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_object_truth_vector.c +++ b/packages/seacas/libraries/exodus/src/ex_get_object_truth_vector.c @@ -15,7 +15,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for ex__get_dimension, EX_FATAL, etc +#include "exodusII_int.h" // for exi_get_dimension, EX_FATAL, etc /*! * reads the EXODUS specified variable truth vector from the database @@ -38,62 +38,62 @@ int ex_get_object_truth_vector(int exoid, ex_entity_type obj_type, ex_entity_id const char *var_name = NULL; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } switch (obj_type) { case EX_EDGE_BLOCK: status = - ex__get_dimension(exoid, DIM_NUM_EDG_VAR, "edge variables", &num_var_db, &varid, __func__); + exi_get_dimension(exoid, DIM_NUM_EDG_VAR, "edge variables", &num_var_db, &varid, __func__); statust = nc_inq_varid(exoid, VAR_EBLK_TAB, &tabid); var_name = "vals_edge_var"; ent_type = "eb"; break; case EX_FACE_BLOCK: status = - ex__get_dimension(exoid, DIM_NUM_FAC_VAR, "face variables", &num_var_db, &varid, __func__); + exi_get_dimension(exoid, DIM_NUM_FAC_VAR, "face variables", &num_var_db, &varid, __func__); statust = nc_inq_varid(exoid, VAR_FBLK_TAB, &tabid); var_name = "vals_face_var"; ent_type = "fb"; break; case EX_ELEM_BLOCK: - status = ex__get_dimension(exoid, DIM_NUM_ELE_VAR, "element variables", &num_var_db, &varid, + status = exi_get_dimension(exoid, DIM_NUM_ELE_VAR, "element variables", &num_var_db, &varid, __func__); statust = nc_inq_varid(exoid, VAR_ELEM_TAB, &tabid); var_name = "vals_elem_var"; ent_type = "eb"; break; case EX_NODE_SET: - status = ex__get_dimension(exoid, DIM_NUM_NSET_VAR, "nodeset variables", &num_var_db, &varid, + status = exi_get_dimension(exoid, DIM_NUM_NSET_VAR, "nodeset variables", &num_var_db, &varid, __func__); statust = nc_inq_varid(exoid, VAR_NSET_TAB, &tabid); var_name = "vals_nset_var"; ent_type = "ns"; break; case EX_EDGE_SET: - status = ex__get_dimension(exoid, DIM_NUM_ESET_VAR, "edgeset variables", &num_var_db, &varid, + status = exi_get_dimension(exoid, DIM_NUM_ESET_VAR, "edgeset variables", &num_var_db, &varid, __func__); statust = nc_inq_varid(exoid, VAR_ESET_TAB, &tabid); var_name = "vals_eset_var"; ent_type = "es"; break; case EX_FACE_SET: - status = ex__get_dimension(exoid, DIM_NUM_FSET_VAR, "faceset variables", &num_var_db, &varid, + status = exi_get_dimension(exoid, DIM_NUM_FSET_VAR, "faceset variables", &num_var_db, &varid, __func__); statust = nc_inq_varid(exoid, VAR_FSET_TAB, &tabid); var_name = "vals_fset_var"; ent_type = "fs"; break; case EX_SIDE_SET: - status = ex__get_dimension(exoid, DIM_NUM_SSET_VAR, "sideset variables", &num_var_db, &varid, + status = exi_get_dimension(exoid, DIM_NUM_SSET_VAR, "sideset variables", &num_var_db, &varid, __func__); statust = nc_inq_varid(exoid, VAR_SSET_TAB, &tabid); var_name = "vals_sset_var"; ent_type = "ss"; break; case EX_ELEM_SET: - status = ex__get_dimension(exoid, DIM_NUM_ELSET_VAR, "elemset variables", &num_var_db, &varid, + status = exi_get_dimension(exoid, DIM_NUM_ELSET_VAR, "elemset variables", &num_var_db, &varid, __func__); statust = nc_inq_varid(exoid, VAR_ELSET_TAB, &tabid); var_name = "vals_elset_var"; @@ -101,7 +101,7 @@ int ex_get_object_truth_vector(int exoid, ex_entity_type obj_type, ex_entity_id break; case EX_BLOB: status = - ex__get_dimension(exoid, DIM_NUM_BLOB_VAR, "blob variables", &num_var_db, &varid, __func__); + exi_get_dimension(exoid, DIM_NUM_BLOB_VAR, "blob variables", &num_var_db, &varid, __func__); statust = nc_inq_varid(exoid, VAR_BLOB_TAB, &tabid); var_name = "vals_blob_var"; ent_type = "blob"; @@ -118,7 +118,7 @@ int ex_get_object_truth_vector(int exoid, ex_entity_type obj_type, ex_entity_id } /* Determine index of entity_id in id array */ - int ent_ndx = ex__id_lkup(exoid, obj_type, entity_id); + int ent_ndx = exi_id_lkup(exoid, obj_type, entity_id); if (ent_ndx <= 0) { ex_get_err(NULL, NULL, &status); if (status != 0) { @@ -150,7 +150,7 @@ int ex_get_object_truth_vector(int exoid, ex_entity_type obj_type, ex_entity_id */ for (int i = 0; i < num_var; i++) { /* NOTE: names are 1-based */ - if (nc_inq_varid(exoid, ex__catstr2(var_name, i + 1, ent_type, ent_ndx), &tabid) != + if (nc_inq_varid(exoid, exi_catstr2(var_name, i + 1, ent_type, ent_ndx), &tabid) != NC_NOERR) { /* variable doesn't exist; put a 0 in the truth vector */ var_vec[i] = 0; diff --git a/packages/seacas/libraries/exodus/src/ex_get_one_attr.c b/packages/seacas/libraries/exodus/src/ex_get_one_attr.c index 5a529f9b4e..081c1995e9 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_one_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_get_one_attr.c @@ -24,7 +24,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__get_dimension, etc +#include "exodusII_int.h" // for EX_FATAL, exi_get_dimension, etc /* * reads the attributes for an edge, face, or element block @@ -45,13 +45,13 @@ int ex_get_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, int const char *vattrbname; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* Determine index of obj_id in vobjids array */ if (obj_type != EX_NODAL) { - obj_id_ndx = ex__id_lkup(exoid, obj_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, obj_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -127,12 +127,12 @@ int ex_get_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, int } /* inquire id's of previously defined dimensions */ - if (ex__get_dimension(exoid, dnumobjent, "entries", &num_entries_this_obj, &temp, __func__) != + if (exi_get_dimension(exoid, dnumobjent, "entries", &num_entries_this_obj, &temp, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } - if (ex__get_dimension(exoid, dnumobjatt, "attributes", &num_attr, &temp, __func__) != NC_NOERR) { + if (exi_get_dimension(exoid, dnumobjatt, "attributes", &num_attr, &temp, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -163,7 +163,7 @@ int ex_get_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, int stride[0] = 1; stride[1] = num_attr; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vars_float(exoid, attrid, start, count, stride, attrib); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_attr.c b/packages/seacas/libraries/exodus/src/ex_get_partial_attr.c index 0956bfe695..b9e637579a 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_attr.c @@ -28,7 +28,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__get_dimension, etc +#include "exodusII_int.h" // for EX_FATAL, exi_get_dimension, etc /*! * reads the specified attribute for a subsect of a block @@ -57,7 +57,7 @@ int ex_get_partial_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, const char *vattrbname; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -69,7 +69,7 @@ int ex_get_partial_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, /* Determine index of obj_id in vobjids array */ if (obj_type != EX_NODAL) { - obj_id_ndx = ex__id_lkup(exoid, obj_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, obj_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -145,7 +145,7 @@ int ex_get_partial_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, } /* inquire id's of previously defined dimensions */ - if (ex__get_dimension(exoid, dnumobjent, "entries", &num_entries_this_obj, &temp, __func__) != + if (exi_get_dimension(exoid, dnumobjent, "entries", &num_entries_this_obj, &temp, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -159,7 +159,7 @@ int ex_get_partial_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, EX_FUNC_LEAVE(EX_FATAL); } - if (ex__get_dimension(exoid, dnumobjatt, "attributes", &num_attr, &temp, __func__) != NC_NOERR) { + if (exi_get_dimension(exoid, dnumobjatt, "attributes", &num_attr, &temp, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -181,7 +181,7 @@ int ex_get_partial_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, start[0] = 0; } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, attrid, start, count, attrib); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_conn.c b/packages/seacas/libraries/exodus/src/ex_get_partial_conn.c index 24dcce2e53..b90895aeb4 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_conn.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_conn.c @@ -29,7 +29,7 @@ */ #include "exodusII.h" // for ex_err, ex_name_of_object, etc -#include "exodusII_int.h" // for ex__check_valid_file_id, etc +#include "exodusII_int.h" // for exi_check_valid_file_id, etc /* * reads the connectivity array for an element block @@ -62,7 +62,7 @@ int ex_get_partial_conn(int exoid, ex_entity_type blk_type, ex_entity_id blk_id, const char *vfaceconn = NULL; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -79,7 +79,7 @@ int ex_get_partial_conn(int exoid, ex_entity_type blk_type, ex_entity_id blk_id, /* Locate index of element block id in VAR_ID_EL_BLK array */ - blk_id_ndx = ex__id_lkup(exoid, blk_type, blk_id); + blk_id_ndx = exi_id_lkup(exoid, blk_type, blk_id); if (blk_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_coord.c b/packages/seacas/libraries/exodus/src/ex_get_partial_coord.c index b940558c50..44b1b1c8f7 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_coord.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_coord.c @@ -27,7 +27,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__comp_ws, etc +#include "exodusII_int.h" // for EX_FATAL, exi_comp_ws, etc /*! * reads the coordinates of the nodes. @@ -62,7 +62,7 @@ int ex_get_partial_coord(int exoid, int64_t start_node_num, int64_t num_nodes, v char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -90,7 +90,7 @@ int ex_get_partial_coord(int exoid, int64_t start_node_num, int64_t num_nodes, v EX_FUNC_LEAVE(EX_FATAL); } - if (ex__get_dimension(exoid, DIM_NUM_DIM, "dimension count", &num_dim, &ndimdim, __func__) != + if (exi_get_dimension(exoid, DIM_NUM_DIM, "dimension count", &num_dim, &ndimdim, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -117,7 +117,7 @@ int ex_get_partial_coord(int exoid, int64_t start_node_num, int64_t num_nodes, v if (i == 0 && x_coor != NULL) { which = "X"; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, coordid, start, count, x_coor); } else { @@ -126,7 +126,7 @@ int ex_get_partial_coord(int exoid, int64_t start_node_num, int64_t num_nodes, v } else if (i == 1 && y_coor != NULL) { which = "Y"; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, coordid, start, count, y_coor); } else { @@ -135,7 +135,7 @@ int ex_get_partial_coord(int exoid, int64_t start_node_num, int64_t num_nodes, v } else if (i == 2 && z_coor != NULL) { which = "Z"; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, coordid, start, count, z_coor); } else { @@ -211,7 +211,7 @@ int ex_get_partial_coord(int exoid, int64_t start_node_num, int64_t num_nodes, v } if (coor != NULL && coordid != -1) { - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, coordid, start, count, coor); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_coord_component.c b/packages/seacas/libraries/exodus/src/ex_get_partial_coord_component.c index f0a300b8b8..9b12c68db3 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_coord_component.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_coord_component.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__comp_ws, etc +#include "exodusII_int.h" // for EX_FATAL, exi_comp_ws, etc /*! * reads the coordinates of some of the nodes in the model for the specified component @@ -38,7 +38,7 @@ int ex_get_partial_coord_component(int exoid, int64_t start_node_num, int64_t nu const char *which = "XYZ"; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -66,7 +66,7 @@ int ex_get_partial_coord_component(int exoid, int64_t start_node_num, int64_t nu EX_FUNC_LEAVE(EX_FATAL); } - if (ex__get_dimension(exoid, DIM_NUM_DIM, "dimensions", &num_dim, &ndimdim, __func__) != + if (exi_get_dimension(exoid, DIM_NUM_DIM, "dimensions", &num_dim, &ndimdim, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -99,7 +99,7 @@ int ex_get_partial_coord_component(int exoid, int64_t start_node_num, int64_t nu start[1] = 0; } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, coordid, start, count, coor); } else { @@ -132,7 +132,7 @@ int ex_get_partial_coord_component(int exoid, int64_t start_node_num, int64_t nu EX_FUNC_LEAVE(EX_FATAL); } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, coordid, start, count, coor); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_id_map.c b/packages/seacas/libraries/exodus/src/ex_get_partial_id_map.c index 90336a9266..764072bec2 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_id_map.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_id_map.c @@ -32,7 +32,7 @@ int ex_get_partial_id_map(int exoid, ex_entity_type map_type, int64_t start_enti char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_nodal_var_int.c b/packages/seacas/libraries/exodus/src/ex_get_partial_nodal_var_int.c index f04eb7bc36..1d982a1d40 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_nodal_var_int.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_nodal_var_int.c @@ -28,7 +28,7 @@ *****************************************************************************/ #include // for ex_err, etc -#include // for EX_WARN, ex__comp_ws, etc +#include // for EX_WARN, exi_comp_ws, etc /*! \internal @@ -37,7 +37,7 @@ the reading of nodal variable values. */ -int ex__get_partial_nodal_var(int exoid, int time_step, int nodal_var_index, int64_t start_node, +int exi_get_partial_nodal_var(int exoid, int time_step, int nodal_var_index, int64_t start_node, int64_t num_nodes, void *var_vals) { int varid; @@ -46,7 +46,7 @@ int ex__get_partial_nodal_var(int exoid, int time_step, int nodal_var_index, int char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -87,7 +87,7 @@ int ex__get_partial_nodal_var(int exoid, int time_step, int nodal_var_index, int } } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, varid, start, count, var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_num_map.c b/packages/seacas/libraries/exodus/src/ex_get_partial_num_map.c index f548847600..6ba48bfe41 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_num_map.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_num_map.c @@ -41,7 +41,7 @@ int ex_get_partial_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_ const char *dim_num_maps; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -109,7 +109,7 @@ int ex_get_partial_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_ } /* Lookup index of element map id property array */ - id_ndx = ex__id_lkup(exoid, map_type, map_id); + id_ndx = exi_id_lkup(exoid, map_type, map_id); if (id_ndx <= 0) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate %s id %" PRId64 " in id variable in file id %d", @@ -119,7 +119,7 @@ int ex_get_partial_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_ } /* inquire id's of previously defined dimensions and variables */ - if ((status = nc_inq_varid(exoid, ex__name_of_map(map_type, id_ndx), &var_id)) != NC_NOERR) { + if ((status = nc_inq_varid(exoid, exi_name_of_map(map_type, id_ndx), &var_id)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate %s %" PRId64 " in file id %d", ex_name_of_object(map_type), map_id, exoid); ex_err_fn(exoid, __func__, errmsg, status); diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_one_attr.c b/packages/seacas/libraries/exodus/src/ex_get_partial_one_attr.c index 1de3536505..d9ef130ecd 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_one_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_one_attr.c @@ -28,7 +28,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__get_dimension, etc +#include "exodusII_int.h" // for EX_FATAL, exi_get_dimension, etc /*! * reads the specified attribute for a subsect of a block @@ -59,7 +59,7 @@ int ex_get_partial_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj const char *vattrbname; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -71,7 +71,7 @@ int ex_get_partial_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj /* Determine index of obj_id in vobjids array */ if (obj_type != EX_NODAL) { - obj_id_ndx = ex__id_lkup(exoid, obj_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, obj_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -147,7 +147,7 @@ int ex_get_partial_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj } /* inquire id's of previously defined dimensions */ - if (ex__get_dimension(exoid, dnumobjent, "entries", &num_entries_this_obj, &temp, __func__) != + if (exi_get_dimension(exoid, dnumobjent, "entries", &num_entries_this_obj, &temp, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -161,7 +161,7 @@ int ex_get_partial_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj EX_FUNC_LEAVE(EX_FATAL); } - if (ex__get_dimension(exoid, dnumobjatt, "attributes", &num_attr, &temp, __func__) != NC_NOERR) { + if (exi_get_dimension(exoid, dnumobjatt, "attributes", &num_attr, &temp, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -195,7 +195,7 @@ int ex_get_partial_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj if (count[0] == 0) { start[0] = 0; } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vars_float(exoid, attrid, start, count, stride, attrib); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_set.c b/packages/seacas/libraries/exodus/src/ex_get_partial_set.c index 0b7965ca22..ba9273f521 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_set.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_set.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, ex_name_of_object, etc -#include "exodusII_int.h" // for ex__is_parallel, etc +#include "exodusII_int.h" // for exi_is_parallel, etc /*! * reads a portion of the set entry list and set extra list for a single set @@ -33,12 +33,12 @@ int ex_get_partial_set(int exoid, ex_entity_type set_type, ex_entity_id set_id, char *extraptr = NULL; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* first check if any sets are specified */ - if ((status = nc_inq_dimid(exoid, ex__dim_num_objects(set_type), &dimid)) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_dim_num_objects(set_type), &dimid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: no %ss defined in file id %d", ex_name_of_object(set_type), exoid); ex_err_fn(exoid, __func__, errmsg, status); @@ -46,7 +46,7 @@ int ex_get_partial_set(int exoid, ex_entity_type set_type, ex_entity_id set_id, } /* Lookup index of set id in VAR_*S_IDS array */ - set_id_ndx = ex__id_lkup(exoid, set_type, set_id); + set_id_ndx = exi_id_lkup(exoid, set_type, set_id); if (set_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -98,7 +98,7 @@ int ex_get_partial_set(int exoid, ex_entity_type set_type, ex_entity_id set_id, } /* read the entry list and extra list arrays */ - if (set_entry_list != NULL || ex__is_parallel(exoid)) { + if (set_entry_list != NULL || exi_is_parallel(exoid)) { start[0] = offset - 1; count[0] = num_to_get; if (count[0] == 0) { @@ -122,7 +122,7 @@ int ex_get_partial_set(int exoid, ex_entity_type set_type, ex_entity_id set_id, } /* only do for edge, face and side sets */ - if (extraptr && (set_extra_list != NULL || ex__is_parallel(exoid))) { + if (extraptr && (set_extra_list != NULL || exi_is_parallel(exoid))) { if ((status = nc_inq_varid(exoid, extraptr, &extra_list_id)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate extra list for %s %" PRId64 " in file id %d", diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_set_dist_fact.c b/packages/seacas/libraries/exodus/src/ex_get_partial_set_dist_fact.c index 3ba1c3492c..f3f897e8cf 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_set_dist_fact.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_set_dist_fact.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, ex_name_of_object, etc -#include "exodusII_int.h" // for ex__check_valid_file_id, etc +#include "exodusII_int.h" // for exi_check_valid_file_id, etc /*! * reads the distribution factors for a single set @@ -24,12 +24,12 @@ int ex_get_partial_set_dist_fact(int exoid, ex_entity_type set_type, ex_entity_i char *factptr = NULL; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* first check if any sets are specified */ - if ((status = nc_inq_dimid(exoid, ex__dim_num_objects(set_type), &dimid)) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_dim_num_objects(set_type), &dimid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "Warning: no %s sets stored in file id %d", ex_name_of_object(set_type), exoid); ex_err_fn(exoid, __func__, errmsg, status); @@ -37,7 +37,7 @@ int ex_get_partial_set_dist_fact(int exoid, ex_entity_type set_type, ex_entity_i } /* Lookup index of set id in VAR_*S_IDS array */ - set_id_ndx = ex__id_lkup(exoid, set_type, set_id); + set_id_ndx = exi_id_lkup(exoid, set_type, set_id); if (set_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -99,7 +99,7 @@ int ex_get_partial_set_dist_fact(int exoid, ex_entity_type set_type, ex_entity_i if (count[0] == 0) { start[0] = 0; } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, dist_id, start, count, set_dist_fact); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_var.c b/packages/seacas/libraries/exodus/src/ex_get_partial_var.c index 8c6f8445c6..bb12106cbd 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_var.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_var.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, ex_name_of_object, etc -#include "exodusII_int.h" // for ex__check_valid_file_id, etc +#include "exodusII_int.h" // for exi_check_valid_file_id, etc /* * reads the values of a single element variable for one element block at @@ -52,21 +52,21 @@ int ex_get_partial_var(int exoid, int time_step, ex_entity_type var_type, int va /* FIXME: Special case: ignore obj_id, possible large_file complications, * etc. */ status = - ex__get_partial_nodal_var(exoid, time_step, var_index, start_index, num_entities, var_vals); + exi_get_partial_nodal_var(exoid, time_step, var_index, start_index, num_entities, var_vals); EX_FUNC_LEAVE(status); } if (var_type == EX_GLOBAL) { /* FIXME: Special case: all vars stored in 2-D single array. */ - status = ex__get_glob_vars(exoid, time_step, num_entities, var_vals); + status = exi_get_glob_vars(exoid, time_step, num_entities, var_vals); EX_FUNC_LEAVE(status); } - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* Determine index of obj_id in VAR_ID_EL_BLK array */ - obj_id_ndx = ex__id_lkup(exoid, var_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, var_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -88,7 +88,7 @@ int ex_get_partial_var(int exoid, int time_step, ex_entity_type var_type, int va /* inquire previously defined variable */ - if ((status = nc_inq_varid(exoid, ex__name_var_of_object(var_type, var_index, obj_id_ndx), + if ((status = nc_inq_varid(exoid, exi_name_var_of_object(var_type, var_index, obj_id_ndx), &varid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate %s %" PRId64 " var %d in file id %d", ex_name_of_object(var_type), obj_id, var_index, exoid); @@ -106,7 +106,7 @@ int ex_get_partial_var(int exoid, int time_step, ex_entity_type var_type, int va start[1] = 0; } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, varid, start, count, var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_processor_elem_maps.c b/packages/seacas/libraries/exodus/src/ex_get_processor_elem_maps.c index 8c5020f8f5..374fcaef11 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_processor_elem_maps.c +++ b/packages/seacas/libraries/exodus/src/ex_get_processor_elem_maps.c @@ -37,12 +37,12 @@ int ex_get_processor_elem_maps(int exoid, void_int *elem_mapi, void_int *elem_ma char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* Get the file type */ - if (ex__get_file_type(exoid, ftype) != EX_NOERR) { + if (exi_get_file_type(exoid, ftype) != EX_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unable to find file type for file ID %d", exoid); ex_err_fn(exoid, __func__, errmsg, EX_LASTERR); diff --git a/packages/seacas/libraries/exodus/src/ex_get_processor_node_maps.c b/packages/seacas/libraries/exodus/src/ex_get_processor_node_maps.c index 93262df6e1..a79954cc7c 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_processor_node_maps.c +++ b/packages/seacas/libraries/exodus/src/ex_get_processor_node_maps.c @@ -42,12 +42,12 @@ int ex_get_processor_node_maps(int exoid, void_int *node_mapi, void_int *node_ma /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* Get the file type */ - if (ex__get_file_type(exoid, ftype) != EX_NOERR) { + if (exi_get_file_type(exoid, ftype) != EX_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unable to find file type for file ID %d", exoid); ex_err_fn(exoid, __func__, errmsg, EX_LASTERR); EX_FUNC_LEAVE(EX_FATAL); diff --git a/packages/seacas/libraries/exodus/src/ex_get_prop.c b/packages/seacas/libraries/exodus/src/ex_get_prop.c index b294dfb25e..a90903d4f0 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_prop.c +++ b/packages/seacas/libraries/exodus/src/ex_get_prop.c @@ -65,7 +65,7 @@ int ex_get_prop(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, const c char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -123,9 +123,9 @@ int ex_get_prop(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, const c } /* find index into property array using obj_id; read value from property */ - /* array at proper index; ex__id_lkup returns an index that is 1-based, */ + /* array at proper index; exi_id_lkup returns an index that is 1-based, */ /* but netcdf expects 0-based arrays so subtract 1 */ - status = ex__id_lkup(exoid, obj_type, obj_id); + status = exi_id_lkup(exoid, obj_type, obj_id); if (status > 0) { start[0] = status - 1; } diff --git a/packages/seacas/libraries/exodus/src/ex_get_prop_array.c b/packages/seacas/libraries/exodus/src/ex_get_prop_array.c index 3b943aa3fe..a39f0758e2 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_prop_array.c +++ b/packages/seacas/libraries/exodus/src/ex_get_prop_array.c @@ -94,7 +94,7 @@ int ex_get_prop_array(int exoid, ex_entity_type obj_type, const char *prop_name, char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_prop_names.c b/packages/seacas/libraries/exodus/src/ex_get_prop_names.c index 4ed474e6b7..2824e80c5f 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_prop_names.c +++ b/packages/seacas/libraries/exodus/src/ex_get_prop_names.c @@ -78,7 +78,7 @@ for (i=0; i < num_props; i++) { int ex_get_prop_names(int exoid, ex_entity_type obj_type, char **prop_names) { EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_qa.c b/packages/seacas/libraries/exodus/src/ex_get_qa.c index b51f7d5e56..47d6123153 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_qa.c +++ b/packages/seacas/libraries/exodus/src/ex_get_qa.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__trim, etc +#include "exodusII_int.h" // for EX_FATAL, exi_trim, etc /*! \ingroup Utilities @@ -56,7 +56,7 @@ error = ex_get_qa (exoid, qa_record); int ex_get_qa(int exoid, char *qa_record[][4]) { EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -104,7 +104,7 @@ int ex_get_qa(int exoid, char *qa_record[][4]) EX_FUNC_LEAVE(EX_FATAL); } qa_record[i][j][MAX_STR_LENGTH] = '\0'; - ex__trim(qa_record[i][j]); + exi_trim(qa_record[i][j]); } } } diff --git a/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_name.c b/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_name.c index 7b1a1b35f3..4baf5a5a04 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_name.c +++ b/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_name.c @@ -23,7 +23,7 @@ int ex_get_reduction_variable_name(int exoid, ex_entity_type obj_type, int var_n const char *vname = NULL; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -61,7 +61,7 @@ int ex_get_reduction_variable_name(int exoid, ex_entity_type obj_type, int var_n int api_name_size = ex_inquire_int(exoid, EX_INQ_MAX_READ_NAME_LENGTH); int name_size = db_name_size < api_name_size ? db_name_size : api_name_size; - status = ex__get_name(exoid, varid, var_num - 1, var_name, name_size, obj_type, __func__); + status = exi_get_name(exoid, varid, var_num - 1, var_name, name_size, obj_type, __func__); if (status != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_names.c b/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_names.c index b2865e9c8d..bd8d9371e5 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_names.c +++ b/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_names.c @@ -71,7 +71,7 @@ int ex_get_reduction_variable_names(int exoid, ex_entity_type obj_type, int num_ const char *vvarname; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -103,7 +103,7 @@ int ex_get_reduction_variable_names(int exoid, ex_entity_type obj_type, int num_ } /* read the variable names */ - status = ex__get_names(exoid, varid, num_vars, var_names, obj_type, __func__); + status = exi_get_names(exoid, varid, num_vars, var_names, obj_type, __func__); if (status != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_param.c b/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_param.c index 4207cb8d4f..2542443dea 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_param.c @@ -62,7 +62,7 @@ int ex_get_reduction_variable_param(int exoid, ex_entity_type obj_type, int *num int status; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_reduction_vars.c b/packages/seacas/libraries/exodus/src/ex_get_reduction_vars.c index 792cd3f6b3..1fd54f766c 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_reduction_vars.c +++ b/packages/seacas/libraries/exodus/src/ex_get_reduction_vars.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, ex_name_of_object, etc -#include "exodusII_int.h" // for ex__check_valid_file_id, etc +#include "exodusII_int.h" // for exi_check_valid_file_id, etc /*! \ingroup ResultsData @@ -72,18 +72,18 @@ int ex_get_reduction_vars(int exoid, int time_step, ex_entity_type var_type, ex_ char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } if (var_type == EX_GLOBAL) { /* FIXME: Special case: all vars stored in 2-D single array. */ - status = ex__get_glob_vars(exoid, time_step, num_variables, var_vals); + status = exi_get_glob_vars(exoid, time_step, num_variables, var_vals); EX_FUNC_LEAVE(status); } /* Determine index of obj_id in VAR_ID_XXX array */ - obj_id_ndx = ex__id_lkup(exoid, var_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, var_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -96,7 +96,7 @@ int ex_get_reduction_vars(int exoid, int time_step, ex_entity_type var_type, ex_ } /* inquire previously defined variable */ - if ((status = nc_inq_varid(exoid, ex__name_red_var_of_object(var_type, obj_id_ndx), &varid)) != + if ((status = nc_inq_varid(exoid, exi_name_red_var_of_object(var_type, obj_id_ndx), &varid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "Warning: no reduction variables for %s %" PRId64 " in file id %d", @@ -112,7 +112,7 @@ int ex_get_reduction_vars(int exoid, int time_step, ex_entity_type var_type, ex_ count[0] = 1; count[1] = num_variables; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, varid, start, count, var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_set.c b/packages/seacas/libraries/exodus/src/ex_get_set.c index e24174929e..a82f3bfcfa 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_set.c +++ b/packages/seacas/libraries/exodus/src/ex_get_set.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, ex_name_of_object, etc -#include "exodusII_int.h" // for ex__check_valid_file_id, etc +#include "exodusII_int.h" // for exi_check_valid_file_id, etc /*! * reads the set entry list and set extra list for a single set @@ -31,12 +31,12 @@ int ex_get_set(int exoid, ex_entity_type set_type, ex_entity_id set_id, void_int char *extraptr = NULL; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* first check if any sets are specified */ - if ((status = nc_inq_dimid(exoid, ex__dim_num_objects(set_type), &dimid)) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_dim_num_objects(set_type), &dimid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "Warning: no %ss stored in file id %d", ex_name_of_object(set_type), exoid); ex_err_fn(exoid, __func__, errmsg, status); @@ -44,7 +44,7 @@ int ex_get_set(int exoid, ex_entity_type set_type, ex_entity_id set_id, void_int } /* Lookup index of set id in VAR_*S_IDS array */ - set_id_ndx = ex__id_lkup(exoid, set_type, set_id); + set_id_ndx = exi_id_lkup(exoid, set_type, set_id); if (set_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); diff --git a/packages/seacas/libraries/exodus/src/ex_get_set_dist_fact.c b/packages/seacas/libraries/exodus/src/ex_get_set_dist_fact.c index 8769b9a78a..8d45635c67 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_set_dist_fact.c +++ b/packages/seacas/libraries/exodus/src/ex_get_set_dist_fact.c @@ -40,12 +40,12 @@ int ex_get_set_dist_fact(int exoid, ex_entity_type set_type, ex_entity_id set_id char *factptr = NULL; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* first check if any sets are specified */ - if ((status = nc_inq_dimid(exoid, ex__dim_num_objects(set_type), &dimid)) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_dim_num_objects(set_type), &dimid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "Warning: no %s sets stored in file id %d", ex_name_of_object(set_type), exoid); ex_err_fn(exoid, __func__, errmsg, status); @@ -53,7 +53,7 @@ int ex_get_set_dist_fact(int exoid, ex_entity_type set_type, ex_entity_id set_id } /* Lookup index of set id in VAR_*S_IDS array */ - set_id_ndx = ex__id_lkup(exoid, set_type, set_id); + set_id_ndx = exi_id_lkup(exoid, set_type, set_id); if (set_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -110,7 +110,7 @@ int ex_get_set_dist_fact(int exoid, ex_entity_type set_type, ex_entity_id set_id } /* read in the distribution factors array */ - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_var_float(exoid, dist_id, set_dist_fact); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_set_param.c b/packages/seacas/libraries/exodus/src/ex_get_set_param.c index 78e6f23779..5e0b448523 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_set_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_set_param.c @@ -45,7 +45,7 @@ int ex_get_set_param(int exoid, ex_entity_type set_type, ex_entity_id set_id, char *numdfptr = NULL; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -66,7 +66,7 @@ int ex_get_set_param(int exoid, ex_entity_type set_type, ex_entity_id set_id, } } /* first check if any sets are specified */ - if ((status = nc_inq_dimid(exoid, ex__dim_num_objects(set_type), &dimid)) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_dim_num_objects(set_type), &dimid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "Warning: no %ss stored in file id %d", ex_name_of_object(set_type), exoid); ex_err_fn(exoid, __func__, errmsg, status); @@ -74,7 +74,7 @@ int ex_get_set_param(int exoid, ex_entity_type set_type, ex_entity_id set_id, } /* Lookup index of set id in VAR_*S_IDS array */ - set_id_ndx = ex__id_lkup(exoid, set_type, set_id); + set_id_ndx = exi_id_lkup(exoid, set_type, set_id); if (set_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -114,7 +114,7 @@ int ex_get_set_param(int exoid, ex_entity_type set_type, ex_entity_id set_id, } /* inquire values of dimension for number of entities in set */ - if (ex__get_dimension(exoid, numentryptr, "entries", &lnum_entry_in_set, &dimid, __func__) != + if (exi_get_dimension(exoid, numentryptr, "entries", &lnum_entry_in_set, &dimid, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_sets.c b/packages/seacas/libraries/exodus/src/ex_get_sets.c index ed51449e26..99e9cca6b6 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_sets.c +++ b/packages/seacas/libraries/exodus/src/ex_get_sets.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_set, EX_FATAL, EX_NOERR, etc -#include "exodusII_int.h" // for ex__check_valid_file_id +#include "exodusII_int.h" // for exi_check_valid_file_id int ex_get_sets(int exoid, size_t set_count, struct ex_set *sets) { @@ -16,7 +16,7 @@ int ex_get_sets(int exoid, size_t set_count, struct ex_set *sets) int stat; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_side_set_node_count.c b/packages/seacas/libraries/exodus/src/ex_get_side_set_node_count.c index 355facf195..12236c6a03 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_side_set_node_count.c +++ b/packages/seacas/libraries/exodus/src/ex_get_side_set_node_count.c @@ -37,13 +37,13 @@ int ex_get_side_set_node_count(int exoid, ex_entity_id side_set_id, int *side_se void_int *side_set_side_list = NULL; size_t elem_ctr; - struct ex__elem_blk_parm *elem_blk_parms = NULL; + struct exi_elem_blk_parm *elem_blk_parms = NULL; char errmsg[MAX_ERR_LENGTH]; int err_stat = EX_NOERR; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -64,7 +64,7 @@ int ex_get_side_set_node_count(int exoid, ex_entity_id side_set_id, int *side_se } /* Lookup index of side set id in VAR_SS_IDS array */ - if (ex__id_lkup(exoid, EX_SIDE_SET, side_set_id) <= 0) { + if (exi_id_lkup(exoid, EX_SIDE_SET, side_set_id) <= 0) { ; } ex_get_err(NULL, NULL, &status); @@ -174,7 +174,7 @@ int ex_get_side_set_node_count(int exoid, ex_entity_id side_set_id, int *side_se for (i = 0; i < tot_num_ss_elem; i++) { elems[i] = i; /* init index array to current position */ } - ex__iqsort64(side_set_elem_list, elems, tot_num_ss_elem); + exi_iqsort64(side_set_elem_list, elems, tot_num_ss_elem); } else { /* Sort side set element list into index array - non-destructive */ @@ -182,7 +182,7 @@ int ex_get_side_set_node_count(int exoid, ex_entity_id side_set_id, int *side_se for (i = 0; i < tot_num_ss_elem; i++) { elems[i] = i; /* init index array to current position */ } - ex__iqsort(side_set_elem_list, elems, tot_num_ss_elem); + exi_iqsort(side_set_elem_list, elems, tot_num_ss_elem); } } @@ -213,7 +213,7 @@ int ex_get_side_set_node_count(int exoid, ex_entity_id side_set_id, int *side_se } /* Allocate space for the element block params */ - if (!(elem_blk_parms = malloc(num_elem_blks * sizeof(struct ex__elem_blk_parm)))) { + if (!(elem_blk_parms = malloc(num_elem_blks * sizeof(struct exi_elem_blk_parm)))) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to allocate space for element block params " "for file id %d", @@ -233,7 +233,7 @@ int ex_get_side_set_node_count(int exoid, ex_entity_id side_set_id, int *side_se id = ((int *)elem_blk_ids)[i]; } - err_stat = ex__get_block_param(exoid, id, ndim, &elem_blk_parms[i]); + err_stat = exi_get_block_param(exoid, id, ndim, &elem_blk_parms[i]); if (err_stat != EX_NOERR) { goto cleanup; } diff --git a/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list.c b/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list.c index 996adc5e7e..82bb47856d 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list.c +++ b/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list.c @@ -77,7 +77,7 @@ int ex_get_side_set_node_list(int exoid, ex_entity_id side_set_id, void_int *sid int err_stat = EX_NOERR; int status; - struct ex__elem_blk_parm *elem_blk_parms = NULL; + struct exi_elem_blk_parm *elem_blk_parms = NULL; /* side to node translation tables - These tables are used to look up the side number based on the @@ -91,7 +91,7 @@ int ex_get_side_set_node_list(int exoid, ex_entity_id side_set_id, void_int *sid char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -113,7 +113,7 @@ int ex_get_side_set_node_list(int exoid, ex_entity_id side_set_id, void_int *sid } /* Lookup index of side set id in VAR_SS_IDS array */ - if (ex__id_lkup(exoid, EX_SIDE_SET, side_set_id) <= 0) { + if (exi_id_lkup(exoid, EX_SIDE_SET, side_set_id) <= 0) { ex_get_err(NULL, NULL, &status); if (status != 0) { @@ -231,7 +231,7 @@ int ex_get_side_set_node_list(int exoid, ex_entity_id side_set_id, void_int *sid for (i = 0; i < tot_num_ss_elem; i++) { elems[i] = i; /* init index array to current position */ } - ex__iqsort64(side_set_elem_list, ss_elem_ndx, tot_num_ss_elem); + exi_iqsort64(side_set_elem_list, ss_elem_ndx, tot_num_ss_elem); } else { /* Sort side set element list into index array - non-destructive */ @@ -239,7 +239,7 @@ int ex_get_side_set_node_list(int exoid, ex_entity_id side_set_id, void_int *sid for (i = 0; i < tot_num_ss_elem; i++) { elems[i] = i; /* init index array to current position */ } - ex__iqsort(side_set_elem_list, ss_elem_ndx, tot_num_ss_elem); + exi_iqsort(side_set_elem_list, ss_elem_ndx, tot_num_ss_elem); } /* Allocate space for the element block ids */ @@ -259,7 +259,7 @@ int ex_get_side_set_node_list(int exoid, ex_entity_id side_set_id, void_int *sid } /* Allocate space for the element block params */ - if (!(elem_blk_parms = malloc(num_elem_blks * sizeof(struct ex__elem_blk_parm)))) { + if (!(elem_blk_parms = malloc(num_elem_blks * sizeof(struct exi_elem_blk_parm)))) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to allocate space for element block params " "for file id %d", @@ -279,7 +279,7 @@ int ex_get_side_set_node_list(int exoid, ex_entity_id side_set_id, void_int *sid id = ((int *)elem_blk_ids)[i]; } - err_stat = ex__get_block_param(exoid, id, ndim, &elem_blk_parms[i]); + err_stat = exi_get_block_param(exoid, id, ndim, &elem_blk_parms[i]); if (err_stat != EX_NOERR) { goto cleanup; } diff --git a/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list_len.c b/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list_len.c index db14925166..28e12874d2 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list_len.c +++ b/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list_len.c @@ -51,12 +51,12 @@ int ex_get_side_set_node_list_len(int exoid, ex_entity_id side_set_id, int err_stat = EX_NOERR; int status; - struct ex__elem_blk_parm *elem_blk_parms = NULL; + struct exi_elem_blk_parm *elem_blk_parms = NULL; char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -192,13 +192,13 @@ int ex_get_side_set_node_list_len(int exoid, ex_entity_id side_set_id, for (i = 0; i < tot_num_ss_elem; i++) { ss_elem_ndx_64[i] = i; /* init index array to current position */ } - ex__iqsort64(side_set_elem_list, ss_elem_ndx_64, tot_num_ss_elem); + exi_iqsort64(side_set_elem_list, ss_elem_ndx_64, tot_num_ss_elem); } else { for (i = 0; i < tot_num_ss_elem; i++) { ss_elem_ndx[i] = i; /* init index array to current position */ } - ex__iqsort(side_set_elem_list, ss_elem_ndx, tot_num_ss_elem); + exi_iqsort(side_set_elem_list, ss_elem_ndx, tot_num_ss_elem); } /* Allocate space for the element block ids */ @@ -227,7 +227,7 @@ int ex_get_side_set_node_list_len(int exoid, ex_entity_id side_set_id, } /* Allocate space for the element block params */ - if (!(elem_blk_parms = calloc(num_elem_blks, sizeof(struct ex__elem_blk_parm)))) { + if (!(elem_blk_parms = calloc(num_elem_blks, sizeof(struct exi_elem_blk_parm)))) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to allocate space for element block params " "for file id %d", @@ -247,7 +247,7 @@ int ex_get_side_set_node_list_len(int exoid, ex_entity_id side_set_id, id = ((int *)elem_blk_ids)[i]; } - err_stat = ex__get_block_param(exoid, id, ndim, &elem_blk_parms[i]); + err_stat = exi_get_block_param(exoid, id, ndim, &elem_blk_parms[i]); if (err_stat != EX_NOERR) { goto cleanup; } diff --git a/packages/seacas/libraries/exodus/src/ex_get_ss_param_global.c b/packages/seacas/libraries/exodus/src/ex_get_ss_param_global.c index 3c776871f9..29c1dad0bf 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_ss_param_global.c +++ b/packages/seacas/libraries/exodus/src/ex_get_ss_param_global.c @@ -35,7 +35,7 @@ int ex_get_ss_param_global(int exoid, void_int *global_ids, void_int *side_cnts, /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_time.c b/packages/seacas/libraries/exodus/src/ex_get_time.c index 45fc9e7b31..08a71b3386 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_time.c +++ b/packages/seacas/libraries/exodus/src/ex_get_time.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__comp_ws, etc +#include "exodusII_int.h" // for EX_FATAL, exi_comp_ws, etc /*! \ingroup ResultsData @@ -54,11 +54,11 @@ int ex_get_time(int exoid, int time_step, void *time_value) int varid; size_t start[1]; char errmsg[MAX_ERR_LENGTH]; - struct ex__file_item *file = NULL; + struct exi_file_item *file = NULL; EX_FUNC_ENTER(); - file = ex__find_file_item(exoid); + file = exi_find_file_item(exoid); if (!file) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unknown file id %d.", exoid); ex_err_fn(exoid, __func__, errmsg, EX_BADFILEID); @@ -105,7 +105,7 @@ int ex_get_time(int exoid, int time_step, void *time_value) /* read time value */ start[0] = --time_step; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_var1_float(exoid, varid, start, time_value); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_truth_table.c b/packages/seacas/libraries/exodus/src/ex_get_truth_table.c index fb5597682d..4620c5c206 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_truth_table.c +++ b/packages/seacas/libraries/exodus/src/ex_get_truth_table.c @@ -22,7 +22,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for ex__get_dimension, EX_FATAL, etc +#include "exodusII_int.h" // for exi_get_dimension, EX_FATAL, etc /*! * \ingroup ResultsData @@ -49,62 +49,62 @@ int ex_get_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ const char *var_name = NULL; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } switch (obj_type) { case EX_EDGE_BLOCK: status = - ex__get_dimension(exoid, DIM_NUM_EDG_VAR, "edge variables", &num_var_db, &varid, __func__); + exi_get_dimension(exoid, DIM_NUM_EDG_VAR, "edge variables", &num_var_db, &varid, __func__); status1 = nc_inq_varid(exoid, VAR_EBLK_TAB, &tabid); var_name = "vals_edge_var"; ent_type = "eb"; break; case EX_FACE_BLOCK: status = - ex__get_dimension(exoid, DIM_NUM_FAC_VAR, "face variables", &num_var_db, &varid, __func__); + exi_get_dimension(exoid, DIM_NUM_FAC_VAR, "face variables", &num_var_db, &varid, __func__); status1 = nc_inq_varid(exoid, VAR_FBLK_TAB, &tabid); var_name = "vals_face_var"; ent_type = "fb"; break; case EX_ELEM_BLOCK: - status = ex__get_dimension(exoid, DIM_NUM_ELE_VAR, "element variables", &num_var_db, &varid, + status = exi_get_dimension(exoid, DIM_NUM_ELE_VAR, "element variables", &num_var_db, &varid, __func__); status1 = nc_inq_varid(exoid, VAR_ELEM_TAB, &tabid); var_name = "vals_elem_var"; ent_type = "eb"; break; case EX_NODE_SET: - status = ex__get_dimension(exoid, DIM_NUM_NSET_VAR, "nodeset variables", &num_var_db, &varid, + status = exi_get_dimension(exoid, DIM_NUM_NSET_VAR, "nodeset variables", &num_var_db, &varid, __func__); status1 = nc_inq_varid(exoid, VAR_NSET_TAB, &tabid); var_name = "vals_nset_var"; ent_type = "ns"; break; case EX_EDGE_SET: - status = ex__get_dimension(exoid, DIM_NUM_ESET_VAR, "edgeset variables", &num_var_db, &varid, + status = exi_get_dimension(exoid, DIM_NUM_ESET_VAR, "edgeset variables", &num_var_db, &varid, __func__); status1 = nc_inq_varid(exoid, VAR_ESET_TAB, &tabid); var_name = "vals_eset_var"; ent_type = "es"; break; case EX_FACE_SET: - status = ex__get_dimension(exoid, DIM_NUM_FSET_VAR, "faceset variables", &num_var_db, &varid, + status = exi_get_dimension(exoid, DIM_NUM_FSET_VAR, "faceset variables", &num_var_db, &varid, __func__); status1 = nc_inq_varid(exoid, VAR_FSET_TAB, &tabid); var_name = "vals_fset_var"; ent_type = "fs"; break; case EX_SIDE_SET: - status = ex__get_dimension(exoid, DIM_NUM_SSET_VAR, "sideset variables", &num_var_db, &varid, + status = exi_get_dimension(exoid, DIM_NUM_SSET_VAR, "sideset variables", &num_var_db, &varid, __func__); status1 = nc_inq_varid(exoid, VAR_SSET_TAB, &tabid); var_name = "vals_sset_var"; ent_type = "ss"; break; case EX_ELEM_SET: - status = ex__get_dimension(exoid, DIM_NUM_ELSET_VAR, "elemset variables", &num_var_db, &varid, + status = exi_get_dimension(exoid, DIM_NUM_ELSET_VAR, "elemset variables", &num_var_db, &varid, __func__); status1 = nc_inq_varid(exoid, VAR_ELSET_TAB, &tabid); var_name = "vals_elset_var"; @@ -112,7 +112,7 @@ int ex_get_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ break; case EX_BLOB: status = - ex__get_dimension(exoid, DIM_NUM_BLOB_VAR, "blob variables", &num_var_db, &varid, __func__); + exi_get_dimension(exoid, DIM_NUM_BLOB_VAR, "blob variables", &num_var_db, &varid, __func__); status1 = nc_inq_varid(exoid, VAR_BLOB_TAB, &tabid); var_name = "vals_blob_var"; ent_type = "blob"; @@ -133,7 +133,7 @@ int ex_get_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ num_entity = ex_inquire_int(exoid, EX_INQ_BLOB); } else { - status = ex__get_dimension(exoid, ex__dim_num_objects(obj_type), ex_name_of_object(obj_type), + status = exi_get_dimension(exoid, exi_dim_num_objects(obj_type), ex_name_of_object(obj_type), &num_entity, &dimid, __func__); if (status != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); @@ -161,7 +161,7 @@ int ex_get_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ for (int i = 0; i < num_var; i++) { /* NOTE: names are 1-based */ - if (nc_inq_varid(exoid, ex__catstr2(var_name, i + 1, ent_type, j + 1), &tabid) == + if (nc_inq_varid(exoid, exi_catstr2(var_name, i + 1, ent_type, j + 1), &tabid) == NC_NOERR) { /* variable exists; put a 1 in the truth table */ var_tab[j * num_var + i] = 1; diff --git a/packages/seacas/libraries/exodus/src/ex_get_var.c b/packages/seacas/libraries/exodus/src/ex_get_var.c index 8e7f9dd264..5b4033cd6b 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_var.c +++ b/packages/seacas/libraries/exodus/src/ex_get_var.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, ex_name_of_object, etc -#include "exodusII_int.h" // for ex__check_valid_file_id, etc +#include "exodusII_int.h" // for exi_check_valid_file_id, etc /*! \ingroup ResultsData diff --git a/packages/seacas/libraries/exodus/src/ex_get_var_multi_time.c b/packages/seacas/libraries/exodus/src/ex_get_var_multi_time.c index a4735c2916..984ee9b5f8 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_var_multi_time.c +++ b/packages/seacas/libraries/exodus/src/ex_get_var_multi_time.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, ex_name_of_object, etc -#include "exodusII_int.h" // for ex__check_valid_file_id, etc +#include "exodusII_int.h" // for exi_check_valid_file_id, etc /*! \ingroup ResultsData @@ -74,26 +74,26 @@ int ex_get_var_multi_time(int exoid, ex_entity_type var_type, int var_index, ex_ char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } if (var_type == EX_NODAL) { /* FIXME: Special case: ignore obj_id, possible large_file complications, * etc. */ - status = ex__get_nodal_var_multi_time(exoid, var_index, num_entry_this_obj, beg_time_step, + status = exi_get_nodal_var_multi_time(exoid, var_index, num_entry_this_obj, beg_time_step, end_time_step, var_vals); EX_FUNC_LEAVE(status); } if (var_type == EX_GLOBAL) { /* FIXME: Special case: all vars stored in 2-D single array. */ - status = ex__get_glob_vars_multi_time(exoid, num_entry_this_obj, beg_time_step, end_time_step, + status = exi_get_glob_vars_multi_time(exoid, num_entry_this_obj, beg_time_step, end_time_step, var_vals); EX_FUNC_LEAVE(status); } /* Determine index of obj_id in VAR_ID_EL_BLK array */ - obj_id_ndx = ex__id_lkup(exoid, var_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, var_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -115,7 +115,7 @@ int ex_get_var_multi_time(int exoid, ex_entity_type var_type, int var_index, ex_ /* inquire previously defined variable */ - if ((status = nc_inq_varid(exoid, ex__name_var_of_object(var_type, var_index, obj_id_ndx), + if ((status = nc_inq_varid(exoid, exi_name_var_of_object(var_type, var_index, obj_id_ndx), &varid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate %s %" PRId64 " var %d in file id %d", ex_name_of_object(var_type), obj_id, var_index, exoid); @@ -130,7 +130,7 @@ int ex_get_var_multi_time(int exoid, ex_entity_type var_type, int var_index, ex_ count[0] = end_time_step - beg_time_step; count[1] = num_entry_this_obj; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, varid, start, count, var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_var_time.c b/packages/seacas/libraries/exodus/src/ex_get_var_time.c index 6679eebb59..be5b685ade 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_var_time.c +++ b/packages/seacas/libraries/exodus/src/ex_get_var_time.c @@ -56,16 +56,16 @@ int ex_get_var_time(int exoid, ex_entity_type var_type, int var_index, int64_t i const char *varobstat; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } switch (var_type) { case EX_GLOBAL: - status = ex__get_glob_var_time(exoid, var_index, beg_time_step, end_time_step, var_vals); + status = exi_get_glob_var_time(exoid, var_index, beg_time_step, end_time_step, var_vals); EX_FUNC_LEAVE(status); case EX_NODAL: - status = ex__get_nodal_var_time(exoid, var_index, id, beg_time_step, end_time_step, var_vals); + status = exi_get_nodal_var_time(exoid, var_index, id, beg_time_step, end_time_step, var_vals); EX_FUNC_LEAVE(status); case EX_EDGE_BLOCK: varobjids = VAR_ID_ED_BLK; @@ -114,7 +114,7 @@ int ex_get_var_time(int exoid, ex_entity_type var_type, int var_index, int64_t i /* find what object the entry is in */ /* first, find out how many objects there are */ - status = ex__get_dimension(exoid, ex__dim_num_objects(var_type), ex_name_of_object(var_type), + status = exi_get_dimension(exoid, exi_dim_num_objects(var_type), ex_name_of_object(var_type), &num_obj, &dimid, __func__); if (status != NC_NOERR) { EX_FUNC_LEAVE(status); @@ -169,7 +169,7 @@ int ex_get_var_time(int exoid, ex_entity_type var_type, int var_index, int64_t i i = 0; if (stat_vals[i] != 0) { - if ((status = nc_inq_dimid(exoid, ex__dim_num_entries_in_object(var_type, i + 1), &dimid)) != + if ((status = nc_inq_dimid(exoid, exi_dim_num_entries_in_object(var_type, i + 1), &dimid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate number of entries in %zuth %s in file id %d", i, @@ -193,7 +193,7 @@ int ex_get_var_time(int exoid, ex_entity_type var_type, int var_index, int64_t i while (numel <= id) { if (stat_vals[++i] != 0) { - if ((status = nc_inq_dimid(exoid, ex__dim_num_entries_in_object(var_type, i + 1), &dimid)) != + if ((status = nc_inq_dimid(exoid, exi_dim_num_entries_in_object(var_type, i + 1), &dimid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate number of entries in %zuth %s in file id %d", i, @@ -217,7 +217,7 @@ int ex_get_var_time(int exoid, ex_entity_type var_type, int var_index, int64_t i size_t offset = id - (numel - num_entries_this_obj); /* inquire previously defined variable */ - if ((status = nc_inq_varid(exoid, ex__name_var_of_object(var_type, var_index, i + 1), &varid)) != + if ((status = nc_inq_varid(exoid, exi_name_var_of_object(var_type, var_index, i + 1), &varid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate variable %zu for %dth %s in file id %d", i, var_index, @@ -274,7 +274,7 @@ int ex_get_var_time(int exoid, ex_entity_type var_type, int var_index, int64_t i count[0] = end_time_step - beg_time_step + 1; count[1] = 1; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, varid, start, count, var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_get_variable_name.c b/packages/seacas/libraries/exodus/src/ex_get_variable_name.c index 8ff88c8c2e..8b5d2f2e58 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_variable_name.c +++ b/packages/seacas/libraries/exodus/src/ex_get_variable_name.c @@ -40,7 +40,7 @@ int ex_get_variable_name(int exoid, ex_entity_type obj_type, int var_num, char * const char *vname = NULL; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -79,7 +79,7 @@ int ex_get_variable_name(int exoid, ex_entity_type obj_type, int var_num, char * int api_name_size = ex_inquire_int(exoid, EX_INQ_MAX_READ_NAME_LENGTH); int name_size = db_name_size < api_name_size ? db_name_size : api_name_size; - status = ex__get_name(exoid, varid, var_num - 1, var_name, name_size, obj_type, __func__); + status = exi_get_name(exoid, varid, var_num - 1, var_name, name_size, obj_type, __func__); if (status != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_variable_names.c b/packages/seacas/libraries/exodus/src/ex_get_variable_names.c index 88f6314e3b..b35bd4d9ea 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_variable_names.c +++ b/packages/seacas/libraries/exodus/src/ex_get_variable_names.c @@ -71,7 +71,7 @@ int ex_get_variable_names(int exoid, ex_entity_type obj_type, int num_vars, char const char *vvarname; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -104,7 +104,7 @@ int ex_get_variable_names(int exoid, ex_entity_type obj_type, int num_vars, char } /* read the variable names */ - status = ex__get_names(exoid, varid, num_vars, var_names, obj_type, __func__); + status = exi_get_names(exoid, varid, num_vars, var_names, obj_type, __func__); if (status != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_variable_param.c b/packages/seacas/libraries/exodus/src/ex_get_variable_param.c index 54ebf13a23..e02b17490e 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_variable_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_variable_param.c @@ -79,7 +79,7 @@ int ex_get_variable_param(int exoid, ex_entity_type obj_type, int *num_vars) int status; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_inquire.c b/packages/seacas/libraries/exodus/src/ex_inquire.c index fdbec746dc..0c521b2ec1 100644 --- a/packages/seacas/libraries/exodus/src/ex_inquire.c +++ b/packages/seacas/libraries/exodus/src/ex_inquire.c @@ -10,7 +10,7 @@ #include "exodusII_int.h" /*! \cond INTERNAL */ -static int ex__get_dimension_value(int exoid, int64_t *var, int default_value, +static int exi_get_dimension_value(int exoid, int64_t *var, int default_value, const char *dimension_name, int missing_ok) { int status; @@ -97,7 +97,7 @@ static int ex_get_concat_set_len(int exoid, int64_t *set_length, const char *set } size_t idum; - if (nc_inq_dimid(exoid, ex__catstr(set_size_root, i + 1), &dimid) != NC_NOERR) { + if (nc_inq_dimid(exoid, exi_catstr(set_size_root, i + 1), &dimid) != NC_NOERR) { if (missing_ok) { idum = 0; } @@ -137,7 +137,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float int status; int num_var; - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { return (EX_FATAL); } @@ -269,7 +269,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float * default if not set by the client is 32 characters. The value * does not include the trailing null. */ - struct ex__file_item *file = ex__find_file_item(rootid); + struct exi_file_item *file = exi_find_file_item(rootid); if (!file) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unknown file id %d for ex_inquire_int().", rootid); @@ -307,7 +307,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_DIM: /* returns the dimensionality (2 or 3, for 2-d or 3-d) of the database */ - if (ex__get_dimension(exoid, DIM_NUM_DIM, "database dimensionality", &ldum, &dimid, __func__) != + if (exi_get_dimension(exoid, DIM_NUM_DIM, "database dimensionality", &ldum, &dimid, __func__) != NC_NOERR) { return (EX_FATAL); } @@ -318,7 +318,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float /* returns the number of assemblies */ { *ret_int = 0; - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (file) { *ret_int = file->assembly_count; } @@ -329,7 +329,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float /* returns the number of blobs */ { *ret_int = 0; - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (file) { *ret_int = file->blob_count; } @@ -338,7 +338,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_NODES: /* returns the number of nodes */ - if (ex__get_dimension(exoid, DIM_NUM_NODES, "nodes", &ldum, &dimid, NULL) != NC_NOERR) { + if (exi_get_dimension(exoid, DIM_NUM_NODES, "nodes", &ldum, &dimid, NULL) != NC_NOERR) { *ret_int = 0; } else { @@ -348,7 +348,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_ELEM: /* returns the number of elements */ - if (ex__get_dimension(exoid, DIM_NUM_ELEM, "elements", &ldum, &dimid, NULL) != NC_NOERR) { + if (exi_get_dimension(exoid, DIM_NUM_ELEM, "elements", &ldum, &dimid, NULL) != NC_NOERR) { *ret_int = 0; } else { @@ -358,7 +358,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_ELEM_BLK: /* returns the number of element blocks */ - if (ex__get_dimension(exoid, DIM_NUM_EL_BLK, "element blocks", &ldum, &dimid, NULL) != + if (exi_get_dimension(exoid, DIM_NUM_EL_BLK, "element blocks", &ldum, &dimid, NULL) != NC_NOERR) { *ret_int = 0; } @@ -369,7 +369,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_NODE_SETS: /* returns the number of node sets */ - if (ex__get_dimension(exoid, DIM_NUM_NS, "node sets", &ldum, &dimid, NULL) != NC_NOERR) { + if (exi_get_dimension(exoid, DIM_NUM_NS, "node sets", &ldum, &dimid, NULL) != NC_NOERR) { *ret_int = 0; } else { @@ -446,7 +446,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_SIDE_SETS: /* returns the number of side sets */ - if (ex__get_dimension(exoid, DIM_NUM_SS, "side sets", &ldum, &dimid, NULL) != NC_NOERR) { + if (exi_get_dimension(exoid, DIM_NUM_SS, "side sets", &ldum, &dimid, NULL) != NC_NOERR) { *ret_int = 0; } else { @@ -619,7 +619,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_QA: /* returns the number of QA records */ - if (ex__get_dimension(rootid, DIM_NUM_QA, "QA records", &ldum, &dimid, NULL) != NC_NOERR) { + if (exi_get_dimension(rootid, DIM_NUM_QA, "QA records", &ldum, &dimid, NULL) != NC_NOERR) { *ret_int = 0; } else { @@ -629,7 +629,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_INFO: /* returns the number of information records */ - if (ex__get_dimension(rootid, DIM_NUM_INFO, "info records", &ldum, &dimid, NULL) != NC_NOERR) { + if (exi_get_dimension(rootid, DIM_NUM_INFO, "info records", &ldum, &dimid, NULL) != NC_NOERR) { *ret_int = 0; } else { @@ -639,7 +639,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_TIME: /* returns the number of time steps stored in the database */ - if (ex__get_dimension(exoid, DIM_TIME, "time dimension", &ldum, &dimid, __func__) != NC_NOERR) { + if (exi_get_dimension(exoid, DIM_TIME, "time dimension", &ldum, &dimid, __func__) != NC_NOERR) { return (EX_FATAL); } *ret_int = ldum; @@ -662,7 +662,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_ELEM_MAP: /* returns the number of element maps */ - if (ex__get_dimension(exoid, DIM_NUM_EM, "element maps", &ldum, &dimid, NULL) != NC_NOERR) { + if (exi_get_dimension(exoid, DIM_NUM_EM, "element maps", &ldum, &dimid, NULL) != NC_NOERR) { *ret_int = 0; } else { @@ -677,7 +677,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_NODE_MAP: /* returns the number of node maps */ - if (ex__get_dimension(exoid, DIM_NUM_NM, "node maps", &ldum, &dimid, NULL) != NC_NOERR) { + if (exi_get_dimension(exoid, DIM_NUM_NM, "node maps", &ldum, &dimid, NULL) != NC_NOERR) { *ret_int = 0; } else { @@ -692,21 +692,21 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_EDGE: /* returns the number of edges (defined across all edge blocks). */ - if (ex__get_dimension_value(exoid, ret_int, 0, DIM_NUM_EDGE, 1) != EX_NOERR) { + if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_EDGE, 1) != EX_NOERR) { return (EX_FATAL); } break; case EX_INQ_EDGE_BLK: /* returns the number of edge blocks. */ - if (ex__get_dimension_value(exoid, ret_int, 0, DIM_NUM_ED_BLK, 1) != EX_NOERR) { + if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_ED_BLK, 1) != EX_NOERR) { return (EX_FATAL); } break; case EX_INQ_EDGE_SETS: /* returns the number of edge sets. */ - if (ex__get_dimension_value(exoid, ret_int, 0, DIM_NUM_ES, 1) != EX_NOERR) { + if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_ES, 1) != EX_NOERR) { return (EX_FATAL); } break; @@ -736,21 +736,21 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_FACE: /* returns the number of faces (defined across all face blocks). */ - if (ex__get_dimension_value(exoid, ret_int, 0, DIM_NUM_FACE, 1) != EX_NOERR) { + if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_FACE, 1) != EX_NOERR) { return (EX_FATAL); } break; case EX_INQ_FACE_BLK: /* returns the number of face blocks. */ - if (ex__get_dimension_value(exoid, ret_int, 0, DIM_NUM_FA_BLK, 1) != EX_NOERR) { + if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_FA_BLK, 1) != EX_NOERR) { return (EX_FATAL); } break; case EX_INQ_FACE_SETS: /* returns the number of face sets. */ - if (ex__get_dimension_value(exoid, ret_int, 0, DIM_NUM_FS, 1) != EX_NOERR) { + if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_FS, 1) != EX_NOERR) { return (EX_FATAL); } break; @@ -780,7 +780,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_ELEM_SETS: /* returns the number of element sets. */ - if (ex__get_dimension_value(exoid, ret_int, 0, DIM_NUM_ELS, 1) != EX_NOERR) { + if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_ELS, 1) != EX_NOERR) { return (EX_FATAL); } break; @@ -803,14 +803,14 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_EDGE_MAP: /* returns the number of edge maps. */ - if (ex__get_dimension_value(exoid, ret_int, 0, DIM_NUM_EDM, 1) != EX_NOERR) { + if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_EDM, 1) != EX_NOERR) { return (EX_FATAL); } break; case EX_INQ_FACE_MAP: /* returns the number of face maps. */ - if (ex__get_dimension_value(exoid, ret_int, 0, DIM_NUM_FAM, 1) != EX_NOERR) { + if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_FAM, 1) != EX_NOERR) { return (EX_FATAL); } break; @@ -887,7 +887,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_COORD_FRAMES: /* return the number of coordinate frames */ - if (ex__get_dimension_value(exoid, ret_int, 0, DIM_NUM_CFRAMES, 1) != EX_NOERR) { + if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_CFRAMES, 1) != EX_NOERR) { return (EX_FATAL); } break; diff --git a/packages/seacas/libraries/exodus/src/ex_int_get_block_param.c b/packages/seacas/libraries/exodus/src/ex_int_get_block_param.c index c8e3ff0c2b..c960e93a7c 100644 --- a/packages/seacas/libraries/exodus/src/ex_int_get_block_param.c +++ b/packages/seacas/libraries/exodus/src/ex_int_get_block_param.c @@ -11,7 +11,7 @@ #include /* Generic error message for element type/node count mapping...*/ -static int el_node_count_error(int exoid, struct ex__elem_blk_parm elem_blk_parms) +static int el_node_count_error(int exoid, struct exi_elem_blk_parm elem_blk_parms) { char errmsg[MAX_ERR_LENGTH]; snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: An element of type '%s' with %d nodes is not valid.", @@ -20,8 +20,8 @@ static int el_node_count_error(int exoid, struct ex__elem_blk_parm elem_blk_parm return (EX_FATAL); } -int ex__get_block_param(int exoid, ex_entity_id id, int ndim, - struct ex__elem_blk_parm *elem_blk_parm) +int exi_get_block_param(int exoid, ex_entity_id id, int ndim, + struct exi_elem_blk_parm *elem_blk_parm) { EX_FUNC_ENTER(); @@ -29,7 +29,7 @@ int ex__get_block_param(int exoid, ex_entity_id id, int ndim, block.id = id; block.type = EX_ELEM_BLOCK; - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_ne_util.c b/packages/seacas/libraries/exodus/src/ex_ne_util.c index a8cd4eee4d..6dfdb00d05 100644 --- a/packages/seacas/libraries/exodus/src/ex_ne_util.c +++ b/packages/seacas/libraries/exodus/src/ex_ne_util.c @@ -11,10 +11,10 @@ /*****************************************************************************/ /* Function(s) contained in this file: * - * ex__leavedef() + * exi_leavedef() * ne__id_lkup() - * ex__get_file_type() - * ex__put_nemesis_version() + * exi_get_file_type() + * exi_put_nemesis_version() * ne__check_file_version() * ex_get_idx() * @@ -111,7 +111,7 @@ int ne__id_lkup(int exoid, const char *ne_var_name, int64_t *idx, ex_entity_id n /* This function retrieves the file type from a Nemesis file. */ /*****************************************************************************/ -int ex__get_file_type(int exoid, char *ftype) +int exi_get_file_type(int exoid, char *ftype) { EX_FUNC_ENTER(); @@ -152,7 +152,7 @@ int ex__get_file_type(int exoid, char *ftype) /* This function outputs the Nemesis version information to the file. */ /*****************************************************************************/ -int ex__put_nemesis_version(int exoid) +int exi_put_nemesis_version(int exoid) { EX_FUNC_ENTER(); diff --git a/packages/seacas/libraries/exodus/src/ex_open.c b/packages/seacas/libraries/exodus/src/ex_open.c index 067ddf14ed..f8014692d4 100644 --- a/packages/seacas/libraries/exodus/src/ex_open.c +++ b/packages/seacas/libraries/exodus/src/ex_open.c @@ -118,7 +118,7 @@ int ex_open_int(const char *path, int mode, int *comp_ws, int *io_ws, float *ver /* set error handling mode to no messages, non-fatal errors */ ex_opts(exoptval); /* call required to set ncopts first time through */ - ex__check_version(run_version); + exi_check_version(run_version); if ((mode & EX_READ) && (mode & EX_WRITE)) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: Cannot specify both EX_READ and EX_WRITE"); @@ -132,14 +132,14 @@ int ex_open_int(const char *path, int mode, int *comp_ws, int *io_ws, float *ver EX_FUNC_LEAVE(EX_FATAL); } - char *canon_path = ex__canonicalize_filename(path); + char *canon_path = exi_canonicalize_filename(path); /* Verify that this file is not already open for read or write... In theory, should be ok for the file to be open multiple times for read, but bad things can happen if being read and written at the same time... */ - if (ex__check_multiple_open(canon_path, mode, __func__)) { + if (exi_check_multiple_open(canon_path, mode, __func__)) { free(canon_path); EX_FUNC_LEAVE(EX_FATAL); } @@ -176,7 +176,7 @@ int ex_open_int(const char *path, int mode, int *comp_ws, int *io_ws, float *ver int type = 0; ex_opts(EX_VERBOSE); - ex__check_file_type(canon_path, &type); + exi_check_file_type(canon_path, &type); if (type == 0) { /* Error message printed at lower level */ @@ -322,7 +322,7 @@ int ex_open_int(const char *path, int mode, int *comp_ws, int *io_ws, float *ver * add it now. */ if (stat_dim != NC_NOERR) { /* Not found; set to default value of 32+1. */ - int max_name = ex__default_max_name_length < 32 ? 32 : ex__default_max_name_length; + int max_name = exi_default_max_name_length < 32 ? 32 : exi_default_max_name_length; if ((status = nc_def_dim(exoid, DIM_STR_NAME, max_name + 1, &dim_str_name)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to define string name dimension in file id %d named %s", exoid, @@ -332,7 +332,7 @@ int ex_open_int(const char *path, int mode, int *comp_ws, int *io_ws, float *ver EX_FUNC_LEAVE(EX_FATAL); } } - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode in file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); free(canon_path); @@ -394,7 +394,7 @@ int ex_open_int(const char *path, int mode, int *comp_ws, int *io_ws, float *ver not know that file was closed and possibly new file opened for this exoid */ - if (ex__find_file_item(exoid) != NULL) { + if (exi_find_file_item(exoid) != NULL) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: There is an existing file already using the file " "id %d which was also assigned to file %s.\n\tWas " @@ -408,7 +408,7 @@ int ex_open_int(const char *path, int mode, int *comp_ws, int *io_ws, float *ver } /* initialize floating point and integer size conversion. */ - if (ex__conv_init(exoid, comp_ws, io_ws, file_wordsize, int64_status, false, false, false, + if (exi_conv_init(exoid, comp_ws, io_ws, file_wordsize, int64_status, false, false, false, mode & EX_WRITE) != EX_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to initialize conversion routines in file id %d named %s", exoid, diff --git a/packages/seacas/libraries/exodus/src/ex_open_par.c b/packages/seacas/libraries/exodus/src/ex_open_par.c index 42d1648784..97afa4f0ca 100644 --- a/packages/seacas/libraries/exodus/src/ex_open_par.c +++ b/packages/seacas/libraries/exodus/src/ex_open_par.c @@ -138,7 +138,7 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float /* set error handling mode to no messages, non-fatal errors */ ex_opts(exoptval); /* call required to set ncopts first time through */ - ex__check_version(run_version); + exi_check_version(run_version); if ((mode & EX_READ) && (mode & EX_WRITE)) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: Cannot specify both EX_READ and EX_WRITE"); @@ -152,14 +152,14 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float EX_FUNC_LEAVE(EX_FATAL); } - char *canon_path = ex__canonicalize_filename(path); + char *canon_path = exi_canonicalize_filename(path); /* Verify that this file is not already open for read or write... In theory, should be ok for the file to be open multiple times for read, but bad things can happen if being read and written at the same time... */ - if (ex__check_multiple_open(canon_path, mode, __func__)) { + if (exi_check_multiple_open(canon_path, mode, __func__)) { free(canon_path); EX_FUNC_LEAVE(EX_FATAL); } @@ -208,7 +208,7 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float we have the define that shows it is enabled, then assume other error... */ int type = 0; - ex__check_file_type(path, &type); + exi_check_file_type(path, &type); if (type == 0) { /* Error message printed at lower level */ @@ -302,7 +302,7 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float /* File opened correctly */ int type = 0; - ex__check_file_type(canon_path, &type); + exi_check_file_type(canon_path, &type); if (type == 5) { is_hdf5 = true; } @@ -353,13 +353,13 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float * add it now. */ if (stat_dim != NC_NOERR) { /* Not found; set to default value of 32+1. */ - int max_name = ex__default_max_name_length < 32 ? 32 : ex__default_max_name_length; + int max_name = exi_default_max_name_length < 32 ? 32 : exi_default_max_name_length; nc_def_dim(exoid, DIM_STR_NAME, max_name + 1, &dim_str_name); } } if (in_redef) { - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { free(canon_path); EX_FUNC_LEAVE(EX_FATAL); } @@ -456,7 +456,7 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float not know that file was closed and possibly new file opened for this exoid */ - if (ex__find_file_item(exoid) != NULL) { + if (exi_find_file_item(exoid) != NULL) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: There is an existing file already using the file " "id %d which was also assigned to file %s.\n\tWas " @@ -470,7 +470,7 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float } /* initialize floating point and integer size conversion. */ - if (ex__conv_init(exoid, comp_ws, io_ws, file_wordsize, int64_status, 1, is_hdf5, is_pnetcdf, + if (exi_conv_init(exoid, comp_ws, io_ws, file_wordsize, int64_status, 1, is_hdf5, is_pnetcdf, mode & EX_WRITE) != EX_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to initialize conversion routines in file id %d", exoid); diff --git a/packages/seacas/libraries/exodus/src/ex_opts.c b/packages/seacas/libraries/exodus/src/ex_opts.c index 51f364183e..74664ec451 100644 --- a/packages/seacas/libraries/exodus/src/ex_opts.c +++ b/packages/seacas/libraries/exodus/src/ex_opts.c @@ -10,7 +10,7 @@ #include "exodusII_int.h" /*! \cond INTERNAL */ -int ex__default_max_name_length = 32; /* For default compatibility with older clients */ +int exi_default_max_name_length = 32; /* For default compatibility with older clients */ #if defined(VERBOSE) int exoptval = EX_VERBOSE; /* loud mode: set EX_VERBOSE */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_all_var_param_ext.c b/packages/seacas/libraries/exodus/src/ex_put_all_var_param_ext.c index f11f8bfa40..0821d8b08f 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_all_var_param_ext.c +++ b/packages/seacas/libraries/exodus/src/ex_put_all_var_param_ext.c @@ -19,7 +19,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for ex__get_dimension, etc +#include "exodusII_int.h" // for exi_get_dimension, etc static int define_dimension(int exoid, const char *DIMENSION, int count, const char *label, int *dimid); @@ -37,7 +37,7 @@ static int ex_define_vars(int exoid, ex_entity_type obj_type, const char *entit #define EX_GET_IDS_STATUS(TNAME, NUMVAR, DNAME, DID, DVAL, VIDS, EIDS, VSTAT, VSTATVAL) \ if (NUMVAR > 0) { \ - status = ex__get_dimension(exoid, DNAME, TNAME "s", &DVAL, &DID, __func__); \ + status = exi_get_dimension(exoid, DNAME, TNAME "s", &DVAL, &DID, __func__); \ if (status != NC_NOERR) \ goto error_ret; \ \ @@ -103,7 +103,7 @@ int ex_put_all_var_param_ext(int exoid, const ex_var_params *vp) char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -166,7 +166,7 @@ int ex_put_all_var_param_ext(int exoid, const ex_var_params *vp) ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 2); + exi_compress_variable(exoid, varid, 2); /* Now define global variable name variable */ if (define_variable_name_variable(exoid, VAR_NAME_GLO_VAR, dimid, "global") != NC_NOERR) { @@ -190,7 +190,7 @@ int ex_put_all_var_param_ext(int exoid, const ex_var_params *vp) ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 2); + exi_compress_variable(exoid, varid, 2); } } @@ -252,7 +252,7 @@ int ex_put_all_var_param_ext(int exoid, const ex_var_params *vp) /* leave define mode */ in_define = 0; - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; @@ -312,7 +312,7 @@ int ex_put_all_var_param_ext(int exoid, const ex_var_params *vp) /* Fatal error: exit definition mode and return */ error_ret: if (in_define == 1) { - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); } free(eblk_ids); free(edblk_ids); @@ -381,7 +381,7 @@ static int define_variable_name_variable(int exoid, const char *VARIABLE, int di ex_err_fn(exoid, __func__, errmsg, status); } } - ex__set_compact_storage(exoid, variable); + exi_set_compact_storage(exoid, variable); #if defined(EX_CAN_USE_NC_DEF_VAR_FILL) int fill = NC_FILL_CHAR; nc_def_var_fill(exoid, variable, 0, &fill); @@ -481,7 +481,7 @@ static int define_truth_table(ex_entity_type obj_type, int exoid, int num_ent, i /* Determine number of entities in entity */ /* Need way to make this more generic... */ - status = nc_inq_dimid(exoid, ex__dim_num_entries_in_object(obj_type, i + 1), &dims[1]); + status = nc_inq_dimid(exoid, exi_dim_num_entries_in_object(obj_type, i + 1), &dims[1]); if (status != NC_NOERR) { char errmsg[MAX_ERR_LENGTH]; snprintf(errmsg, MAX_ERR_LENGTH, @@ -496,7 +496,7 @@ static int define_truth_table(ex_entity_type obj_type, int exoid, int num_ent, i * that the index of the EXODUS variable (which is part of * the name of the netCDF variable) will begin at 1 instead of 0 */ - status = nc_def_var(exoid, ex__name_var_of_object(obj_type, j, i + 1), nc_flt_code(exoid), + status = nc_def_var(exoid, exi_name_var_of_object(obj_type, j, i + 1), nc_flt_code(exoid), 2, dims, &varid); if (status != NC_NOERR) { if (status != NC_ENAMEINUSE) { @@ -508,7 +508,7 @@ static int define_truth_table(ex_entity_type obj_type, int exoid, int num_ent, i return (status); } } - ex__compress_variable(exoid, varid, 2); + exi_compress_variable(exoid, varid, 2); } } /* if */ k++; /* increment truth table pointer */ @@ -555,7 +555,7 @@ static int ex_define_vars(int exoid, ex_entity_type obj_type, const char *entity ex_err_fn(exoid, __func__, errmsg, status); return status; } - ex__set_compact_storage(exoid, *truth_table_var); + exi_set_compact_storage(exoid, *truth_table_var); } return NC_NOERR; } diff --git a/packages/seacas/libraries/exodus/src/ex_put_assemblies.c b/packages/seacas/libraries/exodus/src/ex_put_assemblies.c index d37fe4999b..c3e1f2c398 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_assemblies.c +++ b/packages/seacas/libraries/exodus/src/ex_put_assemblies.c @@ -25,7 +25,7 @@ int ex_put_assemblies(int exoid, size_t count, const struct ex_assembly *assembl EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -106,7 +106,7 @@ int ex_put_assemblies(int exoid, size_t count, const struct ex_assembly *assembl } goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, entlst_id[i], 1); + exi_compress_variable(exoid, entlst_id[i], 1); if (ex_int64_status(exoid) & EX_IDS_INT64_DB) { long long tmp = assemblies[i].id; @@ -158,7 +158,7 @@ int ex_put_assemblies(int exoid, size_t count, const struct ex_assembly *assembl } /* Increment assembly count */ - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (file) { file->assembly_count++; } @@ -166,7 +166,7 @@ int ex_put_assemblies(int exoid, size_t count, const struct ex_assembly *assembl } /* leave define mode */ if (in_define) { - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode in file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); free(entlst_id); @@ -176,7 +176,7 @@ int ex_put_assemblies(int exoid, size_t count, const struct ex_assembly *assembl } /* Update the maximum_name_length attribute on the file. */ - ex__update_max_name_length(exoid, max_name_len - 1); + exi_update_max_name_length(exoid, max_name_len - 1); /* Assembly are now all defined; see if any set data needs to be output... */ for (size_t i = 0; i < count; i++) { @@ -198,7 +198,7 @@ int ex_put_assemblies(int exoid, size_t count, const struct ex_assembly *assembl /* Fatal error: exit definition mode and return */ error_ret: if (in_define) { - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); } free(entlst_id); EX_FUNC_LEAVE(EX_FATAL); diff --git a/packages/seacas/libraries/exodus/src/ex_put_attr.c b/packages/seacas/libraries/exodus/src/ex_put_attr.c index 60fc667a0c..846011c8a8 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_put_attr.c @@ -24,7 +24,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__comp_ws, etc +#include "exodusII_int.h" // for EX_FATAL, exi_comp_ws, etc /*! * writes the attributes for an edge/face/element block @@ -41,13 +41,13 @@ int ex_put_attr(int exoid, ex_entity_type blk_type, ex_entity_id blk_id, const v char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } if (blk_type != EX_NODAL) { /* Determine index of blk_id in VAR_ID_EL_BLK array */ - blk_id_ndx = ex__id_lkup(exoid, blk_type, blk_id); + blk_id_ndx = exi_id_lkup(exoid, blk_type, blk_id); if (blk_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -94,7 +94,7 @@ int ex_put_attr(int exoid, ex_entity_type blk_type, ex_entity_id blk_id, const v } /* write out the attributes */ - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_var_float(exoid, attrid, attrib); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_put_attr_names.c b/packages/seacas/libraries/exodus/src/ex_put_attr_names.c index e1b3b96a9d..8954f73750 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_attr_names.c +++ b/packages/seacas/libraries/exodus/src/ex_put_attr_names.c @@ -25,7 +25,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, ex_name_of_object, etc -#include "exodusII_int.h" // for EX_FATAL, ex__id_lkup, etc +#include "exodusII_int.h" // for EX_FATAL, exi_id_lkup, etc /*! * writes the attribute names for a block @@ -43,11 +43,11 @@ int ex_put_attr_names(int exoid, ex_entity_type blk_type, ex_entity_id blk_id, c char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } - blk_id_ndx = ex__id_lkup(exoid, blk_type, blk_id); + blk_id_ndx = exi_id_lkup(exoid, blk_type, blk_id); if (blk_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -136,7 +136,7 @@ int ex_put_attr_names(int exoid, ex_entity_type blk_type, ex_entity_id blk_id, c } /* write out the attributes */ - status = ex__put_names(exoid, varid, num_attr, names, blk_type, "attribute", __func__); + status = exi_put_names(exoid, varid, num_attr, names, blk_type, "attribute", __func__); EX_FUNC_LEAVE(status); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_attr_param.c b/packages/seacas/libraries/exodus/src/ex_put_attr_param.c index 291bf9d355..498d019c2d 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_attr_param.c +++ b/packages/seacas/libraries/exodus/src/ex_put_attr_param.c @@ -48,7 +48,7 @@ int ex_put_attr_param(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, i int numattrdim; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -57,7 +57,7 @@ int ex_put_attr_param(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, i obj_id_ndx = 0; } else { - obj_id_ndx = ex__id_lkup(exoid, obj_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, obj_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -173,7 +173,7 @@ int ex_put_attr_param(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, i ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 2); + exi_compress_variable(exoid, varid, 2); /* inquire previously defined dimensions */ if ((status = nc_inq_dimid(exoid, DIM_STR_NAME, &strdim)) != NC_NOERR) { @@ -199,7 +199,7 @@ int ex_put_attr_param(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, i #endif /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -207,6 +207,6 @@ int ex_put_attr_param(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, i /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_attribute.c b/packages/seacas/libraries/exodus/src/ex_put_attribute.c index b27aeec599..7da9ee97be 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_attribute.c +++ b/packages/seacas/libraries/exodus/src/ex_put_attribute.c @@ -22,7 +22,7 @@ attributes which are currently supported in Exodus. */ -static int ex__get_varid(int exoid, ex_entity_type obj_type, ex_entity_id id) +static int exi_get_varid(int exoid, ex_entity_type obj_type, ex_entity_id id) { const char *entryptr = NULL; char errmsg[MAX_ERR_LENGTH]; @@ -31,7 +31,7 @@ static int ex__get_varid(int exoid, ex_entity_type obj_type, ex_entity_id id) int status = 0; int varid = 0; - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -63,7 +63,7 @@ static int ex__get_varid(int exoid, ex_entity_type obj_type, ex_entity_id id) /* Everything else ... */ /* First, locate index of this objects id `obj_type` id array */ - id_ndx = ex__id_lkup(exoid, obj_type, id); + id_ndx = exi_id_lkup(exoid, obj_type, id); if (id_ndx <= 0) { ex_get_err(NULL, NULL, &status); if (status != 0) { @@ -113,9 +113,9 @@ int ex_put_double_attribute(int exoid, ex_entity_type obj_type, ex_entity_id id, int varid; EX_FUNC_ENTER(); - varid = ex__get_varid(exoid, obj_type, id); + varid = exi_get_varid(exoid, obj_type, id); if (varid <= 0 && obj_type != EX_GLOBAL) { - /* Error message handled in ex__get_varid */ + /* Error message handled in exi_get_varid */ EX_FUNC_LEAVE(varid); } @@ -136,7 +136,7 @@ int ex_put_double_attribute(int exoid, ex_entity_type obj_type, ex_entity_id id, } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -146,7 +146,7 @@ int ex_put_double_attribute(int exoid, ex_entity_type obj_type, ex_entity_id id, /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -159,9 +159,9 @@ int ex_put_integer_attribute(int exoid, ex_entity_type obj_type, ex_entity_id id int varid; EX_FUNC_ENTER(); - varid = ex__get_varid(exoid, obj_type, id); + varid = exi_get_varid(exoid, obj_type, id); if (varid <= 0 && obj_type != EX_GLOBAL) { - /* Error message handled in ex__get_varid */ + /* Error message handled in exi_get_varid */ EX_FUNC_LEAVE(varid); } @@ -188,7 +188,7 @@ int ex_put_integer_attribute(int exoid, ex_entity_type obj_type, ex_entity_id id } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -198,7 +198,7 @@ int ex_put_integer_attribute(int exoid, ex_entity_type obj_type, ex_entity_id id /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -212,9 +212,9 @@ int ex_put_text_attribute(int exoid, ex_entity_type obj_type, ex_entity_id id, c EX_FUNC_ENTER(); - varid = ex__get_varid(exoid, obj_type, id); + varid = exi_get_varid(exoid, obj_type, id); if (varid <= 0 && obj_type != EX_GLOBAL) { - /* Error message handled in ex__get_varid */ + /* Error message handled in exi_get_varid */ EX_FUNC_LEAVE(varid); } @@ -234,7 +234,7 @@ int ex_put_text_attribute(int exoid, ex_entity_type obj_type, ex_entity_id id, c } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -244,7 +244,7 @@ int ex_put_text_attribute(int exoid, ex_entity_type obj_type, ex_entity_id id, c /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_blobs.c b/packages/seacas/libraries/exodus/src/ex_put_blobs.c index 34609f834c..5bd70b3fdd 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_blobs.c +++ b/packages/seacas/libraries/exodus/src/ex_put_blobs.c @@ -23,7 +23,7 @@ int ex_put_blobs(int exoid, size_t count, const struct ex_blob *blobs) EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -85,7 +85,7 @@ int ex_put_blobs(int exoid, size_t count, const struct ex_blob *blobs) } goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, entlst_id[i], 1); + exi_compress_variable(exoid, entlst_id[i], 1); if (ex_int64_status(exoid) & EX_IDS_INT64_DB) { long long id = blobs[i].id; @@ -111,13 +111,13 @@ int ex_put_blobs(int exoid, size_t count, const struct ex_blob *blobs) } /* Increment blob count */ - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (file) { file->blob_count++; } } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode in file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); free(entlst_id); @@ -141,7 +141,7 @@ int ex_put_blobs(int exoid, size_t count, const struct ex_blob *blobs) /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); free(entlst_id); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_block_params.c b/packages/seacas/libraries/exodus/src/ex_put_block_params.c index 9dad9be910..3f38015130 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_block_params.c +++ b/packages/seacas/libraries/exodus/src/ex_put_block_params.c @@ -59,7 +59,7 @@ int ex_put_block_params(int exoid, size_t block_count, const struct ex_block *bl } EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -112,7 +112,7 @@ int ex_put_block_params(int exoid, size_t block_count, const struct ex_block *bl ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); EX_FUNC_LEAVE(EX_FATAL); } - if ((status = ex__get_dimension(exoid, dnumblk, ex_name_of_object(last_type), &num_blk, &dimid, + if ((status = exi_get_dimension(exoid, dnumblk, ex_name_of_object(last_type), &num_blk, &dimid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: No %ss defined in file id %d", ex_name_of_object(last_type), exoid); @@ -121,7 +121,7 @@ int ex_put_block_params(int exoid, size_t block_count, const struct ex_block *bl } if (block_count == num_blk) { - status = ex__put_homogenous_block_params(exoid, block_count, blocks); + status = exi_put_homogenous_block_params(exoid, block_count, blocks); EX_FUNC_LEAVE(status); } } @@ -162,7 +162,7 @@ int ex_put_block_params(int exoid, size_t block_count, const struct ex_block *bl } /* first check if any blocks of that type are specified */ - if ((status = ex__get_dimension(exoid, dnumblk, ex_name_of_object(blocks[i].type), &num_blk, + if ((status = exi_get_dimension(exoid, dnumblk, ex_name_of_object(blocks[i].type), &num_blk, &dimid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: No %ss defined in file id %d", ex_name_of_object(blocks[i].type), exoid); @@ -186,7 +186,7 @@ int ex_put_block_params(int exoid, size_t block_count, const struct ex_block *bl EX_FUNC_LEAVE(EX_FATAL); } - status = ex__id_lkup(exoid, blocks[i].type, blocks[i].id); + status = exi_id_lkup(exoid, blocks[i].type, blocks[i].id); if (-status != EX_LOOKUPFAIL) { /* found the element block id */ snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: %s id %" PRId64 " already exists in file id %d", ex_name_of_object(blocks[i].type), blocks[i].id, exoid); @@ -197,10 +197,10 @@ int ex_put_block_params(int exoid, size_t block_count, const struct ex_block *bl /* Keep track of the total number of element blocks defined using a counter stored in a linked list keyed by exoid. - NOTE: ex__get_file_item is a function that finds the number of element + NOTE: exi_get_file_item is a function that finds the number of element blocks for a specific file and returns that value. */ - cur_num_blk = ex__get_file_item(exoid, ex__get_counter_list(blocks[i].type)); + cur_num_blk = exi_get_file_item(exoid, exi_get_counter_list(blocks[i].type)); if (cur_num_blk >= (int)num_blk) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: exceeded number of %ss (%d) defined in file id %d", ex_name_of_object(blocks[i].type), (int)num_blk, exoid); @@ -209,9 +209,9 @@ int ex_put_block_params(int exoid, size_t block_count, const struct ex_block *bl EX_FUNC_LEAVE(EX_FATAL); } - /* NOTE: ex__inc_file_item is a function that finds the number of element + /* NOTE: exi_inc_file_item is a function that finds the number of element blocks for a specific file and returns that value incremented. */ - cur_num_blk = ex__inc_file_item(exoid, ex__get_counter_list(blocks[i].type)); + cur_num_blk = exi_inc_file_item(exoid, exi_get_counter_list(blocks[i].type)); start[0] = cur_num_blk; /* write out block id to previously defined id array variable*/ @@ -380,7 +380,7 @@ int ex_put_block_params(int exoid, size_t block_count, const struct ex_block *bl ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 2); + exi_compress_variable(exoid, varid, 2); /* inquire previously defined dimensions */ if ((status = nc_inq_dimid(exoid, DIM_STR_NAME, &strdim)) != NC_NOERR) { @@ -514,7 +514,7 @@ int ex_put_block_params(int exoid, size_t block_count, const struct ex_block *bl ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, connid, 1); + exi_compress_variable(exoid, connid, 1); } } /* store element type as attribute of connectivity variable */ @@ -562,7 +562,7 @@ int ex_put_block_params(int exoid, size_t block_count, const struct ex_block *bl free(blocks_to_define); /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -603,6 +603,6 @@ int ex_put_block_params(int exoid, size_t block_count, const struct ex_block *bl error_ret: free(blocks_to_define); - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_cmap_params.c b/packages/seacas/libraries/exodus/src/ex_put_cmap_params.c index bdab37ccc8..bf70211e32 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_cmap_params.c +++ b/packages/seacas/libraries/exodus/src/ex_put_cmap_params.c @@ -33,7 +33,7 @@ /*****************************************************************************/ #include // for ex_err, etc -#include // for EX_FATAL, ex__leavedef, etc +#include // for EX_FATAL, exi_leavedef, etc int ex_put_cmap_params(int exoid, const void_int *node_cmap_ids, const void_int *node_cmap_node_cnts, const void_int *elem_cmap_ids, @@ -48,7 +48,7 @@ int ex_put_cmap_params(int exoid, const void_int *node_cmap_ids, EX_UNUSED(processor); EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -71,7 +71,7 @@ int ex_put_cmap_params(int exoid, const void_int *node_cmap_ids, ** be used for writing a parallel file */ /* Get the file type */ - if (ex__get_file_type(exoid, ftype) != EX_NOERR) { + if (exi_get_file_type(exoid, ftype) != EX_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get file type from file ID %d\n", exoid); ex_err_fn(exoid, __func__, errmsg, EX_MSG); EX_FUNC_LEAVE(EX_FATAL); @@ -122,7 +122,7 @@ int ex_put_cmap_params(int exoid, const void_int *node_cmap_ids, VAR_N_COMM_DATA_IDX, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -145,7 +145,7 @@ int ex_put_cmap_params(int exoid, const void_int *node_cmap_ids, DIM_NCNT_CMAP, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -157,22 +157,22 @@ int ex_put_cmap_params(int exoid, const void_int *node_cmap_ids, VAR_N_COMM_NIDS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); if ((status = nc_def_var(exoid, VAR_N_COMM_PROC, NC_INT, 1, dimid, &varid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to add variable \"%s\" in file ID %d", VAR_N_COMM_PROC, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); } /* End "if (num_n_comm_maps > 0)" */ @@ -205,7 +205,7 @@ int ex_put_cmap_params(int exoid, const void_int *node_cmap_ids, VAR_E_COMM_DATA_IDX, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -227,7 +227,7 @@ int ex_put_cmap_params(int exoid, const void_int *node_cmap_ids, DIM_ECNT_CMAP, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -239,38 +239,38 @@ int ex_put_cmap_params(int exoid, const void_int *node_cmap_ids, VAR_E_COMM_EIDS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); if ((status = nc_def_var(exoid, VAR_E_COMM_PROC, NC_INT, 1, dimid, &varid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to add variable \"%s\" in file ID %d", VAR_E_COMM_PROC, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); if ((status = nc_def_var(exoid, VAR_E_COMM_SIDS, NC_INT, 1, dimid, &varid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to add variable \"%s\" in file ID %d", VAR_E_COMM_SIDS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); } /* End "if (num_e_comm_maps > 0)" */ /* Exit define mode */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); /* Set the status of the nodal communication maps */ if (num_n_comm_maps > 0) { diff --git a/packages/seacas/libraries/exodus/src/ex_put_cmap_params_cc.c b/packages/seacas/libraries/exodus/src/ex_put_cmap_params_cc.c index 06915afc45..6c68093808 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_cmap_params_cc.c +++ b/packages/seacas/libraries/exodus/src/ex_put_cmap_params_cc.c @@ -33,7 +33,7 @@ /*****************************************************************************/ /*****************************************************************************/ #include // for ex_err, etc -#include // for EX_FATAL, ex__leavedef, etc +#include // for EX_FATAL, exi_leavedef, etc int ex_put_cmap_params_cc(int exoid, const void_int *node_cmap_ids, const void_int *node_cmap_node_cnts, const void_int *node_proc_ptrs, @@ -59,7 +59,7 @@ int ex_put_cmap_params_cc(int exoid, const void_int *node_cmap_ids, /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -233,7 +233,7 @@ file ID %d", VAR_N_COMM_DATA_IDX, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -263,7 +263,7 @@ file ID %d", ncnt_cmap, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -274,22 +274,22 @@ file ID %d", VAR_N_COMM_NIDS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); if ((status = nc_def_var(exoid, VAR_N_COMM_PROC, NC_INT, 1, n_dimid, &varid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to add variable \"%s\" in file ID %d", VAR_N_COMM_PROC, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); } /* End "if (num_n_comm_maps > 0)" */ @@ -305,7 +305,7 @@ file ID %d", VAR_E_COMM_DATA_IDX, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -335,7 +335,7 @@ file ID %d", DIM_ECNT_CMAP, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -346,38 +346,38 @@ file ID %d", VAR_E_COMM_EIDS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); if ((status = nc_def_var(exoid, VAR_E_COMM_PROC, NC_INT, 1, e_dimid, &varid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to add variable \"%s\" in file ID %d", VAR_E_COMM_PROC, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); if ((status = nc_def_var(exoid, VAR_E_COMM_SIDS, bulk_type, 1, e_dimid, &varid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to add variable \"%s\" in file ID %d", VAR_E_COMM_SIDS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); } /* End "if (num_e_comm_maps > 0)" */ /* Exit define mode */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); /* Set the status of the nodal communication maps */ if (num_n_comm_maps > 0) { diff --git a/packages/seacas/libraries/exodus/src/ex_put_concat_all_blocks.c b/packages/seacas/libraries/exodus/src/ex_put_concat_all_blocks.c index b624fc0350..53573ac67c 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_concat_all_blocks.c +++ b/packages/seacas/libraries/exodus/src/ex_put_concat_all_blocks.c @@ -85,7 +85,7 @@ int ex_put_concat_all_blocks(int exoid, const ex_block_params *param) elem_id_int = param->elem_blk_id; } - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -235,7 +235,7 @@ int ex_put_concat_all_blocks(int exoid, const ex_block_params *param) ex_err_fn(exoid, __func__, errmsg, status); \ goto error_ret; /* exit define mode and return */ \ } \ - ex__compress_variable(exoid, temp, 2); \ + exi_compress_variable(exoid, temp, 2); \ \ /* Attribute names... */ \ dims[0] = VADIM1; \ @@ -274,7 +274,7 @@ int ex_put_concat_all_blocks(int exoid, const ex_block_params *param) ex_err_fn(exoid, __func__, errmsg, status); \ goto error_ret; /* exit define mode and return */ \ } \ - ex__compress_variable(exoid, temp, 2); \ + exi_compress_variable(exoid, temp, 2); \ \ /* Attribute names... */ \ dims[0] = VADIM1; \ @@ -307,7 +307,7 @@ int ex_put_concat_all_blocks(int exoid, const ex_block_params *param) ex_err_fn(exoid, __func__, errmsg, status); \ goto error_ret; /* exit define mode and return */ \ } \ - ex__compress_variable(exoid, connid, 1); \ + exi_compress_variable(exoid, connid, 1); \ } /* Iterate over edge blocks ... */ @@ -320,7 +320,7 @@ int ex_put_concat_all_blocks(int exoid, const ex_block_params *param) eb_id = edge_id_int[iblk]; } - cur_num_edge_blk = ex__get_file_item(exoid, ex__get_counter_list(EX_EDGE_BLOCK)); + cur_num_edge_blk = exi_get_file_item(exoid, exi_get_counter_list(EX_EDGE_BLOCK)); if (cur_num_edge_blk >= (int)num_edge_blk) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: exceeded number of edge blocks (%ld) defined in file id %d", @@ -329,9 +329,9 @@ int ex_put_concat_all_blocks(int exoid, const ex_block_params *param) goto error_ret; } - /* NOTE: ex__inc_file_item is used to find the number of edge blocks + /* NOTE: exi_inc_file_item is used to find the number of edge blocks for a specific file and returns that value incremented. */ - cur_num_edge_blk = ex__inc_file_item(exoid, ex__get_counter_list(EX_EDGE_BLOCK)); + cur_num_edge_blk = exi_inc_file_item(exoid, exi_get_counter_list(EX_EDGE_BLOCK)); if (param->num_edge_this_blk[iblk] == 0) { /* Is this a NULL edge block? */ continue; @@ -388,7 +388,7 @@ int ex_put_concat_all_blocks(int exoid, const ex_block_params *param) fb_id = face_id_int[iblk]; } - cur_num_face_blk = ex__get_file_item(exoid, ex__get_counter_list(EX_FACE_BLOCK)); + cur_num_face_blk = exi_get_file_item(exoid, exi_get_counter_list(EX_FACE_BLOCK)); if (cur_num_face_blk >= (int)num_face_blk) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: exceeded number of face blocks (%ld) defined in file id %d", @@ -397,9 +397,9 @@ int ex_put_concat_all_blocks(int exoid, const ex_block_params *param) goto error_ret; } - /* NOTE: ex__inc_file_item is used to find the number of edge blocks + /* NOTE: exi_inc_file_item is used to find the number of edge blocks for a specific file and returns that value incremented. */ - cur_num_face_blk = ex__inc_file_item(exoid, ex__get_counter_list(EX_FACE_BLOCK)); + cur_num_face_blk = exi_inc_file_item(exoid, exi_get_counter_list(EX_FACE_BLOCK)); if (param->num_face_this_blk[iblk] == 0) { /* Is this a NULL face block? */ continue; @@ -456,7 +456,7 @@ int ex_put_concat_all_blocks(int exoid, const ex_block_params *param) eb_id = elem_id_int[iblk]; } - cur_num_elem_blk = ex__get_file_item(exoid, ex__get_counter_list(EX_ELEM_BLOCK)); + cur_num_elem_blk = exi_get_file_item(exoid, exi_get_counter_list(EX_ELEM_BLOCK)); if (cur_num_elem_blk >= (int)num_elem_blk) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: exceeded number of element blocks (%ld) defined " @@ -466,9 +466,9 @@ int ex_put_concat_all_blocks(int exoid, const ex_block_params *param) goto error_ret; } - /* NOTE: ex__inc_file_item is used to find the number of element blocks + /* NOTE: exi_inc_file_item is used to find the number of element blocks for a specific file and returns that value incremented. */ - cur_num_elem_blk = ex__inc_file_item(exoid, ex__get_counter_list(EX_ELEM_BLOCK)); + cur_num_elem_blk = exi_inc_file_item(exoid, exi_get_counter_list(EX_ELEM_BLOCK)); if (param->num_elem_this_blk[iblk] == 0) { /* Is this a NULL element block? */ continue; @@ -557,7 +557,7 @@ int ex_put_concat_all_blocks(int exoid, const ex_block_params *param) ex_err_fn(exoid, __func__, errmsg, status); } for (i = 1; i <= num_maps[map_type]; ++i) { - const char *mapname = ex__name_of_map(map_enums[map_type], i); + const char *mapname = exi_name_of_map(map_enums[map_type], i); if (nc_inq_varid(exoid, mapname, &temp) != NC_NOERR) { int map_int_type = NC_INT; if (ex_int64_status(exoid) & EX_MAPS_INT64_DB) { @@ -576,14 +576,14 @@ int ex_put_concat_all_blocks(int exoid, const ex_block_params *param) ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, temp, 1); + exi_compress_variable(exoid, temp, 1); } } } } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -593,6 +593,6 @@ int ex_put_concat_all_blocks(int exoid, const ex_block_params *param) /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_concat_elem_block.c b/packages/seacas/libraries/exodus/src/ex_put_concat_elem_block.c index 065cbc7b1d..0d839323d5 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_concat_elem_block.c +++ b/packages/seacas/libraries/exodus/src/ex_put_concat_elem_block.c @@ -49,7 +49,7 @@ int ex_put_concat_elem_block(int exoid, const void_int *elem_blk_id, char *const char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -180,7 +180,7 @@ int ex_put_concat_elem_block(int exoid, const void_int *elem_blk_id, char *const num_attr = ((int *)num_attr_this_blk)[iblk]; } - cur_num_elem_blk = ex__get_file_item(exoid, ex__get_counter_list(EX_ELEM_BLOCK)); + cur_num_elem_blk = exi_get_file_item(exoid, exi_get_counter_list(EX_ELEM_BLOCK)); if (cur_num_elem_blk >= num_elem_blk) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: exceeded number of element blocks (%d) defined in file id %d", num_elem_blk, @@ -189,9 +189,9 @@ int ex_put_concat_elem_block(int exoid, const void_int *elem_blk_id, char *const goto error_ret; } - /* NOTE: ex__inc_file_item is used to find the number of element blocks + /* NOTE: exi_inc_file_item is used to find the number of element blocks for a specific file and returns that value incremented. */ - cur_num_elem_blk = ex__inc_file_item(exoid, ex__get_counter_list(EX_ELEM_BLOCK)); + cur_num_elem_blk = exi_inc_file_item(exoid, exi_get_counter_list(EX_ELEM_BLOCK)); if (eb_array[iblk] == 0) { /* Is this a NULL element block? */ continue; @@ -236,7 +236,7 @@ int ex_put_concat_elem_block(int exoid, const void_int *elem_blk_id, char *const ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, connid, 1); + exi_compress_variable(exoid, connid, 1); /* store element type as attribute of connectivity variable */ if ((status = nc_put_att_text(exoid, connid, ATT_NAME_ELB, strlen(elem_type[iblk]) + 1, @@ -312,7 +312,7 @@ int ex_put_concat_elem_block(int exoid, const void_int *elem_blk_id, char *const ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, temp, 1); + exi_compress_variable(exoid, temp, 1); } } @@ -336,13 +336,13 @@ int ex_put_concat_elem_block(int exoid, const void_int *elem_blk_id, char *const ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, temp, 1); + exi_compress_variable(exoid, temp, 1); } } } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); free(eb_array); @@ -383,6 +383,6 @@ int ex_put_concat_elem_block(int exoid, const void_int *elem_blk_id, char *const /* Fatal error: exit definition mode and return */ error_ret: free(eb_array); - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_concat_sets.c b/packages/seacas/libraries/exodus/src/ex_put_concat_sets.c index c0780fbca2..43a8807b63 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_concat_sets.c +++ b/packages/seacas/libraries/exodus/src/ex_put_concat_sets.c @@ -23,7 +23,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__comp_ws, etc +#include "exodusII_int.h" // for EX_FATAL, exi_comp_ws, etc /*! * writes the set ID's, set entry count array, set entry pointers array, @@ -61,7 +61,7 @@ int ex_put_concat_sets(int exoid, ex_entity_type set_type, const struct ex_set_s ex_inquiry ex_inq_val; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -105,7 +105,7 @@ int ex_put_concat_sets(int exoid, ex_entity_type set_type, const struct ex_set_s } /* first check if any sets are specified */ - if ((status = nc_inq_dimid(exoid, ex__dim_num_objects(set_type), &temp)) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_dim_num_objects(set_type), &temp)) != NC_NOERR) { if (status == NC_EBADDIM) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: no %ss defined for file id %d", ex_name_of_object(set_type), exoid); @@ -190,10 +190,10 @@ int ex_put_concat_sets(int exoid, ex_entity_type set_type, const struct ex_set_s /* Keep track of the total number of sets defined using a counter stored in a linked list keyed by exoid. - NOTE: ex__get_file_item is used to find the number of sets of type + NOTE: exi_get_file_item is used to find the number of sets of type for a specific file and returns that value. */ - cur_num_sets = ex__get_file_item(exoid, ex__get_counter_list(set_type)); + cur_num_sets = exi_get_file_item(exoid, exi_get_counter_list(set_type)); if (cur_num_sets >= num_sets) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: exceeded number of %ss (%d) defined in file id %d", ex_name_of_object(set_type), num_sets, exoid); @@ -201,10 +201,10 @@ int ex_put_concat_sets(int exoid, ex_entity_type set_type, const struct ex_set_s goto error_ret; } - /* NOTE: ex__inc_file_item is used to find the number of sets + /* NOTE: exi_inc_file_item is used to find the number of sets for a specific file and returns that value incremented. */ - cur_num_sets = ex__inc_file_item(exoid, ex__get_counter_list(set_type)); + cur_num_sets = exi_inc_file_item(exoid, exi_get_counter_list(set_type)); set_id_ndx = cur_num_sets + 1; /* setup more pointers based on set_type */ @@ -246,11 +246,11 @@ int ex_put_concat_sets(int exoid, ex_entity_type set_type, const struct ex_set_s } if (int_size == sizeof(int)) { - status = nc_def_dim(exoid, ex__dim_num_entries_in_object(set_type, set_id_ndx), + status = nc_def_dim(exoid, exi_dim_num_entries_in_object(set_type, set_id_ndx), ((int *)num_entries_per_set)[i], &dimid); } else { - status = nc_def_dim(exoid, ex__dim_num_entries_in_object(set_type, set_id_ndx), + status = nc_def_dim(exoid, exi_dim_num_entries_in_object(set_type, set_id_ndx), ((int64_t *)num_entries_per_set)[i], &dimid); } @@ -292,7 +292,7 @@ int ex_put_concat_sets(int exoid, ex_entity_type set_type, const struct ex_set_s } goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, temp, 1); + exi_compress_variable(exoid, temp, 1); /* create extra list variable for set (only for edge, face and side sets) */ @@ -312,7 +312,7 @@ int ex_put_concat_sets(int exoid, ex_entity_type set_type, const struct ex_set_s } goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, temp, 1); + exi_compress_variable(exoid, temp, 1); } /* define dimension for number of dist factors per set */ @@ -375,12 +375,12 @@ int ex_put_concat_sets(int exoid, ex_entity_type set_type, const struct ex_set_s } goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, temp, 2); + exi_compress_variable(exoid, temp, 2); } /* end define dist factors */ } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); free(set_stat); @@ -475,7 +475,7 @@ int ex_put_concat_sets(int exoid, ex_entity_type set_type, const struct ex_set_s df_ndx = ((int64_t *)sets_dist_index)[i]; } - if (ex__comp_ws(exoid) == sizeof(float)) { + if (exi_comp_ws(exoid) == sizeof(float)) { flt_dist_fact = sets_dist_fact; if (num_df > 0) { /* store dist factors if required */ if (ex_put_set_dist_fact(exoid, set_type, set_id, &(flt_dist_fact[df_ndx])) == -1) { @@ -489,7 +489,7 @@ int ex_put_concat_sets(int exoid, ex_entity_type set_type, const struct ex_set_s } } } - else if (ex__comp_ws(exoid) == sizeof(double)) { + else if (exi_comp_ws(exoid) == sizeof(double)) { dbl_dist_fact = sets_dist_fact; if (num_df) { /* only store if they exist */ if (ex_put_set_dist_fact(exoid, set_type, set_id, &(dbl_dist_fact[df_ndx])) == -1) { @@ -506,7 +506,7 @@ int ex_put_concat_sets(int exoid, ex_entity_type set_type, const struct ex_set_s else { /* unknown floating point word size */ snprintf(errmsg, MAX_ERR_LENGTH, - "ERROR: unsupported floating point word size %d for file id %d", ex__comp_ws(exoid), + "ERROR: unsupported floating point word size %d for file id %d", exi_comp_ws(exoid), exoid); ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); free(set_stat); @@ -520,6 +520,6 @@ int ex_put_concat_sets(int exoid, ex_entity_type set_type, const struct ex_set_s error_ret: free(set_stat); - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_conn.c b/packages/seacas/libraries/exodus/src/ex_put_conn.c index 056fd70af1..cc1497a822 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_conn.c +++ b/packages/seacas/libraries/exodus/src/ex_put_conn.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__id_lkup, etc +#include "exodusII_int.h" // for EX_FATAL, exi_id_lkup, etc /*! write out the connectivity array */ int ex_int_write_conn(int exoid, ex_entity_id blk_id, const char *type, int var_id, @@ -49,11 +49,11 @@ int ex_put_conn(int exoid, ex_entity_type blk_type, ex_entity_id blk_id, const v char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } - int blk_id_ndx = ex__id_lkup(exoid, blk_type, blk_id); + int blk_id_ndx = exi_id_lkup(exoid, blk_type, blk_id); if (blk_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); diff --git a/packages/seacas/libraries/exodus/src/ex_put_coord.c b/packages/seacas/libraries/exodus/src/ex_put_coord.c index a2277e94a1..eb88a828f8 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_coord.c +++ b/packages/seacas/libraries/exodus/src/ex_put_coord.c @@ -95,7 +95,7 @@ int ex_put_coord(int exoid, const void *x_coor, const void *y_coor, const void * char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -181,7 +181,7 @@ int ex_put_coord(int exoid, const void *x_coor, const void *y_coor, const void * } if (coor != NULL && coordid != -1) { - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_var_float(exoid, coordid, coor); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_put_coord_names.c b/packages/seacas/libraries/exodus/src/ex_put_coord_names.c index 4a299743a0..17fa2d2556 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_coord_names.c +++ b/packages/seacas/libraries/exodus/src/ex_put_coord_names.c @@ -51,7 +51,7 @@ int ex_put_coord_names(int exoid, char *const coord_names[]) char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -77,7 +77,7 @@ int ex_put_coord_names(int exoid, char *const coord_names[]) } /* write out coordinate names */ - status = ex__put_names(exoid, varid, num_dim, coord_names, EX_COORDINATE, "", __func__); + status = exi_put_names(exoid, varid, num_dim, coord_names, EX_COORDINATE, "", __func__); EX_FUNC_LEAVE(status); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_coordinate_frames.c b/packages/seacas/libraries/exodus/src/ex_put_coordinate_frames.c index 3fc32a24bb..b11c10c42a 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_coordinate_frames.c +++ b/packages/seacas/libraries/exodus/src/ex_put_coordinate_frames.c @@ -50,7 +50,7 @@ int ex_put_coordinate_frames(int exoid, int nframes, const void_int *cf_ids, assert(pt_coordinates != NULL); assert(tags != NULL); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -91,7 +91,7 @@ int ex_put_coordinate_frames(int exoid, int nframes, const void_int *cf_ids, } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -125,7 +125,7 @@ int ex_put_coordinate_frames(int exoid, int nframes, const void_int *cf_ids, EX_FUNC_LEAVE(EX_FATAL); } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_var_float(exoid, varcoords, pt_coordinates); } else { @@ -140,6 +140,6 @@ int ex_put_coordinate_frames(int exoid, int nframes, const void_int *cf_ids, EX_FUNC_LEAVE(EX_NOERR); error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_eb_info_global.c b/packages/seacas/libraries/exodus/src/ex_put_eb_info_global.c index 7186ba2fc7..0393409327 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_eb_info_global.c +++ b/packages/seacas/libraries/exodus/src/ex_put_eb_info_global.c @@ -32,7 +32,7 @@ int ex_put_eb_info_global(int exoid, const void_int *el_blk_ids, const void_int char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c b/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c index 91b015854a..77975801d6 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c @@ -42,7 +42,7 @@ int ex_put_elem_cmap(int exoid, ex_entity_id map_id, const void_int *elem_ids, /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_entity_count_per_polyhedra.c b/packages/seacas/libraries/exodus/src/ex_put_entity_count_per_polyhedra.c index 6131f74d2f..d7531efae8 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_entity_count_per_polyhedra.c +++ b/packages/seacas/libraries/exodus/src/ex_put_entity_count_per_polyhedra.c @@ -12,7 +12,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__id_lkup, etc +#include "exodusII_int.h" // for EX_FATAL, exi_id_lkup, etc /*! * writes out the number of entities (nodes/faces) per polyhedra @@ -30,11 +30,11 @@ int ex_put_entity_count_per_polyhedra(int exoid, ex_entity_type blk_type, ex_ent char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } - blk_id_ndx = ex__id_lkup(exoid, blk_type, blk_id); + blk_id_ndx = exi_id_lkup(exoid, blk_type, blk_id); if (blk_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); diff --git a/packages/seacas/libraries/exodus/src/ex_put_id_map.c b/packages/seacas/libraries/exodus/src/ex_put_id_map.c index 0d163c2f98..eaae70e013 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_id_map.c +++ b/packages/seacas/libraries/exodus/src/ex_put_id_map.c @@ -44,7 +44,7 @@ int ex_put_id_map(int exoid, ex_entity_type map_type, const void_int *map) const char *vmap; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -111,10 +111,10 @@ int ex_put_id_map(int exoid, ex_entity_type map_type, const void_int *map) } goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, mapid, 1); + exi_compress_variable(exoid, mapid, 1); /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -140,6 +140,6 @@ int ex_put_id_map(int exoid, ex_entity_type map_type, const void_int *map) /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_info.c b/packages/seacas/libraries/exodus/src/ex_put_info.c index 016ad38031..da69df0d83 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_info.c +++ b/packages/seacas/libraries/exodus/src/ex_put_info.c @@ -80,7 +80,7 @@ int ex_put_info(int exoid, int num_info, char *const info[]) int rootid = exoid & EX_FILE_ID_MASK; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -141,13 +141,13 @@ int ex_put_info(int exoid, int num_info, char *const info[]) * compilers/mpi so are doing it this way... */ #if defined(PARALLEL_AWARE_EXODUS) - if (ex__is_parallel(rootid)) { + if (exi_is_parallel(rootid)) { nc_var_par_access(rootid, varid, NC_INDEPENDENT); } #endif /* leave define mode */ - if ((status = ex__leavedef(rootid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(rootid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -182,7 +182,7 @@ int ex_put_info(int exoid, int num_info, char *const info[]) } /* PnetCDF applies setting to entire file, so put back to collective... */ #if defined(PARALLEL_AWARE_EXODUS) - if (ex__is_parallel(rootid)) { + if (exi_is_parallel(rootid)) { nc_var_par_access(rootid, varid, NC_COLLECTIVE); } #endif @@ -191,6 +191,6 @@ int ex_put_info(int exoid, int num_info, char *const info[]) /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(rootid, __func__); + exi_leavedef(rootid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_init_ext.c b/packages/seacas/libraries/exodus/src/ex_put_init_ext.c index 0f0626d3c3..6d1ecb301a 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_init_ext.c +++ b/packages/seacas/libraries/exodus/src/ex_put_init_ext.c @@ -30,7 +30,7 @@ static void write_dummy_names(int exoid, ex_entity_type obj_type, int num) if (num > 0) { int varid; size_t num_entity; - ex__get_dimension(exoid, ex__dim_num_objects(obj_type), ex_name_of_object(obj_type), + exi_get_dimension(exoid, exi_dim_num_objects(obj_type), ex_name_of_object(obj_type), &num_entity, &varid, __func__); char *text = ""; @@ -57,7 +57,7 @@ static int ex_write_object_names(int exoid, const char *type, const char *dimens ex_err_fn(exoid, __func__, errmsg, status); return (status); /* exit define mode and return */ } - ex__set_compact_storage(exoid, varid); + exi_set_compact_storage(exoid, varid); #if defined(EX_CAN_USE_NC_DEF_VAR_FILL) int fill = NC_FILL_CHAR; nc_def_var_fill(exoid, varid, 0, &fill); @@ -96,7 +96,7 @@ static int ex_write_object_params(int exoid, const char *type, const char *dimen int sixty_four_kb = 64 * 1024; // Compact storage can only be used for < 64KiByte data sizes if (4 * count < sixty_four_kb) { - ex__set_compact_storage(exoid, varid); + exi_set_compact_storage(exoid, varid); } /* type id array */ @@ -115,7 +115,7 @@ static int ex_write_object_params(int exoid, const char *type, const char *dimen return (status); /* exit define mode and return */ } if (int_size * count < sixty_four_kb) { - ex__set_compact_storage(exoid, varid); + exi_set_compact_storage(exoid, varid); } /* store property name as attribute of property array variable */ @@ -234,7 +234,7 @@ int ex_put_init_ext(int exoid, const ex_init_params *model) int header_size, fixed_var_size, iows; #endif EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } int rootid = exoid & EX_FILE_ID_MASK; @@ -294,10 +294,10 @@ int ex_put_init_ext(int exoid, const ex_init_params *model) goto error_ret; } { - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); file->time_varid = temp; } - ex__compress_variable(exoid, temp, -2); /* Don't compress, but do set collective io */ + exi_compress_variable(exoid, temp, -2); /* Don't compress, but do set collective io */ if (model->num_dim > 0) { if ((status = nc_def_dim(exoid, DIM_NUM_DIM, model->num_dim, &numdimdim)) != NC_NOERR) { @@ -449,7 +449,7 @@ int ex_put_init_ext(int exoid, const ex_init_params *model) ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, temp, 2); + exi_compress_variable(exoid, temp, 2); } if (model->num_dim > 1) { @@ -461,7 +461,7 @@ int ex_put_init_ext(int exoid, const ex_init_params *model) ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, temp, 2); + exi_compress_variable(exoid, temp, 2); } if (model->num_dim > 2) { @@ -473,7 +473,7 @@ int ex_put_init_ext(int exoid, const ex_init_params *model) ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, temp, 2); + exi_compress_variable(exoid, temp, 2); } } @@ -533,7 +533,7 @@ int ex_put_init_ext(int exoid, const ex_init_params *model) } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { char errmsg[MAX_ERR_LENGTH]; snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); @@ -624,6 +624,6 @@ int ex_put_init_ext(int exoid, const ex_init_params *model) /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_init_global.c b/packages/seacas/libraries/exodus/src/ex_put_init_global.c index 542fe3b0ec..5053d37b27 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_init_global.c +++ b/packages/seacas/libraries/exodus/src/ex_put_init_global.c @@ -32,7 +32,7 @@ /*****************************************************************************/ #include // for ex_err, etc -#include // for ex__leavedef, EX_FATAL, etc +#include // for exi_leavedef, EX_FATAL, etc /*! * \ingroup ModelDescription @@ -49,7 +49,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -67,7 +67,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 } /* Output the file version */ - if ((status = ex__put_nemesis_version(exoid)) < 0) { + if ((status = exi_put_nemesis_version(exoid)) < 0) { EX_FUNC_LEAVE(status); } @@ -77,7 +77,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 DIM_NUM_NODES_GLOBAL, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -88,7 +88,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 DIM_NUM_ELEMS_GLOBAL, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -103,7 +103,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 DIM_NUM_ELBLK_GLOBAL, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -115,7 +115,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 VAR_ELBLK_IDS_GLOBAL, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -127,7 +127,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 VAR_ELBLK_CNT_GLOBAL, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -143,7 +143,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 DIM_NUM_NS_GLOBAL, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -156,7 +156,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -169,7 +169,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 VAR_NS_NODE_CNT_GLOBAL, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -185,7 +185,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 VAR_NS_DF_CNT_GLOBAL, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -203,7 +203,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 DIM_NUM_SS_GLOBAL, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -216,7 +216,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -233,7 +233,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -250,7 +250,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -258,7 +258,7 @@ int ex_put_init_global(int exoid, int64_t num_nodes_g, int64_t num_elems_g, int6 } /* End "if (num_side_sets_g > 0)" */ /* End define mode */ - if (ex__leavedef(exoid, __func__) != EX_NOERR) { + if (exi_leavedef(exoid, __func__) != EX_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_init_info.c b/packages/seacas/libraries/exodus/src/ex_put_init_info.c index 3310b20166..0c88892b43 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_init_info.c +++ b/packages/seacas/libraries/exodus/src/ex_put_init_info.c @@ -41,7 +41,7 @@ int ex_put_init_info(int exoid, int num_proc, int num_proc_in_f, const char *fty /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -82,7 +82,7 @@ int ex_put_init_info(int exoid, int num_proc, int num_proc_in_f, const char *fty DIM_NUM_PROCS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -97,7 +97,7 @@ int ex_put_init_info(int exoid, int num_proc, int num_proc_in_f, const char *fty ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -110,12 +110,12 @@ int ex_put_init_info(int exoid, int num_proc, int num_proc_in_f, const char *fty ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - if (ex__leavedef(exoid, __func__) != EX_NOERR) { + if (exi_leavedef(exoid, __func__) != EX_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -128,7 +128,7 @@ int ex_put_init_info(int exoid, int num_proc, int num_proc_in_f, const char *fty } } else { - if (ex__leavedef(exoid, __func__) != EX_NOERR) { + if (exi_leavedef(exoid, __func__) != EX_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } } diff --git a/packages/seacas/libraries/exodus/src/ex_put_loadbal_param.c b/packages/seacas/libraries/exodus/src/ex_put_loadbal_param.c index 1ad8419be7..f5463e8637 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_loadbal_param.c +++ b/packages/seacas/libraries/exodus/src/ex_put_loadbal_param.c @@ -29,7 +29,7 @@ /*****************************************************************************/ #include // for ex_err, etc -#include // for ex__leavedef, EX_FATAL, etc +#include // for exi_leavedef, EX_FATAL, etc /*! * \ingroup ModelDescription @@ -60,12 +60,12 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* Get the file type */ - if (ex__get_file_type(exoid, ftype) != EX_NOERR) { + if (exi_get_file_type(exoid, ftype) != EX_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get file type from file ID %d\n", exoid); ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); EX_FUNC_LEAVE(EX_FATAL); @@ -98,8 +98,8 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes } /* Output the file version */ - if ((status = ex__put_nemesis_version(exoid)) < 0) { - ex__leavedef(exoid, __func__); + if ((status = exi_put_nemesis_version(exoid)) < 0) { + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(status); } @@ -110,7 +110,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_INT_N_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -123,7 +123,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_BOR_N_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -135,7 +135,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_EXT_N_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -148,7 +148,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_INT_E_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -160,7 +160,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_BOR_E_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -172,7 +172,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_INT_N_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -182,7 +182,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_BOR_N_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -192,7 +192,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_EXT_N_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -205,7 +205,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes DIM_NUM_INT_ELEMS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -215,11 +215,11 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_ELEM_MAP_INT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); } /* End "if (num_int_elems > 0)" */ @@ -229,7 +229,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_INT_E_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -239,7 +239,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_BOR_E_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -252,7 +252,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes DIM_NUM_BOR_ELEMS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -262,11 +262,11 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_ELEM_MAP_BOR, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); } /* End "if (num_bor_elems > 0)" */ @@ -278,7 +278,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes DIM_NUM_INT_NODES, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -289,11 +289,11 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_NODE_MAP_INT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); } /* End "if (num_int_nodes > 0)" */ @@ -305,7 +305,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes DIM_NUM_BOR_NODES, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -316,11 +316,11 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_NODE_MAP_BOR, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); } /* End "if (num_bor_nodes > 0)" */ @@ -332,7 +332,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes DIM_NUM_EXT_NODES, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -343,11 +343,11 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_NODE_MAP_EXT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); } /* End "if (num_ext_nodes > 0)" */ @@ -359,7 +359,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes DIM_NUM_N_CMAPS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -370,11 +370,11 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_N_COMM_IDS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); /* Add the status vector */ if ((status = nc_def_var(exoid, VAR_N_COMM_STAT, NC_INT, 1, dimid, &varid)) != NC_NOERR) { @@ -382,7 +382,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_N_COMM_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -397,7 +397,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes DIM_NUM_E_CMAPS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -408,18 +408,18 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes VAR_E_COMM_IDS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); if ((status = nc_def_var(exoid, VAR_E_COMM_STAT, NC_INT, 1, dimid, &varid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to define variable \"%s\" in file ID %d", VAR_E_COMM_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -427,7 +427,7 @@ int ex_put_loadbal_param(int exoid, int64_t num_int_nodes, int64_t num_bor_nodes } /* End "if (num_elem_cmaps > 0)" */ /* Leave define mode */ - if (ex__leavedef(exoid, __func__) != EX_NOERR) { + if (exi_leavedef(exoid, __func__) != EX_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_loadbal_param_cc.c b/packages/seacas/libraries/exodus/src/ex_put_loadbal_param_cc.c index 1cdd40e1b3..ed64526b49 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_loadbal_param_cc.c +++ b/packages/seacas/libraries/exodus/src/ex_put_loadbal_param_cc.c @@ -36,7 +36,7 @@ /*****************************************************************************/ #include // for ex_err, etc -#include // for ex__leavedef, EX_FATAL, etc +#include // for exi_leavedef, EX_FATAL, etc #ifndef NC_INT64 #define NC_INT64 NC_INT @@ -82,7 +82,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -134,7 +134,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void } /* Output the file version */ - if ((status = ex__put_nemesis_version(exoid)) < 0) { + if ((status = exi_put_nemesis_version(exoid)) < 0) { EX_FUNC_LEAVE(status); } @@ -145,7 +145,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -158,7 +158,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_INT_N_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -171,7 +171,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_BOR_N_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -183,7 +183,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_EXT_N_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -196,7 +196,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_INT_E_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -208,7 +208,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_BOR_E_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -220,7 +220,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_INT_N_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -230,7 +230,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_BOR_N_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -240,7 +240,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_EXT_N_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -251,7 +251,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_INT_E_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -261,7 +261,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_BOR_E_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -301,7 +301,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void DIM_NUM_INT_ELEMS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -311,11 +311,11 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_ELEM_MAP_INT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); /* and the index variable */ if ((status = nc_def_var(exoid, VAR_ELEM_MAP_INT_IDX, index_type, 1, &dimid_npf, @@ -324,7 +324,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_ELEM_MAP_INT_IDX, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -337,7 +337,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void DIM_NUM_BOR_ELEMS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -347,11 +347,11 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_ELEM_MAP_BOR, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); /* and the index variable */ if ((status = nc_def_var(exoid, VAR_ELEM_MAP_BOR_IDX, index_type, 1, &dimid_npf, @@ -360,7 +360,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_ELEM_MAP_BOR_IDX, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -374,7 +374,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void DIM_NUM_INT_NODES, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -385,11 +385,11 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_NODE_MAP_INT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); /* and the index variable */ if ((status = nc_def_var(exoid, VAR_NODE_MAP_INT_IDX, index_type, 1, &dimid_npf, @@ -398,7 +398,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_NODE_MAP_INT_IDX, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -412,7 +412,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void DIM_NUM_BOR_NODES, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -423,11 +423,11 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_NODE_MAP_BOR, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); /* and the index variable */ if ((status = nc_def_var(exoid, VAR_NODE_MAP_BOR_IDX, index_type, 1, &dimid_npf, @@ -436,7 +436,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_NODE_MAP_BOR_IDX, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -450,7 +450,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void DIM_NUM_EXT_NODES, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -461,11 +461,11 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_NODE_MAP_EXT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); /* and the index variable */ if ((status = nc_def_var(exoid, VAR_NODE_MAP_EXT_IDX, index_type, 1, &dimid_npf, @@ -474,7 +474,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_NODE_MAP_EXT_IDX, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -488,7 +488,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void DIM_NUM_N_CMAPS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -499,7 +499,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_N_COMM_IDS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -509,7 +509,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_N_COMM_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -521,7 +521,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_N_COMM_INFO_IDX, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -534,7 +534,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void DIM_NUM_E_CMAPS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -545,7 +545,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_E_COMM_IDS, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -555,7 +555,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_E_COMM_STAT, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -567,7 +567,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void VAR_E_COMM_INFO_IDX, exoid); ex_err_fn(exoid, __func__, errmsg, status); /* Leave define mode before returning */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } @@ -575,7 +575,7 @@ int ex_put_loadbal_param_cc(int exoid, const void_int *num_int_nodes, const void } /* End "if (num_e_cmaps > 0)" */ /* Leave define mode */ - if (ex__leavedef(exoid, __func__) != EX_NOERR) { + if (exi_leavedef(exoid, __func__) != EX_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_map.c b/packages/seacas/libraries/exodus/src/ex_put_map.c index c6561aa37f..9861092f05 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_map.c +++ b/packages/seacas/libraries/exodus/src/ex_put_map.c @@ -63,7 +63,7 @@ int ex_put_map(int exoid, const void_int *elem_map) char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -101,10 +101,10 @@ int ex_put_map(int exoid, const void_int *elem_map) } goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, mapid, 1); + exi_compress_variable(exoid, mapid, 1); /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -128,6 +128,6 @@ int ex_put_map(int exoid, const void_int *elem_map) /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_map_param.c b/packages/seacas/libraries/exodus/src/ex_put_map_param.c index d289556ba6..f9d30aa53e 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_map_param.c +++ b/packages/seacas/libraries/exodus/src/ex_put_map_param.c @@ -44,7 +44,7 @@ int ex_put_map_param(int exoid, int num_node_maps, int num_elem_maps) int int_type = NC_INT; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -147,7 +147,7 @@ int ex_put_map_param(int exoid, int num_node_maps, int num_elem_maps) } goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); } } @@ -216,12 +216,12 @@ int ex_put_map_param(int exoid, int num_node_maps, int num_elem_maps) } goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); } } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -268,6 +268,6 @@ int ex_put_map_param(int exoid, int num_node_maps, int num_elem_maps) /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_name.c b/packages/seacas/libraries/exodus/src/ex_put_name.c index 38a4840049..0c161ab385 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_name.c +++ b/packages/seacas/libraries/exodus/src/ex_put_name.c @@ -26,9 +26,9 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__id_lkup, etc +#include "exodusII_int.h" // for EX_FATAL, exi_id_lkup, etc -int ex__put_assembly_name(int exoid, ex_entity_type obj_type, ex_entity_id entity_id, +int exi_put_assembly_name(int exoid, ex_entity_type obj_type, ex_entity_id entity_id, const char *name) { /* Internal function to handle renaming of an existing assembly. @@ -49,15 +49,15 @@ int ex__put_assembly_name(int exoid, ex_entity_type obj_type, ex_entity_id entit snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to store assembly name %s in file id %d", name, exoid); ex_err_fn(exoid, __func__, errmsg, status); - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode in file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); } EX_FUNC_LEAVE(EX_FATAL); } /* Update the maximum_name_length attribute on the file. */ - ex__update_max_name_length(exoid, length - 1); - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + exi_update_max_name_length(exoid, length - 1); + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode in file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -90,12 +90,12 @@ int ex_put_name(int exoid, ex_entity_type obj_type, ex_entity_id entity_id, cons const char *vobj; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } switch (obj_type) { - case EX_ASSEMBLY: return ex__put_assembly_name(exoid, obj_type, entity_id, name); + case EX_ASSEMBLY: return exi_put_assembly_name(exoid, obj_type, entity_id, name); case EX_EDGE_BLOCK: vobj = VAR_NAME_ED_BLK; break; case EX_FACE_BLOCK: vobj = VAR_NAME_FA_BLK; break; case EX_ELEM_BLOCK: vobj = VAR_NAME_EL_BLK; break; @@ -121,7 +121,7 @@ int ex_put_name(int exoid, ex_entity_type obj_type, ex_entity_id entity_id, cons EX_FUNC_LEAVE(EX_FATAL); } - ent_ndx = ex__id_lkup(exoid, obj_type, entity_id); + ent_ndx = exi_id_lkup(exoid, obj_type, entity_id); if (ent_ndx == -EX_LOOKUPFAIL) { /* could not find the entity with `entity_id` */ if (obj_type == EX_NODE_MAP || obj_type == EX_ELEM_MAP || obj_type == EX_FACE_MAP || obj_type == EX_EDGE_MAP) { @@ -143,7 +143,7 @@ int ex_put_name(int exoid, ex_entity_type obj_type, ex_entity_id entity_id, cons } /* write EXODUS entityname */ - status = ex__put_name(exoid, varid, ent_ndx - 1, name, obj_type, "", __func__); + status = exi_put_name(exoid, varid, ent_ndx - 1, name, obj_type, "", __func__); EX_FUNC_LEAVE(status); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_names.c b/packages/seacas/libraries/exodus/src/ex_put_names.c index 81df264875..ab7ed91475 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_names.c +++ b/packages/seacas/libraries/exodus/src/ex_put_names.c @@ -44,7 +44,7 @@ int ex_put_names(int exoid, ex_entity_type obj_type, char *const names[]) const char *vname = NULL; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -82,7 +82,7 @@ int ex_put_names(int exoid, ex_entity_type obj_type, char *const names[]) EX_FUNC_LEAVE(EX_FATAL); } - ex__get_dimension(exoid, ex__dim_num_objects(obj_type), ex_name_of_object(obj_type), &num_entity, + exi_get_dimension(exoid, exi_dim_num_objects(obj_type), ex_name_of_object(obj_type), &num_entity, &varid, __func__); if ((status = nc_inq_varid(exoid, vname, &varid)) != NC_NOERR) { @@ -93,7 +93,7 @@ int ex_put_names(int exoid, ex_entity_type obj_type, char *const names[]) } /* write EXODUS entitynames */ - status = ex__put_names(exoid, varid, num_entity, names, obj_type, "", __func__); + status = exi_put_names(exoid, varid, num_entity, names, obj_type, "", __func__); EX_FUNC_LEAVE(status); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_nodal_var.c b/packages/seacas/libraries/exodus/src/ex_put_nodal_var.c index d7d0814a21..3ab1242494 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_nodal_var.c +++ b/packages/seacas/libraries/exodus/src/ex_put_nodal_var.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_WARN, ex__comp_ws, etc +#include "exodusII_int.h" // for EX_WARN, exi_comp_ws, etc /*! \deprecated Use ex_put_var()(exoid, time_step, EX_NODAL, nodal_var_index, 1, num_nodes, diff --git a/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c b/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c index 5e8adf2115..19d1968d79 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c @@ -42,7 +42,7 @@ int ex_put_node_cmap(int exoid, ex_entity_id map_id, const void_int *node_ids, /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_ns_param_global.c b/packages/seacas/libraries/exodus/src/ex_put_ns_param_global.c index 843ce96cc1..899a7359d7 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_ns_param_global.c +++ b/packages/seacas/libraries/exodus/src/ex_put_ns_param_global.c @@ -38,7 +38,7 @@ int ex_put_ns_param_global(int exoid, const void_int *global_ids, const void_int /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_num_map.c b/packages/seacas/libraries/exodus/src/ex_put_num_map.c index 9b82befaee..b4aa483fdc 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_num_map.c +++ b/packages/seacas/libraries/exodus/src/ex_put_num_map.c @@ -42,7 +42,7 @@ int ex_put_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_id, cons int status; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -100,7 +100,7 @@ int ex_put_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_id, cons } /* Check for duplicate map id entry */ - status = ex__id_lkup(exoid, map_type, map_id); + status = exi_id_lkup(exoid, map_type, map_id); if (status != -EX_LOOKUPFAIL) { /* found the map id */ snprintf(errmsg, MAX_ERR_LENGTH, "Warning: %s %" PRId64 " already defined in file id %d", ex_name_of_object(map_type), map_id, exoid); @@ -120,10 +120,10 @@ int ex_put_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_id, cons /* Keep track of the total number of maps defined using a counter stored in a linked list keyed by exoid. - NOTE: ex__get_file_item is used to find the number of maps + NOTE: exi_get_file_item is used to find the number of maps for a specific file and returns that value. */ - int cur_num_maps = ex__get_file_item(exoid, ex__get_counter_list(map_type)); + int cur_num_maps = exi_get_file_item(exoid, exi_get_counter_list(map_type)); if (!overwrite_map) { int num_maps = num_entries; if (cur_num_maps >= num_maps) { @@ -133,9 +133,9 @@ int ex_put_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_id, cons EX_FUNC_LEAVE(EX_FATAL); } - /* NOTE: ex__inc_file_item is used to find the number of maps + /* NOTE: exi_inc_file_item is used to find the number of maps for a specific file and returns that value incremented. */ - cur_num_maps = ex__inc_file_item(exoid, ex__get_counter_list(map_type)); + cur_num_maps = exi_inc_file_item(exoid, exi_get_counter_list(map_type)); } if (id_is_index) { @@ -207,9 +207,9 @@ int ex_put_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_id, cons snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to define map %s in file id %d", vmap, exoid); ex_err_fn(exoid, __func__, errmsg, status); } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { /* exit define mode */ + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { /* exit define mode */ snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); varid = -1; /* force early exit */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_one_attr.c b/packages/seacas/libraries/exodus/src/ex_put_one_attr.c index b519f25c95..962bea8eed 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_one_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_put_one_attr.c @@ -23,7 +23,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__get_dimension, etc +#include "exodusII_int.h" // for EX_FATAL, exi_get_dimension, etc /*! * writes the specified attribute for a block @@ -48,13 +48,13 @@ int ex_put_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, int const char *vattrbname; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* Determine index of obj_id in id array */ if (obj_type != EX_NODAL) { - obj_id_ndx = ex__id_lkup(exoid, obj_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, obj_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); if (status != 0) { @@ -128,12 +128,12 @@ int ex_put_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, int } /* inquire id's of previously defined dimensions */ - if (ex__get_dimension(exoid, dnumobjent, "entries", &num_entries_this_obj, &temp, __func__) != + if (exi_get_dimension(exoid, dnumobjent, "entries", &num_entries_this_obj, &temp, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } - if (ex__get_dimension(exoid, dnumobjatt, "attributes", &num_attr, &temp, __func__) != NC_NOERR) { + if (exi_get_dimension(exoid, dnumobjatt, "attributes", &num_attr, &temp, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -165,7 +165,7 @@ int ex_put_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, int stride[0] = 1; stride[1] = num_attr; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_vars_float(exoid, attrid, start, count, stride, attrib); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_attr.c b/packages/seacas/libraries/exodus/src/ex_put_partial_attr.c index 1b42173049..079c56e4d3 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_attr.c @@ -24,7 +24,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, ex_name_of_object, etc -#include "exodusII_int.h" // for ex__check_valid_file_id, etc +#include "exodusII_int.h" // for exi_check_valid_file_id, etc /*! * writes the attributes for an edge/face/element block @@ -48,13 +48,13 @@ int ex_put_partial_attr(int exoid, ex_entity_type blk_type, ex_entity_id blk_id, char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } if (blk_type != EX_NODAL) { /* Determine index of blk_id in VAR_ID_EL_BLK array */ - blk_id_ndx = ex__id_lkup(exoid, blk_type, blk_id); + blk_id_ndx = exi_id_lkup(exoid, blk_type, blk_id); if (blk_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -151,7 +151,7 @@ int ex_put_partial_attr(int exoid, ex_entity_type blk_type, ex_entity_id blk_id, start[0] = 0; } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_vara_float(exoid, attrid, start, count, attrib); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_conn.c b/packages/seacas/libraries/exodus/src/ex_put_partial_conn.c index 529188d9bf..5bbc8cf12d 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_conn.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_conn.c @@ -28,7 +28,7 @@ * */ #include "exodusII.h" // for ex_err, ex_name_of_object, etc -#include "exodusII_int.h" // for ex__check_valid_file_id, etc +#include "exodusII_int.h" // for exi_check_valid_file_id, etc /* * reads the connectivity array for an element block @@ -75,13 +75,13 @@ int ex_put_partial_conn(int exoid, ex_entity_type blk_type, ex_entity_id blk_id, ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); } - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* Locate index of element block id in VAR_ID_EL_BLK array */ - blk_id_ndx = ex__id_lkup(exoid, blk_type, blk_id); + blk_id_ndx = exi_id_lkup(exoid, blk_type, blk_id); if (blk_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_coord.c b/packages/seacas/libraries/exodus/src/ex_put_partial_coord.c index fdfb7849d0..58a34cffd6 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_coord.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_coord.c @@ -28,7 +28,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__comp_ws, etc +#include "exodusII_int.h" // for EX_FATAL, exi_comp_ws, etc /*! * writes the coordinates of some of the nodes in the model @@ -55,7 +55,7 @@ int ex_put_partial_coord(int exoid, int64_t start_node_num, int64_t num_nodes, c char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -165,7 +165,7 @@ int ex_put_partial_coord(int exoid, int64_t start_node_num, int64_t num_nodes, c } if (coor != NULL && coordid != -1) { - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_vara_float(exoid, coordid, start, count, coor); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_coord_component.c b/packages/seacas/libraries/exodus/src/ex_put_partial_coord_component.c index 5b9bc9b8a0..e2ec6aa72c 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_coord_component.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_coord_component.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__comp_ws, etc +#include "exodusII_int.h" // for EX_FATAL, exi_comp_ws, etc /*! * writes the coordinates of some of the nodes in the model for the specified component @@ -23,7 +23,7 @@ int ex_put_partial_coord_component(int exoid, int64_t start_node_num, int64_t nu int component, const void *coor) { EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -122,7 +122,7 @@ int ex_put_partial_coord_component(int exoid, int64_t start_node_num, int64_t nu EX_FUNC_LEAVE(EX_FATAL); } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_vara_float(exoid, coordid, start, count, coor); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_id_map.c b/packages/seacas/libraries/exodus/src/ex_put_partial_id_map.c index 8cf3d2d54d..7c1ffcdab5 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_id_map.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_id_map.c @@ -48,11 +48,11 @@ int ex_put_partial_id_map(int exoid, ex_entity_type map_type, int64_t start_enti const char *vmap = NULL; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } - if (num_entities == 0 && !ex__is_parallel(exoid)) { + if (num_entities == 0 && !exi_is_parallel(exoid)) { EX_FUNC_LEAVE(EX_NOERR); } @@ -135,10 +135,10 @@ int ex_put_partial_id_map(int exoid, ex_entity_type map_type, int64_t start_enti } goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, mapid, 1); + exi_compress_variable(exoid, mapid, 1); /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -171,6 +171,6 @@ int ex_put_partial_id_map(int exoid, ex_entity_type map_type, int64_t start_enti /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_nodal_var_int.c b/packages/seacas/libraries/exodus/src/ex_put_partial_nodal_var_int.c index d43f74f5f3..83b91fd9e7 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_nodal_var_int.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_nodal_var_int.c @@ -26,7 +26,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_WARN, ex__comp_ws, etc +#include "exodusII_int.h" // for EX_WARN, exi_comp_ws, etc /*! \internal @@ -45,7 +45,7 @@ * \param nodal_var_vals array of nodal variable values */ -int ex__put_partial_nodal_var(int exoid, int time_step, int nodal_var_index, int64_t start_node, +int exi_put_partial_nodal_var(int exoid, int time_step, int nodal_var_index, int64_t start_node, int64_t num_nodes, const void *nodal_var_vals) { @@ -55,7 +55,7 @@ int ex__put_partial_nodal_var(int exoid, int time_step, int nodal_var_index, int char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -75,7 +75,7 @@ int ex__put_partial_nodal_var(int exoid, int time_step, int nodal_var_index, int start[1] = 0; } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_vara_float(exoid, varid, start, count, nodal_var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_node_cmap.c b/packages/seacas/libraries/exodus/src/ex_put_partial_node_cmap.c index 079e2220a4..a30945c4e5 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_node_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_node_cmap.c @@ -52,7 +52,7 @@ int ex_put_partial_node_cmap(int exoid, ex_entity_id map_id, int64_t start_entit /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_num_map.c b/packages/seacas/libraries/exodus/src/ex_put_partial_num_map.c index 978d916259..00b991927d 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_num_map.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_num_map.c @@ -46,7 +46,7 @@ int ex_put_partial_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_ const char *vmap; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -98,7 +98,7 @@ int ex_put_partial_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_ } /* Check for duplicate map id entry */ - status = ex__id_lkup(exoid, map_type, map_id); + status = exi_id_lkup(exoid, map_type, map_id); if (status == -EX_LOOKUPFAIL) { /* did not find the map id */ map_exists = 0; /* Map is being defined */ } @@ -118,10 +118,10 @@ int ex_put_partial_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_ /* Keep track of the total number of maps defined using a counter stored in a linked list keyed by exoid. NOTE: - ex__get_file_item is used to find the number of element maps for a + exi_get_file_item is used to find the number of element maps for a specific file and returns that value. */ - cur_num_maps = ex__get_file_item(exoid, ex__get_counter_list(map_type)); + cur_num_maps = exi_get_file_item(exoid, exi_get_counter_list(map_type)); if (cur_num_maps >= (int)num_maps) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: exceeded number of %ss (%zu) specified in file id %d", @@ -130,16 +130,16 @@ int ex_put_partial_num_map(int exoid, ex_entity_type map_type, ex_entity_id map_ EX_FUNC_LEAVE(EX_FATAL); } - /* NOTE: ex__inc_file_item is used to find the number of element maps + /* NOTE: exi_inc_file_item is used to find the number of element maps for a specific file and returns that value incremented. */ - cur_num_maps = ex__inc_file_item(exoid, ex__get_counter_list(map_type)); + cur_num_maps = exi_inc_file_item(exoid, exi_get_counter_list(map_type)); if (id_is_index) { cur_num_maps = map_id - 1; } } else { - int map_ndx = ex__id_lkup(exoid, map_type, map_id); + int map_ndx = exi_id_lkup(exoid, map_type, map_id); cur_num_maps = map_ndx - 1; } diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_one_attr.c b/packages/seacas/libraries/exodus/src/ex_put_partial_one_attr.c index 903c03c273..11223c3528 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_one_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_one_attr.c @@ -23,7 +23,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__get_dimension, etc +#include "exodusII_int.h" // for EX_FATAL, exi_get_dimension, etc /*! * writes the specified attribute for a block @@ -51,13 +51,13 @@ int ex_put_partial_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj const char *vattrbname; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* Determine index of obj_id in id array */ if (obj_type != EX_NODAL) { - obj_id_ndx = ex__id_lkup(exoid, obj_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, obj_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -132,7 +132,7 @@ int ex_put_partial_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj } /* inquire id's of previously defined dimensions */ - if (ex__get_dimension(exoid, dnumobjent, "entries", &num_entries_this_obj, &temp, __func__) != + if (exi_get_dimension(exoid, dnumobjent, "entries", &num_entries_this_obj, &temp, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -146,7 +146,7 @@ int ex_put_partial_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj EX_FUNC_LEAVE(EX_FATAL); } - if (ex__get_dimension(exoid, dnumobjatt, "attributes", &num_attr, &temp, __func__) != NC_NOERR) { + if (exi_get_dimension(exoid, dnumobjatt, "attributes", &num_attr, &temp, __func__) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -182,7 +182,7 @@ int ex_put_partial_one_attr(int exoid, ex_entity_type obj_type, ex_entity_id obj start[0] = 0; } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_vars_float(exoid, attrid, start, count, stride, attrib); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_set.c b/packages/seacas/libraries/exodus/src/ex_put_partial_set.c index a20b0539ca..ceb274eaab 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_set.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_set.c @@ -25,7 +25,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, ex_name_of_object, etc -#include "exodusII_int.h" // for ex__is_parallel, etc +#include "exodusII_int.h" // for exi_is_parallel, etc /*! * writes the set entry list and set extra list for a single set @@ -53,12 +53,12 @@ int ex_put_partial_set(int exoid, ex_entity_type set_type, ex_entity_id set_id, EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* first check if any sets are specified */ - if ((status = nc_inq_dimid(exoid, ex__dim_num_objects(set_type), &dimid)) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_dim_num_objects(set_type), &dimid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: no %ss defined in file id %d", ex_name_of_object(set_type), exoid); ex_err_fn(exoid, __func__, errmsg, status); @@ -66,7 +66,7 @@ int ex_put_partial_set(int exoid, ex_entity_type set_type, ex_entity_id set_id, } /* Lookup index of set id in VAR_*S_IDS array */ - set_id_ndx = ex__id_lkup(exoid, set_type, set_id); + set_id_ndx = exi_id_lkup(exoid, set_type, set_id); if (set_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -116,7 +116,7 @@ int ex_put_partial_set(int exoid, ex_entity_type set_type, ex_entity_id set_id, } /* write out the entry list and extra list arrays */ - if (set_entry_list != NULL || ex__is_parallel(exoid)) { + if (set_entry_list != NULL || exi_is_parallel(exoid)) { start[0] = offset - 1; count[0] = num_to_put; if (count[0] == 0) { @@ -140,7 +140,7 @@ int ex_put_partial_set(int exoid, ex_entity_type set_type, ex_entity_id set_id, } /* only do for edge, face and side sets */ - if (extraptr && (set_extra_list != NULL || ex__is_parallel(exoid))) { + if (extraptr && (set_extra_list != NULL || exi_is_parallel(exoid))) { if ((status = nc_inq_varid(exoid, extraptr, &extra_list_id)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate extra list for %s %" PRId64 " in file id %d", diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_set_dist_fact.c b/packages/seacas/libraries/exodus/src/ex_put_partial_set_dist_fact.c index edde2493c6..d2252c3700 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_set_dist_fact.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_set_dist_fact.c @@ -27,7 +27,7 @@ write *****************************************************************************/ #include "exodusII.h" // for ex_err, ex_name_of_object, etc -#include "exodusII_int.h" // for ex__check_valid_file_id, etc +#include "exodusII_int.h" // for exi_check_valid_file_id, etc /*! * writes the partial distribution factors for a single set @@ -51,12 +51,12 @@ int ex_put_partial_set_dist_fact(int exoid, ex_entity_type set_type, ex_entity_i EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* first check if any sets are specified */ - if ((status = nc_inq_dimid(exoid, ex__dim_num_objects(set_type), &dimid)) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_dim_num_objects(set_type), &dimid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: no %ss specified in file id %d", ex_name_of_object(set_type), exoid); ex_err_fn(exoid, __func__, errmsg, status); @@ -64,7 +64,7 @@ int ex_put_partial_set_dist_fact(int exoid, ex_entity_type set_type, ex_entity_i } /* Lookup index of set id in VAR_*S_IDS array */ - set_id_ndx = ex__id_lkup(exoid, set_type, set_id); + set_id_ndx = exi_id_lkup(exoid, set_type, set_id); if (set_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -129,7 +129,7 @@ int ex_put_partial_set_dist_fact(int exoid, ex_entity_type set_type, ex_entity_i } /* write out the distribution factors array */ - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_vara_float(exoid, dist_id, start, count, set_dist_fact); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_var.c b/packages/seacas/libraries/exodus/src/ex_put_partial_var.c index a31f08c79e..8eabaae831 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_var.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_var.c @@ -7,9 +7,9 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__get_dimension, etc +#include "exodusII_int.h" // for EX_FATAL, exi_get_dimension, etc -static int ex__look_up_var(int exoid, ex_entity_type var_type, int var_index, ex_entity_id obj_id, +static int exi_look_up_var(int exoid, ex_entity_type var_type, int var_index, ex_entity_id obj_id, const char *VOBJID, const char *VOBJTAB, const char *DNUMOBJ, const char *DNUMOBJVAR, int *varid) { @@ -48,7 +48,7 @@ static int ex__look_up_var(int exoid, ex_entity_type var_type, int var_index, ex } else { /* Determine index of obj_id in VOBJID array */ - obj_id_ndx = ex__id_lkup(exoid, var_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, var_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -70,19 +70,19 @@ static int ex__look_up_var(int exoid, ex_entity_type var_type, int var_index, ex } } - if ((status = nc_inq_varid(exoid, ex__name_var_of_object(var_type, var_index, obj_id_ndx), + if ((status = nc_inq_varid(exoid, exi_name_var_of_object(var_type, var_index, obj_id_ndx), varid)) != NC_NOERR) { if (status == NC_ENOTVAR) { /* variable doesn't exist, create it! */ /* check for the existence of an TNAME variable truth table */ if (nc_inq_varid(exoid, VOBJTAB, varid) == NC_NOERR) { /* find out number of TNAMEs and TNAME variables */ - status = ex__get_dimension(exoid, DNUMOBJ, ex_name_of_object(var_type), &num_obj, &dimid, + status = exi_get_dimension(exoid, DNUMOBJ, ex_name_of_object(var_type), &num_obj, &dimid, __func__); if (status != NC_NOERR) { return (status); } - status = ex__get_dimension(exoid, DNUMOBJVAR, ex_name_of_object(var_type), &num_obj_var, + status = exi_get_dimension(exoid, DNUMOBJVAR, ex_name_of_object(var_type), &num_obj_var, &dimid, __func__); if (status != NC_NOERR) { return (status); @@ -123,7 +123,7 @@ static int ex__look_up_var(int exoid, ex_entity_type var_type, int var_index, ex goto error_ret; /* exit define mode and return */ } - ex__get_dimension(exoid, ex__dim_num_entries_in_object(var_type, obj_id_ndx), + exi_get_dimension(exoid, exi_dim_num_entries_in_object(var_type, obj_id_ndx), ex_name_of_object(var_type), &num_entity, &numobjdim, __func__); /* variable doesn't exist so put file into define mode */ @@ -136,23 +136,23 @@ static int ex__look_up_var(int exoid, ex_entity_type var_type, int var_index, ex /* define netCDF variable to store TNAME variable values */ dims[0] = time_dim; dims[1] = numobjdim; - if ((status = nc_def_var(exoid, ex__name_var_of_object(var_type, var_index, obj_id_ndx), + if ((status = nc_def_var(exoid, exi_name_var_of_object(var_type, var_index, obj_id_ndx), nc_flt_code(exoid), 2, dims, varid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to define %s variable %d in file id %d", ex_name_of_object(var_type), var_index, exoid); ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; } - ex__compress_variable(exoid, *varid, 2); + exi_compress_variable(exoid, *varid, 2); /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { return (EX_FATAL); } } else { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate %s variable %s in file id %d", - ex_name_of_object(var_type), ex__name_var_of_object(var_type, var_index, obj_id_ndx), + ex_name_of_object(var_type), exi_name_var_of_object(var_type, var_index, obj_id_ndx), exoid); ex_err_fn(exoid, __func__, errmsg, status); return (EX_FATAL); @@ -162,7 +162,7 @@ static int ex__look_up_var(int exoid, ex_entity_type var_type, int var_index, ex /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); return (EX_FATAL); } @@ -192,7 +192,7 @@ int ex_put_partial_var(int exoid, int time_step, ex_entity_type var_type, int va EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -222,47 +222,47 @@ int ex_put_partial_var(int exoid, int time_step, ex_entity_type var_type, int va break; case EX_NODAL: status = - ex__put_partial_nodal_var(exoid, time_step, var_index, start_index, num_entities, var_vals); + exi_put_partial_nodal_var(exoid, time_step, var_index, start_index, num_entities, var_vals); EX_FUNC_LEAVE(status); break; case EX_ASSEMBLY: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, "", VAR_ASSEMBLY_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, "", VAR_ASSEMBLY_TAB, DIM_NUM_ASSEMBLY, DIM_NUM_ASSEMBLY_VAR, &varid); break; case EX_BLOB: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, "", VAR_BLOB_TAB, DIM_NUM_BLOB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, "", VAR_BLOB_TAB, DIM_NUM_BLOB, DIM_NUM_BLOB_VAR, &varid); break; case EX_EDGE_BLOCK: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_ED_BLK, VAR_EBLK_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_ED_BLK, VAR_EBLK_TAB, DIM_NUM_ED_BLK, DIM_NUM_EDG_VAR, &varid); break; case EX_FACE_BLOCK: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_FA_BLK, VAR_FBLK_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_FA_BLK, VAR_FBLK_TAB, DIM_NUM_FA_BLK, DIM_NUM_FAC_VAR, &varid); break; case EX_ELEM_BLOCK: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_EL_BLK, VAR_ELEM_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_EL_BLK, VAR_ELEM_TAB, DIM_NUM_EL_BLK, DIM_NUM_ELE_VAR, &varid); break; case EX_NODE_SET: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_NS_IDS, VAR_NSET_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_NS_IDS, VAR_NSET_TAB, DIM_NUM_NS, DIM_NUM_NSET_VAR, &varid); break; case EX_EDGE_SET: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ES_IDS, VAR_ESET_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_ES_IDS, VAR_ESET_TAB, DIM_NUM_ES, DIM_NUM_ESET_VAR, &varid); break; case EX_FACE_SET: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_FS_IDS, VAR_FSET_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_FS_IDS, VAR_FSET_TAB, DIM_NUM_FS, DIM_NUM_FSET_VAR, &varid); break; case EX_SIDE_SET: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_SS_IDS, VAR_SSET_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_SS_IDS, VAR_SSET_TAB, DIM_NUM_SS, DIM_NUM_SSET_VAR, &varid); break; case EX_ELEM_SET: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ELS_IDS, VAR_ELSET_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_ELS_IDS, VAR_ELSET_TAB, DIM_NUM_ELS, DIM_NUM_ELSET_VAR, &varid); break; default: @@ -296,7 +296,7 @@ int ex_put_partial_var(int exoid, int time_step, ex_entity_type var_type, int va start[1] = 0; } - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_vara_float(exoid, varid, start, count, var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_put_processor_elem_maps.c b/packages/seacas/libraries/exodus/src/ex_put_processor_elem_maps.c index 5e3ba65209..8d6437f1f8 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_processor_elem_maps.c +++ b/packages/seacas/libraries/exodus/src/ex_put_processor_elem_maps.c @@ -39,12 +39,12 @@ int ex_put_processor_elem_maps(int exoid, const void_int *elem_mapi, const void_ /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* Get the file type */ - if (ex__get_file_type(exoid, ftype) != EX_NOERR) { + if (exi_get_file_type(exoid, ftype) != EX_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unable to find file type for file ID %d", exoid); ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); diff --git a/packages/seacas/libraries/exodus/src/ex_put_processor_node_maps.c b/packages/seacas/libraries/exodus/src/ex_put_processor_node_maps.c index cbb76d724a..10e427ae83 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_processor_node_maps.c +++ b/packages/seacas/libraries/exodus/src/ex_put_processor_node_maps.c @@ -39,12 +39,12 @@ int ex_put_processor_node_maps(int exoid, const void_int *node_mapi, const void_ /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* Get the file type */ - if (ex__get_file_type(exoid, ftype) != EX_NOERR) { + if (exi_get_file_type(exoid, ftype) != EX_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unable to find file type for file ID %d", exoid); ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); diff --git a/packages/seacas/libraries/exodus/src/ex_put_prop.c b/packages/seacas/libraries/exodus/src/ex_put_prop.c index 8c05608b9d..6b1a86598a 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_prop.c +++ b/packages/seacas/libraries/exodus/src/ex_put_prop.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__id_lkup, etc +#include "exodusII_int.h" // for EX_FATAL, exi_id_lkup, etc #include /*! @@ -93,7 +93,7 @@ int ex_put_prop(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, const c char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -269,10 +269,10 @@ int ex_put_prop(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, const c goto error_ret; /* Exit define mode and return */ } - ex__update_max_name_length(exoid, prop_name_len - 1); + exi_update_max_name_length(exoid, prop_name_len - 1); /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { EX_FUNC_LEAVE(EX_FATAL); } @@ -280,12 +280,12 @@ int ex_put_prop(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, const c } /* find index into property array using obj_id; put value in property */ - /* array at proper index; ex__id_lkup returns an index that is 1-based,*/ + /* array at proper index; exi_id_lkup returns an index that is 1-based,*/ /* but netcdf expects 0-based arrays so subtract 1 */ /* special case: property name ID - check for duplicate ID assignment */ if (strcmp("ID", prop_name) == 0) { - int indx = ex__id_lkup(exoid, obj_type, value); + int indx = exi_id_lkup(exoid, obj_type, value); if (indx != -EX_LOOKUPFAIL) { /* found the id */ snprintf(errmsg, MAX_ERR_LENGTH, "Warning: attempt to assign duplicate %s ID %" PRId64 " in file id %d", @@ -295,7 +295,7 @@ int ex_put_prop(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, const c } } - status = ex__id_lkup(exoid, obj_type, obj_id); + status = exi_id_lkup(exoid, obj_type, obj_id); if (status > 0) { start[0] = status - 1; } @@ -334,6 +334,6 @@ int ex_put_prop(int exoid, ex_entity_type obj_type, ex_entity_id obj_id, const c error_ret: nc_set_fill(exoid, oldfill, &temp); /* default: nofill */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_prop_array.c b/packages/seacas/libraries/exodus/src/ex_put_prop_array.c index 67f5a76e47..1e35e2197a 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_prop_array.c +++ b/packages/seacas/libraries/exodus/src/ex_put_prop_array.c @@ -83,7 +83,7 @@ int ex_put_prop_array(int exoid, ex_entity_type obj_type, const char *prop_name, char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -92,7 +92,7 @@ int ex_put_prop_array(int exoid, ex_entity_type obj_type, const char *prop_name, num_props = ex_get_num_props(exoid, obj_type); /* inquire id of previously defined dimension (number of objects) */ - status = ex__get_dimension(exoid, ex__dim_num_objects(obj_type), ex_name_of_object(obj_type), + status = exi_get_dimension(exoid, exi_dim_num_objects(obj_type), ex_name_of_object(obj_type), &num_obj, &dimid, __func__); if (status != NC_NOERR) { EX_FUNC_LEAVE(status); @@ -199,7 +199,7 @@ int ex_put_prop_array(int exoid, ex_entity_type obj_type, const char *prop_name, /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -225,6 +225,6 @@ int ex_put_prop_array(int exoid, ex_entity_type obj_type, const char *prop_name, /* Fatal error: exit definition mode and return */ error_ret: nc_set_fill(exoid, oldfill, &temp); /* default: nofill */ - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_prop_names.c b/packages/seacas/libraries/exodus/src/ex_put_prop_names.c index f1dce3f50f..d88b2aeccb 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_prop_names.c +++ b/packages/seacas/libraries/exodus/src/ex_put_prop_names.c @@ -108,7 +108,7 @@ int ex_put_prop_names(int exoid, ex_entity_type obj_type, int num_props, char ** char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -120,7 +120,7 @@ int ex_put_prop_names(int exoid, ex_entity_type obj_type, int num_props, char ** name_length = ex_inquire_int(exoid, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH) + 1; /* inquire id of previously defined dimension (number of objects) */ - if ((status = nc_inq_dimid(exoid, ex__dim_num_objects(obj_type), &dimid)) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_dim_num_objects(obj_type), &dimid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate number of %s in file id %d", ex_name_of_object(obj_type), exoid); ex_err_fn(exoid, __func__, errmsg, status); @@ -204,20 +204,20 @@ int ex_put_prop_names(int exoid, ex_entity_type obj_type, int num_props, char ** } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); } /* Update the maximum_name_length attribute on the file. */ - ex__update_max_name_length(exoid, max_name_len - 1); + exi_update_max_name_length(exoid, max_name_len - 1); nc_set_fill(exoid, oldfill, &temp); /* default: turn off fill */ EX_FUNC_LEAVE(EX_NOERR); /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_qa.c b/packages/seacas/libraries/exodus/src/ex_put_qa.c index c66c783f18..1b66067c9e 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_qa.c +++ b/packages/seacas/libraries/exodus/src/ex_put_qa.c @@ -71,7 +71,7 @@ int ex_put_qa(int exoid, int num_qa_records, char *qa_record[][4]) EX_FUNC_ENTER(); int rootid = exoid & EX_FILE_ID_MASK; - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -146,13 +146,13 @@ int ex_put_qa(int exoid, int num_qa_records, char *qa_record[][4]) * compilers/mpi so are doing it this way... */ #if defined(PARALLEL_AWARE_EXODUS) - if (ex__is_parallel(rootid)) { + if (exi_is_parallel(rootid)) { nc_var_par_access(rootid, varid, NC_INDEPENDENT); } #endif /* leave define mode */ - if ((status = ex__leavedef(rootid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(rootid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -192,7 +192,7 @@ int ex_put_qa(int exoid, int num_qa_records, char *qa_record[][4]) } /* PnetCDF applies setting to entire file, so put back to collective... */ #if defined(PARALLEL_AWARE_EXODUS) - if (ex__is_parallel(rootid)) { + if (exi_is_parallel(rootid)) { nc_var_par_access(rootid, varid, NC_COLLECTIVE); } #endif @@ -201,6 +201,6 @@ int ex_put_qa(int exoid, int num_qa_records, char *qa_record[][4]) /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(rootid, __func__); + exi_leavedef(rootid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_name.c b/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_name.c index 7baacca09d..bf823cd794 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_name.c +++ b/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_name.c @@ -46,7 +46,7 @@ int ex_put_reduction_variable_name(int exoid, ex_entity_type obj_type, int var_n EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -76,7 +76,7 @@ int ex_put_reduction_variable_name(int exoid, ex_entity_type obj_type, int var_n } /* write EXODUS variable name */ - status = ex__put_name(exoid, varid, var_num - 1, var_name, obj_type, "variable", __func__); + status = exi_put_name(exoid, varid, var_num - 1, var_name, obj_type, "variable", __func__); EX_FUNC_LEAVE(status); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_names.c b/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_names.c index f6bfb73851..22db5ede79 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_names.c +++ b/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_names.c @@ -125,7 +125,7 @@ int ex_put_reduction_variable_names(int exoid, ex_entity_type obj_type, int num_ int varid; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -184,6 +184,6 @@ int ex_put_reduction_variable_names(int exoid, ex_entity_type obj_type, int num_ } /* write EXODUS variable names */ - int status = ex__put_names(exoid, varid, num_vars, var_names, obj_type, "variable", __func__); + int status = exi_put_names(exoid, varid, num_vars, var_names, obj_type, "variable", __func__); EX_FUNC_LEAVE(status); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_param.c b/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_param.c index 56b4712b58..2f2f4ac8a6 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_param.c +++ b/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_param.c @@ -7,10 +7,10 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for ex__compress_variable, etc +#include "exodusII_int.h" // for exi_compress_variable, etc /*! \cond INTERNAL */ -static int ex__prepare_result_var(int exoid, int num_vars, char *type_name, char *dim_name, +static int exi_prepare_result_var(int exoid, int num_vars, char *type_name, char *dim_name, char *variable_name) { int status; @@ -127,7 +127,7 @@ int ex_put_reduction_variable_param(int exoid, ex_entity_type obj_type, int num_ int status; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -173,7 +173,7 @@ int ex_put_reduction_variable_param(int exoid, ex_entity_type obj_type, int num_ /* define dimensions and variables */ if (obj_type == EX_GLOBAL) { - if (ex__prepare_result_var(exoid, num_vars, "global", DIM_NUM_GLO_VAR, VAR_NAME_GLO_VAR) != + if (exi_prepare_result_var(exoid, num_vars, "global", DIM_NUM_GLO_VAR, VAR_NAME_GLO_VAR) != EX_NOERR) { goto error_ret; } @@ -193,7 +193,7 @@ int ex_put_reduction_variable_param(int exoid, ex_entity_type obj_type, int num_ ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 2); + exi_compress_variable(exoid, varid, 2); } /* netCDF variables in which to store the EXODUS obj_type variable values will @@ -202,68 +202,68 @@ int ex_put_reduction_variable_param(int exoid, ex_entity_type obj_type, int num_ * (the info that is stored in the obj_type variable truth table) */ else if (obj_type == EX_ELEM_BLOCK) { - if (ex__prepare_result_var(exoid, num_vars, "element", DIM_NUM_ELE_RED_VAR, + if (exi_prepare_result_var(exoid, num_vars, "element", DIM_NUM_ELE_RED_VAR, VAR_NAME_ELE_RED_VAR) != EX_NOERR) { goto error_ret; } } else if (obj_type == EX_NODE_SET) { - if (ex__prepare_result_var(exoid, num_vars, "nodeset", DIM_NUM_NSET_RED_VAR, + if (exi_prepare_result_var(exoid, num_vars, "nodeset", DIM_NUM_NSET_RED_VAR, VAR_NAME_NSET_RED_VAR) != EX_NOERR) { goto error_ret; } } else if (obj_type == EX_SIDE_SET) { - if (ex__prepare_result_var(exoid, num_vars, "sideset", DIM_NUM_SSET_RED_VAR, + if (exi_prepare_result_var(exoid, num_vars, "sideset", DIM_NUM_SSET_RED_VAR, VAR_NAME_SSET_RED_VAR) != EX_NOERR) { goto error_ret; } } else if (obj_type == EX_ASSEMBLY) { - if (ex__prepare_result_var(exoid, num_vars, "assembly", DIM_NUM_ASSEMBLY_RED_VAR, + if (exi_prepare_result_var(exoid, num_vars, "assembly", DIM_NUM_ASSEMBLY_RED_VAR, VAR_NAME_ASSEMBLY_RED_VAR) != EX_NOERR) { goto error_ret; } } else if (obj_type == EX_BLOB) { - if (ex__prepare_result_var(exoid, num_vars, "blob", DIM_NUM_BLOB_RED_VAR, + if (exi_prepare_result_var(exoid, num_vars, "blob", DIM_NUM_BLOB_RED_VAR, VAR_NAME_BLOB_RED_VAR) != EX_NOERR) { goto error_ret; } } else if (obj_type == EX_EDGE_BLOCK) { - if (ex__prepare_result_var(exoid, num_vars, "edge", DIM_NUM_EDG_RED_VAR, + if (exi_prepare_result_var(exoid, num_vars, "edge", DIM_NUM_EDG_RED_VAR, VAR_NAME_EDG_RED_VAR) != EX_NOERR) { goto error_ret; } } else if (obj_type == EX_FACE_BLOCK) { - if (ex__prepare_result_var(exoid, num_vars, "face", DIM_NUM_FAC_RED_VAR, + if (exi_prepare_result_var(exoid, num_vars, "face", DIM_NUM_FAC_RED_VAR, VAR_NAME_FAC_RED_VAR) != EX_NOERR) { goto error_ret; } } else if (obj_type == EX_EDGE_SET) { - if (ex__prepare_result_var(exoid, num_vars, "edgeset", DIM_NUM_ESET_RED_VAR, + if (exi_prepare_result_var(exoid, num_vars, "edgeset", DIM_NUM_ESET_RED_VAR, VAR_NAME_ESET_RED_VAR) != EX_NOERR) { goto error_ret; } } else if (obj_type == EX_FACE_SET) { - if (ex__prepare_result_var(exoid, num_vars, "faceset", DIM_NUM_FSET_RED_VAR, + if (exi_prepare_result_var(exoid, num_vars, "faceset", DIM_NUM_FSET_RED_VAR, VAR_NAME_FSET_RED_VAR) != EX_NOERR) { goto error_ret; } } else if (obj_type == EX_ELEM_SET) { - if (ex__prepare_result_var(exoid, num_vars, "elementset", DIM_NUM_ELSET_RED_VAR, + if (exi_prepare_result_var(exoid, num_vars, "elementset", DIM_NUM_ELSET_RED_VAR, VAR_NAME_ELSET_RED_VAR) != EX_NOERR) { goto error_ret; } } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -273,6 +273,6 @@ int ex_put_reduction_variable_param(int exoid, ex_entity_type obj_type, int num_ /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_reduction_vars.c b/packages/seacas/libraries/exodus/src/ex_put_reduction_vars.c index f513e26370..b8b97e9056 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_reduction_vars.c +++ b/packages/seacas/libraries/exodus/src/ex_put_reduction_vars.c @@ -9,7 +9,7 @@ #include "exodusII.h" #include "exodusII_int.h" -static int ex__look_up_var(int exoid, ex_entity_type var_type, ex_entity_id obj_id, +static int exi_look_up_var(int exoid, ex_entity_type var_type, ex_entity_id obj_id, const char *var_obj_id, const char *dim_num_obj_var, int *varid) { int status; @@ -40,7 +40,7 @@ static int ex__look_up_var(int exoid, ex_entity_type var_type, ex_entity_id obj_ } else { /* Determine index of obj_id in var_obj_id array */ - obj_id_ndx = ex__id_lkup(exoid, var_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, var_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -61,7 +61,7 @@ static int ex__look_up_var(int exoid, ex_entity_type var_type, ex_entity_id obj_ } } } - if ((status = nc_inq_varid(exoid, ex__name_red_var_of_object(var_type, obj_id_ndx), varid)) != + if ((status = nc_inq_varid(exoid, exi_name_red_var_of_object(var_type, obj_id_ndx), varid)) != NC_NOERR) { if (status == NC_ENOTVAR) { /* variable doesn't exist, create it! */ int time_dim; @@ -74,7 +74,7 @@ static int ex__look_up_var(int exoid, ex_entity_type var_type, ex_entity_id obj_ size_t num_obj_var; int numvardim; - if ((status = ex__get_dimension(exoid, dim_num_obj_var, ex_name_of_object(var_type), + if ((status = exi_get_dimension(exoid, dim_num_obj_var, ex_name_of_object(var_type), &num_obj_var, &numvardim, __func__)) != EX_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to inquire number of %s reduction variables in file id %d", @@ -92,24 +92,24 @@ static int ex__look_up_var(int exoid, ex_entity_type var_type, ex_entity_id obj_ /* define NetCDF variable to store reduction variable values */ int dims[] = {time_dim, numvardim}; - if ((status = nc_def_var(exoid, ex__name_red_var_of_object(var_type, obj_id_ndx), + if ((status = nc_def_var(exoid, exi_name_red_var_of_object(var_type, obj_id_ndx), nc_flt_code(exoid), 2, dims, varid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to define %s in file id %d", ex_name_of_object(var_type), exoid); ex_err_fn(exoid, __func__, errmsg, status); - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); return (EX_FATAL); } - ex__compress_variable(exoid, *varid, 2); + exi_compress_variable(exoid, *varid, 2); /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { return (EX_FATAL); } } else { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate %s %s in file id %d", - ex_name_of_object(var_type), ex__name_red_var_of_object(var_type, obj_id_ndx), + ex_name_of_object(var_type), exi_name_red_var_of_object(var_type, obj_id_ndx), exoid); ex_err_fn(exoid, __func__, errmsg, status); return (EX_FATAL); @@ -189,7 +189,7 @@ int ex_put_reduction_vars(int exoid, int time_step, ex_entity_type var_type, ex_ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -200,34 +200,34 @@ int ex_put_reduction_vars(int exoid, int time_step, ex_entity_type var_type, ex_ return ex_put_var(exoid, time_step, var_type, 1, 1, num_variables, var_vals); break; case EX_ASSEMBLY: - status = ex__look_up_var(exoid, var_type, obj_id, "assembly", DIM_NUM_ASSEMBLY_RED_VAR, &varid); + status = exi_look_up_var(exoid, var_type, obj_id, "assembly", DIM_NUM_ASSEMBLY_RED_VAR, &varid); break; case EX_BLOB: - status = ex__look_up_var(exoid, var_type, obj_id, "blob", DIM_NUM_BLOB_RED_VAR, &varid); + status = exi_look_up_var(exoid, var_type, obj_id, "blob", DIM_NUM_BLOB_RED_VAR, &varid); break; case EX_EDGE_BLOCK: - status = ex__look_up_var(exoid, var_type, obj_id, VAR_ID_ED_BLK, DIM_NUM_EDG_RED_VAR, &varid); + status = exi_look_up_var(exoid, var_type, obj_id, VAR_ID_ED_BLK, DIM_NUM_EDG_RED_VAR, &varid); break; case EX_FACE_BLOCK: - status = ex__look_up_var(exoid, var_type, obj_id, VAR_ID_FA_BLK, DIM_NUM_FAC_RED_VAR, &varid); + status = exi_look_up_var(exoid, var_type, obj_id, VAR_ID_FA_BLK, DIM_NUM_FAC_RED_VAR, &varid); break; case EX_ELEM_BLOCK: - status = ex__look_up_var(exoid, var_type, obj_id, VAR_ID_EL_BLK, DIM_NUM_ELE_RED_VAR, &varid); + status = exi_look_up_var(exoid, var_type, obj_id, VAR_ID_EL_BLK, DIM_NUM_ELE_RED_VAR, &varid); break; case EX_NODE_SET: - status = ex__look_up_var(exoid, var_type, obj_id, VAR_NS_IDS, DIM_NUM_NSET_RED_VAR, &varid); + status = exi_look_up_var(exoid, var_type, obj_id, VAR_NS_IDS, DIM_NUM_NSET_RED_VAR, &varid); break; case EX_EDGE_SET: - status = ex__look_up_var(exoid, var_type, obj_id, VAR_ES_IDS, DIM_NUM_ESET_RED_VAR, &varid); + status = exi_look_up_var(exoid, var_type, obj_id, VAR_ES_IDS, DIM_NUM_ESET_RED_VAR, &varid); break; case EX_FACE_SET: - status = ex__look_up_var(exoid, var_type, obj_id, VAR_FS_IDS, DIM_NUM_FSET_RED_VAR, &varid); + status = exi_look_up_var(exoid, var_type, obj_id, VAR_FS_IDS, DIM_NUM_FSET_RED_VAR, &varid); break; case EX_SIDE_SET: - status = ex__look_up_var(exoid, var_type, obj_id, VAR_SS_IDS, DIM_NUM_SSET_RED_VAR, &varid); + status = exi_look_up_var(exoid, var_type, obj_id, VAR_SS_IDS, DIM_NUM_SSET_RED_VAR, &varid); break; case EX_ELEM_SET: - status = ex__look_up_var(exoid, var_type, obj_id, VAR_ELS_IDS, DIM_NUM_ELSET_RED_VAR, &varid); + status = exi_look_up_var(exoid, var_type, obj_id, VAR_ELS_IDS, DIM_NUM_ELSET_RED_VAR, &varid); break; default: snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: invalid variable type (%d) specified for file id %d", @@ -247,7 +247,7 @@ int ex_put_reduction_vars(int exoid, int time_step, ex_entity_type var_type, ex_ start[1] = 0; count[1] = num_variables; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_vara_float(exoid, varid, start, count, var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_put_set.c b/packages/seacas/libraries/exodus/src/ex_put_set.c index 0fb9352070..6988759724 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_set.c +++ b/packages/seacas/libraries/exodus/src/ex_put_set.c @@ -25,7 +25,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, ex_name_of_object, etc -#include "exodusII_int.h" // for ex__check_valid_file_id, etc +#include "exodusII_int.h" // for exi_check_valid_file_id, etc /*! * writes the set entry list and set extra list for a single set @@ -49,12 +49,12 @@ int ex_put_set(int exoid, ex_entity_type set_type, ex_entity_id set_id, EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* first check if any sets are specified */ - if ((status = nc_inq_dimid(exoid, ex__dim_num_objects(set_type), &dimid)) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_dim_num_objects(set_type), &dimid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: no %ss defined in file id %d", ex_name_of_object(set_type), exoid); ex_err_fn(exoid, __func__, errmsg, status); @@ -62,7 +62,7 @@ int ex_put_set(int exoid, ex_entity_type set_type, ex_entity_id set_id, } /* Lookup index of set id in VAR_*S_IDS array */ - set_id_ndx = ex__id_lkup(exoid, set_type, set_id); + set_id_ndx = exi_id_lkup(exoid, set_type, set_id); if (set_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); diff --git a/packages/seacas/libraries/exodus/src/ex_put_set_dist_fact.c b/packages/seacas/libraries/exodus/src/ex_put_set_dist_fact.c index 43fa07561f..728500bef8 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_set_dist_fact.c +++ b/packages/seacas/libraries/exodus/src/ex_put_set_dist_fact.c @@ -45,12 +45,12 @@ int ex_put_set_dist_fact(int exoid, ex_entity_type set_type, ex_entity_id set_id EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* first check if any sets are specified */ - if ((status = nc_inq_dimid(exoid, ex__dim_num_objects(set_type), &dimid)) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_dim_num_objects(set_type), &dimid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: no %ss specified in file id %d", ex_name_of_object(set_type), exoid); ex_err_fn(exoid, __func__, errmsg, status); @@ -58,7 +58,7 @@ int ex_put_set_dist_fact(int exoid, ex_entity_type set_type, ex_entity_id set_id } /* Lookup index of set id in VAR_*S_IDS array */ - set_id_ndx = ex__id_lkup(exoid, set_type, set_id); + set_id_ndx = exi_id_lkup(exoid, set_type, set_id); if (set_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -117,7 +117,7 @@ int ex_put_set_dist_fact(int exoid, ex_entity_type set_type, ex_entity_id set_id } /* write out the distribution factors array */ - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_var_float(exoid, dist_id, set_dist_fact); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_put_sets.c b/packages/seacas/libraries/exodus/src/ex_put_sets.c index 3cd9ddd003..0a81e9439b 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_sets.c +++ b/packages/seacas/libraries/exodus/src/ex_put_sets.c @@ -39,7 +39,7 @@ int ex_put_sets(int exoid, size_t set_count, const struct ex_set *sets) EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -59,7 +59,7 @@ int ex_put_sets(int exoid, size_t set_count, const struct ex_set *sets) */ for (i = 0; i < set_count; i++) { /* first check if any sets are specified */ - if ((status = nc_inq_dimid(exoid, ex__dim_num_objects(sets[i].type), &dimid)) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_dim_num_objects(sets[i].type), &dimid)) != NC_NOERR) { if (status == NC_EBADDIM) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: no %ss defined for file id %d", ex_name_of_object(sets[i].type), exoid); @@ -83,7 +83,7 @@ int ex_put_sets(int exoid, size_t set_count, const struct ex_set *sets) sets_to_define[i] = -1; } else { - status = ex__id_lkup(exoid, sets[i].type, sets[i].id); + status = exi_id_lkup(exoid, sets[i].type, sets[i].id); if (status != -EX_LOOKUPFAIL) { /* found the side set id, so set is already defined... */ sets_to_define[i] = 0; } @@ -109,14 +109,14 @@ int ex_put_sets(int exoid, size_t set_count, const struct ex_set *sets) } if (sets_to_define[i] > 0) { - /* NOTE: ex__inc_file_item finds the current number of sets defined + /* NOTE: exi_inc_file_item finds the current number of sets defined for a specific file and returns that value incremented. */ - cur_num_sets = ex__inc_file_item(exoid, ex__get_counter_list(sets[i].type)); + cur_num_sets = exi_inc_file_item(exoid, exi_get_counter_list(sets[i].type)); set_id_ndx = cur_num_sets + 1; sets_to_define[i] = set_id_ndx; } else { - cur_num_sets = ex__get_file_item(exoid, ex__get_counter_list(sets[i].type)); + cur_num_sets = exi_get_file_item(exoid, exi_get_counter_list(sets[i].type)); set_id_ndx = cur_num_sets - set_count + i + 1; sets_to_define[i] = set_id_ndx; } @@ -202,7 +202,7 @@ int ex_put_sets(int exoid, size_t set_count, const struct ex_set *sets) } goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); if (extraptr) { if ((status = nc_def_var(exoid, extraptr, int_type, 1, dims, &varid)) != NC_NOERR) { @@ -220,7 +220,7 @@ int ex_put_sets(int exoid, size_t set_count, const struct ex_set *sets) } goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 1); + exi_compress_variable(exoid, varid, 1); } /* Create distribution factors variable if required */ @@ -268,12 +268,12 @@ int ex_put_sets(int exoid, size_t set_count, const struct ex_set *sets) } goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 2); + exi_compress_variable(exoid, varid, 2); } } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); free(sets_to_define); @@ -381,6 +381,6 @@ int ex_put_sets(int exoid, size_t set_count, const struct ex_set *sets) error_ret: free(sets_to_define); - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_ss_param_global.c b/packages/seacas/libraries/exodus/src/ex_put_ss_param_global.c index 378484cae0..cd3d0e84ee 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_ss_param_global.c +++ b/packages/seacas/libraries/exodus/src/ex_put_ss_param_global.c @@ -39,7 +39,7 @@ int ex_put_ss_param_global(int exoid, const void_int *global_ids, const void_int /*-----------------------------Execution begins-----------------------------*/ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_time.c b/packages/seacas/libraries/exodus/src/ex_put_time.c index 1e36091125..9bae4c7816 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_time.c +++ b/packages/seacas/libraries/exodus/src/ex_put_time.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for EX_FATAL, ex__comp_ws, etc +#include "exodusII_int.h" // for EX_FATAL, exi_comp_ws, etc /*! \ingroup ResultsData @@ -54,11 +54,11 @@ int ex_put_time(int exoid, int time_step, const void *time_value) int varid; size_t start[1]; char errmsg[MAX_ERR_LENGTH]; - struct ex__file_item *file = NULL; + struct exi_file_item *file = NULL; EX_FUNC_ENTER(); - file = ex__find_file_item(exoid); + file = exi_find_file_item(exoid); if (!file) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unknown file id %d.", exoid); ex_err_fn(exoid, __func__, errmsg, EX_BADFILEID); @@ -80,7 +80,7 @@ int ex_put_time(int exoid, int time_step, const void *time_value) /* store time value */ start[0] = --time_step; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_var1_float(exoid, varid, start, time_value); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_put_truth_table.c b/packages/seacas/libraries/exodus/src/ex_put_truth_table.c index d82d19a34f..5daa134e8b 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_truth_table.c +++ b/packages/seacas/libraries/exodus/src/ex_put_truth_table.c @@ -25,7 +25,7 @@ *****************************************************************************/ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for ex__get_dimension, EX_FATAL, etc +#include "exodusII_int.h" // for exi_get_dimension, EX_FATAL, etc /*! \ingroup ResultsData @@ -88,15 +88,15 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } - ex__get_dimension(exoid, ex__dim_num_objects(obj_type), ex_name_of_object(obj_type), &num_entity, + exi_get_dimension(exoid, exi_dim_num_objects(obj_type), ex_name_of_object(obj_type), &num_entity, &numelblkdim, __func__); if (obj_type == EX_ELEM_BLOCK) { - ex__get_dimension(exoid, DIM_NUM_ELE_VAR, "element variables", &num_var_db, &numelvardim, + exi_get_dimension(exoid, DIM_NUM_ELE_VAR, "element variables", &num_var_db, &numelvardim, __func__); var_name = "vals_elem_var"; ent_type = "eb"; @@ -105,7 +105,7 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ tab_type = VAR_ELEM_TAB; } else if (obj_type == EX_EDGE_BLOCK) { - ex__get_dimension(exoid, DIM_NUM_EDG_VAR, "edge block variables", &num_var_db, &numelvardim, + exi_get_dimension(exoid, DIM_NUM_EDG_VAR, "edge block variables", &num_var_db, &numelvardim, __func__); var_name = "vals_edge_var"; ent_type = "eb"; @@ -114,7 +114,7 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ tab_type = VAR_EBLK_TAB; } else if (obj_type == EX_FACE_BLOCK) { - ex__get_dimension(exoid, DIM_NUM_FAC_VAR, "face block variables", &num_var_db, &numelvardim, + exi_get_dimension(exoid, DIM_NUM_FAC_VAR, "face block variables", &num_var_db, &numelvardim, __func__); var_name = "vals_face_var"; ent_type = "fb"; @@ -123,7 +123,7 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ tab_type = VAR_FBLK_TAB; } else if (obj_type == EX_SIDE_SET) { - ex__get_dimension(exoid, DIM_NUM_SSET_VAR, "sideset variables", &num_var_db, &numelvardim, + exi_get_dimension(exoid, DIM_NUM_SSET_VAR, "sideset variables", &num_var_db, &numelvardim, __func__); var_name = "vals_sset_var"; ent_type = "ss"; @@ -132,7 +132,7 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ tab_type = VAR_SSET_TAB; } else if (obj_type == EX_NODE_SET) { - ex__get_dimension(exoid, DIM_NUM_NSET_VAR, "nodeset variables", &num_var_db, &numelvardim, + exi_get_dimension(exoid, DIM_NUM_NSET_VAR, "nodeset variables", &num_var_db, &numelvardim, __func__); var_name = "vals_nset_var"; ent_type = "ns"; @@ -141,7 +141,7 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ tab_type = VAR_NSET_TAB; } else if (obj_type == EX_EDGE_SET) { - ex__get_dimension(exoid, DIM_NUM_ESET_VAR, "edge set variables", &num_var_db, &numelvardim, + exi_get_dimension(exoid, DIM_NUM_ESET_VAR, "edge set variables", &num_var_db, &numelvardim, __func__); var_name = "vals_eset_var"; ent_type = "es"; @@ -150,7 +150,7 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ tab_type = VAR_ESET_TAB; } else if (obj_type == EX_FACE_SET) { - ex__get_dimension(exoid, DIM_NUM_FSET_VAR, "face set variables", &num_var_db, &numelvardim, + exi_get_dimension(exoid, DIM_NUM_FSET_VAR, "face set variables", &num_var_db, &numelvardim, __func__); var_name = "vals_fset_var"; ent_type = "fs"; @@ -159,7 +159,7 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ tab_type = VAR_FSET_TAB; } else if (obj_type == EX_ELEM_SET) { - ex__get_dimension(exoid, DIM_NUM_ELSET_VAR, "element set variables", &num_var_db, &numelvardim, + exi_get_dimension(exoid, DIM_NUM_ELSET_VAR, "element set variables", &num_var_db, &numelvardim, __func__); var_name = "vals_elset_var"; ent_type = "es"; @@ -168,7 +168,7 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ tab_type = VAR_ELSET_TAB; } else if (obj_type == EX_BLOB) { - ex__get_dimension(exoid, DIM_NUM_BLOB_VAR, "blob variables", &num_var_db, &numelvardim, + exi_get_dimension(exoid, DIM_NUM_BLOB_VAR, "blob variables", &num_var_db, &numelvardim, __func__); var_name = "vals_blob_var"; ent_type = "blob"; @@ -271,7 +271,7 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ dims[0] = timedim; /* Determine number of entities in block */ - if ((status = nc_inq_dimid(exoid, ex__catstr(ent_size, (i + 1)), &dims[1])) != NC_NOERR) { + if ((status = nc_inq_dimid(exoid, exi_catstr(ent_size, (i + 1)), &dims[1])) != NC_NOERR) { free(stat_vals); snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate number of entities in " @@ -288,7 +288,7 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ * instead of 0 */ - if ((status = nc_def_var(exoid, ex__catstr2(var_name, j, ent_type, i + 1), + if ((status = nc_def_var(exoid, exi_catstr2(var_name, j, ent_type, i + 1), nc_flt_code(exoid), 2, dims, &varid)) != NC_NOERR) { if (status != NC_ENAMEINUSE) { free(stat_vals); @@ -298,7 +298,7 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 2); + exi_compress_variable(exoid, varid, 2); } } } /* if */ @@ -324,7 +324,7 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -344,6 +344,6 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_var_multi_time.c b/packages/seacas/libraries/exodus/src/ex_put_var_multi_time.c index 7d08241b9a..3188d5ed3d 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_var_multi_time.c +++ b/packages/seacas/libraries/exodus/src/ex_put_var_multi_time.c @@ -9,7 +9,7 @@ #include "exodusII.h" // for ex_err, etc #include "exodusII_int.h" // for EX_FATAL, etc -static int ex__look_up_var(int exoid, ex_entity_type var_type, int var_index, ex_entity_id obj_id, +static int exi_look_up_var(int exoid, ex_entity_type var_type, int var_index, ex_entity_id obj_id, const char *VOBJID, const char *VOBJTAB, const char *DNUMOBJ, const char *DNUMOBJVAR, int *varid) { @@ -48,7 +48,7 @@ static int ex__look_up_var(int exoid, ex_entity_type var_type, int var_index, ex } else { /* Determine index of obj_id in VOBJID array */ - obj_id_ndx = ex__id_lkup(exoid, var_type, obj_id); + obj_id_ndx = exi_id_lkup(exoid, var_type, obj_id); if (obj_id_ndx <= 0) { ex_get_err(NULL, NULL, &status); @@ -70,19 +70,19 @@ static int ex__look_up_var(int exoid, ex_entity_type var_type, int var_index, ex } } - if ((status = nc_inq_varid(exoid, ex__name_var_of_object(var_type, var_index, obj_id_ndx), + if ((status = nc_inq_varid(exoid, exi_name_var_of_object(var_type, var_index, obj_id_ndx), varid)) != NC_NOERR) { if (status == NC_ENOTVAR) { /* variable doesn't exist, create it! */ /* check for the existence of an TNAME variable truth table */ if (nc_inq_varid(exoid, VOBJTAB, varid) == NC_NOERR) { /* find out number of TNAMEs and TNAME variables */ - status = ex__get_dimension(exoid, DNUMOBJ, ex_name_of_object(var_type), &num_obj, &dimid, + status = exi_get_dimension(exoid, DNUMOBJ, ex_name_of_object(var_type), &num_obj, &dimid, __func__); if (status != NC_NOERR) { return (status); } - status = ex__get_dimension(exoid, DNUMOBJVAR, ex_name_of_object(var_type), &num_obj_var, + status = exi_get_dimension(exoid, DNUMOBJVAR, ex_name_of_object(var_type), &num_obj_var, &dimid, __func__); if (status != NC_NOERR) { return (status); @@ -123,7 +123,7 @@ static int ex__look_up_var(int exoid, ex_entity_type var_type, int var_index, ex goto error_ret; /* exit define mode and return */ } - ex__get_dimension(exoid, ex__dim_num_entries_in_object(var_type, obj_id_ndx), + exi_get_dimension(exoid, exi_dim_num_entries_in_object(var_type, obj_id_ndx), ex_name_of_object(var_type), &num_entity, &numobjdim, __func__); /* variable doesn't exist so put file into define mode */ @@ -136,23 +136,23 @@ static int ex__look_up_var(int exoid, ex_entity_type var_type, int var_index, ex /* define netCDF variable to store TNAME variable values */ dims[0] = time_dim; dims[1] = numobjdim; - if ((status = nc_def_var(exoid, ex__name_var_of_object(var_type, var_index, obj_id_ndx), + if ((status = nc_def_var(exoid, exi_name_var_of_object(var_type, var_index, obj_id_ndx), nc_flt_code(exoid), 2, dims, varid)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to define %s variable %d in file id %d", ex_name_of_object(var_type), var_index, exoid); ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; } - ex__compress_variable(exoid, *varid, 2); + exi_compress_variable(exoid, *varid, 2); /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { return (EX_FATAL); } } else { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to locate %s variable %s in file id %d", - ex_name_of_object(var_type), ex__name_var_of_object(var_type, var_index, obj_id_ndx), + ex_name_of_object(var_type), exi_name_var_of_object(var_type, var_index, obj_id_ndx), exoid); ex_err_fn(exoid, __func__, errmsg, status); return (EX_FATAL); @@ -162,7 +162,7 @@ static int ex__look_up_var(int exoid, ex_entity_type var_type, int var_index, ex /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); return (EX_FATAL); } @@ -247,7 +247,7 @@ int ex_put_var_multi_time(int exoid, ex_entity_type var_type, int var_index, ex_ EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -276,47 +276,47 @@ int ex_put_var_multi_time(int exoid, ex_entity_type var_type, int var_index, ex_ } break; case EX_NODAL: - status = ex__put_nodal_var_time(exoid, var_index, num_entries_this_obj, beg_time_step, + status = exi_put_nodal_var_time(exoid, var_index, num_entries_this_obj, beg_time_step, end_time_step, var_vals); EX_FUNC_LEAVE(status); case EX_ASSEMBLY: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, "", VAR_ASSEMBLY_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, "", VAR_ASSEMBLY_TAB, DIM_NUM_ASSEMBLY, DIM_NUM_ASSEMBLY_VAR, &varid); break; case EX_BLOB: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, "", VAR_BLOB_TAB, DIM_NUM_BLOB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, "", VAR_BLOB_TAB, DIM_NUM_BLOB, DIM_NUM_BLOB_VAR, &varid); break; case EX_EDGE_BLOCK: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_ED_BLK, VAR_EBLK_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_ED_BLK, VAR_EBLK_TAB, DIM_NUM_ED_BLK, DIM_NUM_EDG_VAR, &varid); break; case EX_FACE_BLOCK: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_FA_BLK, VAR_FBLK_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_FA_BLK, VAR_FBLK_TAB, DIM_NUM_FA_BLK, DIM_NUM_FAC_VAR, &varid); break; case EX_ELEM_BLOCK: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_EL_BLK, VAR_ELEM_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_EL_BLK, VAR_ELEM_TAB, DIM_NUM_EL_BLK, DIM_NUM_ELE_VAR, &varid); break; case EX_NODE_SET: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_NS_IDS, VAR_NSET_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_NS_IDS, VAR_NSET_TAB, DIM_NUM_NS, DIM_NUM_NSET_VAR, &varid); break; case EX_EDGE_SET: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ES_IDS, VAR_ESET_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_ES_IDS, VAR_ESET_TAB, DIM_NUM_ES, DIM_NUM_ESET_VAR, &varid); break; case EX_FACE_SET: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_FS_IDS, VAR_FSET_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_FS_IDS, VAR_FSET_TAB, DIM_NUM_FS, DIM_NUM_FSET_VAR, &varid); break; case EX_SIDE_SET: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_SS_IDS, VAR_SSET_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_SS_IDS, VAR_SSET_TAB, DIM_NUM_SS, DIM_NUM_SSET_VAR, &varid); break; case EX_ELEM_SET: - status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ELS_IDS, VAR_ELSET_TAB, + status = exi_look_up_var(exoid, var_type, var_index, obj_id, VAR_ELS_IDS, VAR_ELSET_TAB, DIM_NUM_ELS, DIM_NUM_ELSET_VAR, &varid); break; default: @@ -346,7 +346,7 @@ int ex_put_var_multi_time(int exoid, ex_entity_type var_type, int var_index, ex_ count[0] = end_time_step - beg_time_step + 1; count[1] = num_entries_this_obj; - if (ex__comp_ws(exoid) == 4) { + if (exi_comp_ws(exoid) == 4) { status = nc_put_vara_float(exoid, varid, start, count, var_vals); } else { diff --git a/packages/seacas/libraries/exodus/src/ex_put_variable_name.c b/packages/seacas/libraries/exodus/src/ex_put_variable_name.c index 579f33cab2..fba3f2b1be 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_variable_name.c +++ b/packages/seacas/libraries/exodus/src/ex_put_variable_name.c @@ -45,7 +45,7 @@ int ex_put_variable_name(int exoid, ex_entity_type obj_type, int var_num, const EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -78,7 +78,7 @@ int ex_put_variable_name(int exoid, ex_entity_type obj_type, int var_num, const } /* write EXODUS variable name */ - status = ex__put_name(exoid, varid, var_num - 1, var_name, obj_type, "variable", __func__); + status = exi_put_name(exoid, varid, var_num - 1, var_name, obj_type, "variable", __func__); EX_FUNC_LEAVE(status); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_variable_names.c b/packages/seacas/libraries/exodus/src/ex_put_variable_names.c index 2897b890bd..00303bb632 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_variable_names.c +++ b/packages/seacas/libraries/exodus/src/ex_put_variable_names.c @@ -129,7 +129,7 @@ int ex_put_variable_names(int exoid, ex_entity_type obj_type, int num_vars, char char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -178,7 +178,7 @@ int ex_put_variable_names(int exoid, ex_entity_type obj_type, int num_vars, char } /* write EXODUS variable names */ - status = ex__put_names(exoid, varid, num_vars, var_names, obj_type, "variable", __func__); + status = exi_put_names(exoid, varid, num_vars, var_names, obj_type, "variable", __func__); EX_FUNC_LEAVE(status); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_variable_param.c b/packages/seacas/libraries/exodus/src/ex_put_variable_param.c index f284899958..ed896f4a8c 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_variable_param.c +++ b/packages/seacas/libraries/exodus/src/ex_put_variable_param.c @@ -7,7 +7,7 @@ */ #include "exodusII.h" // for ex_err, etc -#include "exodusII_int.h" // for ex__compress_variable, etc +#include "exodusII_int.h" // for exi_compress_variable, etc /*! \cond INTERNAL */ static int ex_prepare_result_var(int exoid, int num_vars, char *type_name, char *dim_name, @@ -59,7 +59,7 @@ static int ex_prepare_result_var(int exoid, int num_vars, char *type_name, char } return (EX_FATAL); /* exit define mode and return */ } - ex__set_compact_storage(exoid, varid); + exi_set_compact_storage(exoid, varid); #if defined(EX_CAN_USE_NC_DEF_VAR_FILL) int fill = NC_FILL_CHAR; nc_def_var_fill(exoid, varid, 0, &fill); @@ -129,7 +129,7 @@ int ex_put_variable_param(int exoid, ex_entity_type obj_type, int num_vars) int status; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -202,9 +202,9 @@ int ex_put_variable_param(int exoid, ex_entity_type obj_type, int num_vars) ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 2); + exi_compress_variable(exoid, varid, 2); if (num_vars * 8 < 64 * 1024) { - ex__set_compact_storage(exoid, varid); + exi_set_compact_storage(exoid, varid); } } else if (obj_type == EX_NODAL) { @@ -224,7 +224,7 @@ int ex_put_variable_param(int exoid, ex_entity_type obj_type, int num_vars) ex_err_fn(exoid, __func__, errmsg, status); goto error_ret; /* exit define mode and return */ } - ex__compress_variable(exoid, varid, 2); + exi_compress_variable(exoid, varid, 2); } } @@ -295,7 +295,7 @@ int ex_put_variable_param(int exoid, ex_entity_type obj_type, int num_vars) } /* leave define mode */ - if ((status = ex__leavedef(exoid, __func__)) != NC_NOERR) { + if ((status = exi_leavedef(exoid, __func__)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to exit define mode"); ex_err_fn(exoid, __func__, errmsg, status); EX_FUNC_LEAVE(EX_FATAL); @@ -305,6 +305,6 @@ int ex_put_variable_param(int exoid, ex_entity_type obj_type, int num_vars) /* Fatal error: exit definition mode and return */ error_ret: - ex__leavedef(exoid, __func__); + exi_leavedef(exoid, __func__); EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_threadsafe.c b/packages/seacas/libraries/exodus/src/ex_threadsafe.c index b334069d1f..f68cea4bf6 100644 --- a/packages/seacas/libraries/exodus/src/ex_threadsafe.c +++ b/packages/seacas/libraries/exodus/src/ex_threadsafe.c @@ -36,7 +36,7 @@ static void ex_key_destructor(void *key_val) abort(); \ } while (0) -void ex__pthread_first_thread_init(void) +void exi_pthread_first_thread_init(void) { int err = pthread_mutexattr_init(&EX_g.attribute); if (err != 0) { @@ -60,7 +60,7 @@ void ex__pthread_first_thread_init(void) } } -int ex__mutex_lock(EX_mutex_t *mutex) +int exi_mutex_lock(EX_mutex_t *mutex) { int ret_value = pthread_mutex_lock(&mutex->atomic_lock); if (ret_value != 0) { @@ -69,7 +69,7 @@ int ex__mutex_lock(EX_mutex_t *mutex) return ret_value; } -int ex__mutex_unlock(EX_mutex_t *mutex, const char *func, int line) +int exi_mutex_unlock(EX_mutex_t *mutex, const char *func, int line) { int ret_value = pthread_mutex_unlock(&mutex->atomic_lock); if (ret_value != 0) { diff --git a/packages/seacas/libraries/exodus/src/ex_update.c b/packages/seacas/libraries/exodus/src/ex_update.c index ab455cdc9e..02e2f8a930 100644 --- a/packages/seacas/libraries/exodus/src/ex_update.c +++ b/packages/seacas/libraries/exodus/src/ex_update.c @@ -31,7 +31,7 @@ int ex_update(int exoid) { EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } diff --git a/packages/seacas/libraries/exodus/src/ex_utils.c b/packages/seacas/libraries/exodus/src/ex_utils.c index 5e8f3c36b1..d345477ecc 100644 --- a/packages/seacas/libraries/exodus/src/ex_utils.c +++ b/packages/seacas/libraries/exodus/src/ex_utils.c @@ -20,25 +20,25 @@ #include "exodusII.h" #include "exodusII_int.h" -struct ex__obj_stats *exoII_eb = NULL; -struct ex__obj_stats *exoII_ed = NULL; -struct ex__obj_stats *exoII_fa = NULL; -struct ex__obj_stats *exoII_ns = NULL; -struct ex__obj_stats *exoII_es = NULL; -struct ex__obj_stats *exoII_fs = NULL; -struct ex__obj_stats *exoII_ss = NULL; -struct ex__obj_stats *exoII_els = NULL; -struct ex__obj_stats *exoII_em = NULL; -struct ex__obj_stats *exoII_edm = NULL; -struct ex__obj_stats *exoII_fam = NULL; -struct ex__obj_stats *exoII_nm = NULL; -struct ex__obj_stats *exoII_ass = NULL; +struct exi_obj_stats *exoII_eb = NULL; +struct exi_obj_stats *exoII_ed = NULL; +struct exi_obj_stats *exoII_fa = NULL; +struct exi_obj_stats *exoII_ns = NULL; +struct exi_obj_stats *exoII_es = NULL; +struct exi_obj_stats *exoII_fs = NULL; +struct exi_obj_stats *exoII_ss = NULL; +struct exi_obj_stats *exoII_els = NULL; +struct exi_obj_stats *exoII_em = NULL; +struct exi_obj_stats *exoII_edm = NULL; +struct exi_obj_stats *exoII_fam = NULL; +struct exi_obj_stats *exoII_nm = NULL; +struct exi_obj_stats *exoII_ass = NULL; /***************************************************************************** * * utility routines for string conversions - * ex__catstr - concatenate string/number (where number is converted to ASCII) - * ex__catstr2 - concatenate string1/number1/string2/number2 " + * exi_catstr - concatenate string/number (where number is converted to ASCII) + * exi_catstr2 - concatenate string1/number1/string2/number2 " * * NOTE: these routines reuse the same storage over and over to build * concatenated strings, because the strings are just passed to netCDF @@ -170,7 +170,7 @@ void ex_print_config(void) { fprintf(stderr, "%s\n", ex_config()); } \ingroup Utilities \undoc */ -int ex__check_file_type(const char *path, int *type) +int exi_check_file_type(const char *path, int *type) { /* Based on (stolen from?) NC_check_file_type from netcdf sources. @@ -246,7 +246,7 @@ int ex_set_max_name_length(int exoid, int length) char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } if (length <= 0) { @@ -270,10 +270,10 @@ int ex_set_max_name_length(int exoid, int length) \ingroup Utilities \undoc */ -void ex__update_max_name_length(int exoid, int length) +void exi_update_max_name_length(int exoid, int length) { EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_VOID(); } @@ -308,11 +308,11 @@ void ex__update_max_name_length(int exoid, int length) \internal \undoc */ -int ex__put_names(int exoid, int varid, size_t num_names, char *const *names, +int exi_put_names(int exoid, int varid, size_t num_names, char *const *names, ex_entity_type obj_type, const char *subtype, const char *routine) { EX_FUNC_ENTER(); - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* inquire previously defined dimensions */ @@ -366,7 +366,7 @@ int ex__put_names(int exoid, int varid, size_t num_names, char *const *names, if (found_name) { /* Update the maximum_name_length attribute on the file. */ - ex__update_max_name_length(exoid, max_name_len - 1); + exi_update_max_name_length(exoid, max_name_len - 1); } free(int_names); @@ -377,10 +377,10 @@ int ex__put_names(int exoid, int varid, size_t num_names, char *const *names, \internal \undoc */ -int ex__put_name(int exoid, int varid, size_t index, const char *name, ex_entity_type obj_type, +int exi_put_name(int exoid, int varid, size_t index, const char *name, ex_entity_type obj_type, const char *subtype, const char *routine) { - if (ex__check_valid_file_id(exoid, __func__) == EX_FATAL) { + if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } @@ -422,7 +422,7 @@ int ex__put_name(int exoid, int varid, size_t index, const char *name, ex_entity } /* Update the maximum_name_length attribute on the file. */ - ex__update_max_name_length(exoid, count[1] - 1); + exi_update_max_name_length(exoid, count[1] - 1); } return (EX_NOERR); } @@ -431,7 +431,7 @@ int ex__put_name(int exoid, int varid, size_t index, const char *name, ex_entity \internal \undoc */ -int ex__get_names(int exoid, int varid, size_t num_names, char **names, ex_entity_type obj_type, +int exi_get_names(int exoid, int varid, size_t num_names, char **names, ex_entity_type obj_type, const char *routine) { /* Query size of names on file @@ -442,7 +442,7 @@ int ex__get_names(int exoid, int varid, size_t num_names, char **names, ex_entit int name_size = db_name_size < api_name_size ? db_name_size : api_name_size; for (size_t i = 0; i < num_names; i++) { - int status = ex__get_name(exoid, varid, i, names[i], name_size, obj_type, routine); + int status = exi_get_name(exoid, varid, i, names[i], name_size, obj_type, routine); if (status != NC_NOERR) { return (status); } @@ -454,7 +454,7 @@ int ex__get_names(int exoid, int varid, size_t num_names, char **names, ex_entit \internal \undoc */ -int ex__get_name(int exoid, int varid, size_t index, char *name, int name_size, +int exi_get_name(int exoid, int varid, size_t index, char *name, int name_size, ex_entity_type obj_type, const char *routine) { @@ -478,7 +478,7 @@ int ex__get_name(int exoid, int varid, size_t index, char *name, int name_size, int api_name_size = ex_inquire_int(exoid, EX_INQ_MAX_READ_NAME_LENGTH); name[api_name_size] = '\0'; - ex__trim(name); + exi_trim(name); return (EX_NOERR); } @@ -486,7 +486,7 @@ int ex__get_name(int exoid, int varid, size_t index, char *name, int name_size, \internal \undoc */ -void ex__trim(char *name) +void exi_trim(char *name) { /* Thread-safe, reentrant */ /* Trim trailing spaces... */ @@ -507,13 +507,13 @@ void ex__trim(char *name) *(end + 1) = '\0'; } -/** ex__catstr - concatenate string/number (where number is converted to ASCII) +/** exi_catstr - concatenate string/number (where number is converted to ASCII) */ /*! \internal \undoc */ -char *ex__catstr(const char *string, int num) +char *exi_catstr(const char *string, int num) { /* Only called from an already locked function */ char *tmp_string = cur_string; @@ -524,12 +524,12 @@ char *ex__catstr(const char *string, int num) return (tmp_string); } -/** ex__catstr2 - concatenate string1num1string2num2 */ +/** exi_catstr2 - concatenate string1num1string2num2 */ /*! \internal \undoc */ -char *ex__catstr2(const char *string1, int num1, const char *string2, int num2) +char *exi_catstr2(const char *string1, int num1, const char *string2, int num2) { /* Only called from an already locked function */ char *tmp_string = cur_string; @@ -617,7 +617,7 @@ ex_entity_type ex_var_type_to_ex_entity_type(char var_type) \internal \undoc */ -char *ex__dim_num_objects(ex_entity_type obj_type) +char *exi_dim_num_objects(ex_entity_type obj_type) { switch (obj_type) { case EX_NODAL: return DIM_NUM_NODES; @@ -649,7 +649,7 @@ char *ex__dim_num_objects(ex_entity_type obj_type) \internal \undoc */ -char *ex__dim_num_entries_in_object(ex_entity_type obj_type, int idx) +char *exi_dim_num_entries_in_object(ex_entity_type obj_type, int idx) { switch (obj_type) { case EX_NODAL: return DIM_NUM_NODES; @@ -677,7 +677,7 @@ char *ex__dim_num_entries_in_object(ex_entity_type obj_type, int idx) \internal \undoc */ -char *ex__name_var_of_object(ex_entity_type obj_type, int i, int j) +char *exi_name_var_of_object(ex_entity_type obj_type, int i, int j) { switch (obj_type) { case EX_ASSEMBLY: return VAR_ASSEMBLY_VAR(i, j); @@ -704,7 +704,7 @@ char *ex__name_var_of_object(ex_entity_type obj_type, int i, int j) \internal \undoc */ -char *ex__name_red_var_of_object(ex_entity_type obj_type, int id) +char *exi_name_red_var_of_object(ex_entity_type obj_type, int id) { switch (obj_type) { case EX_ASSEMBLY: return VAR_ASSEMBLY_RED_VAR(id); @@ -731,7 +731,7 @@ char *ex__name_red_var_of_object(ex_entity_type obj_type, int id) \internal \undoc */ -char *ex__name_of_map(ex_entity_type map_type, int map_index) +char *exi_name_of_map(ex_entity_type map_type, int map_index) { switch (map_type) { case EX_NODE_MAP: return VAR_NODE_MAP(map_index); @@ -744,7 +744,7 @@ char *ex__name_of_map(ex_entity_type map_type, int map_index) /***************************************************************************** * -* ex__id_lkup - look up id +* exi_id_lkup - look up id * * entry conditions - * input parameters: @@ -764,7 +764,7 @@ char *ex__name_of_map(ex_entity_type map_type, int map_index) \internal \undoc */ -int ex__id_lkup(int exoid, ex_entity_type id_type, ex_entity_id num) +int exi_id_lkup(int exoid, ex_entity_type id_type, ex_entity_id num) { char *id_table = NULL; char *id_dim = NULL; @@ -776,7 +776,7 @@ int ex__id_lkup(int exoid, ex_entity_type id_type, ex_entity_id num) int *stat_vals = NULL; static bool sequential = false; - struct ex__obj_stats *tmp_stats; + struct exi_obj_stats *tmp_stats; int status; char errmsg[MAX_ERR_LENGTH]; @@ -789,73 +789,73 @@ int ex__id_lkup(int exoid, ex_entity_type id_type, ex_entity_id num) id_table = VAR_ID_EL_BLK; /* id array name */ id_dim = DIM_NUM_EL_BLK; /* id array dimension name*/ stat_table = VAR_STAT_EL_BLK; /* id status array name */ - tmp_stats = ex__get_stat_ptr(exoid, &exoII_eb); + tmp_stats = exi_get_stat_ptr(exoid, &exoII_eb); break; case EX_NODE_SET: id_table = VAR_NS_IDS; id_dim = DIM_NUM_NS; stat_table = VAR_NS_STAT; - tmp_stats = ex__get_stat_ptr(exoid, &exoII_ns); + tmp_stats = exi_get_stat_ptr(exoid, &exoII_ns); break; case EX_SIDE_SET: id_table = VAR_SS_IDS; id_dim = DIM_NUM_SS; stat_table = VAR_SS_STAT; - tmp_stats = ex__get_stat_ptr(exoid, &exoII_ss); + tmp_stats = exi_get_stat_ptr(exoid, &exoII_ss); break; case EX_EDGE_BLOCK: id_table = VAR_ID_ED_BLK; id_dim = DIM_NUM_ED_BLK; stat_table = VAR_STAT_ED_BLK; - tmp_stats = ex__get_stat_ptr(exoid, &exoII_ed); + tmp_stats = exi_get_stat_ptr(exoid, &exoII_ed); break; case EX_FACE_BLOCK: id_table = VAR_ID_FA_BLK; id_dim = DIM_NUM_FA_BLK; stat_table = VAR_STAT_FA_BLK; - tmp_stats = ex__get_stat_ptr(exoid, &exoII_fa); + tmp_stats = exi_get_stat_ptr(exoid, &exoII_fa); break; case EX_EDGE_SET: id_table = VAR_ES_IDS; id_dim = DIM_NUM_ES; stat_table = VAR_ES_STAT; - tmp_stats = ex__get_stat_ptr(exoid, &exoII_es); + tmp_stats = exi_get_stat_ptr(exoid, &exoII_es); break; case EX_FACE_SET: id_table = VAR_FS_IDS; id_dim = DIM_NUM_FS; stat_table = VAR_FS_STAT; - tmp_stats = ex__get_stat_ptr(exoid, &exoII_fs); + tmp_stats = exi_get_stat_ptr(exoid, &exoII_fs); break; case EX_ELEM_SET: id_table = VAR_ELS_IDS; id_dim = DIM_NUM_ELS; stat_table = VAR_ELS_STAT; - tmp_stats = ex__get_stat_ptr(exoid, &exoII_els); + tmp_stats = exi_get_stat_ptr(exoid, &exoII_els); break; case EX_NODE_MAP: id_table = VAR_NM_PROP(1); id_dim = DIM_NUM_NM; stat_table = ""; - tmp_stats = ex__get_stat_ptr(exoid, &exoII_nm); + tmp_stats = exi_get_stat_ptr(exoid, &exoII_nm); break; case EX_EDGE_MAP: id_table = VAR_EDM_PROP(1); id_dim = DIM_NUM_EDM; stat_table = ""; - tmp_stats = ex__get_stat_ptr(exoid, &exoII_edm); + tmp_stats = exi_get_stat_ptr(exoid, &exoII_edm); break; case EX_FACE_MAP: id_table = VAR_FAM_PROP(1); id_dim = DIM_NUM_FAM; stat_table = ""; - tmp_stats = ex__get_stat_ptr(exoid, &exoII_fam); + tmp_stats = exi_get_stat_ptr(exoid, &exoII_fam); break; case EX_ELEM_MAP: id_table = VAR_EM_PROP(1); id_dim = DIM_NUM_EM; stat_table = ""; - tmp_stats = ex__get_stat_ptr(exoid, &exoII_em); + tmp_stats = exi_get_stat_ptr(exoid, &exoII_em); break; default: snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unsupported id array type %d for file id %d", id_type, @@ -1046,7 +1046,7 @@ int ex__id_lkup(int exoid, ex_entity_type id_type, ex_entity_id num) /****************************************************************************** * - * ex__get_stat_ptr - returns a pointer to a structure of object ids + * exi_get_stat_ptr - returns a pointer to a structure of object ids * *****************************************************************************/ @@ -1056,9 +1056,9 @@ int ex__id_lkup(int exoid, ex_entity_type id_type, ex_entity_id num) * \internal */ -struct ex__obj_stats *ex__get_stat_ptr(int exoid, struct ex__obj_stats **obj_ptr) +struct exi_obj_stats *exi_get_stat_ptr(int exoid, struct exi_obj_stats **obj_ptr) { - struct ex__obj_stats *tmp_ptr = *obj_ptr; + struct exi_obj_stats *tmp_ptr = *obj_ptr; while (tmp_ptr) { if ((tmp_ptr)->exoid == exoid) { @@ -1068,7 +1068,7 @@ struct ex__obj_stats *ex__get_stat_ptr(int exoid, struct ex__obj_stats **obj_ptr } if (!tmp_ptr) { /* exoid not found */ - tmp_ptr = (struct ex__obj_stats *)calloc(1, sizeof(struct ex__obj_stats)); + tmp_ptr = (struct exi_obj_stats *)calloc(1, sizeof(struct exi_obj_stats)); tmp_ptr->exoid = exoid; tmp_ptr->next = *obj_ptr; tmp_ptr->id_vals = 0; @@ -1083,7 +1083,7 @@ struct ex__obj_stats *ex__get_stat_ptr(int exoid, struct ex__obj_stats **obj_ptr /****************************************************************************** * - * ex__rm_stat_ptr - removes a pointer to a structure of object ids + * exi_rm_stat_ptr - removes a pointer to a structure of object ids * *****************************************************************************/ @@ -1094,10 +1094,10 @@ struct ex__obj_stats *ex__get_stat_ptr(int exoid, struct ex__obj_stats **obj_ptr * \internal */ -void ex__rm_stat_ptr(int exoid, struct ex__obj_stats **obj_ptr) +void exi_rm_stat_ptr(int exoid, struct exi_obj_stats **obj_ptr) { - struct ex__obj_stats *tmp_ptr = *obj_ptr; - struct ex__obj_stats *last_head_list_ptr = *obj_ptr; /* save last head pointer */ + struct exi_obj_stats *tmp_ptr = *obj_ptr; + struct exi_obj_stats *last_head_list_ptr = *obj_ptr; /* save last head pointer */ while (tmp_ptr) /* Walk linked list of file ids/vals */ { @@ -1120,32 +1120,32 @@ void ex__rm_stat_ptr(int exoid, struct ex__obj_stats **obj_ptr) } /* structures to hold number of blocks of that type for each file id */ -static struct ex__list_item *ed_ctr_list = NULL; /* edge blocks */ -static struct ex__list_item *fa_ctr_list = NULL; /* face blocks */ -static struct ex__list_item *eb_ctr_list = NULL; /* element blocks */ +static struct exi_list_item *ed_ctr_list = NULL; /* edge blocks */ +static struct exi_list_item *fa_ctr_list = NULL; /* face blocks */ +static struct exi_list_item *eb_ctr_list = NULL; /* element blocks */ /* structures to hold number of sets of that type for each file id */ -static struct ex__list_item *ns_ctr_list = NULL; /* node sets */ -static struct ex__list_item *es_ctr_list = NULL; /* edge sets */ -static struct ex__list_item *fs_ctr_list = NULL; /* face sets */ -static struct ex__list_item *ss_ctr_list = NULL; /* side sets */ -static struct ex__list_item *els_ctr_list = NULL; /* element sets */ +static struct exi_list_item *ns_ctr_list = NULL; /* node sets */ +static struct exi_list_item *es_ctr_list = NULL; /* edge sets */ +static struct exi_list_item *fs_ctr_list = NULL; /* face sets */ +static struct exi_list_item *ss_ctr_list = NULL; /* side sets */ +static struct exi_list_item *els_ctr_list = NULL; /* element sets */ /* structures to hold number of blobs/assemblies for each file id */ -static struct ex__list_item *assm_ctr_list = NULL; /* assemblies */ -static struct ex__list_item *blob_ctr_list = NULL; /* blobs */ +static struct exi_list_item *assm_ctr_list = NULL; /* assemblies */ +static struct exi_list_item *blob_ctr_list = NULL; /* blobs */ /* structures to hold number of maps of that type for each file id */ -static struct ex__list_item *nm_ctr_list = NULL; /* node maps */ -static struct ex__list_item *edm_ctr_list = NULL; /* edge maps */ -static struct ex__list_item *fam_ctr_list = NULL; /* face maps */ -static struct ex__list_item *em_ctr_list = NULL; /* element maps */ +static struct exi_list_item *nm_ctr_list = NULL; /* node maps */ +static struct exi_list_item *edm_ctr_list = NULL; /* edge maps */ +static struct exi_list_item *fam_ctr_list = NULL; /* face maps */ +static struct exi_list_item *em_ctr_list = NULL; /* element maps */ /*! \internal \undoc */ -struct ex__list_item **ex__get_counter_list(ex_entity_type obj_type) +struct exi_list_item **exi_get_counter_list(ex_entity_type obj_type) { /* Thread-safe, but is dealing with globals */ /* Only called from a routine which will be using locks */ @@ -1170,7 +1170,7 @@ struct ex__list_item **ex__get_counter_list(ex_entity_type obj_type) /****************************************************************************** * - * ex__inc_file_item - increment file item + * exi_inc_file_item - increment file item * *****************************************************************************/ @@ -1196,10 +1196,10 @@ struct ex__list_item **ex__get_counter_list(ex_entity_type obj_type) * \internal */ -int ex__inc_file_item(int exoid, /* file id */ - struct ex__list_item **list_ptr) /* ptr to ptr to list_item */ +int exi_inc_file_item(int exoid, /* file id */ + struct exi_list_item **list_ptr) /* ptr to ptr to list_item */ { - struct ex__list_item *tlist_ptr = *list_ptr; /* use temp list ptr to walk linked list */ + struct exi_list_item *tlist_ptr = *list_ptr; /* use temp list ptr to walk linked list */ while (tlist_ptr) { /* Walk linked list of file ids/vals */ if (exoid == tlist_ptr->exo_id) { /* linear search for exodus file id */ break; /* Quit if found */ @@ -1209,7 +1209,7 @@ int ex__inc_file_item(int exoid, /* file id */ if (!tlist_ptr) { /* ptr NULL? */ /* allocate space for new structure record */ - tlist_ptr = (struct ex__list_item *)calloc(1, sizeof(struct ex__list_item)); + tlist_ptr = (struct exi_list_item *)calloc(1, sizeof(struct exi_list_item)); tlist_ptr->exo_id = exoid; /* insert file id */ tlist_ptr->next = *list_ptr; /* insert into head of list */ *list_ptr = tlist_ptr; /* fix up new head of list */ @@ -1219,7 +1219,7 @@ int ex__inc_file_item(int exoid, /* file id */ /***************************************************************************** * - * ex__get_file_item - return count + * exi_get_file_item - return count * *****************************************************************************/ @@ -1245,14 +1245,14 @@ int ex__inc_file_item(int exoid, /* file id */ * \internal */ -int ex__get_file_item(int exoid, /* file id */ - struct ex__list_item **list_ptr) /* ptr to ptr to list_item */ +int exi_get_file_item(int exoid, /* file id */ + struct exi_list_item **list_ptr) /* ptr to ptr to list_item */ { /* Not thread-safe: list_ptr passed in is a global * Would probably work ok with multiple threads since read-only, * but possible that list_ptr will be modified while being used */ - struct ex__list_item *tlist_ptr = *list_ptr; /* use temp list ptr to walk linked list */ + struct exi_list_item *tlist_ptr = *list_ptr; /* use temp list ptr to walk linked list */ while (tlist_ptr) { /* Walk linked list of file ids/vals */ if (exoid == tlist_ptr->exo_id) { /* linear search for exodus file id */ break; /* Quit if found */ @@ -1269,7 +1269,7 @@ int ex__get_file_item(int exoid, /* file id */ /***************************************************************************** * - * ex__rm_file_item - remove file item + * exi_rm_file_item - remove file item * *****************************************************************************/ @@ -1292,13 +1292,13 @@ int ex__get_file_item(int exoid, /* file id */ * \internal */ -void ex__rm_file_item(int exoid, /* file id */ - struct ex__list_item **list_ptr) /* ptr to ptr to list_item */ +void exi_rm_file_item(int exoid, /* file id */ + struct exi_list_item **list_ptr) /* ptr to ptr to list_item */ { - struct ex__list_item *last_head_list_ptr = *list_ptr; /* save last head pointer */ + struct exi_list_item *last_head_list_ptr = *list_ptr; /* save last head pointer */ - struct ex__list_item *tlist_ptr = *list_ptr; + struct exi_list_item *tlist_ptr = *list_ptr; while (tlist_ptr) { /* Walk linked list of file ids/vals */ if (exoid == tlist_ptr->exo_id) { /* linear search for exodus file id */ if (tlist_ptr == *list_ptr) { /* Are we at the head of the list? */ @@ -1367,7 +1367,7 @@ int ex_get_num_props(int exoid, ex_entity_type obj_type) \ingroup Utilities \undoc */ -int ex__get_cpu_ws(void) { return (sizeof(float)); } +int exi_get_cpu_ws(void) { return (sizeof(float)); } /* swap - interchange v[i] and v[j] */ /*! @@ -1584,7 +1584,7 @@ static void ex_int_iisort64(int64_t v[], int64_t iv[], int64_t N) * representable as 'int'. * \internal */ -void ex__iqsort(int v[], int iv[], size_t N) +void exi_iqsort(int v[], int iv[], size_t N) { /* Thread-safe, reentrant */ ex_int_iqsort(v, iv, 0, N - 1); @@ -1599,8 +1599,8 @@ void ex__iqsort(int v[], int iv[], size_t N) #endif } -/*! \sa ex__iqsort() */ -void ex__iqsort64(int64_t v[], int64_t iv[], int64_t N) +/*! \sa exi_iqsort() */ +void exi_iqsort64(int64_t v[], int64_t iv[], int64_t N) { /* Thread-safe, reentrant */ ex_int_iqsort64(v, iv, 0, N - 1); @@ -1645,7 +1645,7 @@ int ex_large_model(int exoid) \internal \undoc */ -int ex__get_dimension(int exoid, const char *DIMENSION, const char *label, size_t *count, +int exi_get_dimension(int exoid, const char *DIMENSION, const char *label, size_t *count, int *dimid, const char *routine) { int status; @@ -1694,7 +1694,7 @@ size_t ex_header_size(int exoid) return 0; } -void ex__set_compact_storage(int exoid, int varid) +void exi_set_compact_storage(int exoid, int varid) { /* Capability was released in version 4.7.4 Only applicable to netcdf-4 files, but will @@ -1717,14 +1717,14 @@ void ex__set_compact_storage(int exoid, int varid) \internal \undoc */ -void ex__compress_variable(int exoid, int varid, int type) +void exi_compress_variable(int exoid, int varid, int type) { #if NC_HAS_HDF5 - struct ex__file_item *file = ex__find_file_item(exoid); + struct exi_file_item *file = exi_find_file_item(exoid); if (!file) { char errmsg[MAX_ERR_LENGTH]; - snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unknown file id %d for ex__compress_variable().", + snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unknown file id %d for exi_compress_variable().", exoid); ex_err_fn(exoid, __func__, errmsg, EX_BADFILEID); } @@ -1777,7 +1777,7 @@ void ex__compress_variable(int exoid, int varid, int type) \internal \undoc */ -int ex__leavedef(int exoid, const char *call_rout) +int exi_leavedef(int exoid, const char *call_rout) { int status; @@ -1793,7 +1793,7 @@ int ex__leavedef(int exoid, const char *call_rout) static int warning_output = 0; -int ex__check_version(int run_version) +int exi_check_version(int run_version) { if (run_version != EX_API_VERS_NODOT && warning_output == 0) { int run_version_major = run_version / 100; @@ -1815,7 +1815,7 @@ int ex__check_version(int run_version) \internal \undoc */ -int ex__handle_mode(unsigned int my_mode, int is_parallel, int run_version) +int exi_handle_mode(unsigned int my_mode, int is_parallel, int run_version) { char errmsg[MAX_ERR_LENGTH]; int nc_mode = 0; @@ -1832,7 +1832,7 @@ int ex__handle_mode(unsigned int my_mode, int is_parallel, int run_version) /* Do not include EX_64BIT_DATA in this list */ static unsigned int all_modes = EX_NORMAL_MODEL | EX_64BIT_OFFSET | EX_NETCDF4 | EX_PNETCDF; - ex__check_version(run_version); + exi_check_version(run_version); /* * See if specified mode is supported in the version of netcdf we @@ -2121,7 +2121,7 @@ int ex__handle_mode(unsigned int my_mode, int is_parallel, int run_version) \internal \undoc */ -int ex__populate_header(int exoid, const char *path, int my_mode, int is_parallel, int *comp_ws, +int exi_populate_header(int exoid, const char *path, int my_mode, int is_parallel, int *comp_ws, int *io_ws) { int status; @@ -2153,7 +2153,7 @@ int ex__populate_header(int exoid, const char *path, int my_mode, int is_paralle not know that file was closed and possibly new file opened for this exoid */ - if (ex__find_file_item(exoid) != NULL) { + if (exi_find_file_item(exoid) != NULL) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: There is an existing file already using the file " "id %d which was also assigned to file %s.\n\tWas " @@ -2180,7 +2180,7 @@ int ex__populate_header(int exoid, const char *path, int my_mode, int is_paralle is_hdf5 = true; } - if (ex__conv_init(exoid, comp_ws, io_ws, 0, int64_status, is_parallel, is_hdf5, is_pnetcdf, + if (exi_conv_init(exoid, comp_ws, io_ws, 0, int64_status, is_parallel, is_hdf5, is_pnetcdf, my_mode & EX_WRITE) != EX_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to init conversion routines in file id %d", exoid); @@ -2318,7 +2318,7 @@ char *ex_copy_string(char *dest, char const *source, size_t elements) * * On failure, returns NULL. */ -char *ex__canonicalize_filename(char const *file_path) +char *exi_canonicalize_filename(char const *file_path) { #if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || \ defined(__MINGW32__) || defined(_WIN64) || defined(__MINGW64__) diff --git a/packages/seacas/libraries/exodus_for/src/exo_jack-windows.c b/packages/seacas/libraries/exodus_for/src/exo_jack-windows.c index f548b71285..1752650a7f 100644 --- a/packages/seacas/libraries/exodus_for/src/exo_jack-windows.c +++ b/packages/seacas/libraries/exodus_for/src/exo_jack-windows.c @@ -2036,7 +2036,7 @@ void F2C(EXPFRM)(int *idexo, int *nframe, void_int *cfids, real *coord, int *tag } /* Routine to return floating point word size */ -int F2C(EXCPWS)() { return (ex__get_cpu_ws()); } +int F2C(EXCPWS)() { return (exi_get_cpu_ws()); } /* Routine to return large model setting */ int F2C(EXLGMD)(int *idexo) { return (ex_large_model(*idexo)); } diff --git a/packages/seacas/libraries/exodus_for/src/exo_jack.c b/packages/seacas/libraries/exodus_for/src/exo_jack.c index eb68ccd44f..22fc9036c2 100644 --- a/packages/seacas/libraries/exodus_for/src/exo_jack.c +++ b/packages/seacas/libraries/exodus_for/src/exo_jack.c @@ -2424,9 +2424,9 @@ void F2C(expfrm, EXPFRM)(int *idexo, int *nframe, void_int *cfids, real *coord, /*! * Routine to return floating point word size - * \sa ex__get_cpu_ws() + * \sa exi_get_cpu_ws() */ -int F2C(excpws, EXCPWS)(void) { return (ex__get_cpu_ws()); } +int F2C(excpws, EXCPWS)(void) { return (exi_get_cpu_ws()); } /*! * Routine to return large model setting diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C index cea2954130..7c2528dad9 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C @@ -595,12 +595,12 @@ int Internals::initialize_state_file(Mesh &mesh, const ex_var_params &var_params return (EX_FATAL); } - struct ex__file_item *file = ex__find_file_item(exodusFilePtr); + struct exi_file_item *file = exi_find_file_item(exodusFilePtr); if (file) { file->time_varid = varid; } - ex__compress_variable(exodusFilePtr, varid, -2); /* don't compress, but do set collective io */ + exi_compress_variable(exodusFilePtr, varid, -2); /* don't compress, but do set collective io */ } // Exit redefine mode bool output_global_data = (mesh.comm.outputNemesis && mesh.comm.processorCount > 1); @@ -1165,12 +1165,12 @@ int Internals::put_metadata(const Mesh &mesh, const CommunicationMetaData &comm) return (EX_FATAL); } { - struct ex__file_item *file = ex__find_file_item(exodusFilePtr); + struct exi_file_item *file = exi_find_file_item(exodusFilePtr); if (file != nullptr) { file->time_varid = varid; } } - ex__compress_variable(exodusFilePtr, varid, -2); + exi_compress_variable(exodusFilePtr, varid, -2); if (!mesh.nodeblocks.empty() && mesh.nodeblocks[0].entityCount > 0) { status = nc_def_dim(exodusFilePtr, DIM_NUM_NODES, mesh.nodeblocks[0].entityCount, &numnoddim); @@ -1200,7 +1200,7 @@ int Internals::put_metadata(const Mesh &mesh, const CommunicationMetaData &comm) } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); } } @@ -1229,7 +1229,7 @@ int Internals::put_metadata(const Mesh &mesh, const CommunicationMetaData &comm) ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); // Attribute name array... dims[0] = numattrdim; @@ -1245,7 +1245,7 @@ int Internals::put_metadata(const Mesh &mesh, const CommunicationMetaData &comm) ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__set_compact_storage(exodusFilePtr, varid); + exi_set_compact_storage(exodusFilePtr, varid); } size_t elem_count = 0; @@ -1283,7 +1283,7 @@ int Internals::put_metadata(const Mesh &mesh, const CommunicationMetaData &comm) } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); } } @@ -1322,7 +1322,7 @@ int Internals::put_metadata(const Mesh &mesh, const CommunicationMetaData &comm) } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); } } @@ -1361,7 +1361,7 @@ int Internals::put_metadata(const Mesh &mesh, const CommunicationMetaData &comm) } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); } } @@ -1464,10 +1464,10 @@ int Internals::put_metadata(const Mesh &mesh, const CommunicationMetaData &comm) return (EX_FATAL); } } - ex__set_compact_storage(exodusFilePtr, varid); + exi_set_compact_storage(exodusFilePtr, varid); // Output the file version - int ierr = ex__put_nemesis_version(exodusFilePtr); + int ierr = exi_put_nemesis_version(exodusFilePtr); if (ierr < 0) { return (ierr); } @@ -1685,7 +1685,7 @@ int Internals::put_metadata(const std::vector &assemblies) return EX_NOERR; } int status; - if ((status = ex__check_valid_file_id(exodusFilePtr, __func__)) != EX_NOERR) { + if ((status = exi_check_valid_file_id(exodusFilePtr, __func__)) != EX_NOERR) { std::string errmsg = fmt::format("Error: Invalid exodus file handle: {}", exodusFilePtr); ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); @@ -1720,7 +1720,7 @@ int Internals::put_metadata(const std::vector &assemblies) ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, entlst_id, 1); + exi_compress_variable(exodusFilePtr, entlst_id, 1); if (ex_int64_status(exodusFilePtr) & EX_IDS_INT64_DB) { long long tmp = assembly.id; @@ -1772,7 +1772,7 @@ int Internals::put_metadata(const std::vector &assemblies) } /* Increment assembly count */ - struct ex__file_item *file = ex__find_file_item(exodusFilePtr); + struct exi_file_item *file = exi_find_file_item(exodusFilePtr); if (file != nullptr) { file->assembly_count++; } @@ -1822,7 +1822,7 @@ int Internals::put_metadata(const std::vector &blobs) ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__set_compact_storage(exodusFilePtr, entlst); + exi_set_compact_storage(exodusFilePtr, entlst); if (ex_int64_status(exodusFilePtr) & EX_IDS_INT64_DB) { long long tmp = blob.id; @@ -1895,7 +1895,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl // Iterate over blocks ... for (size_t iblk = 0; iblk < num_elem_blk; iblk++) { - ex__inc_file_item(exodusFilePtr, ex__get_counter_list(EX_ELEM_BLOCK)); + exi_inc_file_item(exodusFilePtr, exi_get_counter_list(EX_ELEM_BLOCK)); if (blocks[iblk].entityCount == 0) { continue; @@ -1952,7 +1952,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, connid, 1); + exi_compress_variable(exodusFilePtr, connid, 1); // store element type as attribute of connectivity variable status = nc_put_att_text(exodusFilePtr, connid, ATT_NAME_ELB, @@ -1996,7 +1996,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, connid, 1); + exi_compress_variable(exodusFilePtr, connid, 1); } if (blocks[iblk].facesPerEntity > 0) { @@ -2027,7 +2027,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, connid, 1); + exi_compress_variable(exodusFilePtr, connid, 1); } // element attribute array @@ -2058,7 +2058,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); #if defined(PARALLEL_AWARE_EXODUS) // There is currently a bug in netcdf-4.5.1-devel and earlier @@ -2066,7 +2066,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl // mode for netcdf-4-based output. If the number of attributes > // 1 and in parallel mode, set the mode to independent. if (blocks[iblk].attributeCount > 1) { - struct ex__file_item *file = ex__find_file_item(exodusFilePtr); + struct exi_file_item *file = exi_find_file_item(exodusFilePtr); if (file && file->is_parallel && file->is_hdf5) { nc_var_par_access(exodusFilePtr, varid, NC_INDEPENDENT); } @@ -2089,7 +2089,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__set_compact_storage(exodusFilePtr, varid); + exi_set_compact_storage(exodusFilePtr, varid); } } } @@ -2140,7 +2140,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl // Iterate over blocks ... for (size_t iblk = 0; iblk < num_face_blk; iblk++) { - ex__inc_file_item(exodusFilePtr, ex__get_counter_list(EX_FACE_BLOCK)); + exi_inc_file_item(exodusFilePtr, exi_get_counter_list(EX_FACE_BLOCK)); if (blocks[iblk].entityCount == 0) { continue; @@ -2210,7 +2210,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } { // Attribute name array... @@ -2228,7 +2228,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__set_compact_storage(exodusFilePtr, varid); + exi_set_compact_storage(exodusFilePtr, varid); } } @@ -2245,7 +2245,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, connid, 1); + exi_compress_variable(exodusFilePtr, connid, 1); // store element type as attribute of connectivity variable status = nc_put_att_text(exodusFilePtr, connid, ATT_NAME_ELB, @@ -2304,7 +2304,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl // Iterate over blocks ... for (size_t iblk = 0; iblk < num_edge_blk; iblk++) { - ex__inc_file_item(exodusFilePtr, ex__get_counter_list(EX_EDGE_BLOCK)); + exi_inc_file_item(exodusFilePtr, exi_get_counter_list(EX_EDGE_BLOCK)); if (blocks[iblk].entityCount == 0) { continue; @@ -2374,7 +2374,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); // Attribute name array... dims[0] = numattrdim; @@ -2391,7 +2391,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__set_compact_storage(exodusFilePtr, varid); + exi_set_compact_storage(exodusFilePtr, varid); } // edge connectivity array @@ -2408,7 +2408,7 @@ int Internals::put_metadata(const std::vector &blocks, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, connid, 1); + exi_compress_variable(exodusFilePtr, connid, 1); // store element type as attribute of connectivity variable status = nc_put_att_text(exodusFilePtr, connid, ATT_NAME_ELB, @@ -2661,7 +2661,7 @@ int Internals::put_non_define_data(const std::vector &blobs) return (EX_FATAL); } } - ex__update_max_name_length(exodusFilePtr, name_length); + exi_update_max_name_length(exodusFilePtr, name_length); return EX_NOERR; } @@ -2693,7 +2693,7 @@ int Internals::put_non_define_data(const std::vector &assemblies) } } } - ex__update_max_name_length(exodusFilePtr, name_length); + exi_update_max_name_length(exodusFilePtr, name_length); return EX_NOERR; } @@ -2911,9 +2911,9 @@ int Internals::put_metadata(const std::vector &nodesets, bool count_onl for (int i = 0; i < num_node_sets; i++) { - // NOTE: ex__inc_file_item is used to find the number of node sets + // NOTE: exi_inc_file_item is used to find the number of node sets // for a specific file and returns that value incremented. - int cur_num_node_sets = ex__inc_file_item(exodusFilePtr, ex__get_counter_list(EX_NODE_SET)); + int cur_num_node_sets = exi_inc_file_item(exodusFilePtr, exi_get_counter_list(EX_NODE_SET)); if (nodesets[i].entityCount == 0) { continue; @@ -2961,7 +2961,7 @@ int Internals::put_metadata(const std::vector &nodesets, bool count_onl } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); // Create variable for distribution factors if required if (nodesets[i].dfCount > 0) { @@ -2995,7 +2995,7 @@ int Internals::put_metadata(const std::vector &nodesets, bool count_onl } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } if (nodesets[i].attributeCount > 0) { @@ -3025,7 +3025,7 @@ int Internals::put_metadata(const std::vector &nodesets, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } { @@ -3043,7 +3043,7 @@ int Internals::put_metadata(const std::vector &nodesets, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__set_compact_storage(exodusFilePtr, varid); + exi_set_compact_storage(exodusFilePtr, varid); } } } @@ -3093,9 +3093,9 @@ int Internals::put_metadata(const std::vector &edgesets, bool count_onl for (int i = 0; i < num_edge_sets; i++) { - // NOTE: ex__inc_file_item is used to find the number of edge sets + // NOTE: exi_inc_file_item is used to find the number of edge sets // for a specific file and returns that value incremented. - int cur_num_edge_sets = ex__inc_file_item(exodusFilePtr, ex__get_counter_list(EX_EDGE_SET)); + int cur_num_edge_sets = exi_inc_file_item(exodusFilePtr, exi_get_counter_list(EX_EDGE_SET)); if (edgesets[i].entityCount == 0) { continue; @@ -3143,7 +3143,7 @@ int Internals::put_metadata(const std::vector &edgesets, bool count_onl } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); // Orientation variable status = nc_def_var(exodusFilePtr, VAR_ORNT_ES(cur_num_edge_sets + 1), bulk_type, 1, @@ -3164,7 +3164,7 @@ int Internals::put_metadata(const std::vector &edgesets, bool count_onl } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); // Create variable for distribution factors if required if (edgesets[i].dfCount > 0) { @@ -3198,7 +3198,7 @@ int Internals::put_metadata(const std::vector &edgesets, bool count_onl } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } if (edgesets[i].attributeCount > 0) { int numattrdim; @@ -3227,7 +3227,7 @@ int Internals::put_metadata(const std::vector &edgesets, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } { @@ -3245,7 +3245,7 @@ int Internals::put_metadata(const std::vector &edgesets, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__set_compact_storage(exodusFilePtr, varid); + exi_set_compact_storage(exodusFilePtr, varid); } } } @@ -3295,9 +3295,9 @@ int Internals::put_metadata(const std::vector &facesets, bool count_onl for (int i = 0; i < num_face_sets; i++) { - // NOTE: ex__inc_file_item is used to find the number of face sets + // NOTE: exi_inc_file_item is used to find the number of face sets // for a specific file and returns that value incremented. - int cur_num_face_sets = ex__inc_file_item(exodusFilePtr, ex__get_counter_list(EX_FACE_SET)); + int cur_num_face_sets = exi_inc_file_item(exodusFilePtr, exi_get_counter_list(EX_FACE_SET)); if (facesets[i].entityCount == 0) { continue; @@ -3345,7 +3345,7 @@ int Internals::put_metadata(const std::vector &facesets, bool count_onl } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); // Orientation variable status = nc_def_var(exodusFilePtr, VAR_ORNT_FS(cur_num_face_sets + 1), bulk_type, 1, @@ -3366,7 +3366,7 @@ int Internals::put_metadata(const std::vector &facesets, bool count_onl } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); // Create variable for distribution factors if required if (facesets[i].dfCount > 0) { @@ -3400,7 +3400,7 @@ int Internals::put_metadata(const std::vector &facesets, bool count_onl } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } if (facesets[i].attributeCount > 0) { int numattrdim; @@ -3429,7 +3429,7 @@ int Internals::put_metadata(const std::vector &facesets, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } { @@ -3447,7 +3447,7 @@ int Internals::put_metadata(const std::vector &facesets, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__set_compact_storage(exodusFilePtr, varid); + exi_set_compact_storage(exodusFilePtr, varid); } } } @@ -3496,9 +3496,9 @@ int Internals::put_metadata(const std::vector &elemsets, bool count_onl for (int i = 0; i < num_elem_sets; i++) { - // NOTE: ex__inc_file_item is used to find the number of elem sets + // NOTE: exi_inc_file_item is used to find the number of elem sets // for a specific file and returns that value incremented. - int cur_num_elem_sets = ex__inc_file_item(exodusFilePtr, ex__get_counter_list(EX_ELEM_SET)); + int cur_num_elem_sets = exi_inc_file_item(exodusFilePtr, exi_get_counter_list(EX_ELEM_SET)); if (elemsets[i].entityCount == 0) { continue; @@ -3547,7 +3547,7 @@ int Internals::put_metadata(const std::vector &elemsets, bool count_onl } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); // Create variable for distribution factors if required if (elemsets[i].dfCount > 0) { @@ -3581,7 +3581,7 @@ int Internals::put_metadata(const std::vector &elemsets, bool count_onl } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } if (elemsets[i].attributeCount > 0) { int numattrdim; @@ -3610,7 +3610,7 @@ int Internals::put_metadata(const std::vector &elemsets, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } { @@ -3628,7 +3628,7 @@ int Internals::put_metadata(const std::vector &elemsets, bool count_onl ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__set_compact_storage(exodusFilePtr, varid); + exi_set_compact_storage(exodusFilePtr, varid); } } } @@ -3802,9 +3802,9 @@ int Internals::put_metadata(const std::vector &sidesets, bool count_onl for (int i = 0; i < num_side_sets; i++) { - // NOTE: ex__inc_file_item is used to find the number of side sets + // NOTE: exi_inc_file_item is used to find the number of side sets // for a specific file and returns that value incremented. - int cur_num_side_sets = ex__inc_file_item(exodusFilePtr, ex__get_counter_list(EX_SIDE_SET)); + int cur_num_side_sets = exi_inc_file_item(exodusFilePtr, exi_get_counter_list(EX_SIDE_SET)); if (sidesets[i].entityCount == 0) { continue; @@ -3851,7 +3851,7 @@ int Internals::put_metadata(const std::vector &sidesets, bool count_onl } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); // create side list variable for side set status = nc_def_var(exodusFilePtr, VAR_SIDE_SS(cur_num_side_sets + 1), bulk_type, 1, @@ -3872,7 +3872,7 @@ int Internals::put_metadata(const std::vector &sidesets, bool count_onl } return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); // Create variable for distribution factors if required if (sidesets[i].dfCount > 0) { @@ -3917,7 +3917,7 @@ int Internals::put_metadata(const std::vector &sidesets, bool count_onl return (EX_FATAL); } } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } return (EX_NOERR); } @@ -4004,7 +4004,7 @@ namespace { return (EX_FATAL); } } - ex__compress_variable(exodusFilePtr, *varid, 1); + exi_compress_variable(exodusFilePtr, *varid, 1); return (EX_NOERR); } @@ -4032,7 +4032,7 @@ namespace { ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 1); + exi_compress_variable(exodusFilePtr, varid, 1); } return (EX_NOERR); } @@ -4062,7 +4062,7 @@ namespace { ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__set_compact_storage(exodusFilePtr, varid); + exi_set_compact_storage(exodusFilePtr, varid); i++; } } @@ -4171,7 +4171,7 @@ namespace { ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } if (dimension > 1) { @@ -4184,7 +4184,7 @@ namespace { ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } if (dimension > 2) { @@ -4197,7 +4197,7 @@ namespace { ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__compress_variable(exodusFilePtr, varid, 2); + exi_compress_variable(exodusFilePtr, varid, 2); } } @@ -4212,7 +4212,7 @@ namespace { ex_err_fn(exodusFilePtr, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__set_compact_storage(exodusFilePtr, varid); + exi_set_compact_storage(exodusFilePtr, varid); return (EX_NOERR); } @@ -4255,7 +4255,7 @@ namespace { return (EX_FATAL); } if (count * 4 < sixty_four_kb) { - ex__set_compact_storage(exoid, varid); + exi_set_compact_storage(exoid, varid); } // id array: @@ -4270,7 +4270,7 @@ namespace { return (EX_FATAL); } if (count * ids_size < sixty_four_kb) { - ex__set_compact_storage(exoid, varid); + exi_set_compact_storage(exoid, varid); } // store property name as attribute of property array variable @@ -4293,7 +4293,7 @@ namespace { ex_err_fn(exoid, __func__, errmsg.c_str(), status); return (EX_FATAL); } - ex__set_compact_storage(exoid, varid); + exi_set_compact_storage(exoid, varid); } return (EX_NOERR); } diff --git a/packages/seacas/libraries/nemesis/nemesis_wrapper.c b/packages/seacas/libraries/nemesis/nemesis_wrapper.c index c0670d6739..fdf28f97f1 100644 --- a/packages/seacas/libraries/nemesis/nemesis_wrapper.c +++ b/packages/seacas/libraries/nemesis/nemesis_wrapper.c @@ -13,8 +13,8 @@ * 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 */ + 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); @@ -52,7 +52,7 @@ int ne_put_init_global(int neid, /* NemesisI file ID */ num_side_sets_g); } -int ne_put_version(int neid) { return ex__put_nemesis_version(neid); } +int ne_put_version(int neid) { return exi_put_nemesis_version(neid); } /*============================================================================= * Loadbalance Parameter Routines @@ -165,8 +165,8 @@ 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 */ + void_int *side_set_elem_list, /* List of element IDs */ + void_int *side_set_side_list /* List of side IDs */ ) { return ex_get_partial_set(neid, EX_SIDE_SET, side_set_id, start_side_num, num_sides, @@ -189,7 +189,7 @@ 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 */ + void *side_set_df /* Distribution factors */ ) { return ex_get_partial_set_dist_fact(neid, EX_SIDE_SET, side_set_id, start_num, num_df_to_get, @@ -200,7 +200,7 @@ 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 */ + void *side_set_df /* Distribution factors */ ) { return ex_put_partial_set_dist_fact(neid, EX_SIDE_SET, side_set_id, start_num, num_df_to_get, @@ -211,7 +211,7 @@ 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 */ + void_int *node_set_node_list /* List of nodes in node set */ ) { return ex_get_partial_set(neid, EX_NODE_SET, node_set_id, start_node_num, num_node, @@ -233,7 +233,7 @@ 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 */ + void *node_set_df /* Distribution factors */ ) { return ex_get_partial_set_dist_fact(neid, EX_NODE_SET, node_set_id, start_num, num_df_to_get, @@ -244,7 +244,7 @@ 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 */ + void *node_set_df /* Distribution factors */ ) { return ex_put_partial_set_dist_fact(neid, EX_NODE_SET, node_set_id, start_num, num_df_to_get, @@ -254,9 +254,9 @@ int ne_put_n_node_set_df(int neid, /* NetCDF/Exodus file ID */ 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 */ + void *x_coor, /* Vector of X coordinates */ + void *y_coor, /* Vector of Y coordinates */ + void *z_coor /* Vector of Z coordinates */ ) { return ex_get_partial_coord(neid, start_node_num, num_nodes, x_coor, y_coor, z_coor); @@ -265,9 +265,9 @@ int ne_get_n_coord(int neid, /* NetCDF/Exodus file ID */ 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 */ + void *x_coor, /* Vector of X coordinates */ + void *y_coor, /* Vector of Y coordinates */ + void *z_coor /* Vector of Z coordinates */ ) { return ex_put_partial_coord(neid, start_node_num, num_nodes, x_coor, y_coor, z_coor); @@ -277,7 +277,7 @@ 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 */ + void_int *connect /* Connectivity vector */ ) { return ex_get_partial_conn(neid, EX_ELEM_BLOCK, elem_blk_id, start_elem_num, num_elems, connect, @@ -299,7 +299,7 @@ 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 */ + void *attrib /* Attribute */ ) { return ex_get_partial_attr(neid, EX_ELEM_BLOCK, elem_blk_id, start_elem_num, num_elems, attrib); @@ -309,7 +309,7 @@ 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 */ + void *attrib /* Attribute */ ) { return ex_put_partial_attr(neid, EX_ELEM_BLOCK, elem_blk_id, start_elem_num, num_elems, attrib); @@ -317,7 +317,7 @@ int ne_put_n_elem_attr(int neid, /* NetCDF/Exodus file ID */ 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 */ + char *elem_type /* The name of the element type */ ) { return ex_get_elem_type(neid, elem_blk_id, elem_type); @@ -333,7 +333,7 @@ int ne_get_n_elem_var(int neid, /* NetCDF/Exodus file 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 */ + void *elem_var_vals /* variable values */ ) { return ex_get_partial_var(neid, time_step, EX_ELEM_BLOCK, elem_var_index, elem_blk_id, @@ -346,7 +346,7 @@ int ne_put_elem_var_slab(int neid, /* NetCDF/Exodus file ID * 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 */ + void *elem_var_vals /* variable values */ ) { return ex_put_partial_var(neid, time_step, EX_ELEM_BLOCK, elem_var_index, elem_blk_id, start_pos, @@ -358,7 +358,7 @@ int ne_get_n_nodal_var(int neid, /* NetCDF/Exodus file ID */ 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 */ + void *nodal_vars /* array of nodal var values */ ) { return ex_get_partial_var(neid, time_step, EX_NODAL, nodal_var_index, 1, start_node_num, @@ -370,7 +370,7 @@ int ne_put_nodal_var_slab(int neid, /* NetCDF/Exodus file ID */ 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 */ + void *nodal_var_vals /* Nodal variable values */ ) { return ex_put_partial_var(neid, time_step, EX_NODAL, nodal_var_index, 1, start_pos, num_vals, @@ -499,8 +499,8 @@ int ne_put_cmap_params_cc(int neid, /* NetCDF/Exodus file ID 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 */ + void_int *node_ids, /* FEM node IDs */ + void_int *proc_ids, /* Processor IDs */ int processor /* This processor ID */ ) { @@ -509,8 +509,8 @@ int ne_get_node_cmap(int neid, /* NetCDF/Exodus file ID */ 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 */ + void_int *node_ids, /* FEM node IDs */ + void_int *proc_ids, /* Processor IDs */ int processor /* This processor ID */ ) { @@ -519,9 +519,9 @@ int ne_put_node_cmap(int neid, /* NetCDF/Exodus file ID */ 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 */ + void_int *elem_ids, /* Element IDs */ + void_int *side_ids, /* Element side IDs */ + void_int *proc_ids, /* Processor IDs */ int processor /* This processor ID */ ) { @@ -530,9 +530,9 @@ int ne_get_elem_cmap(int neid, /* NetCDF/Exodus file ID */ 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 */ + 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 */ ) { @@ -541,7 +541,7 @@ int ne_put_elem_cmap(int neid, /* NetCDF/Exodus file ID */ 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 */ + int64_t *index, /* array of length 2 to hold results */ int pos /* position of this proc/cmap in index */ ) { From 5d5e8119f474e26df07c8f2b426674a92d320077 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Fri, 10 Nov 2023 12:17:05 -0700 Subject: [PATCH 040/110] EXODUS: Change ne__ to nei_ --- packages/seacas/libraries/exodus/include/exodusII_int.h | 4 ++-- packages/seacas/libraries/exodus/src/ex_get_cmap_params.c | 4 ++-- packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c | 4 ++-- packages/seacas/libraries/exodus/src/ex_get_init_global.c | 2 +- .../seacas/libraries/exodus/src/ex_get_loadbal_param.c | 2 +- packages/seacas/libraries/exodus/src/ex_get_node_cmap.c | 4 ++-- packages/seacas/libraries/exodus/src/ex_ne_util.c | 8 ++++---- packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c | 2 +- packages/seacas/libraries/exodus/src/ex_put_node_cmap.c | 2 +- .../libraries/exodus/src/ex_put_partial_node_cmap.c | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/seacas/libraries/exodus/include/exodusII_int.h b/packages/seacas/libraries/exodus/include/exodusII_int.h index ac61ca8a3a..1295c96363 100644 --- a/packages/seacas/libraries/exodus/include/exodusII_int.h +++ b/packages/seacas/libraries/exodus/include/exodusII_int.h @@ -870,9 +870,9 @@ EXODUS_EXPORT int exi_put_nemesis_version(int exoid); EXODUS_EXPORT int exi_put_homogenous_block_params(int exoid, size_t block_count, const struct ex_block *blocks); -EXODUS_EXPORT int ne__check_file_version(int exoid); +EXODUS_EXPORT int nei_check_file_version(int exoid); -EXODUS_EXPORT int ne__id_lkup(int exoid, /* NetCDF/Exodus file ID */ +EXODUS_EXPORT int nei_id_lkup(int exoid, /* NetCDF/Exodus file ID */ const char *ne_var_name, /* Nemesis variable name */ int64_t *idx, /* index variable for variable, length 2 */ ex_entity_id ne_var_id /* NetCDF variable ID */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c b/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c index 388e1c782e..83299094ee 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c +++ b/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c @@ -134,7 +134,7 @@ int ex_get_cmap_params(int exoid, void_int *node_cmap_ids, void_int *node_cmap_n cmap_id = ((int *)node_cmap_ids)[cnt]; } - if ((map_idx = ne__id_lkup(exoid, VAR_N_COMM_IDS, cmap_info_idx, cmap_id)) < 0) { + if ((map_idx = nei_id_lkup(exoid, VAR_N_COMM_IDS, cmap_info_idx, cmap_id)) < 0) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find nodal comm map with ID %" PRId64 " in file ID %d", cmap_id, exoid); @@ -295,7 +295,7 @@ int ex_get_cmap_params(int exoid, void_int *node_cmap_ids, void_int *node_cmap_n cmap_id = ((int *)elem_cmap_ids)[cnt]; } - if ((map_idx = ne__id_lkup(exoid, VAR_E_COMM_IDS, cmap_info_idx, cmap_id)) < 0) { + if ((map_idx = nei_id_lkup(exoid, VAR_E_COMM_IDS, cmap_info_idx, cmap_id)) < 0) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find elemental comm map with ID %" PRId64 " in file ID %d", cmap_id, exoid); diff --git a/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c b/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c index 38dc6baa15..023f172c36 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c @@ -57,11 +57,11 @@ int ex_get_elem_cmap(int exoid, ex_entity_id map_id, void_int *elem_ids, void_in /* * no need to check if the second index is -1 that is handled - * in ne__id_lkup, where the dimension must be looked up anyways + * in nei_id_lkup, where the dimension must be looked up anyways */ /* Get the index of the elemental comm map with the given ID */ - if ((map_idx = ne__id_lkup(exoid, VAR_E_COMM_IDS, varidx, map_id)) < 0) { + if ((map_idx = nei_id_lkup(exoid, VAR_E_COMM_IDS, varidx, map_id)) < 0) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find elemental comm map with ID %" PRId64 " in file \ ID %d", diff --git a/packages/seacas/libraries/exodus/src/ex_get_init_global.c b/packages/seacas/libraries/exodus/src/ex_get_init_global.c index 4e98e68a36..518316a7e4 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_init_global.c +++ b/packages/seacas/libraries/exodus/src/ex_get_init_global.c @@ -71,7 +71,7 @@ int ex_get_init_global(int exoid, void_int *num_nodes_g, void_int *num_elems_g, /* Check the file version information */ int dimid; - if ((dimid = ne__check_file_version(exoid)) != EX_NOERR) { + if ((dimid = nei_check_file_version(exoid)) != EX_NOERR) { EX_FUNC_LEAVE(dimid); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c b/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c index c17423f209..0795dc6ce6 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c @@ -72,7 +72,7 @@ int ex_get_loadbal_param(int exoid, void_int *num_int_nodes, void_int *num_bor_n } /* Check the file version information */ - if ((dimid = ne__check_file_version(exoid)) != EX_NOERR) { + if ((dimid = nei_check_file_version(exoid)) != EX_NOERR) { EX_FUNC_LEAVE(dimid); } diff --git a/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c b/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c index a36eb19b57..9a989dd337 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c @@ -53,11 +53,11 @@ int ex_get_node_cmap(int exoid, ex_entity_id map_id, void_int *node_ids, void_in /* * no need to check if the second index is -1 that is handled - * in ne__id_lkup, where the dimension must be looked up anyways + * in nei_id_lkup, where the dimension must be looked up anyways */ /* Get the index of the nodal comm map with the given ID */ - if ((map_idx = ne__id_lkup(exoid, VAR_N_COMM_IDS, varidx, map_id)) < 0) { + if ((map_idx = nei_id_lkup(exoid, VAR_N_COMM_IDS, varidx, map_id)) < 0) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find nodal comm map with ID %" PRId64 " in file ID %d", map_id, exoid); diff --git a/packages/seacas/libraries/exodus/src/ex_ne_util.c b/packages/seacas/libraries/exodus/src/ex_ne_util.c index 6dfdb00d05..1161820445 100644 --- a/packages/seacas/libraries/exodus/src/ex_ne_util.c +++ b/packages/seacas/libraries/exodus/src/ex_ne_util.c @@ -12,10 +12,10 @@ /* Function(s) contained in this file: * * exi_leavedef() - * ne__id_lkup() + * nei_id_lkup() * exi_get_file_type() * exi_put_nemesis_version() - * ne__check_file_version() + * nei_check_file_version() * ex_get_idx() * ***************************************************************************** @@ -37,7 +37,7 @@ char *ne_ret_string; /* Note: This function assumes a 1-d vector of data for "ne_var_name". */ /*****************************************************************************/ -int ne__id_lkup(int exoid, const char *ne_var_name, int64_t *idx, ex_entity_id ne_var_id) +int nei_id_lkup(int exoid, const char *ne_var_name, int64_t *idx, ex_entity_id ne_var_id) { int status; int varid; @@ -192,7 +192,7 @@ int exi_put_nemesis_version(int exoid) /* This function checks that the version info is correct. */ /*****************************************************************************/ -int ne__check_file_version(int exoid) +int nei_check_file_version(int exoid) { #if 0 float file_ver; diff --git a/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c b/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c index 77975801d6..4d0a022cd0 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c @@ -56,7 +56,7 @@ int ex_put_elem_cmap(int exoid, ex_entity_id map_id, const void_int *elem_ids, } /* Get the index for this map_id */ - if ((map_idx = ne__id_lkup(exoid, VAR_E_COMM_IDS, varidx, map_id)) == -1) { + if ((map_idx = nei_id_lkup(exoid, VAR_E_COMM_IDS, varidx, map_id)) == -1) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find index for variable \"%s\" in file ID %d", VAR_E_COMM_IDS, exoid); diff --git a/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c b/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c index 19d1968d79..580251542b 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c @@ -56,7 +56,7 @@ int ex_put_node_cmap(int exoid, ex_entity_id map_id, const void_int *node_ids, } /* Get the index for this map_id */ - if ((map_idx = ne__id_lkup(exoid, VAR_N_COMM_IDS, varidx, map_id)) == -1) { + if ((map_idx = nei_id_lkup(exoid, VAR_N_COMM_IDS, varidx, map_id)) == -1) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find index for variable \"%s\" in file ID %d", VAR_N_COMM_IDS, exoid); diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_node_cmap.c b/packages/seacas/libraries/exodus/src/ex_put_partial_node_cmap.c index a30945c4e5..d533b7b61b 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_node_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_node_cmap.c @@ -66,7 +66,7 @@ int ex_put_partial_node_cmap(int exoid, ex_entity_id map_id, int64_t start_entit } /* Get the index for this map_id */ - if ((map_idx = ne__id_lkup(exoid, VAR_N_COMM_IDS, varidx, map_id)) == -1) { + if ((map_idx = nei_id_lkup(exoid, VAR_N_COMM_IDS, varidx, map_id)) == -1) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to find index for variable \"%s\" in file ID %d", VAR_N_COMM_IDS, exoid); From 5f00f462af640e1fdc5d21d401f3ed101bba652c Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Fri, 10 Nov 2023 14:29:19 -0700 Subject: [PATCH 041/110] IOSS: Fix reserved identifiers abc__ -> abc_nl --- .../libraries/ioss/src/Ioss_DatabaseIO.C | 20 ++-- .../libraries/ioss/src/Ioss_DatabaseIO.h | 71 +++++++------- .../libraries/ioss/src/Ioss_IOFactory.C | 8 +- packages/seacas/libraries/ioss/src/Ioss_Map.C | 26 ++--- packages/seacas/libraries/ioss/src/Ioss_Map.h | 8 +- .../seacas/libraries/ioss/src/Ioss_Region.C | 94 +++++++++---------- .../seacas/libraries/ioss/src/Ioss_Region.h | 15 +-- .../libraries/ioss/src/Ioss_SerializeIO.C | 4 +- .../ioss/src/adios/Ioad_DatabaseIO.C | 20 ++-- .../ioss/src/adios/Ioad_DatabaseIO.h | 14 +-- .../ioss/src/catalyst/Iocatalyst_DatabaseIO.C | 14 +-- .../ioss/src/catalyst/Iocatalyst_DatabaseIO.h | 20 ++-- .../ioss/src/cgns/Iocgns_DatabaseIO.C | 44 ++++----- .../ioss/src/cgns/Iocgns_DatabaseIO.h | 22 ++--- .../ioss/src/cgns/Iocgns_ParallelDatabaseIO.C | 48 +++++----- .../ioss/src/cgns/Iocgns_ParallelDatabaseIO.h | 26 ++--- .../ioss/src/exodus/Ioex_BaseDatabaseIO.C | 56 +++++------ .../ioss/src/exodus/Ioex_BaseDatabaseIO.h | 28 +++--- .../ioss/src/exodus/Ioex_DatabaseIO.C | 80 ++++++++-------- .../ioss/src/exodus/Ioex_DatabaseIO.h | 4 +- .../ioss/src/exodus/Ioex_ParallelDatabaseIO.C | 20 ++-- .../ioss/src/exodus/Ioex_ParallelDatabaseIO.h | 8 +- .../ioss/src/exonull/Ioexnl_BaseDatabaseIO.C | 16 ++-- .../ioss/src/exonull/Ioexnl_BaseDatabaseIO.h | 24 ++--- .../ioss/src/exonull/Ioexnl_DatabaseIO.C | 4 +- .../ioss/src/exonull/Ioexnl_DatabaseIO.h | 4 +- .../src/exonull/Ioexnl_ParallelDatabaseIO.C | 4 +- .../src/exonull/Ioexnl_ParallelDatabaseIO.h | 6 +- .../ioss/src/faodel/Iofaodel_DatabaseIO.C | 10 +- .../ioss/src/faodel/Iofaodel_DatabaseIO.h | 12 +-- .../ioss/src/gen_struc/Iogs_DatabaseIO.C | 12 +-- .../ioss/src/gen_struc/Iogs_DatabaseIO.h | 10 +- .../ioss/src/generated/Iogn_DatabaseIO.C | 12 +-- .../ioss/src/generated/Iogn_DatabaseIO.h | 10 +- .../ioss/src/heartbeat/Iohb_DatabaseIO.C | 10 +- .../ioss/src/heartbeat/Iohb_DatabaseIO.h | 16 ++-- .../ioss/src/null/Ionull_DatabaseIO.C | 10 +- .../ioss/src/null/Ionull_DatabaseIO.h | 14 +-- .../ioss/src/pamgen/Iopg_DatabaseIO.C | 12 +-- .../ioss/src/pamgen/Iopg_DatabaseIO.h | 10 +- .../ioss/src/text_mesh/Iotm_DatabaseIO.C | 89 +++++++++--------- .../ioss/src/text_mesh/Iotm_DatabaseIO.h | 10 +- .../visualization/cgns/Iovs_cgns_DatabaseIO.C | 26 ++--- .../visualization/cgns/Iovs_cgns_DatabaseIO.h | 10 +- .../exodus/Iovs_exodus_DatabaseIO.C | 22 ++--- .../exodus/Iovs_exodus_DatabaseIO.h | 10 +- 46 files changed, 505 insertions(+), 508 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C index 4222f2bdea..6bcade5389 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C @@ -509,7 +509,7 @@ namespace Ioss { } } - /** \brief This function gets called inside closeDatabase__(), which checks if Cray Datawarp (DW) + /** \brief This function gets called inside closeDatabase_nl(), which checks if Cray Datawarp (DW) * is in use, if so, we want to call a stageout before actual close of this file. */ void DatabaseIO::close_dw() const @@ -569,9 +569,9 @@ namespace Ioss { } } - void DatabaseIO::openDatabase__() const { open_dw(get_filename()); } + void DatabaseIO::openDatabase_nl() const { open_dw(get_filename()); } - void DatabaseIO::closeDatabase__() const { close_dw(); } + void DatabaseIO::closeDatabase_nl() const { close_dw(); } IfDatabaseExistsBehavior DatabaseIO::open_create_behavior() const { @@ -666,12 +666,12 @@ namespace Ioss { if (m_timeStateInOut) { m_stateStart = std::chrono::steady_clock::now(); } - return begin_state__(state, time); + return begin_state_nl(state, time); } bool DatabaseIO::end_state(int state, double time) { IOSS_FUNC_ENTER(m_); - bool res = end_state__(state, time); + bool res = end_state_nl(state, time); if (m_timeStateInOut) { auto finish = std::chrono::steady_clock::now(); log_time(m_stateStart, finish, state, time, is_input(), singleProcOnly, util_); @@ -681,9 +681,9 @@ namespace Ioss { } // Default versions do nothing... - bool DatabaseIO::begin_state__(int /* state */, double /* time */) { return true; } + bool DatabaseIO::begin_state_nl(int /* state */, double /* time */) { return true; } - bool DatabaseIO::end_state__(int /* state */, double /* time */) { return true; } + bool DatabaseIO::end_state_nl(int /* state */, double /* time */) { return true; } void DatabaseIO::handle_groups() { @@ -973,8 +973,8 @@ namespace Ioss { assert(!sideTopology.empty()); } - void DatabaseIO::get_block_adjacencies__(const Ioss::ElementBlock *eb, - std::vector &block_adjacency) const + void DatabaseIO::get_block_adjacencies_nl(const Ioss::ElementBlock *eb, + std::vector &block_adjacency) const { if (!blockAdjacenciesCalculated) { compute_block_adjacencies(); @@ -1040,7 +1040,7 @@ namespace Ioss { std::vector> inv_con(nodeCount); { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); int blk_position = -1; for (Ioss::ElementBlock *eb : element_blocks) { if (eb->property_exists("original_block_order")) { diff --git a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h index 682bdf0521..701a2cb70d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h @@ -82,7 +82,7 @@ namespace Ioss { int *bad_count = nullptr) const { IOSS_FUNC_ENTER(m_); - return ok__(write_message, error_message, bad_count); + return ok_nl(write_message, error_message, bad_count); } // Check capabilities of input/output database... Returns an @@ -103,13 +103,13 @@ namespace Ioss { int64_t node_global_to_local(int64_t global, bool must_exist) const { IOSS_FUNC_ENTER(m_); - return node_global_to_local__(global, must_exist); + return node_global_to_local_nl(global, must_exist); } int64_t element_global_to_local(int64_t global) const { IOSS_FUNC_ENTER(m_); - return element_global_to_local__(global); + return element_global_to_local_nl(global); } /** If there is a single block of nodes in the model, then it is @@ -126,7 +126,7 @@ namespace Ioss { void release_memory() { IOSS_FUNC_ENTER(m_); - release_memory__(); + release_memory_nl(); } // Do anything that might be needed to the database prior to it @@ -228,21 +228,21 @@ namespace Ioss { { IOSS_FUNC_ENTER(m_); progress(__func__); - openDatabase__(); + openDatabase_nl(); } void closeDatabase() const { IOSS_FUNC_ENTER(m_); progress(__func__); - closeDatabase__(); + closeDatabase_nl(); } void flush_database() const { IOSS_FUNC_ENTER(m_); progress(__func__); - flush_database__(); + flush_database_nl(); } /** \brief If a database type supports groups and if the database @@ -259,7 +259,7 @@ namespace Ioss { bool open_group(const std::string &group_name) { IOSS_FUNC_ENTER(m_); - return open_group__(group_name); + return open_group_nl(group_name); } /** \brief If a database type supports groups, create the specified @@ -275,7 +275,7 @@ namespace Ioss { bool create_subgroup(const std::string &group_name) { IOSS_FUNC_ENTER(m_); - return create_subgroup__(group_name); + return create_subgroup_nl(group_name); } /** \brief Set the database to the given State. @@ -296,7 +296,7 @@ namespace Ioss { { IOSS_FUNC_ENTER(m_); progress(__func__); - return begin__(state); + return begin_nl(state); } /** \brief Return the database to STATE_CLOSED. @@ -313,7 +313,7 @@ namespace Ioss { { IOSS_FUNC_ENTER(m_); progress(__func__); - return end__(state); + return end_nl(state); } bool begin_state(int state, double time); @@ -324,14 +324,14 @@ namespace Ioss { { IOSS_FUNC_ENTER(m_); progress("Begin read_meta_data()"); - read_meta_data__(); + read_meta_data_nl(); progress("End read_meta_data()"); } void get_step_times() { IOSS_FUNC_ENTER(m_); - return get_step_times__(); + return get_step_times_nl(); } virtual bool internal_edges_available() const { return false; } @@ -479,12 +479,12 @@ namespace Ioss { void get_block_adjacencies(const Ioss::ElementBlock *eb, std::vector &block_adjacency) const { - return get_block_adjacencies__(eb, block_adjacency); + return get_block_adjacencies_nl(eb, block_adjacency); } void compute_block_membership(Ioss::SideBlock *efblock, std::vector &block_membership) const { - return compute_block_membership__(efblock, block_membership); + return compute_block_membership_nl(efblock, block_membership); } AxisAlignedBoundingBox get_bounding_box(const Ioss::NodeBlock *nb) const; @@ -725,13 +725,13 @@ namespace Ioss { mutable std::vector> blockAdjacency; - virtual void openDatabase__() const; - virtual void closeDatabase__() const; - virtual void flush_database__() const {} + virtual void openDatabase_nl() const; + virtual void closeDatabase_nl() const; + virtual void flush_database_nl() const {} private: - virtual bool ok__(bool /* write_message */, std::string * /* error_message */, - int *bad_count) const + virtual bool ok_nl(bool /* write_message */, std::string * /* error_message */, + int *bad_count) const { if (bad_count != nullptr) { *bad_count = 0; @@ -739,17 +739,17 @@ namespace Ioss { return dbState != Ioss::STATE_INVALID; } - virtual int64_t node_global_to_local__(int64_t global, bool must_exist) const + virtual int64_t node_global_to_local_nl(int64_t global, bool must_exist) const { return nodeMap.global_to_local(global, must_exist); } - virtual int64_t element_global_to_local__(int64_t global) const + virtual int64_t element_global_to_local_nl(int64_t global) const { return elemMap.global_to_local(global); } - virtual void release_memory__() + virtual void release_memory_nl() { nodeMap.release_memory(); edgeMap.release_memory(); @@ -757,23 +757,24 @@ namespace Ioss { elemMap.release_memory(); } - virtual bool open_group__(const std::string & /* group_name */) { return false; } - virtual bool create_subgroup__(const std::string & /* group_name */) { return false; } + virtual bool open_group_nl(const std::string & /* group_name */) { return false; } + virtual bool create_subgroup_nl(const std::string & /* group_name */) { return false; } - virtual bool begin__(Ioss::State state) = 0; - virtual bool end__(Ioss::State state) = 0; + virtual bool begin_nl(Ioss::State state) = 0; + virtual bool end_nl(Ioss::State state) = 0; - virtual void read_meta_data__() = 0; - virtual void get_step_times__() {} + virtual void read_meta_data_nl() = 0; + virtual void get_step_times_nl() {} - virtual bool begin_state__(int state, double time); - virtual bool end_state__(int state, double time); + virtual bool begin_state_nl(int state, double time); + virtual bool end_state_nl(int state, double time); - void get_block_adjacencies__(const Ioss::ElementBlock *eb, - std::vector &block_adjacency) const; + void get_block_adjacencies_nl(const Ioss::ElementBlock *eb, + std::vector &block_adjacency) const; - virtual void compute_block_membership__(Ioss::SideBlock * /* efblock */, - std::vector & /* block_membership */) const + virtual void + compute_block_membership_nl(Ioss::SideBlock * /* efblock */, + std::vector & /* block_membership */) const { } diff --git a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C index 2c6111dcc5..cac4fe746b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2021 National Technology & Engineering Solutions +// Copyright(C) 1999-2021, 2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -27,7 +27,7 @@ namespace { std::mutex m_; #endif - int describe__(Ioss::IOFactoryMap *registry, Ioss::NameList *names) + int describe_nl(Ioss::IOFactoryMap *registry, Ioss::NameList *names) { int count = 0; Ioss::IOFactoryMap::const_iterator I; @@ -85,7 +85,7 @@ Ioss::DatabaseIO *Ioss::IOFactory::create(const std::string &type, const std::st std::ostringstream errmsg; fmt::print(errmsg, "ERROR: The database type '{}' is not supported.\n", type); Ioss::NameList db_types; - describe__(registry(), &db_types); + describe_nl(registry(), &db_types); fmt::print(errmsg, "\nSupported database types:\n\t{}\n\n", fmt::join(db_types.begin(), db_types.end(), " ")); IOSS_ERROR(errmsg); @@ -117,7 +117,7 @@ Ioss::DatabaseIO *Ioss::IOFactory::create(const std::string &type, const std::st int Ioss::IOFactory::describe(NameList *names) { IOSS_FUNC_ENTER(m_); - return describe__(registry(), names); + return describe_nl(registry(), names); } /** \brief Get the names of database formats known to IOSS. diff --git a/packages/seacas/libraries/ioss/src/Ioss_Map.C b/packages/seacas/libraries/ioss/src/Ioss_Map.C index ecb85d3728..c51aaf486e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Map.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Map.C @@ -95,14 +95,14 @@ void Ioss::Map::set_size(size_t entity_count) } void Ioss::Map::build_reverse_map() { build_reverse_map(m_map.size() - 1, 0); } -void Ioss::Map::build_reverse_map_no_lock() { build_reverse_map__(m_map.size() - 1, 0); } +void Ioss::Map::build_reverse_map_no_lock() { build_reverse_map_nl(m_map.size() - 1, 0); } void Ioss::Map::build_reverse_map(int64_t num_to_get, int64_t offset) { IOSS_FUNC_ENTER(m_); - build_reverse_map__(num_to_get, offset); + build_reverse_map_nl(num_to_get, offset); } -void Ioss::Map::build_reverse_map__(int64_t num_to_get, int64_t offset) +void Ioss::Map::build_reverse_map_nl(int64_t num_to_get, int64_t offset) { // Stored as an unordered map -- key:global_id, value:local_id if (!is_sequential()) { @@ -284,7 +284,7 @@ bool Ioss::Map::set_map(INT *ids, size_t count, size_t offset, bool in_define_mo set_is_sequential(false); #if !defined USE_LAZY_REVERSE if (m_map.size() - 1 > count) { - build_reverse_map__(m_map.size() - 1, 0); + build_reverse_map_nl(m_map.size() - 1, 0); } #endif m_offset = 0; @@ -312,7 +312,7 @@ bool Ioss::Map::set_map(INT *ids, size_t count, size_t offset, bool in_define_mo #if defined USE_LAZY_REVERSE // Build this now before we redefine an entry if (!in_define_mode && changed) { - build_reverse_map__(m_map.size() - 1, 0); + build_reverse_map_nl(m_map.size() - 1, 0); } #endif @@ -340,7 +340,7 @@ bool Ioss::Map::set_map(INT *ids, size_t count, size_t offset, bool in_define_mo m_reverse.clear(); } #if !defined USE_LAZY_REVERSE - build_reverse_map__(count, offset); + build_reverse_map_nl(count, offset); #endif } else if (changed) { @@ -350,7 +350,7 @@ bool Ioss::Map::set_map(INT *ids, size_t count, size_t offset, bool in_define_mo // is if the ids order was redefined after the STATE_MODEL // phase... This is 0-based and used for // remapping output and input TRANSIENT fields. - build_reorder_map__(offset, count); + build_reorder_map_nl(offset, count); } return changed; } @@ -376,7 +376,7 @@ template void Ioss::Map::reverse_map_data(INT *data, size_t count if (!is_sequential()) { for (size_t i = 0; i < count; i++) { INT global_id = data[i]; - data[i] = (INT)global_to_local__(global_id, true); + data[i] = (INT)global_to_local_nl(global_id, true); } } else if (m_offset != 0) { @@ -517,7 +517,7 @@ size_t Ioss::Map::map_field_to_db_scalar_order(T *variables, std::vector return num_out; } -void Ioss::Map::build_reorder_map__(int64_t start, int64_t count) +void Ioss::Map::build_reorder_map_nl(int64_t start, int64_t count) { // This routine builds a map that relates the current node id order // to the original node ordering in affect at the time the file was @@ -547,7 +547,7 @@ void Ioss::Map::build_reorder_map__(int64_t start, int64_t count) int64_t my_end = start + count; for (int64_t i = start; i < my_end; i++) { int64_t global_id = m_map[i + 1]; - int64_t orig_local_id = global_to_local__(global_id) - 1; + int64_t orig_local_id = global_to_local_nl(global_id) - 1; // The reordering should only be a permutation of the original // ordering within this entity block... @@ -575,7 +575,7 @@ void Ioss::Map::build_reorder_map__(int64_t start, int64_t count) int64_t my_end = start + count; for (int64_t i = start; i < my_end; i++) { int64_t global_id = m_map[i + 1]; - int64_t orig_local_id = global_to_local__(global_id) - 1; + int64_t orig_local_id = global_to_local_nl(global_id) - 1; // The reordering should only be a permutation of the original // ordering within this entity block... @@ -592,10 +592,10 @@ void Ioss::Map::build_reorder_map__(int64_t start, int64_t count) int64_t Ioss::Map::global_to_local(int64_t global, bool must_exist) const { IOSS_FUNC_ENTER(m_); - return global_to_local__(global, must_exist); + return global_to_local_nl(global, must_exist); } -int64_t Ioss::Map::global_to_local__(int64_t global, bool must_exist) const +int64_t Ioss::Map::global_to_local_nl(int64_t global, bool must_exist) const { int64_t local = global; #if defined USE_LAZY_REVERSE diff --git a/packages/seacas/libraries/ioss/src/Ioss_Map.h b/packages/seacas/libraries/ioss/src/Ioss_Map.h index 43c6231586..d64529aa07 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Map.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Map.h @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions +// Copyright(C) 1999-2020, 2022, 2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -101,9 +101,9 @@ namespace Ioss { template void map_data(INT *data, size_t count) const; template void map_implicit_data(INT *data, size_t count, size_t offset) const; - int64_t global_to_local__(int64_t global, bool must_exist = true) const; - void build_reorder_map__(int64_t start, int64_t count); - void build_reverse_map__(int64_t num_to_get, int64_t offset); + int64_t global_to_local_nl(int64_t global, bool must_exist = true) const; + void build_reorder_map_nl(int64_t start, int64_t count); + void build_reverse_map_nl(int64_t num_to_get, int64_t offset); #if defined MAP_USE_SORTED_VECTOR void verify_no_duplicate_ids(std::vector &reverse_map); #endif diff --git a/packages/seacas/libraries/ioss/src/Ioss_Region.C b/packages/seacas/libraries/ioss/src/Ioss_Region.C index f11e089936..0be46aeea2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Region.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Region.C @@ -627,7 +627,7 @@ namespace Ioss { bool success = false; { IOSS_FUNC_ENTER(m_); - success = begin_mode__(new_state); + success = begin_mode_nl(new_state); } // Pass the 'begin state' message on to the database so it can do any // cleanup/data checking/manipulations it needs to do. @@ -645,7 +645,7 @@ namespace Ioss { return success; } - bool Region::begin_mode__(State new_state) + bool Region::begin_mode_nl(State new_state) { bool success = false; if (new_state == STATE_CLOSED) { @@ -688,7 +688,7 @@ namespace Ioss { { { IOSS_FUNC_ENTER(m_); - end_mode__(current_state); + end_mode_nl(current_state); } // Pass the 'end state' message on to the database so it can do any @@ -698,7 +698,7 @@ namespace Ioss { return success; } - bool Region::end_mode__(State current_state) + bool Region::end_mode_nl(State current_state) { bool success = true; // Check that 'current_state' matches the current state of the @@ -796,7 +796,7 @@ namespace Ioss { * \param[in] time The time at the new state. * \returns The state index (1-based). */ - int Region::add_state__(double time) + int Region::add_state_nl(double time) { // NOTE: For restart input databases, it is possible that the time @@ -1103,7 +1103,7 @@ namespace Ioss { structured_block->property_add(Ioss::Property("zone", (int)structuredBlocks.size())); structured_block->property_add(Ioss::Property("base", 1)); // Add name as alias to itself to simplify later uses... - add_alias__(structured_block); + add_alias_nl(structured_block); return true; } return false; @@ -1124,7 +1124,7 @@ namespace Ioss { if (get_state() == STATE_DEFINE_MODEL) { nodeBlocks.push_back(node_block); // Add name as alias to itself to simplify later uses... - add_alias__(node_block); + add_alias_nl(node_block); return true; } @@ -1180,7 +1180,7 @@ namespace Ioss { if (get_state() == STATE_DEFINE_MODEL) { assemblies.push_back(assembly); // Add name as alias to itself to simplify later uses... - add_alias__(assembly); + add_alias_nl(assembly); return true; } @@ -1202,7 +1202,7 @@ namespace Ioss { if (get_state() == STATE_DEFINE_MODEL) { blobs.push_back(blob); // Add name as alias to itself to simplify later uses... - add_alias__(blob); + add_alias_nl(blob); return true; } @@ -1239,7 +1239,7 @@ namespace Ioss { // Check that region is in correct state for adding entities if (get_state() == STATE_DEFINE_MODEL) { // Add name as alias to itself to simplify later uses... - add_alias__(element_block); + add_alias_nl(element_block); // An input database defines these in the order matching the order // on the "file". For output, we need to order based on the @@ -1301,7 +1301,7 @@ namespace Ioss { // Check that region is in correct state for adding entities if (get_state() == STATE_DEFINE_MODEL) { // Add name as alias to itself to simplify later uses... - add_alias__(face_block); + add_alias_nl(face_block); // An input database defines these in the order matching the order // on the "file". For output, we need to order based on the @@ -1337,7 +1337,7 @@ namespace Ioss { // Check that region is in correct state for adding entities if (get_state() == STATE_DEFINE_MODEL) { // Add name as alias to itself to simplify later uses... - add_alias__(edge_block); + add_alias_nl(edge_block); // An input database defines these in the order matching the order // on the "file". For output, we need to order based on the @@ -1372,13 +1372,13 @@ namespace Ioss { // Check that region is in correct state for adding entities if (get_state() == STATE_DEFINE_MODEL) { // Add name as alias to itself to simplify later uses... - add_alias__(sideset); + add_alias_nl(sideset); // Also add "sideset_{id}" as an alias. auto id = sideset->get_optional_property(id_str(), -1); if (id != -1) { std::string ss_alias = fmt::format("sideset_{}", id); - add_alias__(sideset->name(), ss_alias, sideset->type()); + add_alias_nl(sideset->name(), ss_alias, sideset->type()); } sideSets.push_back(sideset); return true; @@ -1399,13 +1399,13 @@ namespace Ioss { // Check that region is in correct state for adding entities if (get_state() == STATE_DEFINE_MODEL) { // Add name as alias to itself to simplify later uses... - add_alias__(nodeset); + add_alias_nl(nodeset); // Also add "nodeset_{id}" as an alias. auto id = nodeset->get_optional_property(id_str(), -1); if (id != -1) { std::string ns_alias = fmt::format("nodeset_{}", id); - add_alias__(nodeset->name(), ns_alias, nodeset->type()); + add_alias_nl(nodeset->name(), ns_alias, nodeset->type()); } nodeSets.push_back(nodeset); return true; @@ -1426,7 +1426,7 @@ namespace Ioss { // Check that region is in correct state for adding entities if (get_state() == STATE_DEFINE_MODEL) { // Add name as alias to itself to simplify later uses... - add_alias__(edgeset); + add_alias_nl(edgeset); edgeSets.push_back(edgeset); return true; } @@ -1446,7 +1446,7 @@ namespace Ioss { // Check that region is in correct state for adding entities if (get_state() == STATE_DEFINE_MODEL) { // Add name as alias to itself to simplify later uses... - add_alias__(faceset); + add_alias_nl(faceset); faceSets.push_back(faceset); return true; } @@ -1466,7 +1466,7 @@ namespace Ioss { // Check that region is in correct state for adding entities if (get_state() == STATE_DEFINE_MODEL) { // Add name as alias to itself to simplify later uses... - add_alias__(elementset); + add_alias_nl(elementset); elementSets.push_back(elementset); return true; } @@ -1486,7 +1486,7 @@ namespace Ioss { // Check that region is in correct state for adding entities if (get_state() == STATE_DEFINE_MODEL) { // Add name as alias to itself to simplify later uses... - add_alias__(commset); + add_alias_nl(commset); commSets.push_back(commset); return true; } @@ -1585,14 +1585,14 @@ namespace Ioss { bool Region::add_alias(const GroupingEntity *ge) { IOSS_FUNC_ENTER(m_); - return add_alias__(ge); + return add_alias_nl(ge); } - bool Region::add_alias__(const GroupingEntity *ge) + bool Region::add_alias_nl(const GroupingEntity *ge) { // See if an entity with this name and type already exists... const auto &db_name = ge->name(); - const std::string alias = get_alias__(db_name, ge->type()); + const std::string alias = get_alias_nl(db_name, ge->type()); if (!alias.empty()) { const GroupingEntity *old_ge = get_entity(db_name, ge->type()); @@ -1611,13 +1611,13 @@ namespace Ioss { } } } - bool success = add_alias__(db_name, db_name, ge->type()); + bool success = add_alias_nl(db_name, db_name, ge->type()); // "db_name" property is used with the canonical name setting. if (success && ge->property_exists("db_name")) { std::string canon_name = ge->get_property("db_name").get_string(); if (canon_name != db_name) { - success = add_alias__(db_name, canon_name, ge->type()); + success = add_alias_nl(db_name, canon_name, ge->type()); } } @@ -1637,16 +1637,16 @@ namespace Ioss { bool Region::add_alias(const std::string &db_name, const std::string &alias, EntityType type) { IOSS_FUNC_ENTER(m_); - return add_alias__(db_name, alias, type); + return add_alias_nl(db_name, alias, type); } - bool Region::add_alias__(const std::string &db_name, const std::string &alias, EntityType type) + bool Region::add_alias_nl(const std::string &db_name, const std::string &alias, EntityType type) { // Possible that 'db_name' is itself an alias, resolve down to "canonical" // name... std::string canon = db_name; if (db_name != alias) { - canon = get_alias__(db_name, type); + canon = get_alias_nl(db_name, type); } if (!canon.empty()) { @@ -1673,7 +1673,7 @@ namespace Ioss { auto *entity = get_entity(db_name); IOSS_FUNC_ENTER(m_); if (entity != nullptr) { - return add_alias__(db_name, alias, entity->type()); + return add_alias_nl(db_name, alias, entity->type()); } return false; } @@ -1687,10 +1687,10 @@ namespace Ioss { std::string Region::get_alias(const std::string &alias, EntityType type) const { IOSS_FUNC_ENTER(m_); - return get_alias__(alias, type); + return get_alias_nl(alias, type); } - std::string Region::get_alias__(const std::string &alias, EntityType type) const + std::string Region::get_alias_nl(const std::string &alias, EntityType type) const { std::string ci_alias = Ioss::Utils::uppercase(alias); auto I = aliases_[type].find(ci_alias); @@ -1949,7 +1949,7 @@ namespace Ioss { Assembly *Region::get_assembly(const std::string &my_name) const { IOSS_FUNC_ENTER(m_); - const std::string db_name = get_alias__(my_name, ASSEMBLY); + const std::string db_name = get_alias_nl(my_name, ASSEMBLY); unsigned int db_hash = Ioss::Utils::hash(db_name); Assembly *ge = nullptr; @@ -1970,7 +1970,7 @@ namespace Ioss { Blob *Region::get_blob(const std::string &my_name) const { IOSS_FUNC_ENTER(m_); - const std::string db_name = get_alias__(my_name, BLOB); + const std::string db_name = get_alias_nl(my_name, BLOB); unsigned int db_hash = Ioss::Utils::hash(db_name); Blob *ge = nullptr; @@ -1991,7 +1991,7 @@ namespace Ioss { NodeBlock *Region::get_node_block(const std::string &my_name) const { IOSS_FUNC_ENTER(m_); - const std::string db_name = get_alias__(my_name, NODEBLOCK); + const std::string db_name = get_alias_nl(my_name, NODEBLOCK); unsigned int db_hash = Ioss::Utils::hash(db_name); NodeBlock *ge = nullptr; @@ -2012,7 +2012,7 @@ namespace Ioss { EdgeBlock *Region::get_edge_block(const std::string &my_name) const { IOSS_FUNC_ENTER(m_); - const std::string db_name = get_alias__(my_name, EDGEBLOCK); + const std::string db_name = get_alias_nl(my_name, EDGEBLOCK); unsigned int db_hash = Ioss::Utils::hash(db_name); EdgeBlock *ge = nullptr; @@ -2033,7 +2033,7 @@ namespace Ioss { FaceBlock *Region::get_face_block(const std::string &my_name) const { IOSS_FUNC_ENTER(m_); - const std::string db_name = get_alias__(my_name, FACEBLOCK); + const std::string db_name = get_alias_nl(my_name, FACEBLOCK); unsigned int db_hash = Ioss::Utils::hash(db_name); FaceBlock *ge = nullptr; @@ -2054,7 +2054,7 @@ namespace Ioss { ElementBlock *Region::get_element_block(const std::string &my_name) const { IOSS_FUNC_ENTER(m_); - const std::string db_name = get_alias__(my_name, ELEMENTBLOCK); + const std::string db_name = get_alias_nl(my_name, ELEMENTBLOCK); unsigned int db_hash = Ioss::Utils::hash(db_name); ElementBlock *ge = nullptr; @@ -2075,7 +2075,7 @@ namespace Ioss { StructuredBlock *Region::get_structured_block(const std::string &my_name) const { IOSS_FUNC_ENTER(m_); - const std::string db_name = get_alias__(my_name, STRUCTUREDBLOCK); + const std::string db_name = get_alias_nl(my_name, STRUCTUREDBLOCK); unsigned int db_hash = Ioss::Utils::hash(db_name); StructuredBlock *ge = nullptr; @@ -2096,7 +2096,7 @@ namespace Ioss { SideSet *Region::get_sideset(const std::string &my_name) const { IOSS_FUNC_ENTER(m_); - const std::string db_name = get_alias__(my_name, SIDESET); + const std::string db_name = get_alias_nl(my_name, SIDESET); unsigned int db_hash = Ioss::Utils::hash(db_name); SideSet *ge = nullptr; @@ -2135,7 +2135,7 @@ namespace Ioss { NodeSet *Region::get_nodeset(const std::string &my_name) const { IOSS_FUNC_ENTER(m_); - const std::string db_name = get_alias__(my_name, NODESET); + const std::string db_name = get_alias_nl(my_name, NODESET); unsigned int db_hash = Ioss::Utils::hash(db_name); NodeSet *ge = nullptr; @@ -2156,7 +2156,7 @@ namespace Ioss { EdgeSet *Region::get_edgeset(const std::string &my_name) const { IOSS_FUNC_ENTER(m_); - const std::string db_name = get_alias__(my_name, EDGESET); + const std::string db_name = get_alias_nl(my_name, EDGESET); unsigned int db_hash = Ioss::Utils::hash(db_name); EdgeSet *ge = nullptr; @@ -2177,7 +2177,7 @@ namespace Ioss { FaceSet *Region::get_faceset(const std::string &my_name) const { IOSS_FUNC_ENTER(m_); - const std::string db_name = get_alias__(my_name, FACESET); + const std::string db_name = get_alias_nl(my_name, FACESET); unsigned int db_hash = Ioss::Utils::hash(db_name); FaceSet *ge = nullptr; @@ -2198,7 +2198,7 @@ namespace Ioss { ElementSet *Region::get_elementset(const std::string &my_name) const { IOSS_FUNC_ENTER(m_); - const std::string db_name = get_alias__(my_name, ELEMENTSET); + const std::string db_name = get_alias_nl(my_name, ELEMENTSET); unsigned int db_hash = Ioss::Utils::hash(db_name); ElementSet *ge = nullptr; @@ -2219,7 +2219,7 @@ namespace Ioss { CommSet *Region::get_commset(const std::string &my_name) const { IOSS_FUNC_ENTER(m_); - const std::string db_name = get_alias__(my_name, COMMSET); + const std::string db_name = get_alias_nl(my_name, COMMSET); unsigned int db_hash = Ioss::Utils::hash(db_name); CommSet *ge = nullptr; @@ -2558,7 +2558,7 @@ namespace Ioss { std::string alias = alias_pair.first; std::string base = alias_pair.second; if (alias != base && to->get_entity(base) != nullptr) { - to->add_alias__(base, alias, alias_map.first); + to->add_alias_nl(base, alias, alias_map.first); } } } @@ -2704,7 +2704,7 @@ namespace Ioss { if (alias != base) { GroupingEntity *ge = get_entity(base); if (ge != nullptr) { - add_alias__(base, alias, alias_map.first); + add_alias_nl(base, alias, alias_map.first); } } } @@ -2716,7 +2716,7 @@ namespace Ioss { const std::string &name = entity->name(); // See if any alias with this name... - std::string alias = get_alias__(name, entity->type()); + std::string alias = get_alias_nl(name, entity->type()); if (!alias.empty()) { // There is an entity with this name... diff --git a/packages/seacas/libraries/ioss/src/Ioss_Region.h b/packages/seacas/libraries/ioss/src/Ioss_Region.h index 21726d04e3..27dfee864b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Region.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Region.h @@ -116,9 +116,9 @@ namespace Ioss { virtual int add_state(double time) { IOSS_FUNC_ENTER(m_); - return add_state__(time); + return add_state_nl(time); } - virtual int add_state__(double time); + virtual int add_state_nl(double time); // Get time corresponding to specified state @@ -223,7 +223,8 @@ namespace Ioss { bool add_alias(const std::string &db_name, const std::string &alias); bool add_alias(const GroupingEntity *ge); std::string get_alias(const std::string &alias, EntityType type) const; - std::string get_alias__(const std::string &alias, EntityType type) const; // Not locked by mutex + std::string get_alias_nl(const std::string &alias, + EntityType type) const; // Not locked by mutex const AliasMap &get_alias_map(EntityType entity_type) const; @@ -299,11 +300,11 @@ namespace Ioss { // Add the name 'alias' as an alias for the database entity with the // name 'db_name'. Returns true if alias added; false if problems // adding alias. Not protected by mutex -- call internally only. - bool add_alias__(const std::string &db_name, const std::string &alias, EntityType type); - bool add_alias__(const GroupingEntity *ge); + bool add_alias_nl(const std::string &db_name, const std::string &alias, EntityType type); + bool add_alias_nl(const GroupingEntity *ge); - bool begin_mode__(State new_state); - bool end_mode__(State current_state); + bool begin_mode_nl(State new_state); + bool end_mode_nl(State current_state); void delete_database() override; diff --git a/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C b/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C index 9950678193..7596d48de7 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C +++ b/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C @@ -48,7 +48,7 @@ namespace Ioss { do { util.barrier(); } while (++s_owner != s_groupRank); - m_databaseIO->openDatabase__(); + m_databaseIO->openDatabase_nl(); } else { s_owner = s_groupRank; @@ -65,7 +65,7 @@ namespace Ioss { IOSS_FUNC_ENTER(m_); if (!m_activeFallThru) { if (s_groupFactor > 0) { - m_databaseIO->closeDatabase__(); + m_databaseIO->closeDatabase_nl(); s_owner = s_groupRank; const Ioss::ParallelUtils util = m_databaseIO->util(); do { diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C b/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C index 805c0956fd..de6d17053b 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C @@ -60,14 +60,14 @@ namespace Ioad { // Used to force `rank` initialization before creating `adios_wrapper`. int DatabaseIO::RankInit() { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); number_proc = Ioss::SerializeIO::getSize(); return Ioss::SerializeIO::getRank(); } DatabaseIO::~DatabaseIO() {} - bool DatabaseIO::begin__(Ioss::State state) + bool DatabaseIO::begin_nl(Ioss::State state) { // initialization Ioss::Region *this_region = get_region(); @@ -259,7 +259,7 @@ namespace Ioad { } } - bool DatabaseIO::end__(Ioss::State state) + bool DatabaseIO::end_nl(Ioss::State state) { // Transitioning out of state 'state' assert(state == dbState); @@ -294,7 +294,7 @@ namespace Ioad { return true; } - bool DatabaseIO::begin_state__(int state, double time) + bool DatabaseIO::begin_state_nl(int state, double time) { Ioss::Region *this_region = get_region(); if (!is_input()) { @@ -321,7 +321,7 @@ namespace Ioad { } // common - bool DatabaseIO::end_state__(int state, double time) + bool DatabaseIO::end_state_nl(int state, double time) { Ioss::Region *this_region = get_region(); @@ -1191,7 +1191,7 @@ namespace Ioad { { // Check "time" attribute and global variable. timeScaleFactor = adios_wrapper.GetAttribute(Time_scale_factor, true, 1.0); - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); Ioss::Region *this_region = get_region(); if (globals_map.find(Time_meta) != globals_map.end()) { // Load time steps @@ -1213,7 +1213,7 @@ namespace Ioad { adios_wrapper.GetSync(time_var, tsteps.data()); for (size_t step = 0; step < time_var.Steps(); step++) { // if (tsteps[i] <= last_time) { TODO: Check last time step before writing everything - this_region->add_state__(tsteps[step] * timeScaleFactor); + this_region->add_state_nl(tsteps[step] * timeScaleFactor); } } else { @@ -1226,7 +1226,7 @@ namespace Ioad { add_entity_properties(this_region, properties_map, region_name); } - void DatabaseIO::read_meta_data__() + void DatabaseIO::read_meta_data_nl() { check_processor_info(); Ioss::Region *region = get_region(); @@ -1602,8 +1602,8 @@ namespace Ioad { } } - void DatabaseIO::compute_block_membership__(Ioss::SideBlock *efblock, - std::vector &block_membership) const + void DatabaseIO::compute_block_membership_nl(Ioss::SideBlock *efblock, + std::vector &block_membership) const { const Ioss::ElementBlockContainer &element_blocks = get_region()->get_element_blocks(); assert(Ioss::Utils::check_block_order(element_blocks)); diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.h b/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.h index dc2f760114..47e86e6d36 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.h @@ -46,8 +46,8 @@ namespace Ioad { std::string get_format() const override { return "ADIOS2"; } - bool begin__(Ioss::State state) override; - bool end__(Ioss::State state) override; + bool begin_nl(Ioss::State state) override; + bool end_nl(Ioss::State state) override; unsigned entity_field_support() const override; int int_byte_size_db() const override; @@ -242,20 +242,20 @@ namespace Ioad { const std::string &string_variable) const; void get_globals(const GlobalMapType &globals_map, const FieldsMapType &properties_map); - void compute_block_membership__(Ioss::SideBlock *efblock, - std::vector &block_membership) const override; + void compute_block_membership_nl(Ioss::SideBlock *efblock, + std::vector &block_membership) const override; void define_properties(const Ioss::GroupingEntity *entity_block, const std::string &encoded_entity_name); - void read_meta_data__() override; + void read_meta_data_nl() override; void read_communication_metadata(); void read_region(const FieldsMapType &fields_map); void check_processor_info(); void check_model(); int RankInit(); - bool begin_state__(int state, double time) override; - bool end_state__(int state, double time) override; + bool begin_state_nl(int state, double time) override; + bool end_state_nl(int state, double time) override; unsigned long rank; // rank needs to be declared first to be initialized before adios_wrapper. mutable AdiosWrapper adios_wrapper; // adios_wrapper needs to be declared before bpio // and bp_engine to be initialized first. diff --git a/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.C b/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.C index 37054431e9..e8975e1918 100644 --- a/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.C @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2021 National Technology & Engineering Solutions +// Copyright(C) 1999-2021, 2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -476,13 +476,13 @@ namespace Iocatalyst { } } - bool DatabaseIO::begin__(Ioss::State state) + bool DatabaseIO::begin_nl(Ioss::State state) { this->dbState = state; return true; } - bool DatabaseIO::end__(Ioss::State state) + bool DatabaseIO::end_nl(Ioss::State state) { assert(this->dbState == state); @@ -521,10 +521,10 @@ namespace Iocatalyst { return true; } - bool DatabaseIO::begin_state__(int state, double time) { return true; } + bool DatabaseIO::begin_state_nl(int state, double time) { return true; } // common - bool DatabaseIO::end_state__(int state, double time) + bool DatabaseIO::end_state_nl(int state, double time) { if (this->is_input()) {} else { @@ -552,7 +552,7 @@ namespace Iocatalyst { Ioss::SIDEBLOCK | Ioss::REGION; } - void DatabaseIO::read_meta_data__() + void DatabaseIO::read_meta_data_nl() { auto region = this->get_region(); assert(region != nullptr); @@ -561,7 +561,7 @@ namespace Iocatalyst { impl.readModel(region); } - void DatabaseIO::get_step_times__() + void DatabaseIO::get_step_times_nl() { auto region = this->get_region(); assert(region != nullptr); diff --git a/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.h b/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.h index 2513742a17..47834505d1 100644 --- a/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.h @@ -77,21 +77,21 @@ namespace Iocatalyst { bool deep_copy() const { return this->useDeepCopy; } private: - bool open_group__(const std::string & /* group_name */) override { return false; } - bool create_subgroup__(const std::string & /* group_name */) override { return false; } + bool open_group_nl(const std::string & /* group_name */) override { return false; } + bool create_subgroup_nl(const std::string & /* group_name */) override { return false; } - bool begin__(Ioss::State state) override; - bool end__(Ioss::State state) override; + bool begin_nl(Ioss::State state) override; + bool end_nl(Ioss::State state) override; - void read_meta_data__() override; - void get_step_times__() override; + void read_meta_data_nl() override; + void get_step_times_nl() override; - bool begin_state__(int state, double time) override; - bool end_state__(int state, double time) override; + bool begin_state_nl(int state, double time) override; + bool end_state_nl(int state, double time) override; void - compute_block_membership__(Ioss::SideBlock * /* efblock */, - std::vector & /* block_membership */) const override + compute_block_membership_nl(Ioss::SideBlock * /* efblock */, + std::vector & /* block_membership */) const override { } diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C index d582ca22ac..bd730934c7 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C @@ -37,7 +37,6 @@ #error "Could not include cgnslib.h" #endif -#include "tokenize.h" #include "Ioss_Assembly.h" #include "Ioss_CommSet.h" #include "Ioss_DBUsage.h" @@ -56,15 +55,15 @@ #include "Ioss_Field.h" #include "Ioss_FileInfo.h" #include "Ioss_GroupingEntity.h" +#include "Ioss_Hex8.h" #include "Ioss_Map.h" #include "Ioss_MeshType.h" #include "Ioss_NodeBlock.h" #include "Ioss_NodeSet.h" -#include "Ioss_Quad4.h" -#include "Ioss_Hex8.h" #include "Ioss_ParallelUtils.h" #include "Ioss_Property.h" #include "Ioss_PropertyManager.h" +#include "Ioss_Quad4.h" #include "Ioss_Region.h" #include "Ioss_SideBlock.h" #include "Ioss_SideSet.h" @@ -75,6 +74,7 @@ #include "Ioss_ZoneConnectivity.h" #include "robin_hash.h" #include "robin_set.h" +#include "tokenize.h" // extern char hdf5_access[64]; @@ -580,7 +580,7 @@ namespace Iocgns { } } - Ioss::DatabaseIO::openDatabase__(); + Ioss::DatabaseIO::openDatabase_nl(); } DatabaseIO::~DatabaseIO() @@ -593,7 +593,7 @@ namespace Iocgns { CGCHECKM(cg_close(m_cgnsBasePtr)); m_cgnsBasePtr = -1; } - closeDatabase__(); + closeDatabase_nl(); } catch (...) { } @@ -602,12 +602,12 @@ namespace Iocgns { int DatabaseIO::get_file_pointer() const { if (m_cgnsFilePtr < 0) { - openDatabase__(); + openDatabase_nl(); } return m_cgnsFilePtr; } - void DatabaseIO::openDatabase__() const + void DatabaseIO::openDatabase_nl() const { if (m_cgnsFilePtr < 0) { #if 0 @@ -689,7 +689,7 @@ namespace Iocgns { SMART_ASSERT(m_cgnsFilePtr >= 0); } - void DatabaseIO::closeDatabase__() const + void DatabaseIO::closeDatabase_nl() const { if (m_cgnsFilePtr > 0) { CGCHECKM(cg_close(m_cgnsFilePtr)); @@ -782,12 +782,12 @@ namespace Iocgns { } } - int64_t DatabaseIO::node_global_to_local__(int64_t global, bool /*must_exist*/) const + int64_t DatabaseIO::node_global_to_local_nl(int64_t global, bool /*must_exist*/) const { return global; } - int64_t DatabaseIO::element_global_to_local__(int64_t global) const { return global; } + int64_t DatabaseIO::element_global_to_local_nl(int64_t global) const { return global; } void DatabaseIO::create_structured_block_fpp(IOSS_MAYBE_UNUSED int base, IOSS_MAYBE_UNUSED int num_zones, @@ -1529,7 +1529,7 @@ namespace Iocgns { } } - void DatabaseIO::read_meta_data__() + void DatabaseIO::read_meta_data_nl() { // Determine the number of bases in the grid. // Currently only handle 1. @@ -1543,7 +1543,7 @@ namespace Iocgns { IOSS_ERROR(errmsg); } - get_step_times__(); + get_step_times_nl(); if (open_create_behavior() == Ioss::DB_APPEND) { return; @@ -1634,7 +1634,7 @@ namespace Iocgns { Utils::common_write_meta_data(get_file_pointer(), *get_region(), m_zoneOffset, false); } - void DatabaseIO::get_step_times__() + void DatabaseIO::get_step_times_nl() { Utils::get_step_times(get_file_pointer(), m_timesteps, get_region(), timeScaleFactor, myProcessor); @@ -1700,7 +1700,7 @@ namespace Iocgns { } } - bool DatabaseIO::begin__(Ioss::State state) + bool DatabaseIO::begin_nl(Ioss::State state) { dbState = state; return true; @@ -1715,7 +1715,7 @@ namespace Iocgns { m_cgnsBasePtr = m_cgnsFilePtr; m_cgnsFilePtr = -1; } - closeDatabase__(); + closeDatabase_nl(); } void DatabaseIO::open_state_file(int state) @@ -1739,7 +1739,7 @@ namespace Iocgns { Iocgns::Utils::write_state_meta_data(get_file_pointer(), *get_region(), false); } - bool DatabaseIO::end__(Ioss::State state) + bool DatabaseIO::end_nl(Ioss::State state) { // Transitioning out of state 'state' switch (state) { @@ -1774,7 +1774,7 @@ namespace Iocgns { return true; } - bool DatabaseIO::begin_state__(int state, double /* time */) + bool DatabaseIO::begin_state_nl(int state, double /* time */) { if (is_input()) { return true; @@ -1791,7 +1791,7 @@ namespace Iocgns { return true; } - bool DatabaseIO::end_state__(int state, double time) + bool DatabaseIO::end_state_nl(int state, double time) { if (!is_input()) { m_timesteps.push_back(time); @@ -1805,21 +1805,21 @@ namespace Iocgns { } if (do_flush) { - flush_database__(); + flush_database_nl(); } } return true; } - void DatabaseIO::flush_database__() const + void DatabaseIO::flush_database_nl() const { // For HDF5 files, it looks like we need to close the database between // writes if we want to have a valid database for external access or // to protect against a crash corrupting the file. Utils::finalize_database(get_file_pointer(), m_timesteps, get_region(), myProcessor, false); - closeDatabase__(); - m_cgnsFilePtr = -2; // Tell openDatabase__ that we want to append + closeDatabase_nl(); + m_cgnsFilePtr = -2; // Tell openDatabase_nl that we want to append } int64_t DatabaseIO::get_field_internal(const Ioss::Region *reg, const Ioss::Field &field, diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h index f4d0661be1..55aa00d572 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h @@ -84,30 +84,30 @@ namespace Iocgns { int get_file_pointer() const override; private: - int64_t node_global_to_local__(int64_t global, bool must_exist) const override; - int64_t element_global_to_local__(int64_t global) const override; + int64_t node_global_to_local_nl(int64_t global, bool must_exist) const override; + int64_t element_global_to_local_nl(int64_t global) const override; - void read_meta_data__() override; + void read_meta_data_nl() override; void open_state_file(int state); void free_state_pointer(); - void openDatabase__() const override; - void closeDatabase__() const override; + void openDatabase_nl() const override; + void closeDatabase_nl() const override; - bool begin__(Ioss::State state) override; - bool end__(Ioss::State state) override; + bool begin_nl(Ioss::State state) override; + bool end_nl(Ioss::State state) override; - bool begin_state__(int state, double time) override; - bool end_state__(int state, double time) override; - void flush_database__() const override; + bool begin_state_nl(int state, double time) override; + bool end_state_nl(int state, double time) override; + void flush_database_nl() const override; bool check_valid_file_open(int status) const; void create_structured_block(int base, int zone, size_t &num_node); void create_structured_block_fpp(int base, int num_zones, size_t &num_node); size_t finalize_structured_blocks(); void finalize_database() const override; - void get_step_times__() override; + void get_step_times_nl() override; void create_unstructured_block(int base, int zone, size_t &num_node); void write_adjacency_data(); diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C index 1e354e8f2f..067f1e4e2c 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C @@ -169,7 +169,7 @@ namespace Iocgns { } } - Ioss::DatabaseIO::openDatabase__(); + Ioss::DatabaseIO::openDatabase_nl(); } ParallelDatabaseIO::~ParallelDatabaseIO() @@ -178,8 +178,8 @@ namespace Iocgns { delete gtb.second; } try { - closeBaseDatabase__(); - closeDatabase__(); + closeBaseDatabase_nl(); + closeDatabase_nl(); } catch (...) { } @@ -188,12 +188,12 @@ namespace Iocgns { int ParallelDatabaseIO::get_file_pointer() const { if (m_cgnsFilePtr < 0) { - openDatabase__(); + openDatabase_nl(); } return m_cgnsFilePtr; } - void ParallelDatabaseIO::openDatabase__() const + void ParallelDatabaseIO::openDatabase_nl() const { if (m_cgnsFilePtr < 0) { int mode = is_input() ? CG_MODE_READ : CG_MODE_WRITE; @@ -229,7 +229,7 @@ namespace Iocgns { cgp_mpi_comm(util().communicator()); #endif CGCHECKM(cgp_pio_mode(CGP_COLLECTIVE)); - Ioss::DatabaseIO::openDatabase__(); + Ioss::DatabaseIO::openDatabase_nl(); int ierr = cgp_open(get_dw_name().c_str(), mode, &m_cgnsFilePtr); if (do_timer) { @@ -279,7 +279,7 @@ namespace Iocgns { assert(m_cgnsFilePtr >= 0); } - void ParallelDatabaseIO::closeBaseDatabase__() const + void ParallelDatabaseIO::closeBaseDatabase_nl() const { if (m_cgnsBasePtr > 0) { bool do_timer = false; @@ -300,7 +300,7 @@ namespace Iocgns { } } - void ParallelDatabaseIO::closeDatabase__() const + void ParallelDatabaseIO::closeDatabase_nl() const { if (m_cgnsFilePtr > 0) { bool do_timer = false; @@ -345,7 +345,7 @@ namespace Iocgns { } } - void ParallelDatabaseIO::release_memory__() + void ParallelDatabaseIO::release_memory_nl() { nodeMap.release_memory(); elemMap.release_memory(); @@ -356,21 +356,21 @@ namespace Iocgns { } } - int64_t ParallelDatabaseIO::node_global_to_local__(int64_t global, bool /* must_exist */) const + int64_t ParallelDatabaseIO::node_global_to_local_nl(int64_t global, bool /* must_exist */) const { // TODO: Fix return global; } - int64_t ParallelDatabaseIO::element_global_to_local__(int64_t global) const + int64_t ParallelDatabaseIO::element_global_to_local_nl(int64_t global) const { // TODO: Fix return global; } - void ParallelDatabaseIO::read_meta_data__() + void ParallelDatabaseIO::read_meta_data_nl() { - openDatabase__(); + openDatabase_nl(); // Determine the number of bases in the grid. // Currently only handle 1. @@ -384,7 +384,7 @@ namespace Iocgns { IOSS_ERROR(errmsg); } - get_step_times__(); + get_step_times_nl(); if (open_create_behavior() == Ioss::DB_APPEND) { return; @@ -800,7 +800,7 @@ namespace Iocgns { Utils::common_write_meta_data(get_file_pointer(), *get_region(), m_zoneOffset, true); } - void ParallelDatabaseIO::get_step_times__() + void ParallelDatabaseIO::get_step_times_nl() { Utils::get_step_times(get_file_pointer(), m_timesteps, get_region(), timeScaleFactor, myProcessor); @@ -938,7 +938,7 @@ namespace Iocgns { } } - bool ParallelDatabaseIO::begin__(Ioss::State state) + bool ParallelDatabaseIO::begin_nl(Ioss::State state) { dbState = state; return true; @@ -953,7 +953,7 @@ namespace Iocgns { m_cgnsBasePtr = m_cgnsFilePtr; m_cgnsFilePtr = -1; } - closeDatabase__(); + closeDatabase_nl(); } void ParallelDatabaseIO::open_state_file(int state) @@ -977,7 +977,7 @@ namespace Iocgns { Iocgns::Utils::write_state_meta_data(get_file_pointer(), *get_region(), true); } - bool ParallelDatabaseIO::end__(Ioss::State state) + bool ParallelDatabaseIO::end_nl(Ioss::State state) { // Transitioning out of state 'state' switch (state) { @@ -1008,7 +1008,7 @@ namespace Iocgns { return true; } - bool ParallelDatabaseIO::begin_state__(int state, double /* time */) + bool ParallelDatabaseIO::begin_state_nl(int state, double /* time */) { if (is_input()) { return true; @@ -1025,7 +1025,7 @@ namespace Iocgns { return true; } - bool ParallelDatabaseIO::end_state__(int state, double time) + bool ParallelDatabaseIO::end_state_nl(int state, double time) { if (!is_input()) { m_timesteps.push_back(time); @@ -1041,21 +1041,21 @@ namespace Iocgns { } if (do_flush) { - flush_database__(); + flush_database_nl(); } } return true; } - void ParallelDatabaseIO::flush_database__() const + void ParallelDatabaseIO::flush_database_nl() const { // For HDF5 files, it looks like we need to close the database between // writes if we want to have a valid database for external access or // to protect against a crash corrupting the file. finalize_database(); - closeDatabase__(); - m_cgnsFilePtr = -2; // Tell openDatabase__ that we want to append + closeDatabase_nl(); + m_cgnsFilePtr = -2; // Tell openDatabase_nl that we want to append } const Ioss::Map &ParallelDatabaseIO::get_map(entity_type type) const diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h index f506e0385d..c24b549a48 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h @@ -86,33 +86,33 @@ namespace Iocgns { void write_results_meta_data(); private: - void read_meta_data__() override; + void read_meta_data_nl() override; - int64_t node_global_to_local__(int64_t global, bool must_exist) const override; - int64_t element_global_to_local__(int64_t global) const override; + int64_t node_global_to_local_nl(int64_t global, bool must_exist) const override; + int64_t element_global_to_local_nl(int64_t global) const override; - void release_memory__() override; + void release_memory_nl() override; void open_state_file(int state); void free_state_pointer(); - void openDatabase__() const override; - void closeDatabase__() const override; - void closeBaseDatabase__() const; + void openDatabase_nl() const override; + void closeDatabase_nl() const override; + void closeBaseDatabase_nl() const; - bool begin__(Ioss::State state) override; - bool end__(Ioss::State state) override; + bool begin_nl(Ioss::State state) override; + bool end_nl(Ioss::State state) override; - bool begin_state__(int state, double time) override; - bool end_state__(int state, double time) override; - void flush_database__() const override; + bool begin_state_nl(int state, double time) override; + bool end_state_nl(int state, double time) override; + void flush_database_nl() const override; void handle_structured_blocks(); void handle_unstructured_blocks(); size_t finalize_structured_blocks(); int64_t handle_node_ids(void *ids, int64_t num_to_get) const; void finalize_database() const override; - void get_step_times__() override; + void get_step_times_nl() override; void write_adjacency_data(); int64_t get_field_internal(const Ioss::Region *reg, const Ioss::Field &field, void *data, diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C index a80d3965d1..c6fff954c2 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C @@ -418,7 +418,7 @@ namespace Ioex { return m_exodusFilePtr; } - bool BaseDatabaseIO::ok__(bool write_message, std::string *error_message, int *bad_count) const + bool BaseDatabaseIO::ok_nl(bool write_message, std::string *error_message, int *bad_count) const { // For input, we try to open the existing file. @@ -480,7 +480,7 @@ namespace Ioex { ex_set_max_name_length(m_exodusFilePtr, maximumNameLength); } - bool BaseDatabaseIO::open_group__(const std::string &group_name) + bool BaseDatabaseIO::open_group_nl(const std::string &group_name) { // Get existing file pointer... bool success = false; @@ -500,7 +500,7 @@ namespace Ioex { return success; } - bool BaseDatabaseIO::create_subgroup__(const std::string &group_name) + bool BaseDatabaseIO::create_subgroup_nl(const std::string &group_name) { bool success = false; if (!is_input()) { @@ -683,7 +683,7 @@ namespace Ioex { void BaseDatabaseIO::update_block_omissions_from_assemblies() { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); if (!assemblyOmissions.empty()) { assert(blockInclusions.empty()); @@ -731,7 +731,7 @@ namespace Ioex { void BaseDatabaseIO::get_assemblies() { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); auto assemblies = get_exodus_assemblies(get_file_pointer()); if (!assemblies.empty()) { @@ -814,7 +814,7 @@ namespace Ioex { void BaseDatabaseIO::get_blobs() { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); // Query number of blobs... int nblob = ex_inquire_int(get_file_pointer(), EX_INQ_BLOB); @@ -899,7 +899,7 @@ namespace Ioex { int num_attr = 0; { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); int ierr = ex_get_attr_param(get_file_pointer(), EX_NODE_BLOCK, 1, &num_attr); if (ierr < 0) { Ioex::exodus_error(get_file_pointer(), __LINE__, __func__, __FILE__); @@ -1008,8 +1008,8 @@ namespace Ioex { } // common - void BaseDatabaseIO::compute_block_membership__(Ioss::SideBlock *efblock, - std::vector &block_membership) const + void BaseDatabaseIO::compute_block_membership_nl(Ioss::SideBlock *efblock, + std::vector &block_membership) const { const Ioss::ElementBlockContainer &element_blocks = get_region()->get_element_blocks(); assert(Ioss::Utils::check_block_order(element_blocks)); @@ -1072,7 +1072,7 @@ namespace Ioex { // 'globalVariables' array { size_t num_to_get = field.verify(data_size); - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); Ioss::Field::RoleType role = field.get_role(); @@ -1099,7 +1099,7 @@ namespace Ioex { // and output them all at one time. The storage location is a // 'globalVariables' array { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); Ioss::Field::RoleType role = field.get_role(); size_t num_to_get = field.verify(data_size); @@ -1348,14 +1348,14 @@ namespace Ioex { } // common - bool BaseDatabaseIO::begin__(Ioss::State state) + bool BaseDatabaseIO::begin_nl(Ioss::State state) { dbState = state; return true; } // common - bool BaseDatabaseIO::end__(Ioss::State state) + bool BaseDatabaseIO::end_nl(Ioss::State state) { // Transitioning out of state 'state' assert(state == dbState); @@ -1375,7 +1375,7 @@ namespace Ioex { } { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); if (!is_input()) { ex_update(get_file_pointer()); @@ -1454,9 +1454,9 @@ namespace Ioex { } } - bool BaseDatabaseIO::begin_state__(int state, double time) + bool BaseDatabaseIO::begin_state_nl(int state, double time) { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); time /= timeScaleFactor; @@ -1488,9 +1488,9 @@ namespace Ioex { } // common - bool BaseDatabaseIO::end_state__(int state, double time) + bool BaseDatabaseIO::end_state_nl(int state, double time) { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); if (!is_input()) { write_reduction_fields(); @@ -1530,7 +1530,7 @@ namespace Ioex { // Get "global attributes" // These are single key-value per grouping entity // Stored as Ioss::Property with origin of ATTRIBUTE - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); auto type = Ioex::map_exodus_type(entity->type()); int att_count = ex_get_attribute_count(get_file_pointer(), type, id); @@ -1597,7 +1597,7 @@ namespace Ioex { { int nvar = 0; { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); int ierr = ex_get_variable_param(get_file_pointer(), type, &nvar); if (ierr < 0) { @@ -1618,7 +1618,7 @@ namespace Ioex { std::fill(truth_table.begin(), truth_table.end(), 1); } else { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); int ierr = ex_get_truth_table(get_file_pointer(), type, block_count, nvar, truth_table.data()); if (ierr < 0) { @@ -1645,7 +1645,7 @@ namespace Ioex { // Read the names... // (Currently, names are read for every block. We could save them...) { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); int ierr = ex_get_variable_names(get_file_pointer(), type, nvar, names); if (ierr < 0) { @@ -1697,7 +1697,7 @@ namespace Ioex { ex_entity_type type = Ioex::map_exodus_type(entity->type()); int nvar = 0; { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); int ierr = ex_get_reduction_variable_param(get_file_pointer(), type, &nvar); if (ierr < 0) { @@ -1714,7 +1714,7 @@ namespace Ioex { // Read the names... // (Currently, names are read for every block. We could save them...) { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); int ierr = ex_get_reduction_variable_names(get_file_pointer(), type, nvar, names); if (ierr < 0) { @@ -1845,7 +1845,7 @@ namespace Ioex { } { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); int ierr = ex_put_all_var_param_ext(get_file_pointer(), &exo_params); if (ierr < 0) { @@ -2118,7 +2118,7 @@ namespace Ioex { } // common - void BaseDatabaseIO::flush_database__() const + void BaseDatabaseIO::flush_database_nl() const { if (!is_input()) { if (isParallel || myProcessor == 0) { @@ -2192,7 +2192,7 @@ namespace Ioex { } if (do_flush) { - flush_database__(); + flush_database_nl(); } } @@ -2251,7 +2251,7 @@ namespace Ioex { else { // Use attribute names if they exist. { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); if (block->entity_count() != 0) { ex_entity_type entity_type = Ioex::map_exodus_type(block->type()); int ierr = ex_get_attr_names(get_file_pointer(), entity_type, id, &names[0]); diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h index c5a560465e..0ad0d77093 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h @@ -98,20 +98,20 @@ namespace Ioex { // If 'error_message' non-null, then put the warning message into the string and return it. // If 'bad_count' non-null, it counts the number of processors where the file does not exist. // if ok returns false, but *bad_count==0, then the routine does not support this argument. - bool ok__(bool write_message = false, std::string *error_message = nullptr, - int *bad_count = nullptr) const override; + bool ok_nl(bool write_message = false, std::string *error_message = nullptr, + int *bad_count = nullptr) const override; - bool open_group__(const std::string &group_name) override; - bool create_subgroup__(const std::string &group_name) override; + bool open_group_nl(const std::string &group_name) override; + bool create_subgroup_nl(const std::string &group_name) override; - bool begin__(Ioss::State state) override; - bool end__(Ioss::State state) override; + bool begin_nl(Ioss::State state) override; + bool end_nl(Ioss::State state) override; void open_state_file(int state); - bool begin_state__(int state, double time) override; - bool end_state__(int state, double time) override; - void get_step_times__() override = 0; + bool begin_state_nl(int state, double time) override; + bool end_state_nl(int state, double time) override; + void get_step_times_nl() override = 0; int maximum_symbol_length() const override { return maximumNameLength; } @@ -128,8 +128,8 @@ namespace Ioex { Ioss::Map &entity_map, void *ids, size_t num_to_get, size_t offset) const; - void compute_block_membership__(Ioss::SideBlock *efblock, - std::vector &block_membership) const override; + void compute_block_membership_nl(Ioss::SideBlock *efblock, + std::vector &block_membership) const override; int int_byte_size_db() const override; void set_int_byte_size_api(Ioss::DataSize size) const override; @@ -199,9 +199,9 @@ namespace Ioex { virtual void write_meta_data(Ioss::IfDatabaseExistsBehavior behavior) = 0; void write_results_metadata(bool gather_data, Ioss::IfDatabaseExistsBehavior behavior); - void openDatabase__() const override { get_file_pointer(); } + void openDatabase_nl() const override { get_file_pointer(); } - void closeDatabase__() const override + void closeDatabase_nl() const override { free_file_pointer(); close_dw(); @@ -264,7 +264,7 @@ namespace Ioex { // Given the global region step, return the step on the database... int get_database_step(int global_step) const; - void flush_database__() const override; + void flush_database_nl() const override; void finalize_write(int state, double sim_time); mutable int m_exodusFilePtr{-1}; diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C index fea712ed91..02b61984a8 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C @@ -436,7 +436,7 @@ namespace Ioex { return Ioex::BaseDatabaseIO::get_file_pointer(); } - void DatabaseIO::read_meta_data__() + void DatabaseIO::read_meta_data_nl() { // If this is a HISTORY file, there isn't really any metadata // Other than a single node and single element. Just hardwire @@ -453,7 +453,7 @@ namespace Ioex { eb->property_add(Ioss::Property("id", 1)); eb->property_add(Ioss::Property("guid", util().generate_guid(1))); get_region()->add(eb); - get_step_times__(); + get_step_times_nl(); add_region_fields(); } return; @@ -467,12 +467,12 @@ namespace Ioex { // anything since it is already there. We do need the number of // steps though... if (open_create_behavior() == Ioss::DB_APPEND || dbUsage == Ioss::QUERY_TIMESTEPS_ONLY) { - get_step_times__(); + get_step_times_nl(); return; } { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); if (isParallel) { Ioex::check_processor_info(decoded_filename(), get_file_pointer(), util().parallel_size(), @@ -483,7 +483,7 @@ namespace Ioex { read_communication_metadata(); } - get_step_times__(); + get_step_times_nl(); get_nodeblocks(); get_edgeblocks(); @@ -633,7 +633,7 @@ namespace Ioex { } } - void DatabaseIO::get_step_times__() + void DatabaseIO::get_step_times_nl() { bool exists = false; double last_time = DBL_MAX; @@ -668,14 +668,14 @@ namespace Ioex { Ioss::Region *this_region = get_region(); for (int i = 0; i < max_step; i++) { if (tsteps[i] <= max_time) { - this_region->add_state__(tsteps[i] * timeScaleFactor); + this_region->add_state_nl(tsteps[i] * timeScaleFactor); } } } } else { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); timestep_count = ex_inquire_int(get_file_pointer(), EX_INQ_TIME); if (timestep_count <= 0) { return; @@ -739,7 +739,7 @@ namespace Ioex { Ioss::Region *this_region = get_region(); for (int i = 0; i < max_step; i++) { if (tsteps[i] <= last_time) { - this_region->add_state__(tsteps[i] * timeScaleFactor); + this_region->add_state_nl(tsteps[i] * timeScaleFactor); } else { if (myProcessor == 0 && max_time == std::numeric_limits::max()) { @@ -960,7 +960,7 @@ namespace Ioex { if (is_input() || open_create_behavior() == Ioss::DB_APPEND) { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); // Check whether there is a "original_global_id_map" map on // the database. If so, use it instead of the "node_num_map". bool map_read = false; @@ -1074,7 +1074,7 @@ namespace Ioex { int error; { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); if ((ex_int64_status(get_file_pointer()) & EX_IDS_INT64_API) != 0) { error = ex_get_ids(get_file_pointer(), entity_type, X_block_ids.data()); @@ -1100,7 +1100,7 @@ namespace Ioex { int iblk; { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); for (iblk = 0; iblk < m_groupCount[entity_type]; iblk++) { int index = 4 * iblk; @@ -1173,7 +1173,7 @@ namespace Ioex { block_name = alias; } else { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); block_name = Ioex::get_entity_name(get_file_pointer(), entity_type, id, basename, maximumNameLength, db_has_name); } @@ -1288,7 +1288,7 @@ namespace Ioex { add_mesh_reduction_fields(id, block); if (entity_type == EX_ELEM_BLOCK) { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); if (nmap > 0) { auto *elb = dynamic_cast(block); Ioss::Utils::check_dynamic_cast(elb); @@ -1443,7 +1443,7 @@ namespace Ioex { Ioss::Int64Vector side_set_ids(m_groupCount[EX_SIDE_SET]); { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); int error; if ((ex_int64_status(get_file_pointer()) & EX_IDS_INT64_API) != 0) { error = ex_get_ids(get_file_pointer(), EX_SIDE_SET, side_set_ids.data()); @@ -1499,7 +1499,7 @@ namespace Ioex { bool db_has_name = false; { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); std::string alias = Ioss::Utils::encode_entity_name("surface", id); if (ignore_database_names()) { @@ -1832,7 +1832,7 @@ namespace Ioex { int num_attr = 0; { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); int ierr = ex_get_attr_param(get_file_pointer(), EX_SIDE_SET, 1, &num_attr); if (ierr < 0) { Ioex::exodus_error(get_file_pointer(), __LINE__, __func__, __FILE__); @@ -1870,7 +1870,7 @@ namespace Ioex { Ioss::IntVector attributes(count); std::vector Xsets(count); { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); if (ex_int64_status(get_file_pointer()) & EX_IDS_INT64_API) { int error = ex_get_ids(get_file_pointer(), type, Xset_ids.data()); if (error < 0) { @@ -2016,7 +2016,7 @@ namespace Ioex { // nodesets, just return an empty container. if (isParallel || isSerialParallel) { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); // This is a parallel run. There should be communications data // Get nemesis commset metadata int64_t my_node_count = 0; @@ -2089,7 +2089,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -2284,7 +2284,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -2333,7 +2333,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -2382,7 +2382,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -2557,7 +2557,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -2636,7 +2636,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -2707,7 +2707,7 @@ namespace Ioex { { { int ierr; - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -2808,7 +2808,7 @@ namespace Ioex { size_t db_size = ns->get_property("filtered_db_set_size").get_int(); int ierr; - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -2925,7 +2925,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); @@ -3083,7 +3083,7 @@ namespace Ioex { int64_t DatabaseIO::get_field_internal(const Ioss::SideBlock *fb, const Ioss::Field &field, void *data, size_t data_size) const { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); int64_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -4033,7 +4033,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -4147,7 +4147,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -4203,7 +4203,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -4259,7 +4259,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); @@ -4380,7 +4380,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); @@ -4454,7 +4454,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); @@ -4829,7 +4829,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); // ex_update(get_file_pointer()); size_t entity_count = ns->entity_count(); @@ -4939,7 +4939,7 @@ namespace Ioex { std::vector procs(entity_count * int_byte_size_api()); if (type == "node") { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); // Convert global node id to local node id and store in 'entities' if (int_byte_size_api() == 4) { int *entity_proc = static_cast(data); @@ -5008,7 +5008,7 @@ namespace Ioex { } } else if (type == "side") { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); std::vector sides(entity_count * int_byte_size_api()); if (int_byte_size_api() == 4) { int *entity_proc = static_cast(data); @@ -5095,7 +5095,7 @@ namespace Ioex { int64_t DatabaseIO::put_field_internal(const Ioss::SideBlock *fb, const Ioss::Field &field, void *data, size_t data_size) const { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -5351,7 +5351,7 @@ namespace Ioex { mesh.full_nemesis_data = false; } - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeio_(this); mesh.populate(region); gather_communication_metadata(&mesh.comm); diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h index a2fca63746..87c63ac607 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h @@ -71,7 +71,7 @@ namespace Ioex { int get_file_pointer() const override; // Open file and set exodusFilePtr. private: - void get_step_times__() override; + void get_step_times_nl() override; bool open_input_file(bool write_message, std::string *error_msg, int *bad_count, bool abort_if_error) const override; @@ -163,7 +163,7 @@ namespace Ioex { void compute_node_status() const; // Metadata-related functions. - void read_meta_data__() override; + void read_meta_data_nl() override; void read_communication_metadata(); int64_t read_transient_field(const Ioex::VariableNameMap &variables, const Ioss::Field &field, diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C index b2519351c5..c5ed3aaa86 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C @@ -395,7 +395,7 @@ namespace Ioex { ParallelDatabaseIO::~ParallelDatabaseIO() = default; - void ParallelDatabaseIO::release_memory__() + void ParallelDatabaseIO::release_memory_nl() { free_file_pointer(); nodeMap.release_memory(); @@ -612,7 +612,7 @@ namespace Ioex { MPI_Info info = MPI_INFO_NULL; int app_opt_val = ex_opts(EX_VERBOSE); - Ioss::DatabaseIO::openDatabase__(); + Ioss::DatabaseIO::openDatabase_nl(); std::string filename = get_dw_name(); @@ -755,7 +755,7 @@ namespace Ioex { return Ioex::BaseDatabaseIO::free_file_pointer(); } - void ParallelDatabaseIO::read_meta_data__() + void ParallelDatabaseIO::read_meta_data_nl() { int exoid = get_file_pointer(); // get_file_pointer() must be called first. @@ -768,7 +768,7 @@ namespace Ioex { // we don't write anything since it is already there. We do // need the number of steps though... if (open_create_behavior() == Ioss::DB_APPEND || dbUsage == Ioss::QUERY_TIMESTEPS_ONLY) { - get_step_times__(); + get_step_times_nl(); return; } @@ -784,7 +784,7 @@ namespace Ioex { read_region(); get_elemblocks(); - get_step_times__(); + get_step_times_nl(); get_nodeblocks(); get_edgeblocks(); @@ -903,7 +903,7 @@ namespace Ioex { } } - void ParallelDatabaseIO::get_step_times__() + void ParallelDatabaseIO::get_step_times_nl() { double last_time = DBL_MAX; int timestep_count = 0; @@ -2046,7 +2046,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -2096,7 +2096,7 @@ namespace Ioex { size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -3729,7 +3729,7 @@ namespace Ioex { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -3786,7 +3786,7 @@ namespace Ioex { size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h index 7213cb72ba..483e6c27d0 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2022 National Technology & Engineering Solutions +// Copyright(C) 1999-2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -83,9 +83,9 @@ namespace Ioex { private: void compute_node_status() const; - void release_memory__() override; + void release_memory_nl() override; - void get_step_times__() override; + void get_step_times_nl() override; bool open_input_file(bool write_message, std::string *error_msg, int *bad_count, bool abort_if_error) const override; @@ -177,7 +177,7 @@ namespace Ioex { void output_node_map() const; // Metadata-related functions. - void read_meta_data__() override; + void read_meta_data_nl() override; int64_t read_transient_field(const Ioex::VariableNameMap &variables, const Ioss::Field &field, const Ioss::GroupingEntity *ge, void *data) const; diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C index 146482acea..71f7fb1295 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C @@ -220,7 +220,7 @@ namespace Ioexnl { int BaseDatabaseIO::free_file_pointer() const { return 0; } - bool BaseDatabaseIO::ok__(bool, std::string *, int *) const { return true; } + bool BaseDatabaseIO::ok_nl(bool, std::string *, int *) const { return true; } // common void BaseDatabaseIO::put_qa() @@ -433,8 +433,8 @@ namespace Ioexnl { } // common - void BaseDatabaseIO::compute_block_membership__(Ioss::SideBlock *efblock, - std::vector &block_membership) const + void BaseDatabaseIO::compute_block_membership_nl(Ioss::SideBlock *efblock, + std::vector &block_membership) const { const Ioss::ElementBlockContainer &element_blocks = get_region()->get_element_blocks(); assert(Ioss::Utils::check_block_order(element_blocks)); @@ -702,14 +702,14 @@ namespace Ioexnl { void BaseDatabaseIO::write_reduction_fields() const {} // common - bool BaseDatabaseIO::begin__(Ioss::State state) + bool BaseDatabaseIO::begin_nl(Ioss::State state) { dbState = state; return true; } // common - bool BaseDatabaseIO::end__(Ioss::State state) + bool BaseDatabaseIO::end_nl(Ioss::State state) { // Transitioning out of state 'state' assert(state == dbState); @@ -740,7 +740,7 @@ namespace Ioexnl { return true; } - bool BaseDatabaseIO::begin_state__(int, double) + bool BaseDatabaseIO::begin_state_nl(int, double) { if (!is_input()) { // Zero global variable array... @@ -756,7 +756,7 @@ namespace Ioexnl { } // common - bool BaseDatabaseIO::end_state__(int state, double time) + bool BaseDatabaseIO::end_state_nl(int state, double time) { if (!is_input()) { write_reduction_fields(); @@ -1052,7 +1052,7 @@ namespace Ioexnl { } // common - void BaseDatabaseIO::flush_database__() const {} + void BaseDatabaseIO::flush_database_nl() const {} void BaseDatabaseIO::finalize_write(int, double) {} diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.h index e8b0e77ffe..03ddbbaf32 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.h @@ -98,17 +98,17 @@ namespace Ioexnl { // If 'error_message' non-null, then put the warning message into the string and return it. // If 'bad_count' non-null, it counts the number of processors where the file does not exist. // if ok returns false, but *bad_count==0, then the routine does not support this argument. - bool ok__(bool write_message = false, std::string *error_message = nullptr, - int *bad_count = nullptr) const override; + bool ok_nl(bool write_message = false, std::string *error_message = nullptr, + int *bad_count = nullptr) const override; - bool begin__(Ioss::State state) override; - bool end__(Ioss::State state) override; + bool begin_nl(Ioss::State state) override; + bool end_nl(Ioss::State state) override; void open_state_file(int state); - bool begin_state__(int state, double time) override; - bool end_state__(int state, double time) override; - void get_step_times__() override = 0; + bool begin_state_nl(int state, double time) override; + bool end_state_nl(int state, double time) override; + void get_step_times_nl() override = 0; int maximum_symbol_length() const override { return maximumNameLength; } @@ -125,8 +125,8 @@ namespace Ioexnl { Ioss::Map &entity_map, void *ids, size_t num_to_get, size_t offset) const; - void compute_block_membership__(Ioss::SideBlock *efblock, - std::vector &block_membership) const override; + void compute_block_membership_nl(Ioss::SideBlock *efblock, + std::vector &block_membership) const override; int int_byte_size_db() const override; void set_int_byte_size_api(Ioss::DataSize size) const override; @@ -181,9 +181,9 @@ namespace Ioexnl { virtual void write_meta_data(Ioss::IfDatabaseExistsBehavior behavior) = 0; void write_results_metadata(bool gather_data, Ioss::IfDatabaseExistsBehavior behavior); - void openDatabase__() const override { get_file_pointer(); } + void openDatabase_nl() const override { get_file_pointer(); } - void closeDatabase__() const override + void closeDatabase_nl() const override { free_file_pointer(); close_dw(); @@ -243,7 +243,7 @@ namespace Ioexnl { // Given the global region step, return the step on the database... int get_database_step(int global_step) const; - void flush_database__() const override; + void flush_database_nl() const override; void finalize_write(int state, double sim_time); mutable int m_exodusFilePtr{-1}; diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C index 998e9fd75a..7f914a05d0 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C @@ -120,11 +120,11 @@ namespace Ioexnl { int DatabaseIO::get_file_pointer() const { return 0; } - void DatabaseIO::read_meta_data__() {} + void DatabaseIO::read_meta_data_nl() {} void DatabaseIO::read_region() {} - void DatabaseIO::get_step_times__() {} + void DatabaseIO::get_step_times_nl() {} int64_t DatabaseIO::write_attribute_field(const Ioss::Field &field, const Ioss::GroupingEntity *ge, void *data) const diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h index 0c2215dcd5..c3ce4b8e3a 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h @@ -71,7 +71,7 @@ namespace Ioexnl { int get_file_pointer() const override; // Open file and set exodusFilePtr. private: - void get_step_times__() override; + void get_step_times_nl() override; bool handle_output_file(bool write_message, std::string *error_msg, int *bad_count, bool overwrite, bool abort_if_error) const override; @@ -124,7 +124,7 @@ namespace Ioexnl { void compute_node_status() const; // Metadata-related functions. - void read_meta_data__() override; + void read_meta_data_nl() override; void read_communication_metadata(); int64_t read_transient_field(const Ioexnl::VariableNameMap &variables, const Ioss::Field &field, diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.C index 20aad4b7a5..f0c4975c21 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.C @@ -296,7 +296,7 @@ namespace Ioexnl { ParallelDatabaseIO::~ParallelDatabaseIO() = default; - void ParallelDatabaseIO::release_memory__() + void ParallelDatabaseIO::release_memory_nl() { free_file_pointer(); nodeMap.release_memory(); @@ -338,7 +338,7 @@ namespace Ioexnl { return Ioexnl::BaseDatabaseIO::free_file_pointer(); } - void ParallelDatabaseIO::read_meta_data__() {} + void ParallelDatabaseIO::read_meta_data_nl() {} int64_t ParallelDatabaseIO::write_attribute_field(const Ioss::Field &field, const Ioss::GroupingEntity *ge, diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h index 9e7ad4301e..4afb5f0599 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h @@ -78,9 +78,9 @@ namespace Ioexnl { private: void compute_node_status() const; - void release_memory__() override; + void release_memory_nl() override; - void get_step_times__() override {} + void get_step_times_nl() override {} bool handle_output_file(bool write_message, std::string *error_msg, int *bad_count, bool overwrite, bool abort_if_error) const override; @@ -136,7 +136,7 @@ namespace Ioexnl { void output_node_map() const; // Metadata-related functions. - void read_meta_data__() override; + void read_meta_data_nl() override; int64_t read_transient_field(const Ioexnl::VariableNameMap &variables, const Ioss::Field &field, const Ioss::GroupingEntity *ge, void *data) const; diff --git a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.C b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.C index f077347b60..785a1e9628 100644 --- a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.C @@ -301,13 +301,13 @@ mpisyncstart.enable true std::string DatabaseIO::get_format() const { return "faodel"; } - bool DatabaseIO::begin_state__(int /* state */, double /* time */) { return false; } + bool DatabaseIO::begin_state_nl(int /* state */, double /* time */) { return false; } - bool DatabaseIO::end_state__(int /* state */, double /* time */) { return false; } + bool DatabaseIO::end_state_nl(int /* state */, double /* time */) { return false; } - void DatabaseIO::read_meta_data__() + void DatabaseIO::read_meta_data_nl() { - this->get_step_times__(); + this->get_step_times_nl(); this->read_region(); @@ -325,7 +325,7 @@ mpisyncstart.enable true this->get_commsets(); } - void DatabaseIO::get_step_times__() + void DatabaseIO::get_step_times_nl() { auto search_key = make_states_search_key(parallel_rank(), *get_region()); kelpie::ObjectCapacities oc; diff --git a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.h b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.h index 5b9bc7dde0..e19d3789dc 100644 --- a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.h @@ -100,17 +100,17 @@ namespace Iofaodel { void finalize_database() const override; - void read_meta_data__() override; + void read_meta_data_nl() override; - bool begin_state__(int /* state */, double /* time */) override; - bool end_state__(int /* state */, double /* time */) override; + bool begin_state_nl(int /* state */, double /* time */) override; + bool end_state_nl(int /* state */, double /* time */) override; - bool begin__(Ioss::State state) override + bool begin_nl(Ioss::State state) override { dbState = state; return true; }; - bool end__(Ioss::State state) override + bool end_nl(Ioss::State state) override { dbState = Ioss::STATE_UNKNOWN; return true; @@ -126,7 +126,7 @@ namespace Iofaodel { /* * TODO identify all the get_*{blocks|sets} needed here */ - void get_step_times__() override; + void get_step_times_nl() override; void get_edgeblocks(); void get_elemblocks(); diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C index 4a3eba6cfb..b2b565873d 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C @@ -128,7 +128,7 @@ namespace Iogs { DatabaseIO::~DatabaseIO() { delete m_generatedMesh; } - void DatabaseIO::read_meta_data__() + void DatabaseIO::read_meta_data_nl() { if (m_generatedMesh == nullptr) { if (get_filename() == "external") { @@ -154,7 +154,7 @@ namespace Iogs { nodeCount = m_generatedMesh->node_count_proc(); elementCount = m_generatedMesh->element_count_proc(); - get_step_times__(); + get_step_times_nl(); add_transient_fields(this_region); get_nodeblocks(); @@ -165,11 +165,11 @@ namespace Iogs { Ioss::Property(std::string("title"), std::string("GeneratedMesh: ") += get_filename())); } - bool DatabaseIO::begin__(Ioss::State /* state */) { return true; } + bool DatabaseIO::begin_nl(Ioss::State /* state */) { return true; } - bool DatabaseIO::end__(Ioss::State /* state */) { return true; } + bool DatabaseIO::end_nl(Ioss::State /* state */) { return true; } - bool DatabaseIO::begin_state__(int /* state */, double time) + bool DatabaseIO::begin_state_nl(int /* state */, double time) { currentTime = time; return true; @@ -481,7 +481,7 @@ namespace Iogs { add_transient_fields(block); } - void DatabaseIO::get_step_times__() + void DatabaseIO::get_step_times_nl() { int time_step_count = m_generatedMesh->timestep_count(); for (int i = 0; i < time_step_count; i++) { diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h index b0abf6befe..7ee0497a43 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h @@ -91,14 +91,14 @@ namespace Iogs { const std::vector &get_sideset_names() const { return m_sideset_names; } private: - void read_meta_data__() override; + void read_meta_data_nl() override; - bool begin__(Ioss::State state) override; - bool end__(Ioss::State state) override; + bool begin_nl(Ioss::State state) override; + bool end_nl(Ioss::State state) override; - bool begin_state__(int state, double time) override; + bool begin_state_nl(int state, double time) override; - void get_step_times__() override; + void get_step_times_nl() override; void get_nodeblocks(); void get_structured_blocks(); void get_nodesets(); diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C index c34a425de6..f8b63f5684 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C @@ -126,7 +126,7 @@ namespace Iogn { DatabaseIO::~DatabaseIO() { delete m_generatedMesh; } - void DatabaseIO::read_meta_data__() + void DatabaseIO::read_meta_data_nl() { if (m_generatedMesh == nullptr) { if (get_filename() == "external") { @@ -172,7 +172,7 @@ namespace Iogn { nodesetCount = m_generatedMesh->nodeset_count(); sidesetCount = m_generatedMesh->sideset_count(); - get_step_times__(); + get_step_times_nl(); add_transient_fields(this_region); get_nodeblocks(); @@ -185,11 +185,11 @@ namespace Iogn { Ioss::Property(std::string("title"), std::string("GeneratedMesh: ") += get_filename())); } - bool DatabaseIO::begin__(Ioss::State /* state */) { return true; } + bool DatabaseIO::begin_nl(Ioss::State /* state */) { return true; } - bool DatabaseIO::end__(Ioss::State /* state */) { return true; } + bool DatabaseIO::end_nl(Ioss::State /* state */) { return true; } - bool DatabaseIO::begin_state__(int /* state */, double time) + bool DatabaseIO::begin_state_nl(int /* state */, double time) { currentTime = time; return true; @@ -582,7 +582,7 @@ namespace Iogn { add_transient_fields(block); } - void DatabaseIO::get_step_times__() + void DatabaseIO::get_step_times_nl() { auto time_step_count = m_generatedMesh->timestep_count(); for (int i = 0; i < time_step_count; i++) { diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h index bb8d471773..bfb7e51c92 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h @@ -102,14 +102,14 @@ namespace Iogn { const std::vector &get_sideset_names() const { return m_sideset_names; } private: - void read_meta_data__() override; + void read_meta_data_nl() override; - bool begin__(Ioss::State state) override; - bool end__(Ioss::State state) override; + bool begin_nl(Ioss::State state) override; + bool end_nl(Ioss::State state) override; - bool begin_state__(int state, double time) override; + bool begin_state_nl(int state, double time) override; - void get_step_times__() override; + void get_step_times_nl() override; void get_nodeblocks(); void get_elemblocks(); void get_nodesets(); diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C index fb0e1ebfe4..8560a480fc 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C @@ -278,11 +278,11 @@ namespace Iohb { } } - bool DatabaseIO::begin__(Ioss::State /* state */) { return true; } + bool DatabaseIO::begin_nl(Ioss::State /* state */) { return true; } - bool DatabaseIO::end__(Ioss::State /* state */) { return true; } + bool DatabaseIO::end_nl(Ioss::State /* state */) { return true; } - bool DatabaseIO::begin_state__(int /* state */, double time) + bool DatabaseIO::begin_state_nl(int /* state */, double time) { // If this is the first time, open the output stream and see if user wants a legend initialize(); @@ -301,14 +301,14 @@ namespace Iohb { return true; } - void DatabaseIO::flush_database__() const + void DatabaseIO::flush_database_nl() const { if (myProcessor == 0) { logStream->flush(); } } - bool DatabaseIO::end_state__(int /* state */, double /* time */) + bool DatabaseIO::end_state_nl(int /* state */, double /* time */) { if (legend_ != nullptr) { if (fileFormat == Iohb::Format::SPYHIS) { diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h index f66138a311..5ba262df9f 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h @@ -82,21 +82,21 @@ namespace Iohb { int int_byte_size_db() const override { return int_byte_size_api(); } private: - int64_t node_global_to_local__(int64_t /* global */, bool /* must_exist */) const override + int64_t node_global_to_local_nl(int64_t /* global */, bool /* must_exist */) const override { return 0; } - int64_t element_global_to_local__(int64_t /* global */) const override { return 0; } + int64_t element_global_to_local_nl(int64_t /* global */) const override { return 0; } - void read_meta_data__() override {} + void read_meta_data_nl() override {} - void flush_database__() const override; + void flush_database_nl() const override; - bool begin__(Ioss::State state) override; - bool end__(Ioss::State state) override; + bool begin_nl(Ioss::State state) override; + bool end_nl(Ioss::State state) override; - bool begin_state__(int state, double time) override; - bool end_state__(int state, double time) override; + bool begin_state_nl(int state, double time) override; + bool end_state_nl(int state, double time) override; void initialize() const; diff --git a/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C b/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C index ff6d8ccf20..d3865c1b6c 100644 --- a/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C @@ -29,7 +29,7 @@ namespace Ionull { DatabaseIO::~DatabaseIO() = default; - void DatabaseIO::read_meta_data__() {} + void DatabaseIO::read_meta_data_nl() {} unsigned DatabaseIO::entity_field_support() const { @@ -39,13 +39,13 @@ namespace Ionull { Ioss::STRUCTUREDBLOCK; } - bool DatabaseIO::begin__(Ioss::State /* state */) { return true; } + bool DatabaseIO::begin_nl(Ioss::State /* state */) { return true; } - bool DatabaseIO::end__(Ioss::State /* state */) { return true; } + bool DatabaseIO::end_nl(Ioss::State /* state */) { return true; } - bool DatabaseIO::begin_state__(int /* state */, double) { return true; } + bool DatabaseIO::begin_state_nl(int /* state */, double) { return true; } - bool DatabaseIO::end_state__(int /* state */, double) { return true; } + bool DatabaseIO::end_state_nl(int /* state */, double) { return true; } int64_t DatabaseIO::put_field_internal(const Ioss::Region *, const Ioss::Field &field, void *, size_t data_size) const diff --git a/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.h b/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.h index 0607bed41a..144377f7c9 100644 --- a/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.h @@ -64,13 +64,13 @@ namespace Ionull { int int_byte_size_db() const override { return 8; } void set_int_byte_size_api(Ioss::DataSize) const override {} - bool begin__(Ioss::State state) override; - bool end__(Ioss::State state) override; + bool begin_nl(Ioss::State state) override; + bool end_nl(Ioss::State state) override; - bool begin_state__(int state, double time) override; - bool end_state__(int state, double time) override; + bool begin_state_nl(int state, double time) override; + bool end_state_nl(int state, double time) override; - bool ok__(bool, std::string *, int *) const override { return true; } + bool ok_nl(bool, std::string *, int *) const override { return true; } private: // Input only database -- these will never be called... @@ -90,8 +90,8 @@ namespace Ionull { IOSS_NOOP_GFI(Ioss::Assembly) IOSS_NOOP_GFI(Ioss::Blob) - void read_meta_data__() override; - void get_step_times__() override {} + void read_meta_data_nl() override; + void get_step_times_nl() override {} int64_t put_field_internal(const Ioss::Region *reg, const Ioss::Field &field, void *data, size_t data_size) const override; diff --git a/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C b/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C index 2592f4d6c4..79a0fec71f 100644 --- a/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C @@ -154,7 +154,7 @@ namespace Iopg { return mesh_description; } - void DatabaseIO::read_meta_data__() + void DatabaseIO::read_meta_data_nl() { // The file for pamgen contains the mesh description. // The Iopg routine is expecting the mesh description to be a @@ -941,9 +941,9 @@ namespace Iopg { } } // namespace Iopg - bool DatabaseIO::begin__(Ioss::State /* state */) { return true; } + bool DatabaseIO::begin_nl(Ioss::State /* state */) { return true; } - bool DatabaseIO::end__(Ioss::State /* state */) { return true; } + bool DatabaseIO::end_nl(Ioss::State /* state */) { return true; } int64_t DatabaseIO::get_field_internal(const Ioss::NodeBlock *nb, const Ioss::Field &field, void *data, size_t data_size) const @@ -1121,7 +1121,7 @@ namespace Iopg { void *data, size_t data_size) const { { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); size_t num_to_get = field.verify(data_size); @@ -1473,8 +1473,8 @@ namespace Iopg { return elemMap; } - void DatabaseIO::compute_block_membership__(Ioss::SideBlock *sideblock, - std::vector &block_membership) const + void DatabaseIO::compute_block_membership_nl(Ioss::SideBlock *sideblock, + std::vector &block_membership) const { Ioss::IntVector block_ids(elementBlockCount); if (elementBlockCount == 1) { diff --git a/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.h b/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.h index 4765526d8e..9c794707ef 100644 --- a/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.h @@ -81,14 +81,14 @@ namespace Iopg { std::string title() const { return databaseTitle; } int maximum_symbol_length() const override { return 32; } - void compute_block_membership__(Ioss::SideBlock *efblock, - std::vector &block_membership) const override; + void compute_block_membership_nl(Ioss::SideBlock *efblock, + std::vector &block_membership) const override; private: - void read_meta_data__() override; + void read_meta_data_nl() override; - bool begin__(Ioss::State state) override; - bool end__(Ioss::State state) override; + bool begin_nl(Ioss::State state) override; + bool end_nl(Ioss::State state) override; void read_region(); void read_communication_metadata(); diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C index fe7c1b2d03..ce12b53dcd 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C @@ -34,8 +34,7 @@ #include "Ioss_Property.h" // for Property #include "Ioss_PropertyManager.h" // for PropertyManager #include "Ioss_Region.h" // for Region -#include "Ioss_SerializeIO.h" -#include "Ioss_SideSet.h" // for SideSet +#include "Ioss_SideSet.h" // for SideSet #include "Ioss_Utils.h" #include "Ioss_VariableType.h" // for VariableType #include "Iotm_TextMesh.h" // for TextMesh @@ -132,7 +131,7 @@ namespace Iotm { DatabaseIO::~DatabaseIO() { delete m_textMesh; } - void DatabaseIO::read_meta_data__() + void DatabaseIO::read_meta_data_nl() { if (m_textMesh == nullptr) { if (get_filename() == "external") { @@ -178,7 +177,7 @@ namespace Iotm { sidesetCount = m_textMesh->sideset_count(); assemblyCount = m_textMesh->assembly_count(); - get_step_times__(); + get_step_times_nl(); add_transient_fields(this_region); get_nodeblocks(); @@ -192,11 +191,11 @@ namespace Iotm { Ioss::Property(std::string("title"), std::string("TextMesh: ") += get_filename())); } - bool DatabaseIO::begin__(Ioss::State /* state */) { return true; } + bool DatabaseIO::begin_nl(Ioss::State /* state */) { return true; } - bool DatabaseIO::end__(Ioss::State /* state */) { return true; } + bool DatabaseIO::end_nl(Ioss::State /* state */) { return true; } - bool DatabaseIO::begin_state__(int /* state */, double time) + bool DatabaseIO::begin_state_nl(int /* state */, double time) { currentTime = time; return true; @@ -556,51 +555,47 @@ namespace Iotm { int64_t DatabaseIO::get_field_internal(const Ioss::Assembly *assembly, const Ioss::Field &field, void * /* data */, size_t data_size) const { - { - Ioss::SerializeIO serializeIO__(this); - - size_t num_to_get = field.verify(data_size); - if (num_to_get > 0) { - - Ioss::Field::RoleType role = field.get_role(); - if (role == Ioss::Field::MESH) { - if (field.get_name() == "ids") { - // Map the local ids in this node block - // (1...node_count) to global node ids. - // get_map(EX_ASSEMBLY).map_implicit_data(data, field, num_to_get, 0); - } - - else if (field.get_name() == "connectivity") { - // Do nothing, just handles an idiosyncrasy of the GroupingEntity - } - else if (field.get_name() == "connectivity_raw") { - // Do nothing, just handles an idiosyncrasy of the GroupingEntity - } - else { - num_to_get = Ioss::Utils::field_warning(assembly, field, "input"); - } + size_t num_to_get = field.verify(data_size); + if (num_to_get > 0) { + + Ioss::Field::RoleType role = field.get_role(); + if (role == Ioss::Field::MESH) { + if (field.get_name() == "ids") { + // Map the local ids in this node block + // (1...node_count) to global node ids. + // get_map(EX_ASSEMBLY).map_implicit_data(data, field, num_to_get, 0); } - else if (role == Ioss::Field::TRANSIENT) { - // Check if the specified field exists on this assembly. - // Note that 'higher-order' storage types (e.g. SYM_TENSOR) - // exist on the database as scalars with the appropriate - // extensions. - - // Read in each component of the variable and transfer into - // 'data'. Need temporary storage area of size 'number of - // items in this assembly. - // num_to_get = - // read_transient_field(EX_ASSEMBLY, m_variables[EX_ASSEMBLY], field, assembly, data); + + else if (field.get_name() == "connectivity") { + // Do nothing, just handles an idiosyncrasy of the GroupingEntity } - else if (role == Ioss::Field::REDUCTION) { - // get_reduction_field(EX_ASSEMBLY, field, assembly, data); + else if (field.get_name() == "connectivity_raw") { + // Do nothing, just handles an idiosyncrasy of the GroupingEntity } - else if (role == Ioss::Field::ATTRIBUTE) { - // num_to_get = read_attribute_field(EX_ASSEMBLY, field, assembly, data); + else { + num_to_get = Ioss::Utils::field_warning(assembly, field, "input"); } } - return num_to_get; + else if (role == Ioss::Field::TRANSIENT) { + // Check if the specified field exists on this assembly. + // Note that 'higher-order' storage types (e.g. SYM_TENSOR) + // exist on the database as scalars with the appropriate + // extensions. + + // Read in each component of the variable and transfer into + // 'data'. Need temporary storage area of size 'number of + // items in this assembly. + // num_to_get = + // read_transient_field(EX_ASSEMBLY, m_variables[EX_ASSEMBLY], field, assembly, data); + } + else if (role == Ioss::Field::REDUCTION) { + // get_reduction_field(EX_ASSEMBLY, field, assembly, data); + } + else if (role == Ioss::Field::ATTRIBUTE) { + // num_to_get = read_attribute_field(EX_ASSEMBLY, field, assembly, data); + } } + return num_to_get; } const Ioss::Map &DatabaseIO::get_node_map() const @@ -640,7 +635,7 @@ namespace Iotm { add_transient_fields(block); } - void DatabaseIO::get_step_times__() + void DatabaseIO::get_step_times_nl() { int time_step_count = m_textMesh->timestep_count(); for (int i = 0; i < time_step_count; i++) { diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.h index fc5cabf629..4400279621 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.h @@ -88,14 +88,14 @@ namespace Iotm { void set_text_mesh(Iotm::TextMesh *textMesh) { m_textMesh = textMesh; } private: - void read_meta_data__() override; + void read_meta_data_nl() override; - bool begin__(Ioss::State state) override; - bool end__(Ioss::State state) override; + bool begin_nl(Ioss::State state) override; + bool end_nl(Ioss::State state) override; - bool begin_state__(int state, double time) override; + bool begin_state_nl(int state, double time) override; - void get_step_times__() override; + void get_step_times_nl() override; void get_nodeblocks(); void get_elemblocks(); void get_nodesets(); diff --git a/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_DatabaseIO.C b/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_DatabaseIO.C index c0988da501..19fb404f06 100644 --- a/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_DatabaseIO.C @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2021 National Technology & Engineering Solutions +// Copyright(C) 1999-2021, 2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -38,9 +38,9 @@ namespace Iovs_cgns { DatabaseIO::~DatabaseIO() { this->catCGNSMesh->Delete(); } - bool DatabaseIO::begin__(Ioss::State /*state*/) { return true; } + bool DatabaseIO::begin_nl(Ioss::State /*state*/) { return true; } - bool DatabaseIO::end__(Ioss::State state) + bool DatabaseIO::end_nl(Ioss::State state) { switch (state) { case Ioss::STATE_DEFINE_MODEL: { @@ -52,7 +52,7 @@ namespace Iovs_cgns { return true; } - bool DatabaseIO::begin_state__(int state, double time) + bool DatabaseIO::begin_state_nl(int state, double time) { this->catCGNSMesh->ReleaseMemory(); if (!isIdOutputCreated) { @@ -63,7 +63,7 @@ namespace Iovs_cgns { return true; } - bool DatabaseIO::end_state__(int /*state*/, double /*time*/) + bool DatabaseIO::end_state_nl(int /*state*/, double /*time*/) { std::vector error_codes; std::vector error_messages; @@ -76,7 +76,7 @@ namespace Iovs_cgns { return true; } - void DatabaseIO::read_meta_data__() {} + void DatabaseIO::read_meta_data_nl() {} void DatabaseIO::write_meta_data() { @@ -105,7 +105,7 @@ namespace Iovs_cgns { isCellField = true; outputId("cell_ids", ids, isCellField, sb); - auto zone_id = sb->get_property("zone").get_int(); + auto zone_id = sb->get_property("zone").get_int(); std::vector object_id(cell_count, zone_id); outputId("object_id", object_id, isCellField, sb); } @@ -139,12 +139,12 @@ namespace Iovs_cgns { int64_t DatabaseIO::put_field_internal(const Ioss::StructuredBlock *sb, const Ioss::Field &field, void *data, size_t data_size) const { - size_t node_count = sb->get_property("node_count").get_int(); - size_t num_to_get = field.verify(data_size); - auto var_type = field.transformed_storage(); - auto ioss_type = field.get_type(); - int comp_count = var_type->component_count(); - void *rdata = num_to_get > 0 ? data : nullptr; + size_t node_count = sb->get_property("node_count").get_int(); + size_t num_to_get = field.verify(data_size); + auto var_type = field.transformed_storage(); + auto ioss_type = field.get_type(); + int comp_count = var_type->component_count(); + void *rdata = num_to_get > 0 ? data : nullptr; bool is_cell_field = true; if (node_count == num_to_get) { diff --git a/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_DatabaseIO.h b/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_DatabaseIO.h index 375165d1a2..d1e2d5b68a 100644 --- a/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_DatabaseIO.h @@ -28,13 +28,13 @@ namespace Iovs_cgns { void write_meta_data(); private: - bool begin__(Ioss::State state) override; - bool end__(Ioss::State state) override; + bool begin_nl(Ioss::State state) override; + bool end_nl(Ioss::State state) override; - bool begin_state__(int state, double time) override; - bool end_state__(int state, double time) override; + bool begin_state_nl(int state, double time) override; + bool end_state_nl(int state, double time) override; - void read_meta_data__() override; + void read_meta_data_nl() override; int64_t get_field_internal(const Ioss::Region * /*reg*/, const Ioss::Field & /*field*/, void * /*data*/, size_t /*data_size*/) const override diff --git a/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.C b/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.C index 57fd76721b..de26537a6f 100644 --- a/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.C @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2022 National Technology & Engineering Solutions +// Copyright(C) 1999-2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -59,7 +59,7 @@ namespace Iovs_exodus { DatabaseIO::~DatabaseIO() { this->catExoMesh->Delete(); } - bool DatabaseIO::begin__(Ioss::State state) + bool DatabaseIO::begin_nl(Ioss::State state) { dbState = state; Ioss::Region *region = this->get_region(); @@ -75,7 +75,7 @@ namespace Iovs_exodus { return true; } - bool DatabaseIO::end__(Ioss::State state) + bool DatabaseIO::end_nl(Ioss::State state) { // Transitioning out of state 'state' assert(state == dbState); @@ -95,9 +95,9 @@ namespace Iovs_exodus { // Default versions do nothing at this time... // Will be used for global variables... - bool DatabaseIO::begin_state__(int state, double time) + bool DatabaseIO::begin_state_nl(int state, double time) { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); if (!this->globalNodeAndElementIDsCreated) { this->create_global_node_and_element_ids(); @@ -108,9 +108,9 @@ namespace Iovs_exodus { return true; } - bool DatabaseIO::end_state__(int /*state*/, double /*time*/) + bool DatabaseIO::end_state_nl(int /*state*/, double /*time*/) { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); std::vector error_codes; std::vector error_messages; this->catExoMesh->logMemoryUsageAndTakeTimerReading(); @@ -123,7 +123,7 @@ namespace Iovs_exodus { return true; } - void DatabaseIO::read_meta_data__() {} + void DatabaseIO::read_meta_data_nl() {} void DatabaseIO::create_global_node_and_element_ids() const { @@ -150,7 +150,7 @@ namespace Iovs_exodus { // are REDUCTION fields (1 value). We need to gather these // and output them all at one time. The storage location is a // 'globalVariables' array - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); size_t num_to_get = field.verify(data_size); Ioss::Field::RoleType role = field.get_role(); @@ -194,7 +194,7 @@ namespace Iovs_exodus { int64_t DatabaseIO::put_field_internal(const Ioss::NodeBlock *nb, const Ioss::Field &field, void *data, size_t data_size) const { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { @@ -254,7 +254,7 @@ namespace Iovs_exodus { int64_t DatabaseIO::put_field_internal(const Ioss::ElementBlock *eb, const Ioss::Field &field, void *data, size_t data_size) const { - Ioss::SerializeIO serializeIO__(this); + Ioss::SerializeIO serializeIO_(this); size_t num_to_get = field.verify(data_size); if (num_to_get > 0) { diff --git a/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.h b/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.h index f669fc77a4..252129c3fa 100644 --- a/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.h @@ -54,13 +54,13 @@ namespace Iovs_exodus { int int_byte_size_db() const override { return int_byte_size_api(); } private: - bool begin__(Ioss::State state) override; - bool end__(Ioss::State state) override; + bool begin_nl(Ioss::State state) override; + bool end_nl(Ioss::State state) override; - bool begin_state__(int state, double time) override; - bool end_state__(int state, double time) override; + bool begin_state_nl(int state, double time) override; + bool end_state_nl(int state, double time) override; - void read_meta_data__() override; + void read_meta_data_nl() override; // For the time being, treat vis as write only. Consider glue pipelines. int64_t get_field_internal(const Ioss::Region * /*reg*/, const Ioss::Field & /*field*/, From 7f59e49b175d2367683ebcf2753cb7583dd8c323 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Fri, 10 Nov 2023 15:34:30 -0700 Subject: [PATCH 042/110] Address codacy issues --- packages/seacas/applications/exodiff/check.C | 4 ++-- packages/seacas/libraries/ioss/src/Ioss_Compare.C | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/seacas/applications/exodiff/check.C b/packages/seacas/applications/exodiff/check.C index 7dca3c8ba4..39e02b1ae5 100644 --- a/packages/seacas/applications/exodiff/check.C +++ b/packages/seacas/applications/exodiff/check.C @@ -257,8 +257,8 @@ namespace { size_t matched = 0; for (size_t b = 0; b < file1.Num_Assembly(); ++b) { Assembly *assembly1 = file1.Get_Assembly_by_Index(b); - Assembly *assembly2 = nullptr; if (assembly1 != nullptr) { + Assembly *assembly2 = nullptr; if (interFace.by_name) { assembly2 = file2.Get_Assembly_by_Name(assembly1->Name()); } @@ -282,8 +282,8 @@ namespace { if (matched != file2.Num_Assembly()) { for (size_t b = 0; b < file2.Num_Assembly(); ++b) { Assembly *assembly2 = file2.Get_Assembly_by_Index(b); - Assembly *assembly1 = nullptr; if (assembly2 != nullptr) { + Assembly *assembly1 = nullptr; if (interFace.by_name) { assembly1 = file1.Get_Assembly_by_Name(assembly2->Name()); } diff --git a/packages/seacas/libraries/ioss/src/Ioss_Compare.C b/packages/seacas/libraries/ioss/src/Ioss_Compare.C index 92c53d8d1c..47d8f62fd8 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Compare.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Compare.C @@ -1114,7 +1114,6 @@ namespace { } } if (!found) { - name_not_found = true; fmt::print(Ioss::WarnOut(), NOTFOUND_1, type, in_set_2->name()); overall_result = false; } From 426adb87afd8b9c36a48c5ab214a2d5c7789cef8 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Wed, 4 Oct 2023 20:27:10 -0400 Subject: [PATCH 043/110] Fixed some clang -Wunused-macros warnings --- packages/seacas/libraries/chaco/util/random.c | 5 +++-- packages/zoltan/src/par/par_average.c | 2 -- packages/zoltan/src/phg/phg_serialpartition.c | 2 +- packages/zoltan/src/zz/zz_coord.c | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/seacas/libraries/chaco/util/random.c b/packages/seacas/libraries/chaco/util/random.c index 6c3e288e05..2a76ac2fac 100644 --- a/packages/seacas/libraries/chaco/util/random.c +++ b/packages/seacas/libraries/chaco/util/random.c @@ -27,8 +27,6 @@ #define R 10855L /* remainder */ #define MAX_VALUE (MOD - 1) -#define EXP_VAL 1285562981L /* value for 10,000th draw */ - #define IMPOSSIBLE_RAND (-1) #define STARTUP_RANDS \ 16 /* throw away this number of \ @@ -135,6 +133,9 @@ double rand_rect_port(void) { return (double)rand_port() / (double)(MAX_VALUE + use Russian peasant algorithm followed by approximate factoring */ #if defined(TESTING) + +#define EXP_VAL 1285562981L /* value for 10,000th draw */ + /* Test the generator */ #include int main(void) diff --git a/packages/zoltan/src/par/par_average.c b/packages/zoltan/src/par/par_average.c index 4bf4d0a090..1d218774db 100644 --- a/packages/zoltan/src/par/par_average.c +++ b/packages/zoltan/src/par/par_average.c @@ -56,8 +56,6 @@ extern "C" { #include "par_median_const.h" #include "zz_const.h" -#define TINY 1.0e-6 - /* prototypes for TFLOPS_SPECIAL */ static void Zoltan_average_cuts_reduce(int, int, int, double *, double *, int, MPI_Datatype, MPI_Comm); diff --git a/packages/zoltan/src/phg/phg_serialpartition.c b/packages/zoltan/src/phg/phg_serialpartition.c index 2a8ba2bbbd..4887ac35a0 100644 --- a/packages/zoltan/src/phg/phg_serialpartition.c +++ b/packages/zoltan/src/phg/phg_serialpartition.c @@ -172,7 +172,7 @@ const int num_coarse_iter = 1 + 9/zz->Num_Proc; /* Force LocalCoarsePartition if large global graph */ #define LARGE_GRAPH_VTX 64000 -#define LARGE_GRAPH_PINS 256000 +/*#define LARGE_GRAPH_PINS 256000*/ if (phg->dist_x[phg->comm->nProc_x] > LARGE_GRAPH_VTX){ /* TODO: || (global_nPins > LARGE_GRAPH_PINS) */ local_coarse_part = 1; diff --git a/packages/zoltan/src/zz/zz_coord.c b/packages/zoltan/src/zz/zz_coord.c index 28a27ff2fa..b6bb5de55f 100644 --- a/packages/zoltan/src/zz/zz_coord.c +++ b/packages/zoltan/src/zz/zz_coord.c @@ -816,7 +816,6 @@ static void order_decreasing(double *d, int *order) * Assume dim is 2 or 3. */ -#define SIGN(a,b) ((b) < 0 ? -fabs(a) : fabs(a)) static int eigenvectors(double (*m)[3], double (*evecs)[3], int dim) { double temp[2][2]; From a84d17afa8b2a935f00c7c6251069846f66c44e7 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Wed, 4 Oct 2023 20:43:28 -0400 Subject: [PATCH 044/110] Fixed some clang -Wcast-qual warnings --- .../Utilities/DDirectory/DD_Set_Neighbor_Hash_Fn2.c | 10 +++++----- packages/zoltan/src/hsfc/hsfc.c | 4 ++-- packages/zoltan/src/par/par_median_randomized.c | 4 ++-- packages/zoltan/src/rcb/rcb_util.c | 2 +- packages/zoltan/src/tpls/verify_graph.c | 4 ++-- packages/zoltan/src/zz/zz_struct.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/zoltan/src/Utilities/DDirectory/DD_Set_Neighbor_Hash_Fn2.c b/packages/zoltan/src/Utilities/DDirectory/DD_Set_Neighbor_Hash_Fn2.c index aec55773ab..c2aa4e499a 100644 --- a/packages/zoltan/src/Utilities/DDirectory/DD_Set_Neighbor_Hash_Fn2.c +++ b/packages/zoltan/src/Utilities/DDirectory/DD_Set_Neighbor_Hash_Fn2.c @@ -183,17 +183,17 @@ static unsigned int dd_nh2 (ZOLTAN_ID_PTR gid, int gid_length, static int compare_sort (const void *a, const void *b) { - if (((Range_Info*) a)->low < ((Range_Info *) b)->low) return -1; - if (((Range_Info*) a)->low > ((Range_Info *) b)->low) return 1; + if (((const Range_Info*) a)->low < ((const Range_Info *) b)->low) return -1; + if (((const Range_Info*) a)->low > ((const Range_Info *) b)->low) return 1; else return 0 ; } static int compare_search (const void *a, const void *b) { - int temp = (signed) *((ZOLTAN_ID_TYPE *) a); - if (temp < ((Range_Info*) b)->low) return -1; - if (temp > ((Range_Info*) b)->high) return 1; + int temp = (signed) *((const ZOLTAN_ID_TYPE *) a); + if (temp < ((const Range_Info*) b)->low) return -1; + if (temp > ((const Range_Info*) b)->high) return 1; else return 0 ; } diff --git a/packages/zoltan/src/hsfc/hsfc.c b/packages/zoltan/src/hsfc/hsfc.c index c0a82b4668..8e750f5145 100644 --- a/packages/zoltan/src/hsfc/hsfc.c +++ b/packages/zoltan/src/hsfc/hsfc.c @@ -698,8 +698,8 @@ int Zoltan_HSFC( /* routine for bsearch locating the partition segment holding key */ int Zoltan_HSFC_compare (const void *key, const void *arg) { - if ( *(double*) key >= ((Partition*) arg)->r) return 1; - if ( *(double*) key < ((Partition*) arg)->l) return -1; + if ( *(const double*) key >= ((const Partition*) arg)->r) return 1; + if ( *(const double*) key < ((const Partition*) arg)->l) return -1; return 0; /* key in arg interval [l,r) */ } diff --git a/packages/zoltan/src/par/par_median_randomized.c b/packages/zoltan/src/par/par_median_randomized.c index 918e22d9ce..3bc70e8275 100644 --- a/packages/zoltan/src/par/par_median_randomized.c +++ b/packages/zoltan/src/par/par_median_randomized.c @@ -81,8 +81,8 @@ int rb_sort_doubles_increasing(const void *a, const void *b) { double v1, v2; - v1 = *(double *)a; - v2 = *(double *)b; + v1 = *(const double *)a; + v2 = *(const double *)b; if (v1 < v2) return -1; else if (v1 > v2) return 1; diff --git a/packages/zoltan/src/rcb/rcb_util.c b/packages/zoltan/src/rcb/rcb_util.c index 1a303c7883..1d69f09fe9 100644 --- a/packages/zoltan/src/rcb/rcb_util.c +++ b/packages/zoltan/src/rcb/rcb_util.c @@ -227,7 +227,7 @@ void Zoltan_RCB_Serialize_Structure(ZZ const *zz, char **buf) memcpy(bufptr, (void *)(zzrcb->Box), sizeof(struct rcb_box)); bufptr += sizeof(struct rcb_box); - memcpy(bufptr, (void *) &(zzrcb->Tran), sizeof(ZZ_Transform)); + memcpy(bufptr, (const void *) &(zzrcb->Tran), sizeof(ZZ_Transform)); bufptr += sizeof(ZZ_Transform); *buf = bufptr; diff --git a/packages/zoltan/src/tpls/verify_graph.c b/packages/zoltan/src/tpls/verify_graph.c index 9c67648716..5684a99654 100644 --- a/packages/zoltan/src/tpls/verify_graph.c +++ b/packages/zoltan/src/tpls/verify_graph.c @@ -562,8 +562,8 @@ int Zoltan_Verify_Graph(MPI_Comm comm, indextype *vtxdist, indextype *xadj, /* comparison routine for bsearch */ static int Zoltan_Compare_Indextypes(const void *key, const void *arg) { - if ( *(indextype*) key > (*(indextype*) arg)) return 1; - if ( *(indextype*) key < (*(indextype*) arg)) return -1; + if ( *(const indextype*) key > (*(const indextype*) arg)) return 1; + if ( *(const indextype*) key < (*(const indextype*) arg)) return -1; return 0; /* equal */ } diff --git a/packages/zoltan/src/zz/zz_struct.c b/packages/zoltan/src/zz/zz_struct.c index dc4e57dcf7..0012d59601 100644 --- a/packages/zoltan/src/zz/zz_struct.c +++ b/packages/zoltan/src/zz/zz_struct.c @@ -403,7 +403,7 @@ int Zoltan_Serialize(ZZ const *zz, size_t bufSize, char *buf) *intptr = zz->Debug_Proc; intptr++; *intptr = zz->Fortran; intptr++; *intptr = zz->Tflops_Special; intptr++; - *intptr = *((int*) &(zz->Seed)); intptr++; + *intptr = *((const int*) &(zz->Seed)); intptr++; *intptr = zz->Deterministic; intptr++; *intptr = zz->Obj_Weight_Dim; intptr++; *intptr = zz->Edge_Weight_Dim; intptr++; From f420fa896527c00c39cab4100b4c1360545049d8 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Wed, 4 Oct 2023 21:27:55 -0400 Subject: [PATCH 045/110] Fixed some clang -Wmissing-prototypes warnings --- packages/seacas/libraries/chaco/util/bit_reverse.c | 2 ++ packages/zoltan/siMPI/pyMPI/siMPI/_MPI_OP_UTIL.c | 2 +- packages/zoltan/src/coloring/g2l_hash.c | 2 +- packages/zoltan/src/ha/divide_machine.c | 1 + packages/zoltan/src/lb/lb_balance.c | 6 ++++++ packages/zoltan/src/order/hsfcOrder.c | 1 + packages/zoltan/src/par/par_average.c | 1 + packages/zoltan/src/par/par_bisect.c | 4 +++- packages/zoltan/src/par/par_median_randomized.c | 2 +- 9 files changed, 17 insertions(+), 4 deletions(-) diff --git a/packages/seacas/libraries/chaco/util/bit_reverse.c b/packages/seacas/libraries/chaco/util/bit_reverse.c index c2cfd497bd..ea2cf995c4 100644 --- a/packages/seacas/libraries/chaco/util/bit_reverse.c +++ b/packages/seacas/libraries/chaco/util/bit_reverse.c @@ -6,6 +6,8 @@ * See packages/seacas/LICENSE for details */ +#import "prototypes.h" + /* Reverse the bits of a number. */ int bit_reverse(int val, int nbits) /* value to reverse bits of */ diff --git a/packages/zoltan/siMPI/pyMPI/siMPI/_MPI_OP_UTIL.c b/packages/zoltan/siMPI/pyMPI/siMPI/_MPI_OP_UTIL.c index 54c6ed6e64..878a65e6ac 100644 --- a/packages/zoltan/siMPI/pyMPI/siMPI/_MPI_OP_UTIL.c +++ b/packages/zoltan/siMPI/pyMPI/siMPI/_MPI_OP_UTIL.c @@ -26,7 +26,7 @@ void _MPI_Default_Op ( void* a, void* b, int* len, MPI_Datatype* type ) } /*==========================================================================*/ -void _MPI_Ops_init(int i) +static void _MPI_Ops_init(int i) { _MPI_COVERAGE(); _MPI_OP_LIST[i].valid = _MPI_NOT_VALID; diff --git a/packages/zoltan/src/coloring/g2l_hash.c b/packages/zoltan/src/coloring/g2l_hash.c index bcc5d3cfce..c49c0f621e 100644 --- a/packages/zoltan/src/coloring/g2l_hash.c +++ b/packages/zoltan/src/coloring/g2l_hash.c @@ -62,7 +62,7 @@ extern "C" { #define MAX_PRIME 193 -int Zoltan_GenPrime(int stopafter, int *prime_num) +static int Zoltan_GenPrime(int stopafter, int *prime_num) { static const int primes[MAX_PRIME]= {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 37, 41, 47, 53, 59, 67, 79, 89, diff --git a/packages/zoltan/src/ha/divide_machine.c b/packages/zoltan/src/ha/divide_machine.c index 7bcd62cdce..111364ece7 100644 --- a/packages/zoltan/src/ha/divide_machine.c +++ b/packages/zoltan/src/ha/divide_machine.c @@ -52,6 +52,7 @@ extern "C" { #include "zz_const.h" +#include "ha_const.h" int Zoltan_Divide_Machine( diff --git a/packages/zoltan/src/lb/lb_balance.c b/packages/zoltan/src/lb/lb_balance.c index 71d02cfd78..4663ab066f 100644 --- a/packages/zoltan/src/lb/lb_balance.c +++ b/packages/zoltan/src/lb/lb_balance.c @@ -89,6 +89,12 @@ static int search_hash_table(ZZ *, ZOLTAN_ID_PTR gid, struct Hash_Node **ht, int tableSize); static void free_hash_table(struct Hash_Node **ht, int tableSize); +static void Zoltan_PartDist_MPIOp( + void *in, + void *inout, + int *len, + MPI_Datatype *dptr); + /****************************************************************************/ /****************************************************************************/ diff --git a/packages/zoltan/src/order/hsfcOrder.c b/packages/zoltan/src/order/hsfcOrder.c index 44c07ee65f..cd01f47dec 100644 --- a/packages/zoltan/src/order/hsfcOrder.c +++ b/packages/zoltan/src/order/hsfcOrder.c @@ -52,6 +52,7 @@ extern "C" { #include "zz_const.h" #include "zz_sort.h" #include "hsfc_hilbert_const.h" +#include "hsfcOrder.h" int Zoltan_LocalHSFC_Order( diff --git a/packages/zoltan/src/par/par_average.c b/packages/zoltan/src/par/par_average.c index 1d218774db..a8df8956bf 100644 --- a/packages/zoltan/src/par/par_average.c +++ b/packages/zoltan/src/par/par_average.c @@ -53,6 +53,7 @@ extern "C" { #include #include #include +#include "par_average_const.h" #include "par_median_const.h" #include "zz_const.h" diff --git a/packages/zoltan/src/par/par_bisect.c b/packages/zoltan/src/par/par_bisect.c index 7855d4211d..fdffac6486 100644 --- a/packages/zoltan/src/par/par_bisect.c +++ b/packages/zoltan/src/par/par_bisect.c @@ -106,6 +106,8 @@ static double eval_cut_quality(int, double *, double *, double *, double *, int); static void compute_weight_sums( int, int *, int, double *, double, double *, double *, MPI_Comm, int, int, int, int); +static void Zoltan_bisector_merge(void *in, void *inout, int *len, MPI_Datatype *dptr); + #endif /* RB_MAX_WGTS > 1 */ /*****************************************************************************/ @@ -1251,7 +1253,7 @@ static double eval_cut_quality( */ -void Zoltan_bisector_merge(void *in, void *inout, int *len, MPI_Datatype *dptr) +static void Zoltan_bisector_merge(void *in, void *inout, int *len, MPI_Datatype *dptr) { struct bisector *med1, *med2; int i, nwgts; diff --git a/packages/zoltan/src/par/par_median_randomized.c b/packages/zoltan/src/par/par_median_randomized.c index 3bc70e8275..220ff67e9e 100644 --- a/packages/zoltan/src/par/par_median_randomized.c +++ b/packages/zoltan/src/par/par_median_randomized.c @@ -77,7 +77,7 @@ typedef struct _commStruct{ MPI_Comm comm; }commStruct; -int rb_sort_doubles_increasing(const void *a, const void *b) +static int rb_sort_doubles_increasing(const void *a, const void *b) { double v1, v2; From 4fadd046f7f9f57f514c0fe542669b3f3a8413b1 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Wed, 4 Oct 2023 21:32:40 -0400 Subject: [PATCH 046/110] Fixed some clang -Wmissing-variable-declarations warnings --- packages/zoltan/src/reftree/reftree_coarse_path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/zoltan/src/reftree/reftree_coarse_path.c b/packages/zoltan/src/reftree/reftree_coarse_path.c index 3fc07b4197..e8a2a27b4d 100644 --- a/packages/zoltan/src/reftree/reftree_coarse_path.c +++ b/packages/zoltan/src/reftree/reftree_coarse_path.c @@ -118,7 +118,7 @@ static int *to_add_ptr; /* in this file the vertices are integers from 0 to nvert-1, but in the input/output arguments they are gids. vertex_gid maps from int to gid */ -ZOLTAN_ID_PTR vertex_gid; +static ZOLTAN_ID_PTR vertex_gid; /* variables for each element which define the path */ static int *prev, *next, *in, *out, *onpath; From 95b065c39e28b138dcd51c3ac801d575355154d7 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Wed, 4 Oct 2023 21:39:14 -0400 Subject: [PATCH 047/110] Fixed some clang -Wunreachable-code warnings --- packages/zoltan/src/tpls/postprocessing.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/zoltan/src/tpls/postprocessing.c b/packages/zoltan/src/tpls/postprocessing.c index 0b81dc6754..015bf32e5d 100644 --- a/packages/zoltan/src/tpls/postprocessing.c +++ b/packages/zoltan/src/tpls/postprocessing.c @@ -223,7 +223,8 @@ Zoltan_Postprocess_Order (ZZ *zz, /* Fill in the Zoltan Order Struct */ /* EBEB: For now, discard separator info */ - if (0){ /* DEBUG: Print separator sizes to file */ +#if 0 + { /* DEBUG: Print separator sizes to file */ FILE *fp; fp = fopen("separators.txt", "w"); fprintf(fp, "%i\n", ord->num_part); @@ -237,6 +238,7 @@ Zoltan_Postprocess_Order (ZZ *zz, fprintf(fp, "\n"); fclose(fp); } +#endif return (ierr); } From a9556cbadb03056f90e331f30d523e1973f8878a Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Wed, 4 Oct 2023 21:40:55 -0400 Subject: [PATCH 048/110] Fixed some clang -Wswitch-enum warnings, and an off-by-1 in error message --- packages/zoltan/src/zz/zz_set_fn.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/zoltan/src/zz/zz_set_fn.c b/packages/zoltan/src/zz/zz_set_fn.c index 2e095044fa..cf5ed81ca2 100644 --- a/packages/zoltan/src/zz/zz_set_fn.c +++ b/packages/zoltan/src/zz/zz_set_fn.c @@ -271,9 +271,11 @@ int ierr; ierr = Zoltan_Set_Hier_Method_Fn(zz, (ZOLTAN_HIER_METHOD_FN *) fn, data); break; + case ZOLTAN_PROC_NAME_FN_TYPE: + case ZOLTAN_MAX_FN_TYPES: default: sprintf(msg, "ZOLTAN_FN_TYPE %d is invalid.\n" - "Value must be in range 0 to %d.", fn_type, ZOLTAN_MAX_FN_TYPES); + "Value must be in range 0 to %d.", fn_type, ZOLTAN_MAX_FN_TYPES - 1); ZOLTAN_PRINT_ERROR(zz->Proc, yo, msg); ierr = ZOLTAN_WARN; } @@ -484,9 +486,11 @@ int ierr = ZOLTAN_OK; *fn = (ZOLTAN_VOID_FN *) zz->Get_Hier_Method; *data = zz->Get_Hier_Method_Data; break; + case ZOLTAN_PROC_NAME_FN_TYPE: + case ZOLTAN_MAX_FN_TYPES: default: sprintf(msg, "ZOLTAN_FN_TYPE %d is invalid.\n" - "Value must be in range 0 to %d.", fn_type, ZOLTAN_MAX_FN_TYPES); + "Value must be in range 0 to %d.", fn_type, ZOLTAN_MAX_FN_TYPES - 1); *fn = NULL; *data = NULL; ZOLTAN_PRINT_ERROR(zz->Proc, yo, msg); From ec3e738b95b6a03eb150754e4dcc552ac846537e Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Wed, 4 Oct 2023 21:42:59 -0400 Subject: [PATCH 049/110] Fixed some clang -Wunreachable-code-return warnings --- packages/zoltan/siMPI/pyMPI/siMPI/PMPI_Abort.c | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/zoltan/siMPI/pyMPI/siMPI/PMPI_Abort.c b/packages/zoltan/siMPI/pyMPI/siMPI/PMPI_Abort.c index b2d0194432..2d0b6f2670 100644 --- a/packages/zoltan/siMPI/pyMPI/siMPI/PMPI_Abort.c +++ b/packages/zoltan/siMPI/pyMPI/siMPI/PMPI_Abort.c @@ -24,5 +24,4 @@ int PMPI_Abort( MPI_Comm comm, int errorcode ) #endif _MPI_ERR_ROUTINE(errorcode, "MPI aborting..."); abort(); - return -1; } From 096d82f19f58a8a10239a6a67019d349da635622 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Wed, 8 Nov 2023 19:17:10 -0500 Subject: [PATCH 050/110] Fixed clang -Wstrict-prototypes warning --- packages/seacas/libraries/exodus/include/exodusII_int.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/seacas/libraries/exodus/include/exodusII_int.h b/packages/seacas/libraries/exodus/include/exodusII_int.h index aa0c7c9652..5e1d512198 100644 --- a/packages/seacas/libraries/exodus/include/exodusII_int.h +++ b/packages/seacas/libraries/exodus/include/exodusII_int.h @@ -117,7 +117,7 @@ extern EX_mutex_t EX_g; extern int ex__mutex_lock(EX_mutex_t *mutex); extern int ex__mutex_unlock(EX_mutex_t *mutex, const char *func, int line); extern void ex__pthread_first_thread_init(void); -extern EX_errval_t *exerrval_get(); +extern EX_errval_t *exerrval_get(void); #define EX_FUNC_ENTER() \ do { \ From 8a4e8507dabfa3e2e67ffa1e24c1a075bdd85e9c Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Sat, 11 Nov 2023 17:08:16 -0500 Subject: [PATCH 051/110] Some ReadMe improvement after trying to build for first time --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 495eeee1de..ece5461123 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,8 @@ libraries using the `install-tpl.sh` script, or you can install them manually as detailed in [TPL-Manual-Install.md](TPL-Manual-Install.md). -* To use the script, simply type `./install-tpl.sh` +* The script requires bash and wget, which you may need to install. +* To use the script, simply type `bash ./install-tpl.sh`. * The default behavior can be modified via a few environment variables: | Variable | Values | Default | Description | @@ -93,7 +94,7 @@ to configure the SEACAS CMake build. * `cd $ACCESS` * `mkdir build` * `cd build` -* edit the `${ACCESS}cmake-config` file and adjust compilers and other settings as needed. +* edit the `${ACCESS}/cmake-config` file and adjust compilers and other settings as needed. * enter the command `../cmake-config` and cmake should configure everything for the build. * `make && make install` * If everything works, your applications should be in `${ACCESS}/bin` @@ -285,7 +286,7 @@ in aprepro. ### Mac On a mac system, I use the `brew` system which provides all of the applications listed above. The X11 system I use is `XQuartz`. The -Mac also requires `XCode` +Mac also requires `Xcode` ### Linux On an ubuntu system, the following is used to set up the basic From 791f20942d74de80597c2db4a2c427ba3cc5cc07 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 13 Nov 2023 15:35:40 -0700 Subject: [PATCH 052/110] Fix import -> include --- packages/seacas/libraries/chaco/util/bit_reverse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/seacas/libraries/chaco/util/bit_reverse.c b/packages/seacas/libraries/chaco/util/bit_reverse.c index ea2cf995c4..9c15a334d8 100644 --- a/packages/seacas/libraries/chaco/util/bit_reverse.c +++ b/packages/seacas/libraries/chaco/util/bit_reverse.c @@ -6,7 +6,7 @@ * See packages/seacas/LICENSE for details */ -#import "prototypes.h" +#include "prototypes.h" /* Reverse the bits of a number. */ int bit_reverse(int val, int nbits) From a797e3f5204382bf5f47043bf23a0654a2181ba4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 22:36:01 +0000 Subject: [PATCH 053/110] @gsjaardema has signed the CLA in sandialabs/seacas#421 --- signatures/version1/cla.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/signatures/version1/cla.json b/signatures/version1/cla.json index 66f0e5c0f7..edff1afcca 100644 --- a/signatures/version1/cla.json +++ b/signatures/version1/cla.json @@ -135,6 +135,14 @@ "created_at": "2023-03-31T15:59:13Z", "repoId": 36943822, "pullRequestNo": 374 + }, + { + "name": "seanm", + "id": 117260, + "comment_id": 1806968902, + "created_at": "2023-11-12T01:33:41Z", + "repoId": 36943822, + "pullRequestNo": 421 } ] } \ No newline at end of file From e24eeb69d393506be6353ecee4b72fb17e942e14 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 13 Nov 2023 18:01:06 -0700 Subject: [PATCH 054/110] EXODIFF: Remove redundant num_assemblies() function --- packages/seacas/applications/exodiff/exoII_read.h | 1 - packages/seacas/applications/exodiff/exodiff.C | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/seacas/applications/exodiff/exoII_read.h b/packages/seacas/applications/exodiff/exoII_read.h index 3b0e359e18..fc423d057d 100644 --- a/packages/seacas/applications/exodiff/exoII_read.h +++ b/packages/seacas/applications/exodiff/exoII_read.h @@ -61,7 +61,6 @@ template class ExoII_Read size_t Num_Elements() const { return num_elmts; } size_t Num_Faces() const { return num_faces; } size_t Num_Edges() const { return num_edges; } - size_t Num_Assemblies() const { return num_assemblies; } size_t Num_Node_Sets() const { return num_node_sets; } size_t Num_Side_Sets() const { return num_side_sets; } size_t Num_Edge_Blocks() const { return num_edge_blocks; } diff --git a/packages/seacas/applications/exodiff/exodiff.C b/packages/seacas/applications/exodiff/exodiff.C index 7342fc84c9..816caf316c 100644 --- a/packages/seacas/applications/exodiff/exodiff.C +++ b/packages/seacas/applications/exodiff/exodiff.C @@ -308,7 +308,7 @@ namespace { file.Num_Edge_Blocks(), file.Num_Face_Blocks(), file.Num_Global_Vars(), file.Num_Nodal_Vars(), file.Num_Element_Vars(), file.Num_NS_Vars(), file.Num_SS_Vars(), file.Num_Times(), file.Num_FB_Vars(), file.Num_EB_Vars(), count, file.Num_Faces(), - file.Num_Edges(), file.Num_Assemblies()); + file.Num_Edges(), file.Num_Assembly()); } void initialize(std::vector &mm_entity, size_t size, const ToleranceType &ttype) From 5df01c4706c043e5c420d4f9052ec4fb1822b7d2 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 15 Nov 2023 09:53:04 -0700 Subject: [PATCH 055/110] IOSS: Replace remaining &abcd[0] with abcd.data() --- .../ioss/src/exodus/Ioex_DatabaseIO.C | 56 +++++++++---------- .../ioss/src/exodus/Ioex_DecompositionData.C | 2 +- .../ioss/src/exodus/Ioex_Internals.C | 8 +-- .../libraries/ioss/src/exodus/Ioex_Utils.C | 2 +- .../ioss/src/exonull/Ioexnl_DatabaseIO.C | 36 ++++++------ .../src/exonull/Ioexnl_DecompositionData.C | 2 +- .../ioss/src/exonull/Ioexnl_Internals.C | 4 +- .../ioss/src/faodel/Iofaodel_DatabaseIO.C | 6 +- .../ioss/src/gen_struc/Iogs_DatabaseIO.C | 2 +- .../ioss/src/gen_struc/Iogs_GeneratedMesh.C | 6 +- .../ioss/src/generated/Iogn_DatabaseIO.C | 4 +- .../ioss/src/generated/Iogn_GeneratedMesh.C | 6 +- .../ioss/src/main/cth_pressure_map.C | 32 +++++------ .../ioss/src/text_mesh/Iotm_DatabaseIO.C | 4 +- .../ioss/src/text_mesh/Iotm_TextMesh.C | 6 +- 15 files changed, 88 insertions(+), 88 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C index 02b61984a8..45ffd26bbf 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C @@ -2958,8 +2958,8 @@ namespace Ioex { // Convert local node id to global node id and store in 'data' if (int_byte_size_api() == 4) { int *entity_proc = static_cast(data); - int *ents = reinterpret_cast(&entities[0]); - int *pros = reinterpret_cast(&procs[0]); + int *ents = reinterpret_cast(entities.data()); + int *pros = reinterpret_cast(procs.data()); size_t j = 0; if (field.get_name() == "entity_processor") { @@ -2980,8 +2980,8 @@ namespace Ioex { } else { auto *entity_proc = static_cast(data); - auto *ents = reinterpret_cast(&entities[0]); - auto *pros = reinterpret_cast(&procs[0]); + auto *ents = reinterpret_cast(entities.data()); + auto *pros = reinterpret_cast(procs.data()); size_t j = 0; if (field.get_name() == "entity_processor") { @@ -3016,9 +3016,9 @@ namespace Ioex { if (int_byte_size_api() == 4) { int *entity_proc = static_cast(data); - int *ents = reinterpret_cast(&entities[0]); - int *pros = reinterpret_cast(&procs[0]); - int *sids = reinterpret_cast(&sides[0]); + int *ents = reinterpret_cast(entities.data()); + int *pros = reinterpret_cast(procs.data()); + int *sids = reinterpret_cast(sides.data()); size_t j = 0; if (field.get_name() == "entity_processor") { @@ -3040,9 +3040,9 @@ namespace Ioex { } else { auto *entity_proc = static_cast(data); - auto *ents = reinterpret_cast(&entities[0]); - auto *pros = reinterpret_cast(&procs[0]); - auto *sids = reinterpret_cast(&sides[0]); + auto *ents = reinterpret_cast(entities.data()); + auto *pros = reinterpret_cast(procs.data()); + auto *sids = reinterpret_cast(sides.data()); size_t j = 0; if (field.get_name() == "entity_processor") { @@ -4943,8 +4943,8 @@ namespace Ioex { // Convert global node id to local node id and store in 'entities' if (int_byte_size_api() == 4) { int *entity_proc = static_cast(data); - int *ent = reinterpret_cast(&entities[0]); - int *pro = reinterpret_cast(&procs[0]); + int *ent = reinterpret_cast(entities.data()); + int *pro = reinterpret_cast(procs.data()); int j = 0; for (size_t i = 0; i < entity_count; i++) { int global_id = entity_proc[j++]; @@ -4954,8 +4954,8 @@ namespace Ioex { } else { auto *entity_proc = static_cast(data); - auto *ent = reinterpret_cast(&entities[0]); - auto *pro = reinterpret_cast(&procs[0]); + auto *ent = reinterpret_cast(entities.data()); + auto *pro = reinterpret_cast(procs.data()); int64_t j = 0; for (size_t i = 0; i < entity_count; i++) { int64_t global_id = entity_proc[j++]; @@ -4990,13 +4990,13 @@ namespace Ioex { std::vector internal(nodeCount * int_byte_size_api()); if (int_byte_size_api() == 4) { - compute_internal_border_maps(reinterpret_cast(&entities[0]), - reinterpret_cast(&internal[0]), nodeCount, + compute_internal_border_maps(reinterpret_cast(entities.data()), + reinterpret_cast(internal.data()), nodeCount, entity_count); } else { - compute_internal_border_maps(reinterpret_cast(&entities[0]), - reinterpret_cast(&internal[0]), nodeCount, + compute_internal_border_maps(reinterpret_cast(entities.data()), + reinterpret_cast(internal.data()), nodeCount, entity_count); } @@ -5012,9 +5012,9 @@ namespace Ioex { std::vector sides(entity_count * int_byte_size_api()); if (int_byte_size_api() == 4) { int *entity_proc = static_cast(data); - int *ent = reinterpret_cast(&entities[0]); - int *sid = reinterpret_cast(&sides[0]); - int *pro = reinterpret_cast(&procs[0]); + int *ent = reinterpret_cast(entities.data()); + int *sid = reinterpret_cast(sides.data()); + int *pro = reinterpret_cast(procs.data()); int j = 0; for (size_t i = 0; i < entity_count; i++) { ent[i] = elemMap.global_to_local(entity_proc[j++]); @@ -5024,9 +5024,9 @@ namespace Ioex { } else { auto *entity_proc = static_cast(data); - auto *ent = reinterpret_cast(&entities[0]); - auto *sid = reinterpret_cast(&sides[0]); - auto *pro = reinterpret_cast(&procs[0]); + auto *ent = reinterpret_cast(entities.data()); + auto *sid = reinterpret_cast(sides.data()); + auto *pro = reinterpret_cast(procs.data()); int64_t j = 0; for (size_t i = 0; i < entity_count; i++) { ent[i] = elemMap.global_to_local(entity_proc[j++]); @@ -5048,13 +5048,13 @@ namespace Ioex { // Iterate through array again and consolidate all '1's std::vector internal(elementCount * int_byte_size_api()); if (int_byte_size_api() == 4) { - compute_internal_border_maps(reinterpret_cast(&entities[0]), - reinterpret_cast(&internal[0]), elementCount, + compute_internal_border_maps(reinterpret_cast(entities.data()), + reinterpret_cast(internal.data()), elementCount, entity_count); } else { - compute_internal_border_maps(reinterpret_cast(&entities[0]), - reinterpret_cast(&internal[0]), elementCount, + compute_internal_border_maps(reinterpret_cast(entities.data()), + reinterpret_cast(internal.data()), elementCount, entity_count); } diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C index 98e21da560..2d8be24a4e 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C @@ -1871,7 +1871,7 @@ namespace Ioex { // The number of locally-owned nodes on this processor is 'position' *locally_owned_count = position; - MPI_Allgather(locally_owned_count, 1, MPI_LONG_LONG_INT, &rcv_count[0], 1, MPI_LONG_LONG_INT, + MPI_Allgather(locally_owned_count, 1, MPI_LONG_LONG_INT, rcv_count.data(), 1, MPI_LONG_LONG_INT, comm_); m_decomposition.show_progress("\tAllgather finished"); diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C index 7c2528dad9..01450270f3 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C @@ -816,8 +816,8 @@ void Mesh::get_global_counts() // they can determine the offsets and totals... global_counts.resize(counts.size() * parallelUtil.parallel_size()); - MPI_Allgather(&counts[0], counts.size(), MPI_LONG_LONG_INT, &global_counts[0], counts.size(), - MPI_LONG_LONG_INT, parallelUtil.communicator()); + MPI_Allgather(counts.data(), counts.size(), MPI_LONG_LONG_INT, global_counts.data(), + counts.size(), MPI_LONG_LONG_INT, parallelUtil.communicator()); std::vector offsets(counts.size()); @@ -4014,7 +4014,7 @@ namespace { if (size > 0) { std::array dimid; - int status = nc_def_dim(exodusFilePtr, dim, size, &dimid[0]); + int status = nc_def_dim(exodusFilePtr, dim, size, dimid.data()); if (status != NC_NOERR) { ex_opts(EX_VERBOSE); std::string errmsg = fmt::format("Error: failed to dimension \"{}\" in file id {}", @@ -4042,7 +4042,7 @@ namespace { { if (size > 0) { std::array dimid; - int status = nc_def_dim(exodusFilePtr, dim, size, &dimid[0]); + int status = nc_def_dim(exodusFilePtr, dim, size, dimid.data()); if (status != NC_NOERR) { ex_opts(EX_VERBOSE); std::string errmsg = fmt::format("Error: failed to dimension \"{}\" in file id {}", diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C index 04c4b39b0b..da0f48807f 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C @@ -470,7 +470,7 @@ namespace Ioex { // Filter out names of the form "basename_id" if the name // id doesn't match the id in the name... size_t base_size = basename.size(); - if (std::strncmp(basename.c_str(), &buffer[0], base_size) == 0) { + if (std::strncmp(basename.c_str(), buffer.data(), base_size) == 0) { int64_t name_id = extract_id(buffer.data()); // See if name is truly of form "basename_name_id" (e.g. "surface_{id}") diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C index 7f914a05d0..f3a03f8688 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C @@ -968,8 +968,8 @@ namespace Ioexnl { // Convert global node id to local node id and store in 'entities' if (int_byte_size_api() == 4) { int *entity_proc = static_cast(data); - int *ent = reinterpret_cast(&entities[0]); - int *pro = reinterpret_cast(&procs[0]); + int *ent = reinterpret_cast(entities.data()); + int *pro = reinterpret_cast(procs.data()); int j = 0; for (size_t i = 0; i < entity_count; i++) { int global_id = entity_proc[j++]; @@ -979,8 +979,8 @@ namespace Ioexnl { } else { auto *entity_proc = static_cast(data); - auto *ent = reinterpret_cast(&entities[0]); - auto *pro = reinterpret_cast(&procs[0]); + auto *ent = reinterpret_cast(entities.data()); + auto *pro = reinterpret_cast(procs.data()); int64_t j = 0; for (size_t i = 0; i < entity_count; i++) { int64_t global_id = entity_proc[j++]; @@ -1009,13 +1009,13 @@ namespace Ioexnl { std::vector internal(nodeCount * int_byte_size_api()); if (int_byte_size_api() == 4) { - compute_internal_border_maps(reinterpret_cast(&entities[0]), - reinterpret_cast(&internal[0]), nodeCount, + compute_internal_border_maps(reinterpret_cast(entities.data()), + reinterpret_cast(internal.data()), nodeCount, entity_count); } else { - compute_internal_border_maps(reinterpret_cast(&entities[0]), - reinterpret_cast(&internal[0]), nodeCount, + compute_internal_border_maps(reinterpret_cast(entities.data()), + reinterpret_cast(internal.data()), nodeCount, entity_count); } } @@ -1024,9 +1024,9 @@ namespace Ioexnl { std::vector sides(entity_count * int_byte_size_api()); if (int_byte_size_api() == 4) { int *entity_proc = static_cast(data); - int *ent = reinterpret_cast(&entities[0]); - int *sid = reinterpret_cast(&sides[0]); - int *pro = reinterpret_cast(&procs[0]); + int *ent = reinterpret_cast(entities.data()); + int *sid = reinterpret_cast(sides.data()); + int *pro = reinterpret_cast(procs.data()); int j = 0; for (size_t i = 0; i < entity_count; i++) { ent[i] = elemMap.global_to_local(entity_proc[j++]); @@ -1036,9 +1036,9 @@ namespace Ioexnl { } else { auto *entity_proc = static_cast(data); - auto *ent = reinterpret_cast(&entities[0]); - auto *sid = reinterpret_cast(&sides[0]); - auto *pro = reinterpret_cast(&procs[0]); + auto *ent = reinterpret_cast(entities.data()); + auto *sid = reinterpret_cast(sides.data()); + auto *pro = reinterpret_cast(procs.data()); int64_t j = 0; for (size_t i = 0; i < entity_count; i++) { ent[i] = elemMap.global_to_local(entity_proc[j++]); @@ -1054,13 +1054,13 @@ namespace Ioexnl { // Iterate through array again and consolidate all '1's std::vector internal(elementCount * int_byte_size_api()); if (int_byte_size_api() == 4) { - compute_internal_border_maps(reinterpret_cast(&entities[0]), - reinterpret_cast(&internal[0]), elementCount, + compute_internal_border_maps(reinterpret_cast(entities.data()), + reinterpret_cast(internal.data()), elementCount, entity_count); } else { - compute_internal_border_maps(reinterpret_cast(&entities[0]), - reinterpret_cast(&internal[0]), elementCount, + compute_internal_border_maps(reinterpret_cast(entities.data()), + reinterpret_cast(internal.data()), elementCount, entity_count); } } diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.C index 2dbf099c97..d98f21d695 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.C @@ -90,7 +90,7 @@ namespace Ioexnl { // The number of locally-owned nodes on this processor is 'position' *locally_owned_count = position; - MPI_Allgather(locally_owned_count, 1, MPI_LONG_LONG_INT, &rcv_count[0], 1, MPI_LONG_LONG_INT, + MPI_Allgather(locally_owned_count, 1, MPI_LONG_LONG_INT, rcv_count.data(), 1, MPI_LONG_LONG_INT, comm_); m_decomposition.show_progress("\tAllgather finished"); diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.C index 7028b35973..4741a99882 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.C @@ -458,8 +458,8 @@ void Mesh::get_global_counts() // they can determine the offsets and totals... global_counts.resize(counts.size() * parallelUtil.parallel_size()); - MPI_Allgather(&counts[0], counts.size(), MPI_LONG_LONG_INT, &global_counts[0], counts.size(), - MPI_LONG_LONG_INT, parallelUtil.communicator()); + MPI_Allgather(counts.data(), counts.size(), MPI_LONG_LONG_INT, global_counts.data(), + counts.size(), MPI_LONG_LONG_INT, parallelUtil.communicator()); std::vector offsets(counts.size()); diff --git a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.C b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.C index 785a1e9628..3047e3320e 100644 --- a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.C @@ -1183,19 +1183,19 @@ mpisyncstart.enable true { auto field_x = Ioss::Field("mesh_model_coordinates_x", field.get_type(), "scalar", role, num_to_get); - this->get_field_internal(*sb, field_x, &data_x[0], component_data_size); + this->get_field_internal(*sb, field_x, data_x.data(), component_data_size); } if (dim > 1) { auto field_y = Ioss::Field("mesh_model_coordinates_y", field.get_type(), "scalar", role, num_to_get); - this->get_field_internal(*sb, field_y, &data_y[0], component_data_size); + this->get_field_internal(*sb, field_y, data_y.data(), component_data_size); } if (dim > 2) { auto field_z = Ioss::Field("mesh_model_coordinates_z", field.get_type(), "scalar", role, num_to_get); - this->get_field_internal(*sb, field_z, &data_z[0], component_data_size); + this->get_field_internal(*sb, field_z, data_z.data(), component_data_size); } size_t index(0); diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C index b2b565873d..88b38037f2 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C @@ -337,7 +337,7 @@ namespace Iogs { std::vector elem_side; m_generatedMesh->sideset_elem_sides(id, elem_side); if (field.get_name() == "element_side_raw") { - map_global_to_local(get_element_map(), elem_side.size(), 2, &elem_side[0]); + map_global_to_local(get_element_map(), elem_side.size(), 2, elem_side.data()); } if (field.is_type(Ioss::Field::INTEGER)) { diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C index 01e3bc01a8..40a7cd81af 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C @@ -612,7 +612,7 @@ namespace Iogs { /* create global coordinates */ int64_t count = node_count_proc(); coord.resize(count * 3); - coordinates(&coord[0]); + coordinates(coord.data()); } void GeneratedMesh::coordinates(double *coord) const @@ -762,7 +762,7 @@ namespace Iogs { if (block_number == 1) { // HEX Element Block connect.resize(element_count_proc(block_number) * 8); } - raw_connectivity(block_number, &connect[0]); + raw_connectivity(block_number, connect.data()); } void GeneratedMesh::connectivity(int64_t block_number, Ioss::IntVector &connect) const @@ -770,7 +770,7 @@ namespace Iogs { if (block_number == 1) { // HEX Element Block connect.resize(element_count_proc(block_number) * 8); } - raw_connectivity(block_number, &connect[0]); + raw_connectivity(block_number, connect.data()); } void GeneratedMesh::connectivity(int64_t block_number, int64_t *connect) const diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C index f8b63f5684..5bff68d07a 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C @@ -382,7 +382,7 @@ namespace Iogn { std::vector elem_side; m_generatedMesh->sideset_elem_sides(id, elem_side); if (field.get_name() == "element_side_raw") { - map_global_to_local(get_element_map(), elem_side.size(), 2, &elem_side[0]); + map_global_to_local(get_element_map(), elem_side.size(), 2, elem_side.data()); } if (field.is_type(Ioss::Field::INTEGER)) { @@ -439,7 +439,7 @@ namespace Iogn { std::vector nodes; m_generatedMesh->nodeset_nodes(id, nodes); if (field.get_name() == "ids_raw") { - map_global_to_local(get_node_map(), nodes.size(), 1, &nodes[0]); + map_global_to_local(get_node_map(), nodes.size(), 1, nodes.data()); } if (field.is_type(Ioss::Field::INTEGER)) { diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C index 6cdac2efee..f7c5dcf261 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C @@ -1073,7 +1073,7 @@ namespace Iogn { /* create global coordinates */ int64_t count = node_count_proc(); coord.resize(count * 3); - coordinates(&coord[0]); + coordinates(coord.data()); } void GeneratedMesh::coordinates(double *coord) const @@ -1228,7 +1228,7 @@ namespace Iogn { int64_t npe = createTets ? 3 : 4; connect.resize(element_count_proc(block_number) * npe); } - raw_connectivity(block_number, &connect[0]); + raw_connectivity(block_number, connect.data()); } void GeneratedMesh::connectivity(int64_t block_number, Ioss::IntVector &connect) const @@ -1241,7 +1241,7 @@ namespace Iogn { int64_t npe = createTets ? 3 : 4; connect.resize(element_count_proc(block_number) * npe); } - raw_connectivity(block_number, &connect[0]); + raw_connectivity(block_number, connect.data()); } void GeneratedMesh::connectivity(int64_t block_number, int64_t *connect) const diff --git a/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C b/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C index d9ca82a841..a254a0b7b8 100644 --- a/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C +++ b/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C @@ -17,7 +17,6 @@ #include #include -#include "Ioss_ScopeGuard.h" #include "Ioss_CommSet.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" @@ -32,6 +31,7 @@ #include "Ioss_ParallelUtils.h" #include "Ioss_Property.h" #include "Ioss_Region.h" +#include "Ioss_ScopeGuard.h" #include "Ioss_SideBlock.h" #include "Ioss_SideSet.h" #include "Ioss_State.h" @@ -850,8 +850,8 @@ namespace { if (ige->type() == Ioss::SIDEBLOCK && field_name == "ids") { return; } - ige->get_field_data(field_name, &data[0], isize); - oge->put_field_data(field_name, &data[0], isize); + ige->get_field_data(field_name, data.data(), isize); + oge->put_field_data(field_name, data.data(), isize); } void transfer_properties(Ioss::GroupingEntity *ige, Ioss::GroupingEntity *oge) @@ -930,8 +930,8 @@ namespace { data.resize(isize); - (*i)->get_field_data("skin", &data[0], isize); - fb->put_field_data("element_side", &data[0], osize); + (*i)->get_field_data("skin", data.data(), isize); + fb->put_field_data("element_side", data.data(), osize); ++i; } else { @@ -1013,11 +1013,11 @@ namespace { int isize = (*i)->get_field(field_name).get_size(); int count = (*i)->get_field(field_name).raw_count(); data.resize(isize); - auto *rdata = reinterpret_cast(&data[0]); + auto *rdata = reinterpret_cast(data.data()); for (int ii = 0; ii < count; ii++) { rdata[ii] = globals.offset_pressure; } - fb->put_field_data(field_name, &data[0], isize); + fb->put_field_data(field_name, data.data(), isize); break; } } @@ -1063,9 +1063,9 @@ namespace { int isize = (*i)->get_field(field_name).get_size(); int count = (*i)->get_field(field_name).raw_count(); data.resize(isize); - auto *rdata = reinterpret_cast(&data[0]); + auto *rdata = reinterpret_cast(data.data()); - (*i)->get_field_data(field_name, &data[0], isize); + (*i)->get_field_data(field_name, data.data(), isize); for (int ii = 0; ii < count; ii++) { rdata[ii] -= zdata[ii]; } @@ -1075,19 +1075,19 @@ namespace { rdata[ii] += globals.offset_pressure; } } - fb->put_field_data(field_name, &data[0], isize); + fb->put_field_data(field_name, data.data(), isize); } else if (globals.offset_pressure != 0.0 && field_name == cth_pressure) { int isize = (*i)->get_field(field_name).get_size(); int count = (*i)->get_field(field_name).raw_count(); data.resize(isize); - auto *rdata = reinterpret_cast(&data[0]); + auto *rdata = reinterpret_cast(data.data()); - (*i)->get_field_data(field_name, &data[0], isize); + (*i)->get_field_data(field_name, data.data(), isize); for (int ii = 0; ii < count; ii++) { rdata[ii] += globals.offset_pressure; } - fb->put_field_data(field_name, &data[0], isize); + fb->put_field_data(field_name, data.data(), isize); } else if (Ioss::Utils::substr_equal("cth_", field_name)) { assert(fb->field_exists(field_name)); @@ -1154,11 +1154,11 @@ namespace { int isize = (*i)->get_field(field_name).get_size(); int count = (*i)->get_field(field_name).raw_count(); data.resize(isize); - auto *rdata = reinterpret_cast(&data[0]); + auto *rdata = reinterpret_cast(data.data()); for (int ii = 0; ii < count; ii++) { rdata[ii] = value; } - fb->put_field_data(field_name, &data[0], isize); + fb->put_field_data(field_name, data.data(), isize); } else { // Replicate first field as last field... @@ -1242,7 +1242,7 @@ namespace { std::vector coord(3 * num_nodes); assert(3 * num_nodes * sizeof(double) == (size_t)coord_size); - nb->get_field_data("mesh_model_coordinates", &coord[0], coord_size); + nb->get_field_data("mesh_model_coordinates", coord.data(), coord_size); // Also get an array for the average nodal normal vector... std::vector node_normal(3 * num_nodes); diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C index ce12b53dcd..17614f379b 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C @@ -389,7 +389,7 @@ namespace Iotm { std::vector elem_side; m_textMesh->sideblock_elem_sides(id, ef_blk->name(), elem_side); if (field.get_name() == "element_side_raw") { - map_global_to_local(get_element_map(), elem_side.size(), 2, &elem_side[0]); + map_global_to_local(get_element_map(), elem_side.size(), 2, elem_side.data()); } if (field.is_type(Ioss::Field::INTEGER)) { @@ -446,7 +446,7 @@ namespace Iotm { std::vector nodes; m_textMesh->nodeset_nodes(id, nodes); if (field.get_name() == "ids_raw") { - map_global_to_local(get_node_map(), nodes.size(), 1, &nodes[0]); + map_global_to_local(get_node_map(), nodes.size(), 1, nodes.data()); } if (field.is_type(Ioss::Field::INTEGER)) { diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C index 33cf23b954..cf6f8675d4 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C +++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C @@ -348,7 +348,7 @@ namespace Iotm { /* create global coordinates */ int64_t count = node_count_proc(); coord.resize(count * spatial_dimension()); - coordinates(&coord[0]); + coordinates(coord.data()); } void TextMesh::coordinates(double *coord) const @@ -504,7 +504,7 @@ namespace Iotm { int64_t npe = topo.num_nodes(); connect.resize(element_count_proc(id) * npe); - raw_connectivity(id, &connect[0]); + raw_connectivity(id, connect.data()); } void TextMesh::connectivity(int64_t id, Ioss::IntVector &connect) const @@ -514,7 +514,7 @@ namespace Iotm { int64_t npe = topo.num_nodes(); connect.resize(element_count_proc(id) * npe); - raw_connectivity(id, &connect[0]); + raw_connectivity(id, connect.data()); } void TextMesh::connectivity(int64_t id, int64_t *connect) const { raw_connectivity(id, connect); } From d634ba816760ec4b354ef0cd0db236fbba7baa39 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 15 Nov 2023 10:57:35 -0700 Subject: [PATCH 056/110] CI: See if this fixes intel oneapi build --- cmake-config | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake-config b/cmake-config index 13d4748eb8..f5e264a40a 100755 --- a/cmake-config +++ b/cmake-config @@ -554,6 +554,7 @@ echo " CXX: ${CXX}" echo " FC: ${FC}" echo " MPI: ${MPI}" echo " SHARED: ${SHARED}" +echo " FORTRAN: ${FORTRAN}" echo " BUILD_TYPE: ${BUILD_TYPE}" echo " THREADSAFE: ${THREADSAFE}" echo " CRAY: ${CRAY}" From 56f633e8a7b797d48e39056824320eec69b7088f Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 15 Nov 2023 12:07:28 -0700 Subject: [PATCH 057/110] CI: Change fortran compiler to ifx --- cmake-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-config b/cmake-config index f5e264a40a..ee16b69286 100755 --- a/cmake-config +++ b/cmake-config @@ -162,7 +162,7 @@ then then CXX=icpc CC=icc - FC=ifort + FC=ifx CFLAGS="-Wall -Wunused" CXXFLAGS="-Wall -Wextra -Wunused" fi From d9632090a4a6f1640b02b3215197c4e16727994e Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 15 Nov 2023 14:13:58 -0700 Subject: [PATCH 058/110] CI: See if fixes intel fortran compiler issue --- .github/workflows/intel-build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml index 7070447ce1..d5bbb3f72f 100644 --- a/.github/workflows/intel-build.yml +++ b/.github/workflows/intel-build.yml @@ -121,6 +121,9 @@ jobs: shell: bash -l {0} run: sudo apt update && sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl bzip2 m4 flex bison cmake libzip-dev + - name: Setup Intel Fortran + uses: modflowpy/install-intelfortran-action@v1 + - name: Fetch TPL Cache id: cache-TPL uses: actions/cache@v3 From aa75589b1e6d70a89ef4d39a6c993f8124e647c9 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 15 Nov 2023 16:07:17 -0700 Subject: [PATCH 059/110] IOSS: Fix spelling error --- packages/seacas/libraries/ioss/src/Ioss_Decomposition.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C index 151e08783e..f4a9b266b2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C @@ -1586,7 +1586,7 @@ namespace Ioss { std::vector recv_comm_map_count(m_processorCount); MPI_Alltoall(send_comm_map_count.data(), 1, Ioss::mpi_type((INT)0), recv_comm_map_count.data(), 1, Ioss::mpi_type((INT)0), m_comm); - show_progress("\tCommuniation 1 finished"); + show_progress("\tCommunication 1 finished"); std::vector recv_comm_map_disp(recv_comm_map_count); Ioss::Utils::generate_index(recv_comm_map_disp); @@ -1595,7 +1595,7 @@ namespace Ioss { Ioss::MY_Alltoallv(send_comm_map, send_comm_map_count, send_comm_map_disp, m_nodeCommMap, recv_comm_map_count, recv_comm_map_disp, m_comm); Ioss::Utils::clear(send_comm_map); - show_progress("\tCommuniation 2 finished"); + show_progress("\tCommunication 2 finished"); // Map global 0-based index to local 1-based index. for (size_t i = 0; i < m_nodeCommMap.size(); i += 2) { From 369c360afcf69199da3691a8aee73f9fab633101 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 15 Nov 2023 16:07:32 -0700 Subject: [PATCH 060/110] IOSS: Fix parallel-io sideset read --- .../seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C index c5ed3aaa86..545e667181 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C @@ -1385,7 +1385,7 @@ namespace Ioex { Ioss::Int64Vector &element, Ioss::Int64Vector &sides) { // Check whether we already populated the element/sides vectors. - if (element.empty() && sides.empty() && number_sides > 0) { + if (element.empty() && sides.empty()) { element.resize(number_sides); sides.resize(number_sides); From 269a94197fb862f8060b325ad1268fc3e97dc41f Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 15 Nov 2023 17:00:13 -0700 Subject: [PATCH 061/110] CI: Another try at github intel fortran --- cmake-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-config b/cmake-config index ee16b69286..f5e264a40a 100755 --- a/cmake-config +++ b/cmake-config @@ -162,7 +162,7 @@ then then CXX=icpc CC=icc - FC=ifx + FC=ifort CFLAGS="-Wall -Wunused" CXXFLAGS="-Wall -Wextra -Wunused" fi From 670eff1a070123db397b367ae45619de85ce7e6f Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 15 Nov 2023 17:00:54 -0700 Subject: [PATCH 062/110] EXODIFF: Echo when pedantic checking is enabled --- packages/seacas/applications/exodiff/exodiff.C | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/seacas/applications/exodiff/exodiff.C b/packages/seacas/applications/exodiff/exodiff.C index 816caf316c..859b3b23df 100644 --- a/packages/seacas/applications/exodiff/exodiff.C +++ b/packages/seacas/applications/exodiff/exodiff.C @@ -442,6 +442,9 @@ namespace { if (!interFace.quiet_flag) { output_init(file1, 1, ""); output_init(file2, 2, ""); + if (interFace.pedantic) { + fmt::print(" Pedantic Checking Enabled\n"); + } if (!interFace.command_file.empty()) { FileInfo fi(interFace.command_file); fmt::print(" COMMAND FILE: {}\n\n", fi.realpath()); From 84e82574a0653108af3d25a2efe8132a379b401e Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 16 Nov 2023 07:18:48 -0700 Subject: [PATCH 063/110] CI: Revert last intel fortran try --- .github/workflows/intel-build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml index d5bbb3f72f..7070447ce1 100644 --- a/.github/workflows/intel-build.yml +++ b/.github/workflows/intel-build.yml @@ -121,9 +121,6 @@ jobs: shell: bash -l {0} run: sudo apt update && sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl bzip2 m4 flex bison cmake libzip-dev - - name: Setup Intel Fortran - uses: modflowpy/install-intelfortran-action@v1 - - name: Fetch TPL Cache id: cache-TPL uses: actions/cache@v3 From 6328d27f71bbbb0ab52fb1e5d1c04bf7baf5d1f4 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 16 Nov 2023 11:10:32 -0700 Subject: [PATCH 064/110] CI: List directory so can see if ifort in it --- .github/workflows/intel-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml index 7070447ce1..4fb9f2c546 100644 --- a/.github/workflows/intel-build.yml +++ b/.github/workflows/intel-build.yml @@ -149,6 +149,7 @@ jobs: mkdir build cd build source /opt/intel/oneapi/setvars.sh + ls /opt/intel/oneapi/compiler/2023.2.2/linux/bin/intel64/ printenv >> $GITHUB_ENV NUMPROCS=2 COMPILER=${{ matrix.compiler }} INSTALL_PATH=${HOME}/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} bash ../cmake-config From c7ad8e3532966d226be03aabcbfa5e6e48575421 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 16 Nov 2023 11:23:17 -0700 Subject: [PATCH 065/110] CI: Fix yaml syntax --- .github/workflows/intel-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml index 4fb9f2c546..1b15fc5683 100644 --- a/.github/workflows/intel-build.yml +++ b/.github/workflows/intel-build.yml @@ -149,7 +149,7 @@ jobs: mkdir build cd build source /opt/intel/oneapi/setvars.sh - ls /opt/intel/oneapi/compiler/2023.2.2/linux/bin/intel64/ + ls /opt/intel/oneapi/compiler/2023.2.2/linux/bin/intel64/ printenv >> $GITHUB_ENV NUMPROCS=2 COMPILER=${{ matrix.compiler }} INSTALL_PATH=${HOME}/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} bash ../cmake-config From d754a703e3640c764864bebe6aa7eb63df5a6022 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 16 Nov 2023 11:45:10 -0700 Subject: [PATCH 066/110] CI: Now see if can find where fortran is installed --- .github/workflows/intel-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml index 1b15fc5683..337813e0eb 100644 --- a/.github/workflows/intel-build.yml +++ b/.github/workflows/intel-build.yml @@ -150,6 +150,8 @@ jobs: cd build source /opt/intel/oneapi/setvars.sh ls /opt/intel/oneapi/compiler/2023.2.2/linux/bin/intel64/ + find /opt/intel/oneapi -name if\* -print + printenv printenv >> $GITHUB_ENV NUMPROCS=2 COMPILER=${{ matrix.compiler }} INSTALL_PATH=${HOME}/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} bash ../cmake-config From 9034d60be3e2ccc64125cedd3d5046fb4e72e7ac Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 16 Nov 2023 12:09:14 -0700 Subject: [PATCH 067/110] CI: Should now find ifort... --- .github/workflows/intel-build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml index 337813e0eb..14698f9107 100644 --- a/.github/workflows/intel-build.yml +++ b/.github/workflows/intel-build.yml @@ -149,9 +149,8 @@ jobs: mkdir build cd build source /opt/intel/oneapi/setvars.sh - ls /opt/intel/oneapi/compiler/2023.2.2/linux/bin/intel64/ - find /opt/intel/oneapi -name if\* -print - printenv + ls /opt/intel/oneapi/2024.0/bin/ + export PATH=/opt/intel/oneapi/2024.0/bin/:$PATH printenv >> $GITHUB_ENV NUMPROCS=2 COMPILER=${{ matrix.compiler }} INSTALL_PATH=${HOME}/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} bash ../cmake-config From af34c0c2e4f00795348c011ec1a32584455adf60 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 16 Nov 2023 14:00:43 -0700 Subject: [PATCH 068/110] CI: More info on intel build --- .github/workflows/intel-build.yml | 4 ++++ cmake-config | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml index 14698f9107..b3a637913b 100644 --- a/.github/workflows/intel-build.yml +++ b/.github/workflows/intel-build.yml @@ -149,7 +149,11 @@ jobs: mkdir build cd build source /opt/intel/oneapi/setvars.sh + echo "------------" + ls /opt/intel/oneapi/2024.0/ + echo "------------" ls /opt/intel/oneapi/2024.0/bin/ + echo "------------" export PATH=/opt/intel/oneapi/2024.0/bin/:$PATH printenv >> $GITHUB_ENV NUMPROCS=2 COMPILER=${{ matrix.compiler }} INSTALL_PATH=${HOME}/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} bash ../cmake-config diff --git a/cmake-config b/cmake-config index f5e264a40a..6088915ba1 100755 --- a/cmake-config +++ b/cmake-config @@ -160,9 +160,9 @@ then if [ "$COMPILER" == "intel" ] then - CXX=icpc - CC=icc - FC=ifort + CXX=icx + CC=icx + FC=ifx CFLAGS="-Wall -Wunused" CXXFLAGS="-Wall -Wextra -Wunused" fi From c678b44a0a2bb9b4e072a207bf0fc619ffb6dfc3 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 16 Nov 2023 14:35:30 -0700 Subject: [PATCH 069/110] CI: One more intel try -- icpx, icx, ifx --- cmake-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-config b/cmake-config index 6088915ba1..2ae29736b1 100755 --- a/cmake-config +++ b/cmake-config @@ -160,7 +160,7 @@ then if [ "$COMPILER" == "intel" ] then - CXX=icx + CXX=icpx CC=icx FC=ifx CFLAGS="-Wall -Wunused" From ee98879fb0f1b39b9f440c4113507f99ad451b59 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 16 Nov 2023 15:00:24 -0700 Subject: [PATCH 070/110] CI: Set ld_library_path on intel ci --- .github/workflows/intel-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml index b3a637913b..57d05856ec 100644 --- a/.github/workflows/intel-build.yml +++ b/.github/workflows/intel-build.yml @@ -155,6 +155,7 @@ jobs: ls /opt/intel/oneapi/2024.0/bin/ echo "------------" export PATH=/opt/intel/oneapi/2024.0/bin/:$PATH + export LD_LIBRARY_PATH=/opt/intel/oneapi/2024.0/lib/:$LD_LIBRARY_PATH printenv >> $GITHUB_ENV NUMPROCS=2 COMPILER=${{ matrix.compiler }} INSTALL_PATH=${HOME}/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} bash ../cmake-config From 8a2d425dec00a2bfc9773814e25b3bb0250ad13a Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 16 Nov 2023 15:58:37 -0700 Subject: [PATCH 071/110] IOSS: Check for empty filtered sidesets in parallel io --- .../libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C index 545e667181..30161801e0 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C @@ -1547,6 +1547,12 @@ namespace Ioex { Ioex::filter_element_list(get_region(), element, sides, true); number_sides = element.size(); assert(element.size() == sides.size()); + + // Determine if there are any sides left on the sideset after filtering... + int64_t global_sides = util().global_minmax(number_sides, Ioss::ParallelUtils::DO_SUM); + if (global_sides == 0) { + continue; + } } if (split_type == Ioss::SPLIT_BY_TOPOLOGIES && sideTopology.size() == 1) { From 72ce97ada05dd6da4505a7ed1225a001da3cf674 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 16 Nov 2023 15:58:53 -0700 Subject: [PATCH 072/110] IOSS: initialize variable to default --- packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h index 701a2cb70d..65c51d2416 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h @@ -67,6 +67,7 @@ namespace Ioss { DatabaseIO() = delete; DatabaseIO(const DatabaseIO &) = delete; DatabaseIO &operator=(const DatabaseIO &) = delete; + virtual ~DatabaseIO(); /** \brief Check to see if database state is OK. * @@ -119,8 +120,6 @@ namespace Ioss { */ virtual bool node_major() const { return true; } - virtual ~DatabaseIO(); - // Eliminate as much memory as possible, but still retain meta data information // Typically, eliminate the maps... void release_memory() @@ -898,7 +897,7 @@ namespace Ioss { bool fieldSeparatorSpecified{false}; bool enableFieldRecognition{true}; bool fieldStripTrailing_{false}; - bool isInput; + bool isInput{true}; // No good default... bool isParallelConsistent{ true}; // True if application will make field data get/put calls parallel // consistently. From a9d6071d3a6f6c93b9681c12dfa93439e77824f1 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 20 Nov 2023 13:57:34 -0700 Subject: [PATCH 073/110] EXODIFF: Better name consistency checking --- .../seacas/applications/exodiff/ED_Version.h | 4 +- packages/seacas/applications/exodiff/check.C | 54 ++++++++++++++++--- .../seacas/applications/exodiff/exo_entity.h | 2 + 3 files changed, 51 insertions(+), 9 deletions(-) diff --git a/packages/seacas/applications/exodiff/ED_Version.h b/packages/seacas/applications/exodiff/ED_Version.h index 64e837111a..4efbd0b7b7 100644 --- a/packages/seacas/applications/exodiff/ED_Version.h +++ b/packages/seacas/applications/exodiff/ED_Version.h @@ -5,5 +5,5 @@ // See packages/seacas/LICENSE for details #pragma once -static std::string version("3.27"); -static std::string verdate("2023-11-08"); +static std::string version("3.28"); +static std::string verdate("2023-11-14"); diff --git a/packages/seacas/applications/exodiff/check.C b/packages/seacas/applications/exodiff/check.C index 39e02b1ae5..e6a4ed0259 100644 --- a/packages/seacas/applications/exodiff/check.C +++ b/packages/seacas/applications/exodiff/check.C @@ -402,9 +402,11 @@ namespace { is_same = false; } if (!interFace.by_name && assembly1->Name() != assembly2->Name()) { - Warning(fmt::format(".. Assembly {} names don't agree ('{}' != '{}').\n", assembly1->Id(), - assembly1->Name(), assembly2->Name())); - is_same = false; + if (!assembly1->generatedName_ && !assembly2->generatedName_) { + Warning(fmt::format(".. Assembly {} names don't agree ('{}' != '{}').\n", assembly1->Id(), + assembly1->Name(), assembly2->Name())); + is_same = false; + } } if (assembly1->Type() != assembly2->Type()) { Warning(fmt::format(".. Assembly '{}': entity types don't agree ({} != {}).\n", @@ -441,12 +443,18 @@ namespace { if (interFace.by_name && block1->Id() != block2->Id()) { Warning(fmt::format(".. Block '{}' ids don't agree ({} != {}).\n", block1->Name(), block1->Id(), block2->Id())); - is_same = false; + if (interFace.pedantic) { + is_same = false; + } } if (!interFace.by_name && block1->Name() != block2->Name()) { - Warning(fmt::format(".. Block {} names don't agree ({} != {}).\n", block1->Id(), - block1->Name(), block2->Name())); - is_same = false; + if (!block1->generatedName_ && !block2->generatedName_) { + Warning(fmt::format(".. Block {} names don't agree ({} != {}).\n", block1->Id(), + block1->Name(), block2->Name())); + if (interFace.pedantic) { + is_same = false; + } + } } if (!(no_case_equals(block1->Element_Type(), block2->Element_Type()))) { if (!interFace.short_block_check || @@ -521,6 +529,22 @@ namespace { is_same = false; } } + if (interFace.by_name && set1->Id() != set2->Id()) { + Warning(fmt::format(".. Nodeset '{}' ids don't agree ({} != {}).\n", set1->Name(), + set1->Id(), set2->Id())); + if (interFace.pedantic) { + is_same = false; + } + } + if (!interFace.by_name && set1->Name() != set2->Name()) { + if (!set1->generatedName_ && !set2->generatedName_) { + Warning(fmt::format(".. Nodeset {} names don't agree ({} != {}).\n", set1->Id(), + set1->Name(), set2->Name())); + if (interFace.pedantic) { + is_same = false; + } + } + } } } @@ -631,6 +655,22 @@ namespace { is_same = false; } } + if (interFace.by_name && set1->Id() != set2->Id()) { + Warning(fmt::format(".. Sideset '{}' ids don't agree ({} != {}).\n", set1->Name(), + set1->Id(), set2->Id())); + if (interFace.pedantic) { + is_same = false; + } + } + if (!interFace.by_name && set1->Name() != set2->Name()) { + if (!set1->generatedName_ && !set2->generatedName_) { + Warning(fmt::format(".. Sideset {} names don't agree ({} != {}).\n", set1->Id(), + set1->Name(), set2->Name())); + if (interFace.pedantic) { + is_same = false; + } + } + } } } diff --git a/packages/seacas/applications/exodiff/exo_entity.h b/packages/seacas/applications/exodiff/exo_entity.h index 6a1d7b38ab..e48ed77f28 100644 --- a/packages/seacas/applications/exodiff/exo_entity.h +++ b/packages/seacas/applications/exodiff/exo_entity.h @@ -63,6 +63,8 @@ class Exo_Entity // Return "block", "nodelist", "surface", depending on underlying type. virtual const char *short_label() const = 0; + bool generatedName_{true}; + protected: std::string name_{}; int fileId{-1}; From 0e2fc8a61eae58ef795732e6526cd744b6ca7cea Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 20 Nov 2023 14:36:21 -0700 Subject: [PATCH 074/110] IOSS: Replace all Ioss includes with double quotes instead of angle brackets --- .../seacas/libraries/ioss/src/Ioss_Assembly.C | 10 +- .../seacas/libraries/ioss/src/Ioss_Assembly.h | 2 +- .../seacas/libraries/ioss/src/Ioss_Blob.C | 8 +- .../seacas/libraries/ioss/src/Ioss_Blob.h | 2 +- .../libraries/ioss/src/Ioss_CodeTypes.h | 2 +- .../seacas/libraries/ioss/src/Ioss_CommSet.C | 8 +- .../seacas/libraries/ioss/src/Ioss_CommSet.h | 4 +- .../ioss/src/Ioss_CompositeVariableType.C | 4 +- .../ioss/src/Ioss_CompositeVariableType.h | 2 +- .../ioss/src/Ioss_ConcreteVariableType.C | 4 +- .../ioss/src/Ioss_ConcreteVariableType.h | 2 +- .../ioss/src/Ioss_ConstructedVariableType.C | 4 +- .../ioss/src/Ioss_ConstructedVariableType.h | 2 +- .../libraries/ioss/src/Ioss_CoordinateFrame.C | 4 +- .../libraries/ioss/src/Ioss_CopyDatabase.C | 8 +- .../seacas/libraries/ioss/src/Ioss_DataPool.h | 2 +- .../libraries/ioss/src/Ioss_DatabaseIO.C | 14 +- .../libraries/ioss/src/Ioss_DatabaseIO.h | 20 +- .../libraries/ioss/src/Ioss_Decomposition.C | 12 +- .../libraries/ioss/src/Ioss_Decomposition.h | 12 +- .../libraries/ioss/src/Ioss_EdgeBlock.C | 10 +- .../libraries/ioss/src/Ioss_EdgeBlock.h | 4 +- .../seacas/libraries/ioss/src/Ioss_EdgeSet.C | 8 +- .../seacas/libraries/ioss/src/Ioss_EdgeSet.h | 2 +- .../libraries/ioss/src/Ioss_ElementBlock.C | 8 +- .../libraries/ioss/src/Ioss_ElementBlock.h | 8 +- .../ioss/src/Ioss_ElementPermutation.C | 6 +- .../ioss/src/Ioss_ElementPermutation.h | 2 +- .../libraries/ioss/src/Ioss_ElementSet.C | 6 +- .../libraries/ioss/src/Ioss_ElementSet.h | 2 +- .../libraries/ioss/src/Ioss_ElementTopology.C | 10 +- .../libraries/ioss/src/Ioss_ElementTopology.h | 4 +- .../ioss/src/Ioss_ElementVariableType.h | 4 +- .../libraries/ioss/src/Ioss_EntityBlock.C | 10 +- .../libraries/ioss/src/Ioss_EntityBlock.h | 4 +- .../libraries/ioss/src/Ioss_EntitySet.C | 6 +- .../libraries/ioss/src/Ioss_EntitySet.h | 4 +- .../libraries/ioss/src/Ioss_FaceBlock.C | 8 +- .../libraries/ioss/src/Ioss_FaceBlock.h | 10 +- .../libraries/ioss/src/Ioss_FaceGenerator.C | 16 +- .../seacas/libraries/ioss/src/Ioss_FaceSet.C | 8 +- .../seacas/libraries/ioss/src/Ioss_FaceSet.h | 2 +- .../seacas/libraries/ioss/src/Ioss_Field.C | 10 +- .../seacas/libraries/ioss/src/Ioss_Field.h | 2 +- .../libraries/ioss/src/Ioss_FieldManager.C | 8 +- .../libraries/ioss/src/Ioss_FieldManager.h | 4 +- .../seacas/libraries/ioss/src/Ioss_FileInfo.C | 8 +- .../seacas/libraries/ioss/src/Ioss_FileInfo.h | 2 +- .../libraries/ioss/src/Ioss_GetLongOpt.C | 2 +- .../libraries/ioss/src/Ioss_GroupingEntity.C | 12 +- .../libraries/ioss/src/Ioss_GroupingEntity.h | 18 +- .../libraries/ioss/src/Ioss_IOFactory.C | 10 +- .../libraries/ioss/src/Ioss_IOFactory.h | 8 +- .../libraries/ioss/src/Ioss_Initializer.C | 2 +- packages/seacas/libraries/ioss/src/Ioss_Map.C | 8 +- packages/seacas/libraries/ioss/src/Ioss_Map.h | 4 +- .../libraries/ioss/src/Ioss_MemoryUtils.C | 2 +- .../ioss/src/Ioss_NamedSuffixVariableType.h | 4 +- .../libraries/ioss/src/Ioss_NodeBlock.C | 8 +- .../libraries/ioss/src/Ioss_NodeBlock.h | 8 +- .../seacas/libraries/ioss/src/Ioss_NodeSet.C | 6 +- .../seacas/libraries/ioss/src/Ioss_NodeSet.h | 2 +- .../libraries/ioss/src/Ioss_NullEntity.h | 4 +- .../libraries/ioss/src/Ioss_ParallelUtils.C | 12 +- .../libraries/ioss/src/Ioss_ParallelUtils.h | 6 +- .../seacas/libraries/ioss/src/Ioss_Property.C | 6 +- .../libraries/ioss/src/Ioss_PropertyManager.C | 6 +- .../libraries/ioss/src/Ioss_PropertyManager.h | 4 +- .../seacas/libraries/ioss/src/Ioss_Region.C | 56 +-- .../seacas/libraries/ioss/src/Ioss_Region.h | 16 +- .../libraries/ioss/src/Ioss_SerializeIO.C | 8 +- .../libraries/ioss/src/Ioss_SerializeIO.h | 2 +- .../libraries/ioss/src/Ioss_SideBlock.C | 12 +- .../libraries/ioss/src/Ioss_SideBlock.h | 10 +- .../seacas/libraries/ioss/src/Ioss_SideSet.C | 12 +- .../seacas/libraries/ioss/src/Ioss_SideSet.h | 4 +- .../libraries/ioss/src/Ioss_SmartAssert.C | 2 +- .../ioss/src/Ioss_StandardElementTypes.h | 126 ++--- .../libraries/ioss/src/Ioss_StructuredBlock.C | 16 +- .../libraries/ioss/src/Ioss_StructuredBlock.h | 12 +- .../libraries/ioss/src/Ioss_SubSystem.h | 60 +-- .../seacas/libraries/ioss/src/Ioss_Tracer.C | 4 +- .../libraries/ioss/src/Ioss_Transform.C | 2 +- .../libraries/ioss/src/Ioss_Transform.h | 2 +- .../seacas/libraries/ioss/src/Ioss_Utils.C | 8 +- .../seacas/libraries/ioss/src/Ioss_Utils.h | 12 +- .../libraries/ioss/src/Ioss_VariableType.C | 10 +- .../libraries/ioss/src/Ioss_VariableType.h | 4 +- .../ioss/src/Ioss_ZoneConnectivity.C | 4 +- .../ioss/src/Ioss_ZoneConnectivity.h | 2 +- .../libraries/ioss/src/adios/AdiosWrapper.h | 4 +- .../libraries/ioss/src/adios/AdiosWrapper.hpp | 2 +- .../ioss/src/adios/Ioad_DatabaseIO.C | 10 +- .../ioss/src/adios/Ioad_DatabaseIO.h | 4 +- .../libraries/ioss/src/adios/Ioad_IOFactory.h | 8 +- .../ioss/src/catalyst/Iocatalyst_DatabaseIO.C | 18 +- .../ioss/src/catalyst/Iocatalyst_DatabaseIO.h | 4 +- .../ioss/src/catalyst/Iocatalyst_IOFactory.h | 8 +- .../ioss/src/cgns/Iocgns_DatabaseIO.C | 4 +- .../ioss/src/cgns/Iocgns_DatabaseIO.h | 14 +- .../ioss/src/cgns/Iocgns_DecompositionData.C | 12 +- .../ioss/src/cgns/Iocgns_DecompositionData.h | 14 +- .../ioss/src/cgns/Iocgns_IOFactory.h | 6 +- .../ioss/src/cgns/Iocgns_ParallelDatabaseIO.C | 6 +- .../ioss/src/cgns/Iocgns_ParallelDatabaseIO.h | 14 +- .../ioss/src/cgns/Iocgns_StructuredZoneData.C | 4 +- .../ioss/src/cgns/Iocgns_StructuredZoneData.h | 4 +- .../libraries/ioss/src/cgns/Iocgns_Utils.C | 58 +-- .../libraries/ioss/src/cgns/Iocgns_Utils.h | 18 +- .../libraries/ioss/src/elements/Ioss_Beam2.C | 4 +- .../libraries/ioss/src/elements/Ioss_Beam2.h | 4 +- .../libraries/ioss/src/elements/Ioss_Beam3.C | 4 +- .../libraries/ioss/src/elements/Ioss_Beam3.h | 4 +- .../libraries/ioss/src/elements/Ioss_Beam4.C | 4 +- .../libraries/ioss/src/elements/Ioss_Beam4.h | 4 +- .../libraries/ioss/src/elements/Ioss_Edge2.C | 4 +- .../libraries/ioss/src/elements/Ioss_Edge2.h | 4 +- .../ioss/src/elements/Ioss_Edge2D2.C | 4 +- .../ioss/src/elements/Ioss_Edge2D2.h | 4 +- .../ioss/src/elements/Ioss_Edge2D3.C | 4 +- .../ioss/src/elements/Ioss_Edge2D3.h | 4 +- .../libraries/ioss/src/elements/Ioss_Edge3.C | 4 +- .../libraries/ioss/src/elements/Ioss_Edge3.h | 4 +- .../libraries/ioss/src/elements/Ioss_Edge4.C | 4 +- .../libraries/ioss/src/elements/Ioss_Edge4.h | 4 +- .../libraries/ioss/src/elements/Ioss_Hex16.C | 4 +- .../libraries/ioss/src/elements/Ioss_Hex16.h | 4 +- .../libraries/ioss/src/elements/Ioss_Hex20.C | 4 +- .../libraries/ioss/src/elements/Ioss_Hex20.h | 4 +- .../libraries/ioss/src/elements/Ioss_Hex27.C | 4 +- .../libraries/ioss/src/elements/Ioss_Hex27.h | 4 +- .../libraries/ioss/src/elements/Ioss_Hex32.C | 4 +- .../libraries/ioss/src/elements/Ioss_Hex32.h | 4 +- .../libraries/ioss/src/elements/Ioss_Hex64.C | 4 +- .../libraries/ioss/src/elements/Ioss_Hex64.h | 4 +- .../libraries/ioss/src/elements/Ioss_Hex8.C | 4 +- .../libraries/ioss/src/elements/Ioss_Hex8.h | 4 +- .../libraries/ioss/src/elements/Ioss_Hex9.C | 4 +- .../libraries/ioss/src/elements/Ioss_Hex9.h | 4 +- .../libraries/ioss/src/elements/Ioss_Node.C | 4 +- .../libraries/ioss/src/elements/Ioss_Node.h | 4 +- .../ioss/src/elements/Ioss_Pyramid13.C | 4 +- .../ioss/src/elements/Ioss_Pyramid13.h | 4 +- .../ioss/src/elements/Ioss_Pyramid14.C | 4 +- .../ioss/src/elements/Ioss_Pyramid14.h | 4 +- .../ioss/src/elements/Ioss_Pyramid18.C | 4 +- .../ioss/src/elements/Ioss_Pyramid18.h | 4 +- .../ioss/src/elements/Ioss_Pyramid19.C | 4 +- .../ioss/src/elements/Ioss_Pyramid19.h | 4 +- .../ioss/src/elements/Ioss_Pyramid5.C | 4 +- .../ioss/src/elements/Ioss_Pyramid5.h | 6 +- .../libraries/ioss/src/elements/Ioss_Quad12.C | 4 +- .../libraries/ioss/src/elements/Ioss_Quad12.h | 4 +- .../libraries/ioss/src/elements/Ioss_Quad16.C | 4 +- .../libraries/ioss/src/elements/Ioss_Quad16.h | 4 +- .../libraries/ioss/src/elements/Ioss_Quad4.C | 4 +- .../libraries/ioss/src/elements/Ioss_Quad4.h | 4 +- .../libraries/ioss/src/elements/Ioss_Quad6.C | 4 +- .../libraries/ioss/src/elements/Ioss_Quad6.h | 4 +- .../libraries/ioss/src/elements/Ioss_Quad8.C | 4 +- .../libraries/ioss/src/elements/Ioss_Quad8.h | 4 +- .../libraries/ioss/src/elements/Ioss_Quad9.C | 4 +- .../libraries/ioss/src/elements/Ioss_Quad9.h | 4 +- .../libraries/ioss/src/elements/Ioss_Shell4.C | 4 +- .../libraries/ioss/src/elements/Ioss_Shell4.h | 4 +- .../libraries/ioss/src/elements/Ioss_Shell8.C | 4 +- .../libraries/ioss/src/elements/Ioss_Shell8.h | 4 +- .../libraries/ioss/src/elements/Ioss_Shell9.C | 4 +- .../libraries/ioss/src/elements/Ioss_Shell9.h | 4 +- .../ioss/src/elements/Ioss_ShellLine2D2.C | 4 +- .../ioss/src/elements/Ioss_ShellLine2D2.h | 4 +- .../ioss/src/elements/Ioss_ShellLine2D3.C | 4 +- .../ioss/src/elements/Ioss_ShellLine2D3.h | 4 +- .../libraries/ioss/src/elements/Ioss_Sphere.C | 4 +- .../libraries/ioss/src/elements/Ioss_Sphere.h | 4 +- .../ioss/src/elements/Ioss_Spring2.C | 4 +- .../ioss/src/elements/Ioss_Spring2.h | 4 +- .../ioss/src/elements/Ioss_Spring3.C | 4 +- .../ioss/src/elements/Ioss_Spring3.h | 4 +- .../libraries/ioss/src/elements/Ioss_Super.C | 4 +- .../libraries/ioss/src/elements/Ioss_Super.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tet10.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tet10.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tet11.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tet11.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tet14.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tet14.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tet15.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tet15.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tet16.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tet16.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tet4.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tet4.h | 6 +- .../libraries/ioss/src/elements/Ioss_Tet40.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tet40.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tet7.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tet7.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tet8.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tet8.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tri13.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tri13.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tri3.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tri3.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tri4.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tri4.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tri4a.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tri4a.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tri6.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tri6.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tri7.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tri7.h | 4 +- .../libraries/ioss/src/elements/Ioss_Tri9.C | 4 +- .../libraries/ioss/src/elements/Ioss_Tri9.h | 4 +- .../ioss/src/elements/Ioss_TriShell3.C | 4 +- .../ioss/src/elements/Ioss_TriShell3.h | 4 +- .../ioss/src/elements/Ioss_TriShell4.C | 4 +- .../ioss/src/elements/Ioss_TriShell4.h | 4 +- .../ioss/src/elements/Ioss_TriShell6.C | 4 +- .../ioss/src/elements/Ioss_TriShell6.h | 4 +- .../ioss/src/elements/Ioss_TriShell7.C | 4 +- .../ioss/src/elements/Ioss_TriShell7.h | 4 +- .../ioss/src/elements/Ioss_Unknown.C | 4 +- .../ioss/src/elements/Ioss_Unknown.h | 4 +- .../ioss/src/elements/Ioss_Wedge12.C | 4 +- .../ioss/src/elements/Ioss_Wedge12.h | 4 +- .../ioss/src/elements/Ioss_Wedge15.C | 4 +- .../ioss/src/elements/Ioss_Wedge15.h | 4 +- .../ioss/src/elements/Ioss_Wedge16.C | 4 +- .../ioss/src/elements/Ioss_Wedge16.h | 4 +- .../ioss/src/elements/Ioss_Wedge18.C | 4 +- .../ioss/src/elements/Ioss_Wedge18.h | 4 +- .../ioss/src/elements/Ioss_Wedge20.C | 4 +- .../ioss/src/elements/Ioss_Wedge20.h | 4 +- .../ioss/src/elements/Ioss_Wedge21.C | 4 +- .../ioss/src/elements/Ioss_Wedge21.h | 4 +- .../ioss/src/elements/Ioss_Wedge24.C | 4 +- .../ioss/src/elements/Ioss_Wedge24.h | 4 +- .../ioss/src/elements/Ioss_Wedge52.C | 4 +- .../ioss/src/elements/Ioss_Wedge52.h | 4 +- .../libraries/ioss/src/elements/Ioss_Wedge6.C | 4 +- .../libraries/ioss/src/elements/Ioss_Wedge6.h | 4 +- .../ioss/src/exodus/Ioex_BaseDatabaseIO.C | 12 +- .../ioss/src/exodus/Ioex_BaseDatabaseIO.h | 10 +- .../ioss/src/exodus/Ioex_DatabaseIO.C | 14 +- .../ioss/src/exodus/Ioex_DatabaseIO.h | 8 +- .../ioss/src/exodus/Ioex_DecompositionData.C | 16 +- .../ioss/src/exodus/Ioex_DecompositionData.h | 8 +- .../ioss/src/exodus/Ioex_IOFactory.h | 6 +- .../ioss/src/exodus/Ioex_ParallelDatabaseIO.C | 68 +-- .../ioss/src/exodus/Ioex_ParallelDatabaseIO.h | 8 +- .../ioss/src/exodus/Ioex_SuperElement.C | 12 +- .../ioss/src/exodus/Ioex_SuperElement.h | 2 +- .../libraries/ioss/src/exodus/Ioex_Utils.C | 10 +- .../libraries/ioss/src/exodus/Ioex_Utils.h | 8 +- .../ioss/src/exonull/Ioexnl_BaseDatabaseIO.C | 8 +- .../ioss/src/exonull/Ioexnl_BaseDatabaseIO.h | 10 +- .../ioss/src/exonull/Ioexnl_DatabaseIO.C | 8 +- .../ioss/src/exonull/Ioexnl_DatabaseIO.h | 8 +- .../src/exonull/Ioexnl_DecompositionData.C | 16 +- .../src/exonull/Ioexnl_DecompositionData.h | 8 +- .../ioss/src/exonull/Ioexnl_IOFactory.h | 6 +- .../src/exonull/Ioexnl_ParallelDatabaseIO.C | 68 +-- .../src/exonull/Ioexnl_ParallelDatabaseIO.h | 8 +- .../ioss/src/exonull/Ioexnl_SuperElement.C | 12 +- .../ioss/src/exonull/Ioexnl_SuperElement.h | 2 +- .../libraries/ioss/src/exonull/Ioexnl_Utils.C | 10 +- .../libraries/ioss/src/exonull/Ioexnl_Utils.h | 8 +- .../ioss/src/faodel/Iofaodel_DatabaseIO.C | 18 +- .../ioss/src/faodel/Iofaodel_DatabaseIO.h | 16 +- .../src/faodel/Iofaodel_FieldSerialization.h | 42 +- .../faodel/Iofaodel_PropertySerialization.C | 42 +- .../faodel/Iofaodel_PropertySerialization.h | 6 +- .../ioss/src/faodel/Iofaodel_Utils.C | 42 +- .../ioss/src/faodel/Iofaodel_Utils.h | 6 +- .../ioss/src/gen_struc/Iogs_DatabaseIO.C | 6 +- .../ioss/src/gen_struc/Iogs_DatabaseIO.h | 10 +- .../ioss/src/gen_struc/Iogs_GeneratedMesh.C | 6 +- .../ioss/src/gen_struc/Iogs_GeneratedMesh.h | 4 +- .../ioss/src/generated/Iogn_DashSurfaceMesh.h | 6 +- .../ioss/src/generated/Iogn_DatabaseIO.C | 6 +- .../ioss/src/generated/Iogn_DatabaseIO.h | 10 +- .../ioss/src/generated/Iogn_GeneratedMesh.C | 12 +- .../ioss/src/generated/Iogn_GeneratedMesh.h | 4 +- .../ioss/src/heartbeat/Iohb_DatabaseIO.C | 2 +- .../ioss/src/heartbeat/Iohb_DatabaseIO.h | 10 +- .../ioss/src/init/Ionit_Initializer.C | 6 +- .../libraries/ioss/src/main/cgns_decomp.C | 18 +- .../ioss/src/main/cth_pressure_map.C | 2 +- .../seacas/libraries/ioss/src/main/io_info.C | 8 +- .../seacas/libraries/ioss/src/main/io_info.h | 6 +- .../libraries/ioss/src/main/io_modify.C | 40 +- .../seacas/libraries/ioss/src/main/io_shell.C | 22 +- .../libraries/ioss/src/main/io_shell_ts.C | 24 +- .../libraries/ioss/src/main/shell_to_hex.C | 6 +- .../seacas/libraries/ioss/src/main/sphgen.C | 6 +- .../ioss/src/main/struc_to_unstruc.C | 12 +- .../ioss/src/null/Ionull_DatabaseIO.C | 2 +- .../ioss/src/null/Ionull_DatabaseIO.h | 4 +- .../ioss/src/null/Ionull_IOFactory.h | 6 +- .../ioss/src/pamgen/Iopg_DatabaseIO.C | 6 +- .../ioss/src/pamgen/Iopg_DatabaseIO.h | 12 +- .../ioss/src/text_mesh/Iotm_DatabaseIO.C | 6 +- .../ioss/src/text_mesh/Iotm_DatabaseIO.h | 10 +- .../ioss/src/text_mesh/Iotm_TextMesh.C | 2 +- .../ioss/src/text_mesh/Iotm_TextMesh.h | 4 +- .../text_mesh/Iotm_TextMeshTopologyMapping.h | 4 +- .../ioss/src/transform/Iotr_Factory.C | 2 +- .../ioss/src/transform/Iotr_Factory.h | 2 +- .../ioss/src/transform/Iotr_MinMax.C | 4 +- .../ioss/src/transform/Iotr_MinMax.h | 4 +- .../ioss/src/transform/Iotr_Offset.C | 4 +- .../ioss/src/transform/Iotr_Offset.h | 2 +- .../ioss/src/transform/Iotr_Offset3D.C | 4 +- .../ioss/src/transform/Iotr_Offset3D.h | 4 +- .../libraries/ioss/src/transform/Iotr_Scale.C | 4 +- .../libraries/ioss/src/transform/Iotr_Scale.h | 4 +- .../ioss/src/transform/Iotr_Scale3D.C | 4 +- .../ioss/src/transform/Iotr_Scale3D.h | 4 +- .../ioss/src/transform/Iotr_Tensor.C | 4 +- .../ioss/src/transform/Iotr_Tensor.h | 4 +- .../ioss/src/transform/Iotr_VectorMagnitude.C | 4 +- .../ioss/src/transform/Iotr_VectorMagnitude.h | 4 +- .../UnitTestElementBlockBatchRead.C | 26 +- .../unit_tests/UnitTestIotmTextMeshFixture.h | 42 +- .../libraries/ioss/src/unit_tests/unitMain.C | 2 +- .../seacas/libraries/ioss/src/utest/Ut_ioad.C | 2 +- .../ioss/src/utest/Utst_IofxDatabaseIO.C | 24 +- .../ioss/src/utest/Utst_blob_write_read.C | 16 +- .../libraries/ioss/src/utest/Utst_ioel.C | 16 +- .../libraries/ioss/src/utest/Utst_map.C | 6 +- .../libraries/ioss/src/utest/Utst_sort.C | 2 +- .../ioss/src/utest/Utst_structured_decomp.C | 2 +- .../ioss/src/utest/Utst_superelement.C | 4 +- .../ioss2catalyst/IossApplication.cxx | 14 +- .../ioss2catalyst/IossRegionReport.cxx | 439 ++++++++---------- .../catalyst/ioss2catalyst/IossRegionReport.h | 35 +- .../pipeline/CatalystLoggingPipelineTests.cxx | 4 +- .../visualization/cgns/Iovs_cgns_DatabaseIO.h | 2 +- .../visualization/cgns/Iovs_cgns_IOFactory.h | 8 +- .../exodus/Iovs_exodus_DatabaseIO.C | 16 +- .../exodus/Iovs_exodus_DatabaseIO.h | 14 +- .../exodus/Iovs_exodus_IOFactory.h | 8 +- .../utils/Iovs_CatalystLogging.C | 2 +- .../utils/Iovs_CatalystLogging.h | 4 +- .../ioss/src/visualization/utils/Iovs_Utils.C | 6 +- .../ioss/src/visualization/utils/Iovs_Utils.h | 14 +- packages/seacas/scripts/exodus3.in.py | 6 +- 347 files changed, 1558 insertions(+), 1584 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_Assembly.C b/packages/seacas/libraries/ioss/src/Ioss_Assembly.C index 7aa22daa8b..d92c4c351d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Assembly.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Assembly.C @@ -4,11 +4,11 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include +#include "Ioss_Assembly.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Assembly.h b/packages/seacas/libraries/ioss/src/Ioss_Assembly.h index 5824826ecb..bbb4262abf 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Assembly.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Assembly.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "Ioss_GroupingEntity.h" #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_Blob.C b/packages/seacas/libraries/ioss/src/Ioss_Blob.C index 0a8463e01b..31b59d677d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Blob.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Blob.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include +#include "Ioss_Blob.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_Property.h" #include namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/Ioss_Blob.h b/packages/seacas/libraries/ioss/src/Ioss_Blob.h index 32c45df3a2..71da78870c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Blob.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Blob.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "Ioss_GroupingEntity.h" #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h b/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h index b60eb0911f..2ec40e4278 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h +++ b/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h @@ -95,7 +95,7 @@ using Kokkos_Complex = Kokkos::complex; #else #if defined IOSS_TRACE -#include +#include "Ioss_Tracer.h" #define IOSS_FUNC_ENTER(m) Ioss::Tracer m(__func__) #else #define IOSS_FUNC_ENTER(m) diff --git a/packages/seacas/libraries/ioss/src/Ioss_CommSet.C b/packages/seacas/libraries/ioss/src/Ioss_CommSet.C index ab55aca4fc..10c4a5a0f6 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CommSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_CommSet.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include +#include "Ioss_CommSet.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_Field.h" +#include "Ioss_Property.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_CommSet.h b/packages/seacas/libraries/ioss/src/Ioss_CommSet.h index 48375a668a..fd0c33b17d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CommSet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_CommSet.h @@ -9,8 +9,8 @@ #include "ioss_export.h" #include "Ioss_EntityType.h" // for EntityType, etc -#include // for GroupingEntity -#include // for Property +#include "Ioss_GroupingEntity.h" // for GroupingEntity +#include "Ioss_Property.h" // for Property #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.C b/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.C index 41ec213945..2885411505 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.C +++ b/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_CompositeVariableType.h" +#include "Ioss_VariableType.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.h b/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.h index 4b248e0d91..8ac8e2ae9a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.h @@ -8,7 +8,7 @@ #include "ioss_export.h" -#include // for VariableType +#include "Ioss_VariableType.h" // for VariableType #include // for string namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.C b/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.C index feacd738ca..6b25267b48 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_ConcreteVariableType.h" +#include "Ioss_VariableType.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.h b/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.h index 91ff768898..6e4a5d75c4 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.h @@ -8,7 +8,7 @@ #include "ioss_export.h" -#include // for VariableType +#include "Ioss_VariableType.h" // for VariableType #include // for string namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.C b/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.C index 29045d3a14..3c1bf4fba5 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_ConstructedVariableType.h" +#include "Ioss_VariableType.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.h b/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.h index 079e17fca2..eefb092bfd 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.h @@ -8,7 +8,7 @@ #include "ioss_export.h" -#include // for VariableType +#include "Ioss_VariableType.h" // for VariableType #include // for string namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.C b/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.C index 4ad91825e2..186b348206 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.C +++ b/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_CoordinateFrame.h" +#include "Ioss_Utils.h" #include namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C b/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C index 4461e0e12c..334aa2f9dd 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C +++ b/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include +#include "Ioss_CopyDatabase.h" +#include "Ioss_DataPool.h" +#include "Ioss_FaceGenerator.h" +#include "Ioss_MeshCopyOptions.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_DataPool.h b/packages/seacas/libraries/ioss/src/Ioss_DataPool.h index 75609d41c0..c7dcb9c4a5 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_DataPool.h +++ b/packages/seacas/libraries/ioss/src/Ioss_DataPool.h @@ -8,7 +8,7 @@ #include "ioss_export.h" -#include +#include "Ioss_CodeTypes.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C index 6bcade5389..3667290ac8 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C @@ -4,13 +4,13 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include -#include -#include +#include "Ioss_BoundingBox.h" +#include "Ioss_CodeTypes.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_Enumerate.h" +#include "Ioss_FileInfo.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Sort.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h index 65c51d2416..428b533496 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h @@ -6,16 +6,16 @@ #pragma once -#include -#include -#include // for DatabaseUsage, etc -#include // for DataSize -#include // for EntityType -#include -#include // for ParallelUtils -#include // for PropertyManager -#include // for State, State::STATE_INVALID -#include // for SurfaceSplitType +#include "Ioss_BoundingBox.h" +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage, etc +#include "Ioss_DataSize.h" // for DataSize +#include "Ioss_EntityType.h" // for EntityType +#include "Ioss_Map.h" +#include "Ioss_ParallelUtils.h" // for ParallelUtils +#include "Ioss_PropertyManager.h" // for PropertyManager +#include "Ioss_State.h" // for State, State::STATE_INVALID +#include "Ioss_SurfaceSplit.h" // for SurfaceSplitType #include #include // for size_t, nullptr #include // for int64_t diff --git a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C index f4a9b266b2..83ae1b5848 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C @@ -6,12 +6,12 @@ * See packages/seacas/LICENSE for details */ -#include -#include -#include -#include -#include -#include +#include "Ioss_Decomposition.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_Enumerate.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Sort.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h index 4caade27bd..1bd6600b67 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h @@ -9,18 +9,18 @@ #include "ioss_export.h" -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_Map.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_PropertyManager.h" #include #include #include #include #include -#include -#include +#include "Ioss_ParallelUtils.h" +#include "Ioss_Utils.h" #if !defined(NO_PARMETIS_SUPPORT) #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.C b/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.C index a914aeb872..cbc2904d47 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.C @@ -4,11 +4,11 @@ // // See packages/seacas/LICENSE for details -#include // for IntVector -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_DatabaseIO.h" +#include "Ioss_EdgeBlock.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_Property.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.h b/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.h index 5e4e5c8a0b..3cb47e8c53 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.h @@ -8,9 +8,9 @@ #include "ioss_export.h" +#include "Ioss_EntityBlock.h" // for EntityBlock #include "Ioss_EntityType.h" // for EntityType, etc -#include // for EntityBlock -#include // for Property +#include "Ioss_Property.h" // for Property #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.C b/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.C index 3b8f49e47e..ed8928d348 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include +#include "Ioss_DatabaseIO.h" +#include "Ioss_EdgeSet.h" +#include "Ioss_Field.h" +#include "Ioss_Property.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.h b/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.h index 0b52e3dbd4..e6b5f0ab1e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.h @@ -8,9 +8,9 @@ #include "ioss_export.h" +#include "Ioss_EntitySet.h" // for EntitySet #include "Ioss_EntityType.h" // for EntityType, etc #include "Ioss_Property.h" // for Property -#include // for EntitySet #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.C b/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.C index d5782721f0..6f63b7786a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include // for DatabaseIO -#include -#include // for Field, etc -#include // for Property +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_ElementBlock.h" +#include "Ioss_Field.h" // for Field, etc +#include "Ioss_Property.h" // for Property #include // for size_t #include // for string #include // for vector diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.h b/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.h index 51ec92782f..4b4fd983a2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.h @@ -6,10 +6,10 @@ #pragma once -#include -#include -#include -#include +#include "Ioss_BoundingBox.h" +#include "Ioss_CodeTypes.h" +#include "Ioss_EntityBlock.h" +#include "Ioss_Property.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.C b/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.C index 72eaf86847..aea07ab41a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.C @@ -4,9 +4,9 @@ // // See packages/seacas/LICENSE for details -#include // for IntVector -#include -#include +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementPermutation.h" +#include "Ioss_Utils.h" #include #include #include // for basic_ostream, etc diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.h b/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.h index 8045d31b32..24233e4310 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementPermutation.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "Ioss_CodeTypes.h" #include #include #include // for map, map<>::value_compare diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementSet.C b/packages/seacas/libraries/ioss/src/Ioss_ElementSet.C index c002c1f762..b6ee6f0a5c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementSet.C @@ -4,9 +4,9 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include +#include "Ioss_DatabaseIO.h" +#include "Ioss_ElementSet.h" +#include "Ioss_Property.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementSet.h b/packages/seacas/libraries/ioss/src/Ioss_ElementSet.h index 867ccab11b..c130b75e38 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementSet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementSet.h @@ -8,9 +8,9 @@ #include "ioss_export.h" +#include "Ioss_EntitySet.h" // for EntitySet #include "Ioss_EntityType.h" // for EntityType, etc #include "Ioss_Property.h" // for Property -#include // for EntitySet #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.C b/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.C index 0e4bea10c0..0bb79eda0d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.C @@ -4,11 +4,11 @@ // // See packages/seacas/LICENSE for details -#include // for IntVector -#include // for ElementPermutation -#include -#include // for Super -#include +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementPermutation.h" // for ElementPermutation +#include "Ioss_ElementTopology.h" +#include "Ioss_Super.h" // for Super +#include "Ioss_Utils.h" #include // for assert #include // for size_t diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h b/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h index 516a8009fc..4d0ac65c02 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h @@ -6,8 +6,8 @@ #pragma once -#include -#include // for ElementPermutation +#include "Ioss_CodeTypes.h" +#include "Ioss_ElementPermutation.h" // for ElementPermutation #include // for map, map<>::value_compare #include // for set #include // for string, operator< diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementVariableType.h b/packages/seacas/libraries/ioss/src/Ioss_ElementVariableType.h index d8c282d038..59e06a5d57 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementVariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementVariableType.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_VariableType.h" #include namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.C b/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.C index df7ac400c3..9b651af265 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.C @@ -4,11 +4,11 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include +#include "Ioss_DatabaseIO.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_EntityBlock.h" +#include "Ioss_Field.h" +#include "Ioss_Property.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.h b/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.h index a6aa0e239c..b72589e61f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.h @@ -6,8 +6,8 @@ #pragma once -#include // for GroupingEntity -#include // for Property +#include "Ioss_GroupingEntity.h" // for GroupingEntity +#include "Ioss_Property.h" // for Property #include // for size_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_EntitySet.C b/packages/seacas/libraries/ioss/src/Ioss_EntitySet.C index 98ca8a337c..ad67e7f6f1 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EntitySet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_EntitySet.C @@ -4,9 +4,9 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include +#include "Ioss_EntitySet.h" +#include "Ioss_Field.h" +#include "Ioss_Property.h" #include #include "Ioss_FieldManager.h" diff --git a/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h b/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h index c119694b98..310cb38ee2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h @@ -6,8 +6,8 @@ #pragma once -#include // for GroupingEntity -#include // for Property +#include "Ioss_GroupingEntity.h" // for GroupingEntity +#include "Ioss_Property.h" // for Property #include // for size_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.C b/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.C index e43bcedfa3..78b5529bc4 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include +#include "Ioss_DatabaseIO.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_FaceBlock.h" +#include "Ioss_Property.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.h b/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.h index ed57c93ac2..a283ab568f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.h @@ -8,12 +8,12 @@ #include "ioss_export.h" +#include "Ioss_EntityBlock.h" #include "Ioss_EntityType.h" // for EntityType, etc -#include -#include // for Property -#include // for size_t -#include // for int64_t -#include // for string +#include "Ioss_Property.h" // for Property +#include // for size_t +#include // for int64_t +#include // for string namespace Ioss { class DatabaseIO; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C index 61aafdc059..f8211e6eb7 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C @@ -4,14 +4,14 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_CommSet.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_FaceGenerator.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_Property.h" +#include "Ioss_Region.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceSet.C b/packages/seacas/libraries/ioss/src/Ioss_FaceSet.C index e4636add9d..44307bfb0e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceSet.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include +#include "Ioss_DatabaseIO.h" +#include "Ioss_FaceSet.h" +#include "Ioss_Field.h" +#include "Ioss_Property.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceSet.h b/packages/seacas/libraries/ioss/src/Ioss_FaceSet.h index b4c72772fc..eb4e182f8f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceSet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceSet.h @@ -8,9 +8,9 @@ #include "ioss_export.h" +#include "Ioss_EntitySet.h" // for EntitySet #include "Ioss_EntityType.h" // for EntityType, etc #include "Ioss_Property.h" // for Property -#include // for EntitySet #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_Field.C b/packages/seacas/libraries/ioss/src/Ioss_Field.C index f36e599938..324e66789d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Field.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Field.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include +#include "Ioss_Field.h" +#include "Ioss_Transform.h" +#include "Ioss_Utils.h" +#include "Ioss_VariableType.h" #include #include #include @@ -15,7 +15,7 @@ #include #include -#include +#include "Ioss_CodeTypes.h" namespace { size_t internal_get_size(Ioss::Field::BasicType type, size_t count, diff --git a/packages/seacas/libraries/ioss/src/Ioss_Field.h b/packages/seacas/libraries/ioss/src/Ioss_Field.h index 22683efd07..2d27521a9b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Field.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Field.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "Ioss_CodeTypes.h" #include // for size_t #include #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C index 0205cee5fc..8894f14cbf 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include +#include "Ioss_Field.h" +#include "Ioss_FieldManager.h" +#include "Ioss_Sort.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h index 6b775ece53..afc47acc9e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h +++ b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h @@ -6,8 +6,8 @@ #pragma once -#include -#include // for Field, Field::RoleType +#include "Ioss_CodeTypes.h" +#include "Ioss_Field.h" // for Field, Field::RoleType #include // for size_t #include // for string #include // for vector diff --git a/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C b/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C index 8cb2145aa4..dafc99018b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_FileInfo.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_FileInfo.h b/packages/seacas/libraries/ioss/src/Ioss_FileInfo.h index 9a07274137..167c3ea06c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FileInfo.h +++ b/packages/seacas/libraries/ioss/src/Ioss_FileInfo.h @@ -8,7 +8,7 @@ #include "ioss_export.h" -#include +#include "Ioss_CodeTypes.h" #include // for time_t #include // for string, operator!=, etc #include // for off_t diff --git a/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C b/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C index 96d380aa0d..19d456a9db 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C +++ b/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C @@ -5,7 +5,7 @@ // See packages/seacas/LICENSE for details /* S Manoharan. Advanced Computer Research Institute. Lyon. France */ -#include +#include "Ioss_GetLongOpt.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.C b/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.C index 392bb85d0b..ed1dd2919e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.C +++ b/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.C @@ -4,12 +4,12 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include -#include +#include "Ioss_DatabaseIO.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_Property.h" +#include "Ioss_Region.h" +#include "Ioss_Utils.h" +#include "Ioss_VariableType.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.h b/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.h index 3a94f12fbc..b1f1f436f8 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.h +++ b/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.h @@ -8,15 +8,15 @@ #include "ioss_export.h" -#include // for Complex -#include // for DatabaseIO -#include // for EntityType -#include // for Field, Field::RoleType, etc -#include // for FieldManager, NameList -#include // for Property -#include // for PropertyManager -#include // for State -#include // for component_count() +#include "Ioss_CodeTypes.h" // for Complex +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_EntityType.h" // for EntityType +#include "Ioss_Field.h" // for Field, Field::RoleType, etc +#include "Ioss_FieldManager.h" // for FieldManager, NameList +#include "Ioss_Property.h" // for Property +#include "Ioss_PropertyManager.h" // for PropertyManager +#include "Ioss_State.h" // for State +#include "Ioss_VariableType.h" // for component_count() #include // for size_t, nullptr #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C index cac4fe746b..cc5d87e93a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include // for IOSS_ERROR -#include +#include "Ioss_IOFactory.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Utils.h" // for IOSS_ERROR +#include "Ioss_Version.h" #include #include #include // for _Rb_tree_iterator, etc @@ -19,7 +19,7 @@ #include "Ioss_DBUsage.h" // for DatabaseUsage #include "Ioss_PropertyManager.h" #if defined(SEACAS_HAVE_MPI) -#include +#include "Ioss_Decomposition.h" #endif namespace { diff --git a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.h b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.h index 7f609d038a..b34a8cde24 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.h @@ -8,12 +8,12 @@ #include "ioss_export.h" -#include +#include "Ioss_CodeTypes.h" #include -#include -#include -#include +#include "Ioss_DBUsage.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_PropertyManager.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Initializer.C b/packages/seacas/libraries/ioss/src/Ioss_Initializer.C index 7df801f45c..e549672748 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Initializer.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Initializer.C @@ -4,7 +4,7 @@ // // See packages/seacas/LICENSE for details -#include +#include "Ioss_ElementPermutation.h" #include "Ioss_Beam2.h" #include "Ioss_Beam3.h" diff --git a/packages/seacas/libraries/ioss/src/Ioss_Map.C b/packages/seacas/libraries/ioss/src/Ioss_Map.C index c51aaf486e..672df41209 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Map.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Map.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include // for Field, etc -#include -#include -#include // for IOSS_ERROR +#include "Ioss_Field.h" // for Field, etc +#include "Ioss_Map.h" +#include "Ioss_SmartAssert.h" +#include "Ioss_Utils.h" // for IOSS_ERROR #include // for size_t #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Map.h b/packages/seacas/libraries/ioss/src/Ioss_Map.h index d64529aa07..d6929062b9 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Map.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Map.h @@ -6,8 +6,8 @@ #pragma once -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_Field.h" #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C b/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C index 3caebb9f3a..b8aac6060b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C @@ -4,7 +4,7 @@ // // See packages/seacas/LICENSE for details -#include +#include "Ioss_MemoryUtils.h" // For memory utilities... #if defined(__IOSS_WINDOWS__) diff --git a/packages/seacas/libraries/ioss/src/Ioss_NamedSuffixVariableType.h b/packages/seacas/libraries/ioss/src/Ioss_NamedSuffixVariableType.h index 1d4193a1ca..af8db98482 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NamedSuffixVariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_NamedSuffixVariableType.h @@ -9,10 +9,10 @@ #include "ioss_export.h" -#include +#include "Ioss_CodeTypes.h" #include -#include +#include "Ioss_VariableType.h" namespace Ioss { class IOSS_EXPORT NamedSuffixVariableType : public VariableType diff --git a/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.C b/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.C index 03621d6cea..bc0ea9d58d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include +#include "Ioss_DatabaseIO.h" +#include "Ioss_Field.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_Property.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.h b/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.h index 84b2fd1e7b..f1728ae7ab 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.h @@ -6,10 +6,10 @@ #pragma once -#include -#include -#include // for EntityType, etc -#include // for Property +#include "Ioss_BoundingBox.h" +#include "Ioss_EntityBlock.h" +#include "Ioss_EntityType.h" // for EntityType, etc +#include "Ioss_Property.h" // for Property #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_NodeSet.C b/packages/seacas/libraries/ioss/src/Ioss_NodeSet.C index cebf6cf432..e8d576d173 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NodeSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_NodeSet.C @@ -4,9 +4,9 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include +#include "Ioss_DatabaseIO.h" +#include "Ioss_NodeSet.h" +#include "Ioss_Property.h" #include #include "Ioss_EntitySet.h" diff --git a/packages/seacas/libraries/ioss/src/Ioss_NodeSet.h b/packages/seacas/libraries/ioss/src/Ioss_NodeSet.h index d8c96c3547..35f27a163b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NodeSet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_NodeSet.h @@ -8,9 +8,9 @@ #include "ioss_export.h" +#include "Ioss_EntitySet.h" // for EntitySet #include "Ioss_EntityType.h" // for EntityType, etc #include "Ioss_Property.h" // for Property -#include // for EntitySet #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_NullEntity.h b/packages/seacas/libraries/ioss/src/Ioss_NullEntity.h index dd150f8c35..9f7656275b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NullEntity.h +++ b/packages/seacas/libraries/ioss/src/Ioss_NullEntity.h @@ -6,8 +6,8 @@ #pragma once -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_GroupingEntity.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C index 4000c664b6..e1255bd96c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C @@ -4,11 +4,11 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_MemoryUtils.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Utils.h" #include #include #include @@ -21,7 +21,7 @@ #include "Ioss_Property.h" #ifdef SEACAS_HAVE_MPI -#include +#include "Ioss_SerializeIO.h" #endif namespace { diff --git a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h index cc99e4d82a..d0b397464c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h @@ -6,8 +6,8 @@ #pragma once -#include // for Int64Vector, IntVector -#include +#include "Ioss_CodeTypes.h" // for Int64Vector, IntVector +#include "Ioss_Utils.h" #include #include // for size_t #include @@ -21,7 +21,7 @@ #endif #ifdef SEACAS_HAVE_MPI -#include +#include "Ioss_SerializeIO.h" #endif namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/Ioss_Property.C b/packages/seacas/libraries/ioss/src/Ioss_Property.C index c32d16ab79..0edc7e5bb1 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Property.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Property.C @@ -3,9 +3,9 @@ // NTESS, the U.S. Government retains certain rights in this software. // // See packages/seacas/LICENSE for details -#include -#include -#include +#include "Ioss_GroupingEntity.h" +#include "Ioss_Property.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C b/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C index 4e5c3d09f0..5b1e4a11bc 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C +++ b/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C @@ -4,9 +4,9 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include +#include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.h b/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.h index 69757bc966..6dadea59c6 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.h +++ b/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.h @@ -6,8 +6,8 @@ #pragma once -#include -#include // for Property +#include "Ioss_CodeTypes.h" +#include "Ioss_Property.h" // for Property #include // for size_t #include #include // for string, operator< diff --git a/packages/seacas/libraries/ioss/src/Ioss_Region.C b/packages/seacas/libraries/ioss/src/Ioss_Region.C index 0be46aeea2..cd616ec65f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Region.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Region.C @@ -4,34 +4,34 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "Ioss_Assembly.h" +#include "Ioss_Blob.h" +#include "Ioss_CodeTypes.h" +#include "Ioss_CommSet.h" +#include "Ioss_CoordinateFrame.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_EdgeBlock.h" +#include "Ioss_EdgeSet.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementSet.h" +#include "Ioss_EntityBlock.h" +#include "Ioss_EntityType.h" +#include "Ioss_FaceBlock.h" +#include "Ioss_FaceSet.h" +#include "Ioss_Field.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Region.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_SmartAssert.h" +#include "Ioss_Sort.h" +#include "Ioss_State.h" +#include "Ioss_StructuredBlock.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Region.h b/packages/seacas/libraries/ioss/src/Ioss_Region.h index 27dfee864b..58f6a16629 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Region.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Region.h @@ -6,14 +6,14 @@ #pragma once -#include // for CoordinateFrame -#include // for DatabaseIO -#include // for EntityType, etc -#include -#include // for GroupingEntity -#include -#include // for Property -#include // for State +#include "Ioss_CoordinateFrame.h" // for CoordinateFrame +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_EntityType.h" // for EntityType, etc +#include "Ioss_Field.h" +#include "Ioss_GroupingEntity.h" // for GroupingEntity +#include "Ioss_MeshType.h" +#include "Ioss_Property.h" // for Property +#include "Ioss_State.h" // for State #include #include // for size_t, nullptr #include // for int64_t diff --git a/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C b/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C index 7596d48de7..2ecb08617d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C +++ b/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C @@ -3,10 +3,10 @@ // NTESS, the U.S. Government retains certain rights in this software. // // See packages/seacas/LICENSE for details -#include // for DatabaseIO -#include // for ParallelUtils -#include -#include // for IOSS_ERROR, Ioss::WarnOut() +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_ParallelUtils.h" // for ParallelUtils +#include "Ioss_SerializeIO.h" +#include "Ioss_Utils.h" // for IOSS_ERROR, Ioss::WarnOut() #include #include "Ioss_CodeTypes.h" // for SEACAS_HAVE_MPI diff --git a/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.h b/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.h index 0a16f9038c..1f4b81110b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.h +++ b/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.h @@ -5,7 +5,7 @@ // See packages/seacas/LICENSE for details #pragma once -#include +#include "Ioss_CodeTypes.h" #include "ioss_export.h" diff --git a/packages/seacas/libraries/ioss/src/Ioss_SideBlock.C b/packages/seacas/libraries/ioss/src/Ioss_SideBlock.C index bed6c6314c..f84221658a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SideBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_SideBlock.C @@ -4,12 +4,12 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include -#include +#include "Ioss_DatabaseIO.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_EntityBlock.h" +#include "Ioss_Field.h" +#include "Ioss_Property.h" +#include "Ioss_SideBlock.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_SideBlock.h b/packages/seacas/libraries/ioss/src/Ioss_SideBlock.h index fb3924f653..5cf20c9553 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SideBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_SideBlock.h @@ -6,11 +6,11 @@ #pragma once -#include -#include // for EntityBlock -#include // for EntityType, etc -#include // for Property -#include +#include "Ioss_ElementBlock.h" +#include "Ioss_EntityBlock.h" // for EntityBlock +#include "Ioss_EntityType.h" // for EntityType, etc +#include "Ioss_Property.h" // for Property +#include "Ioss_SideSet.h" #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_SideSet.C b/packages/seacas/libraries/ioss/src/Ioss_SideSet.C index 77c980e16a..2fb019a420 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SideSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_SideSet.C @@ -4,12 +4,12 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include -#include +#include "Ioss_DatabaseIO.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_Property.h" +#include "Ioss_Region.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_SideSet.h b/packages/seacas/libraries/ioss/src/Ioss_SideSet.h index 9f5b49a7fa..4d6a15220d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SideSet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_SideSet.h @@ -9,8 +9,8 @@ #include "ioss_export.h" #include "Ioss_EntityType.h" // for EntityType, etc -#include // for GroupingEntity -#include // for Property +#include "Ioss_GroupingEntity.h" // for GroupingEntity +#include "Ioss_Property.h" // for Property #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.C b/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.C index 769a65170a..c708ad4171 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.C +++ b/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.C @@ -4,7 +4,7 @@ // // See packages/seacas/LICENSE for details -#include +#include "Ioss_SmartAssert.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_StandardElementTypes.h b/packages/seacas/libraries/ioss/src/Ioss_StandardElementTypes.h index 35d618c40d..aa21155980 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_StandardElementTypes.h +++ b/packages/seacas/libraries/ioss/src/Ioss_StandardElementTypes.h @@ -6,66 +6,66 @@ * See packages/seacas/LICENSE for details */ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "Ioss_Beam2.h" +#include "Ioss_Beam3.h" +#include "Ioss_Beam4.h" +#include "Ioss_Edge2.h" +#include "Ioss_Edge3.h" +#include "Ioss_Edge4.h" +#include "Ioss_Hex16.h" +#include "Ioss_Hex20.h" +#include "Ioss_Hex27.h" +#include "Ioss_Hex32.h" +#include "Ioss_Hex64.h" +#include "Ioss_Hex8.h" +#include "Ioss_Hex9.h" +#include "Ioss_Initializer.h" +#include "Ioss_Node.h" +#include "Ioss_Pyramid13.h" +#include "Ioss_Pyramid14.h" +#include "Ioss_Pyramid18.h" +#include "Ioss_Pyramid19.h" +#include "Ioss_Pyramid5.h" +#include "Ioss_Quad12.h" +#include "Ioss_Quad16.h" +#include "Ioss_Quad4.h" +#include "Ioss_Quad6.h" +#include "Ioss_Quad8.h" +#include "Ioss_Quad9.h" +#include "Ioss_Shell4.h" +#include "Ioss_Shell8.h" +#include "Ioss_Shell9.h" +#include "Ioss_ShellLine2D2.h" +#include "Ioss_ShellLine2D3.h" +#include "Ioss_Sphere.h" +#include "Ioss_Spring2.h" +#include "Ioss_Spring3.h" +#include "Ioss_Super.h" +#include "Ioss_Tet10.h" +#include "Ioss_Tet11.h" +#include "Ioss_Tet14.h" +#include "Ioss_Tet15.h" +#include "Ioss_Tet16.h" +#include "Ioss_Tet4.h" +#include "Ioss_Tet40.h" +#include "Ioss_Tet8.h" +#include "Ioss_Tri13.h" +#include "Ioss_Tri3.h" +#include "Ioss_Tri4.h" +#include "Ioss_Tri6.h" +#include "Ioss_Tri7.h" +#include "Ioss_Tri9.h" +#include "Ioss_TriShell3.h" +#include "Ioss_TriShell4.h" +#include "Ioss_TriShell6.h" +#include "Ioss_TriShell7.h" +#include "Ioss_Unknown.h" +#include "Ioss_Wedge12.h" +#include "Ioss_Wedge15.h" +#include "Ioss_Wedge16.h" +#include "Ioss_Wedge18.h" +#include "Ioss_Wedge20.h" +#include "Ioss_Wedge21.h" +#include "Ioss_Wedge24.h" +#include "Ioss_Wedge52.h" +#include "Ioss_Wedge6.h" diff --git a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C index fa7dd752f2..d650c38c84 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C @@ -4,14 +4,14 @@ // // See packages/seacas/LICENSE for details -#include // for AxisAlignedBoundingBox -#include // for DatabaseIO -#include // for Field, etc -#include // for FieldManager -#include -#include // for Property -#include -#include +#include "Ioss_BoundingBox.h" // for AxisAlignedBoundingBox +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_Field.h" // for Field, etc +#include "Ioss_FieldManager.h" // for FieldManager +#include "Ioss_Hex8.h" +#include "Ioss_Property.h" // for Property +#include "Ioss_SmartAssert.h" +#include "Ioss_StructuredBlock.h" #include #include // for size_t #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h index 1a0ee76ec7..b8e2b33ef0 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h @@ -6,12 +6,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "Ioss_BoundingBox.h" +#include "Ioss_CodeTypes.h" +#include "Ioss_EntityBlock.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_Property.h" +#include "Ioss_ZoneConnectivity.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_SubSystem.h b/packages/seacas/libraries/ioss/src/Ioss_SubSystem.h index d130941f4a..bd0d495c5d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SubSystem.h +++ b/packages/seacas/libraries/ioss/src/Ioss_SubSystem.h @@ -6,33 +6,33 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "Ioss_Assembly.h" +#include "Ioss_Blob.h" +#include "Ioss_CommSet.h" +#include "Ioss_Compare.h" +#include "Ioss_CoordinateFrame.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_EdgeBlock.h" +#include "Ioss_EdgeSet.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementSet.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_EntityBlock.h" +#include "Ioss_EntitySet.h" +#include "Ioss_FaceBlock.h" +#include "Ioss_FaceSet.h" +#include "Ioss_Field.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_IOFactory.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_Property.h" +#include "Ioss_Region.h" +#include "Ioss_SerializeIO.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_StructuredBlock.h" +#include "Ioss_SurfaceSplit.h" +#include "Ioss_Utils.h" +#include "Ioss_VariableType.h" diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tracer.C b/packages/seacas/libraries/ioss/src/Ioss_Tracer.C index 9b2107219b..4179655b65 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tracer.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tracer.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_Tracer.h" +#include "Ioss_Utils.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Transform.C b/packages/seacas/libraries/ioss/src/Ioss_Transform.C index b7e9766836..6d7904ab58 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Transform.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Transform.C @@ -4,7 +4,7 @@ // // See packages/seacas/LICENSE for details -#include +#include "Ioss_Transform.h" #include namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/Ioss_Transform.h b/packages/seacas/libraries/ioss/src/Ioss_Transform.h index b597ac3f3b..77901b28fd 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Transform.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Transform.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "Ioss_CodeTypes.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.C b/packages/seacas/libraries/ioss/src/Ioss_Utils.C index 1f34711c14..effcfd6199 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_FileInfo.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.h b/packages/seacas/libraries/ioss/src/Ioss_Utils.h index 3d4fa7dc2c..a0af63301e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.h @@ -6,12 +6,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_EntityType.h" +#include "Ioss_Field.h" +#include "Ioss_Property.h" +#include "Ioss_Sort.h" #include // for sort, lower_bound, copy, etc #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_VariableType.C b/packages/seacas/libraries/ioss/src/Ioss_VariableType.C index dacff0c500..0aa3053951 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_VariableType.C +++ b/packages/seacas/libraries/ioss/src/Ioss_VariableType.C @@ -4,11 +4,11 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include +#include "Ioss_CompositeVariableType.h" +#include "Ioss_ConstructedVariableType.h" +#include "Ioss_NamedSuffixVariableType.h" +#include "Ioss_Utils.h" +#include "Ioss_VariableType.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_VariableType.h b/packages/seacas/libraries/ioss/src/Ioss_VariableType.h index a1997c01d3..3fd7503bfd 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_VariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_VariableType.h @@ -6,8 +6,8 @@ #pragma once -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_Utils.h" #include // for strncmp #include // for less #include // for map, map<>::value_compare diff --git a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C index 12988e663c..edee536489 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_Utils.h" +#include "Ioss_ZoneConnectivity.h" #include #include #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h index 8c22f34d8e..f0ca50a4a1 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "Ioss_CodeTypes.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.h b/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.h index fab957328a..828cbb69b9 100644 --- a/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.h +++ b/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.h @@ -8,8 +8,8 @@ #include "ioad_export.h" -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_PropertyManager.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.hpp b/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.hpp index 63f9ee6c22..1705d95548 100644 --- a/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.hpp +++ b/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.hpp @@ -7,8 +7,8 @@ #ifndef IOSS_Ioad_AdiosWrapper_hpp #define IOSS_Ioad_AdiosWrapper_hpp +#include "Ioss_Utils.h" // for Utils, IOSS_ERROR, etc #include "adios/AdiosWrapper.h" -#include // for Utils, IOSS_ERROR, etc namespace Ioad { diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C b/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C index de6d17053b..26a9248e5d 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C @@ -6,6 +6,7 @@ #include +#include "Ioss_CodeTypes.h" // for HAVE_MPI #include "Ioss_CommSet.h" // for CommSet #include "Ioss_DBUsage.h" // for DatabaseUsage, etc #include "Ioss_DatabaseIO.h" // for DatabaseIO @@ -13,6 +14,7 @@ #include "Ioss_EdgeSet.h" // for EdgeSet #include "Ioss_ElementBlock.h" // for ElementBlock #include "Ioss_ElementSet.h" // for ElementSet +#include "Ioss_ElementTopology.h" // for NameList #include "Ioss_EntityType.h" // for EntityType::ELEMENTBLOCK #include "Ioss_FaceBlock.h" // for FaceBlock #include "Ioss_FaceSet.h" // for FaceSet @@ -20,13 +22,11 @@ #include "Ioss_Map.h" // for Map, MapContainer #include "Ioss_NodeBlock.h" // for NodeBlock #include "Ioss_NodeSet.h" // for NodeSet +#include "Ioss_ParallelUtils.h" // for ParallelUtils, etc #include "Ioss_Property.h" // for Property +#include "Ioss_SerializeIO.h" // for SerializeIO #include "Ioss_SideBlock.h" // for SideBlock -#include // for HAVE_MPI -#include // for NameList -#include // for ParallelUtils, etc -#include // for SerializeIO -#include // for Utils, IOSS_ERROR, etc +#include "Ioss_Utils.h" // for Utils, IOSS_ERROR, etc #include #include "adios/Ioad_Constants.h" diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.h b/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.h index 47e86e6d36..b19b706ecc 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.h @@ -8,11 +8,11 @@ #include "ioad_export.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" #include "Ioss_EntitySet.h" #include "Ioss_Region.h" // for Region, SideSetContainer, etc #include "Ioss_SideSet.h" // for SideBlockContainer, SideSet -#include -#include #include "Ioss_Field.h" // for Field, etc #include diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.h b/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.h index 43626f2f38..ea85ad83b0 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.h @@ -8,11 +8,11 @@ #include "ioad_export.h" +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage #include "Ioss_DatabaseIO.h" // for DatabaseIO -#include -#include // for DatabaseUsage -#include // for IOFactory -#include // for string +#include "Ioss_IOFactory.h" // for IOFactory +#include // for string namespace Ioss { class PropertyManager; diff --git a/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.C b/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.C index e8975e1918..425e706fc8 100644 --- a/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.C @@ -6,6 +6,8 @@ #include +#include "Ioss_Assembly.h" // for Assembly +#include "Ioss_CodeTypes.h" // for HAVE_MPI #include "Ioss_CommSet.h" // for CommSet #include "Ioss_DBUsage.h" // for DatabaseUsage, etc #include "Ioss_DatabaseIO.h" // for DatabaseIO @@ -13,6 +15,7 @@ #include "Ioss_EdgeSet.h" // for EdgeSet #include "Ioss_ElementBlock.h" // for ElementBlock #include "Ioss_ElementSet.h" // for ElementSet +#include "Ioss_ElementTopology.h" // for NameList #include "Ioss_EntityType.h" // for EntityType::ELEMENTBLOCK #include "Ioss_FaceBlock.h" // for FaceBlock #include "Ioss_FaceSet.h" // for FaceSet @@ -20,17 +23,14 @@ #include "Ioss_Map.h" // for Map, MapContainer #include "Ioss_NodeBlock.h" // for NodeBlock #include "Ioss_NodeSet.h" // for NodeSet +#include "Ioss_ParallelUtils.h" // for ParallelUtils, etc #include "Ioss_Property.h" // for Property +#include "Ioss_Region.h" // for Region +#include "Ioss_SerializeIO.h" // for SerializeIO #include "Ioss_SideBlock.h" // for SideBlock -#include // for Assembly -#include // for HAVE_MPI -#include // for NameList -#include // for ParallelUtils, etc -#include // for Region -#include // for SerializeIO -#include // for StructuredBlock - -#include // for Utils, IOSS_ERROR, etc +#include "Ioss_StructuredBlock.h" // for StructuredBlock + +#include "Ioss_Utils.h" // for Utils, IOSS_ERROR, etc #include #include diff --git a/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.h b/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.h index 47834505d1..04b3c676f6 100644 --- a/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_DatabaseIO.h @@ -8,11 +8,11 @@ #include "iocatalyst_export.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" #include "Ioss_EntitySet.h" #include "Ioss_Region.h" // for Region, SideSetContainer, etc #include "Ioss_SideSet.h" // for SideBlockContainer, SideSet -#include -#include #include "Ioss_Field.h" // for Field, etc diff --git a/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_IOFactory.h b/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_IOFactory.h index f84d50eb07..344d962650 100644 --- a/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_IOFactory.h @@ -8,11 +8,11 @@ #include "iocatalyst_export.h" +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage #include "Ioss_DatabaseIO.h" // for DatabaseIO -#include -#include // for DatabaseUsage -#include // for IOFactory -#include // for string +#include "Ioss_IOFactory.h" // for IOFactory +#include // for string namespace Ioss { class PropertyManager; diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C index bd730934c7..7f93cc1ea2 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C @@ -10,8 +10,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h index 55aa00d572..cfec2ef521 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h @@ -6,13 +6,13 @@ #pragma once -#include -#include // for DatabaseUsage -#include // for DatabaseIO -#include -#include // for IOFactory -#include // for Map -#include // for State +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_FaceGenerator.h" +#include "Ioss_IOFactory.h" // for IOFactory +#include "Ioss_Map.h" // for Map +#include "Ioss_State.h" // for State #include #include #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.C index 974e85ff78..e4dc6088d6 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.C @@ -8,12 +8,12 @@ #if CG_BUILD_PARALLEL #include -#include -#include -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_SmartAssert.h" +#include "Ioss_Sort.h" +#include "Ioss_StructuredBlock.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.h index 3af8aad155..77b9c17b0d 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.h @@ -27,13 +27,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_Decomposition.h" +#include "Ioss_FaceGenerator.h" +#include "Ioss_Field.h" +#include "Ioss_MeshType.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_StructuredBlock.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.h index 6469f63cc2..663d69e1af 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.h @@ -6,9 +6,9 @@ #pragma once -#include -#include // for DatabaseUsage -#include // for IOFactory +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_IOFactory.h" // for IOFactory #include // for string #include "Ioss_DatabaseIO.h" // for DatabaseIO diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C index 067f1e4e2c..2976fb374a 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C @@ -13,9 +13,9 @@ #if CG_BUILD_PARALLEL #include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_Sort.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h index c24b549a48..367eae1198 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h @@ -11,13 +11,13 @@ #include #if CG_BUILD_PARALLEL -#include -#include // for DatabaseUsage -#include // for DatabaseIO -#include // for IOFactory -#include // for Map -#include -#include // for State +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_IOFactory.h" // for IOFactory +#include "Ioss_Map.h" // for Map +#include "Ioss_MeshType.h" +#include "Ioss_State.h" // for State #include // for size_t #include // for int64_t #include // for ostream diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C index 61de238c1b..23103d2e1c 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_SmartAssert.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.h index 379f74c7b9..57d71d96d5 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.h @@ -7,8 +7,8 @@ */ #pragma once -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_StructuredBlock.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C index db97aced5a..ca3826d4a3 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C @@ -4,35 +4,35 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "Ioss_Assembly.h" +#include "Ioss_Beam2.h" +#include "Ioss_Beam3.h" +#include "Ioss_CodeTypes.h" +#include "Ioss_FaceGenerator.h" +#include "Ioss_Hex20.h" +#include "Ioss_Hex27.h" +#include "Ioss_Hex8.h" +#include "Ioss_IOFactory.h" +#include "Ioss_Node.h" +#include "Ioss_Pyramid13.h" +#include "Ioss_Pyramid14.h" +#include "Ioss_Pyramid5.h" +#include "Ioss_Quad4.h" +#include "Ioss_Quad8.h" +#include "Ioss_Quad9.h" +#include "Ioss_Sort.h" +#include "Ioss_Spring2.h" +#include "Ioss_Spring3.h" +#include "Ioss_StructuredBlock.h" +#include "Ioss_Tet10.h" +#include "Ioss_Tet4.h" +#include "Ioss_Tri3.h" +#include "Ioss_Tri6.h" +#include "Ioss_Unknown.h" +#include "Ioss_Utils.h" +#include "Ioss_Wedge15.h" +#include "Ioss_Wedge18.h" +#include "Ioss_Wedge6.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h index 06a1d2ab6b..484aeab658 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h @@ -6,15 +6,15 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_FaceGenerator.h" +#include "Ioss_Region.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_StructuredBlock.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam2.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam2.C index 07a5e0717e..d712c372e7 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam2.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam2.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include // for ElementVariableType +#include "Ioss_Beam2.h" +#include "Ioss_ElementVariableType.h" // for ElementVariableType #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam2.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam2.h index 42fc9b9d10..8cd536469d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam2.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam2.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam3.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam3.C index 9af78ef56c..3fc1a6414b 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam3.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam3.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include // for ElementVariableType +#include "Ioss_Beam3.h" +#include "Ioss_ElementVariableType.h" // for ElementVariableType #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam3.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam3.h index c9ad1ecaf8..5d076b0a4b 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam3.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam3.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam4.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam4.C index 6ce1592c37..8d1e550d7f 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam4.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam4.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include // for ElementVariableType +#include "Ioss_Beam4.h" +#include "Ioss_ElementVariableType.h" // for ElementVariableType #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam4.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam4.h index b0f3661dc6..249d96e66d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Beam4.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Beam4.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2.C index 9eb2a76430..9039b7d805 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include // for ElementVariableType +#include "Ioss_Edge2.h" +#include "Ioss_ElementVariableType.h" // for ElementVariableType #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2.h index 74565e6669..a6c2f5b2d8 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D2.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D2.C index 0bc5e938d3..35f7f247b6 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D2.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D2.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include // for ElementVariableType +#include "Ioss_Edge2D2.h" +#include "Ioss_ElementVariableType.h" // for ElementVariableType #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D2.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D2.h index 8349fa8190..41ba792ee1 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D2.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D2.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D3.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D3.C index 45e3b52a95..db3b13d71d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D3.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D3.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include // for ElementVariableType +#include "Ioss_Edge2D3.h" +#include "Ioss_ElementVariableType.h" // for ElementVariableType #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D3.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D3.h index 3711cd2835..4d98a90d61 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D3.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge2D3.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge3.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge3.C index f3f5cc9db7..2dcfa18440 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge3.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge3.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include // for ElementVariableType +#include "Ioss_Edge3.h" +#include "Ioss_ElementVariableType.h" // for ElementVariableType #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge3.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge3.h index 862bf7e578..9a143e2023 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge3.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge3.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge4.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge4.C index 8156635bd3..dd9f851ebc 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge4.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge4.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include // for ElementVariableType +#include "Ioss_Edge4.h" +#include "Ioss_ElementVariableType.h" // for ElementVariableType #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge4.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge4.h index 269338f84a..d282ebf3fb 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Edge4.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Edge4.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex16.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex16.C index 3e5514cd1d..75397911a6 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex16.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex16.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Hex16.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex16.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex16.h index 9fbb7f8ec4..daf85babf7 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex16.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex16.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex20.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex20.C index 4cf7029aeb..836dc9485d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex20.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex20.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Hex20.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex20.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex20.h index d84e00acdc..37c2e5e8ed 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex20.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex20.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex27.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex27.C index e32df851b9..cc21cd3b09 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex27.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex27.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Hex27.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex27.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex27.h index 23dddd8dcd..bd0b6dd3a2 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex27.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex27.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex32.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex32.C index b43affe4d4..dddf80007c 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex32.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex32.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Hex32.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex32.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex32.h index 77ea7feb8c..f9f4a6d97d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex32.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex32.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex64.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex64.C index 5430a73e84..8243c0f0c6 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex64.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex64.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Hex64.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex64.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex64.h index 50ca2a5ba9..9e7f839ebe 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex64.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex64.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.C index 8486e2be58..80978eb458 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Hex8.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.h index 465c273c16..f2f3a109c3 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex9.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex9.C index 42b6835a48..141332e228 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex9.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex9.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Hex9.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex9.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex9.h index 47a88be0b1..f7ff58f110 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex9.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex9.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Node.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Node.C index 98e406dc12..115dafaa42 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Node.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Node.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Node.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Node.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Node.h index a51f8b8928..516ea08cbf 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Node.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Node.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid13.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid13.C index a447d944aa..86455e150d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid13.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid13.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Pyramid13.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid13.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid13.h index 8d220a3d8f..fb1951d8f8 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid13.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid13.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid14.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid14.C index 952926d7b4..41d9bcd79e 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid14.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid14.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Pyramid14.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid14.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid14.h index 43a6507ca9..14031ca2a7 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid14.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid14.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid18.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid18.C index 08be32e56e..026b2896f1 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid18.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid18.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Pyramid18.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid18.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid18.h index 36220a6e06..e0847ad2e4 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid18.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid18.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid19.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid19.C index cf44b381bf..5bb9ead687 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid19.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid19.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Pyramid19.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid19.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid19.h index fddd6483b7..e571564dfd 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid19.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid19.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.C index 8c2a92a9df..860a599826 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Pyramid5.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.h index 787d08bbe9..8918fbf939 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Pyramid5.h @@ -6,9 +6,9 @@ #pragma once -#include // for IntVector -#include // for ElementPermutation -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementPermutation.h" // for ElementPermutation +#include "Ioss_ElementTopology.h" // for ElementTopology #include "ioss_export.h" diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad12.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad12.C index 23ff90c75e..a6cacd768c 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad12.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad12.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Quad12.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad12.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad12.h index e30d9ff6aa..1ab1a07459 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad12.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad12.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad16.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad16.C index 9406ca8413..9a9afb005f 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad16.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad16.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Quad16.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad16.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad16.h index 604e22826c..6199126c76 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad16.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad16.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad4.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad4.C index 0847e98597..44608fdea7 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad4.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad4.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Quad4.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad4.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad4.h index d51f9a601d..89727fdda9 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad4.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad4.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad6.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad6.C index 724817235c..9d225f4565 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad6.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad6.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Quad6.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad6.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad6.h index c918f54079..d965dc7967 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad6.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad6.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad8.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad8.C index 0cc55cadde..bb38fc09cc 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad8.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad8.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Quad8.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad8.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad8.h index 578e75fd2b..206c9492b3 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad8.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad8.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad9.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad9.C index 31905d8fe6..85755a7319 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad9.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad9.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Quad9.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad9.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad9.h index 677839c07d..232893d486 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Quad9.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Quad9.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell4.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell4.C index 2dc016a95c..d68437bccb 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell4.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell4.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Shell4.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell4.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell4.h index d5d214dc7d..2d34c0abfa 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell4.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell4.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell8.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell8.C index 855a9ec543..429a494094 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell8.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell8.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Shell8.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell8.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell8.h index 184705a612..becf1283da 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell8.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell8.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell9.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell9.C index fd34aaf0cb..57f1afbe58 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell9.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell9.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Shell9.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell9.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell9.h index c3136e6879..01855bd64f 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Shell9.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Shell9.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D2.C b/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D2.C index 429f5e915d..c30012655d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D2.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D2.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_ShellLine2D2.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D2.h b/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D2.h index f2b7b50a60..68cd398fe3 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D2.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D2.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D3.C b/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D3.C index 0a7743f59c..238bebff60 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D3.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D3.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_ShellLine2D3.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D3.h b/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D3.h index f65769eac2..3559e1d32d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D3.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_ShellLine2D3.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.C index 9c8ac30280..91551431cd 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Sphere.h" #include // for assert #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.h index 1dd1d8623b..1b9b9a9836 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Sphere.h @@ -6,8 +6,8 @@ #pragma once -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology #include #include "ioss_export.h" diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Spring2.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Spring2.C index 5ac6d92035..e80b0bec38 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Spring2.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Spring2.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Spring2.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Spring2.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Spring2.h index 31e61822b5..d784850e5b 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Spring2.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Spring2.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Spring3.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Spring3.C index 2405d2cb75..5f60fa31aa 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Spring3.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Spring3.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Spring3.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Spring3.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Spring3.h index 6438e4291e..00b89de4a1 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Spring3.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Spring3.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Super.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Super.C index 9ba332132e..914a9ab082 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Super.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Super.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Super.h" #include // for string #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Super.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Super.h index c74d847038..a65763463c 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Super.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Super.h @@ -6,8 +6,8 @@ #pragma once -#include // for IntVector -#include // for ElementPermutation +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementPermutation.h" // for ElementPermutation #include // for string #include "Ioss_ElementTopology.h" diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet10.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet10.C index 66636bf41e..40b84e1e9b 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet10.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet10.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tet10.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet10.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet10.h index e88a941e49..4d4962e1c9 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet10.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet10.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet11.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet11.C index c76aa4e7cc..84e5929e6a 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet11.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet11.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tet11.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet11.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet11.h index 7fe079c29a..29a1d6c55c 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet11.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet11.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet14.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet14.C index 75e6f67af5..6bd833a91c 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet14.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet14.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tet14.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet14.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet14.h index 24630c87b3..25cb12653c 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet14.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet14.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet15.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet15.C index 1e06c62627..68473a6134 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet15.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet15.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tet15.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet15.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet15.h index 84ae93030f..2cb52f9d09 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet15.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet15.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet16.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet16.C index 9c30f82240..581a825717 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet16.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet16.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tet16.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet16.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet16.h index bdf60ad2b8..3d7f9b3d3e 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet16.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet16.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.C index f176d57aba..c02a0fcfd6 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tet4.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.h index dcc664e0ba..f88d9f778d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet4.h @@ -6,9 +6,9 @@ #pragma once -#include // for IntVector -#include // for ElementPermutatio -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementPermutation.h" // for ElementPermutatio +#include "Ioss_ElementTopology.h" // for ElementTopology #include "ioss_export.h" diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet40.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet40.C index fc84e785fc..ac875a7fbd 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet40.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet40.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tet40.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet40.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet40.h index f51d8eadbd..f56220d0b5 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet40.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet40.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet7.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet7.C index 7db8141b79..b0bc4a54ae 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet7.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet7.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tet7.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet7.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet7.h index 58f23e2840..5efe59a672 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet7.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet7.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet8.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet8.C index 0d1c262347..50a12270b4 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet8.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet8.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tet8.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet8.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet8.h index e9c2971409..68c4ef00f3 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tet8.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tet8.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri13.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri13.C index 634eb2c7be..8fa0c6c0e7 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri13.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri13.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tri13.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri13.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri13.h index c1bd5d5487..13d7e5c748 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri13.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri13.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri3.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri3.C index 40fe2944fe..a93fd47608 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri3.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri3.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tri3.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri3.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri3.h index 0a45420544..206b23e92d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri3.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri3.h @@ -8,8 +8,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4.C index 36b480f413..d1ff4088be 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tri4.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4.h index 42db2713f1..ec65c81852 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4a.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4a.C index 709e9144c4..3553fa8f1d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4a.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4a.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tri4a.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4a.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4a.h index 6ae8161467..d2fed2b69f 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4a.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri4a.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri6.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri6.C index c3cd3b5f94..d4c04385bb 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri6.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri6.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tri6.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri6.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri6.h index 5072748179..019ac2e4c3 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri6.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri6.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri7.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri7.C index 43d37608e5..f4d9de2c90 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri7.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri7.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tri7.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri7.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri7.h index d24b5a8237..8f57936043 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri7.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri7.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri9.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri9.C index 0ca50fcd67..ca977d3468 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri9.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri9.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Tri9.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri9.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri9.h index a143024685..62988b674f 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Tri9.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Tri9.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell3.C b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell3.C index d568d5b961..8b4f72cf90 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell3.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell3.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_TriShell3.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell3.h b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell3.h index c4edfd5a0f..72413b2779 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell3.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell3.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell4.C b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell4.C index 59210de98a..3d81d06df7 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell4.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell4.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_TriShell4.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell4.h b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell4.h index 5d57fb8786..f4a990e997 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell4.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell4.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell6.C b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell6.C index b37aebcebb..72222b61d1 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell6.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell6.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_TriShell6.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell6.h b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell6.h index e40e31650e..63e32e0290 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell6.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell6.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell7.C b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell7.C index e0d857be4a..1e72719232 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell7.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell7.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_TriShell7.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell7.h b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell7.h index f8127cd51b..3a9cdbff2a 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell7.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_TriShell7.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Unknown.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Unknown.C index 226b1fa6d0..ea4e493535 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Unknown.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Unknown.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Unknown.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Unknown.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Unknown.h index 348f815d34..5f3ac0db74 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Unknown.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Unknown.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge12.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge12.C index 8faaa61df6..5dde98ec19 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge12.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge12.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Wedge12.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge12.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge12.h index 156588eac5..c8bafb59fd 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge12.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge12.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge15.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge15.C index 0c389fc076..cd8a4ae45d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge15.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge15.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Wedge15.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge15.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge15.h index e69c33b147..710d387eb9 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge15.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge15.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge16.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge16.C index 7a14418994..0aa79e8cee 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge16.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge16.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Wedge16.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge16.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge16.h index b25f7ff98c..9079299566 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge16.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge16.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge18.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge18.C index 74cc7771fe..9ab308a8ae 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge18.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge18.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Wedge18.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge18.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge18.h index a1df9a12c0..a029b1b9a2 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge18.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge18.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge20.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge20.C index 0ae781bb73..dfa7290229 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge20.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge20.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Wedge20.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge20.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge20.h index 8c983c418e..36a395f5a6 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge20.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge20.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge21.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge21.C index 1005372836..d0b95712c2 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge21.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge21.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Wedge21.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge21.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge21.h index 07779f67c4..6809c5934e 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge21.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge21.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge24.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge24.C index a1b2a82706..800328671d 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge24.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge24.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Wedge24.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge24.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge24.h index 7e4766f4c3..ea1a38d4e6 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge24.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge24.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge52.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge52.C index 521537dd32..507975c6b8 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge52.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge52.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Wedge52.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge52.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge52.h index be02764f14..a4c91fc77f 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge52.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge52.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge6.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge6.C index 115e142e10..9421130332 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge6.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge6.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for ElementVariableType -#include +#include "Ioss_ElementVariableType.h" // for ElementVariableType +#include "Ioss_Wedge6.h" #include // for assert #include diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge6.h b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge6.h index a7735ae8d0..30cec3d442 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge6.h +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Wedge6.h @@ -9,8 +9,8 @@ #include "ioss_export.h" -#include // for IntVector -#include // for ElementTopology +#include "Ioss_CodeTypes.h" // for IntVector +#include "Ioss_ElementTopology.h" // for ElementTopology // STL Includes diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C index c6fff954c2..e3731aa94d 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C @@ -4,12 +4,12 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_FileInfo.h" +#include "Ioss_IOFactory.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_SerializeIO.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h index 0ad0d77093..1873234e58 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h @@ -7,11 +7,11 @@ // -*- Mode: c++ -*- #pragma once -#include -#include -#include -#include -#include +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_Field.h" +#include "Ioss_Map.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C index 45ffd26bbf..5086242b11 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C @@ -4,13 +4,13 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_FileInfo.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_SerializeIO.h" +#include "Ioss_SmartAssert.h" +#include "Ioss_SurfaceSplit.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h index 87c63ac607..0fa38abbf7 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h @@ -7,10 +7,10 @@ // -*- Mode: c++ -*- #pragma once -#include -#include -#include -#include +#include "Ioss_DBUsage.h" +#include "Ioss_Field.h" +#include "Ioss_Map.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C index 2d8be24a4e..2c759b4dd5 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C @@ -4,16 +4,16 @@ // // See packages/seacas/LICENSE for details -#include +#include "Ioss_CodeTypes.h" #include #if defined PARALLEL_AWARE_EXODUS -#include // for ElementTopology -#include // for Field, etc -#include // for Map, MapContainer -#include // for PropertyManager -#include -#include -#include +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Field.h" // for Field, etc +#include "Ioss_Map.h" // for Map, MapContainer +#include "Ioss_PropertyManager.h" // for PropertyManager +#include "Ioss_SmartAssert.h" +#include "Ioss_Sort.h" +#include "Ioss_Utils.h" #include #include // for lower_bound, copy, etc diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h index 59fbb6b67a..2082bb70da 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h @@ -10,7 +10,7 @@ #include #if defined PARALLEL_AWARE_EXODUS -#include +#include "Ioss_CodeTypes.h" #include #include "ioex_export.h" @@ -22,9 +22,9 @@ #if !defined(NO_ZOLTAN_SUPPORT) #include #endif -#include -#include -#include +#include "Ioss_Decomposition.h" +#include "Ioss_Map.h" +#include "Ioss_PropertyManager.h" namespace Ioss { class Field; diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.h index 9206b71e40..03fc76720d 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.h @@ -6,9 +6,9 @@ #pragma once -#include -#include // for DatabaseUsage -#include // for IOFactory +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_IOFactory.h" // for IOFactory #include // for string #include "Ioss_DatabaseIO.h" // for DatabaseIO diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C index 30161801e0..3340ef8d18 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C @@ -11,7 +11,7 @@ // // See packages/seacas/LICENSE for details -#include +#include "Ioss_CodeTypes.h" #include #if defined PARALLEL_AWARE_EXODUS #include @@ -42,39 +42,39 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include "Ioss_Assembly.h" +#include "Ioss_Blob.h" +#include "Ioss_CommSet.h" +#include "Ioss_CoordinateFrame.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_EdgeBlock.h" +#include "Ioss_EdgeSet.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementSet.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_EntityBlock.h" +#include "Ioss_EntitySet.h" +#include "Ioss_EntityType.h" +#include "Ioss_FaceBlock.h" +#include "Ioss_FaceSet.h" +#include "Ioss_Field.h" +#include "Ioss_FileInfo.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_Map.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Property.h" +#include "Ioss_Region.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_State.h" +#include "Ioss_SurfaceSplit.h" +#include "Ioss_Utils.h" +#include "Ioss_VariableType.h" + +#include "Ioss_FileInfo.h" #undef MPICPP // ======================================================================== diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h index 483e6c27d0..c225a4e4e5 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h @@ -11,10 +11,10 @@ #include "ioex_export.h" #if defined PARALLEL_AWARE_EXODUS -#include -#include // for DatabaseUsage -#include // for Map -#include // for State +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_Map.h" // for Map +#include "Ioss_State.h" // for State #include // for DatabaseIO #include // for less #include // for map, map<>::value_compare diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C index 450bf5dd66..961a431b39 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C @@ -4,12 +4,12 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include -#include +#include "Ioss_Field.h" +#include "Ioss_FieldManager.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Utils.h" #include #include #include // for SuperElement diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.h index 663ee255cc..ae32bd42b6 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.h @@ -5,7 +5,7 @@ // See packages/seacas/LICENSE for details #pragma once -#include // for GroupingEntity +#include "Ioss_GroupingEntity.h" // for GroupingEntity #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C index da0f48807f..084d79a8ff 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C @@ -4,11 +4,11 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include +#include "Ioss_ElementTopology.h" +#include "Ioss_Region.h" +#include "Ioss_SmartAssert.h" +#include "Ioss_Utils.h" +#include "Ioss_VariableType.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h index 3683c41bbf..b14e65e066 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h @@ -7,10 +7,10 @@ */ #pragma once -#include -#include -#include -#include +#include "Ioss_CoordinateFrame.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C index 71f7fb1295..945edd0b2a 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_IOFactory.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.h index 03ddbbaf32..d5bd02d5ed 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.h @@ -7,11 +7,11 @@ // -*- Mode: c++ -*- #pragma once -#include -#include -#include -#include -#include +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_Field.h" +#include "Ioss_Map.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C index f3a03f8688..29753a8570 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C @@ -4,10 +4,10 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_SmartAssert.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h index c3ce4b8e3a..83f6e969fd 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h @@ -7,10 +7,10 @@ // -*- Mode: c++ -*- #pragma once -#include -#include -#include -#include +#include "Ioss_DBUsage.h" +#include "Ioss_Field.h" +#include "Ioss_Map.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.C index d98f21d695..edb06d2456 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.C @@ -4,16 +4,16 @@ // // See packages/seacas/LICENSE for details -#include +#include "Ioss_CodeTypes.h" #include #if defined PARALLEL_AWARE_EXODUS -#include // for ElementTopology -#include // for Field, etc -#include // for Map, MapContainer -#include // for PropertyManager -#include -#include -#include +#include "Ioss_ElementTopology.h" // for ElementTopology +#include "Ioss_Field.h" // for Field, etc +#include "Ioss_Map.h" // for Map, MapContainer +#include "Ioss_PropertyManager.h" // for PropertyManager +#include "Ioss_SmartAssert.h" +#include "Ioss_Sort.h" +#include "Ioss_Utils.h" #include #include // for lower_bound, copy, etc diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.h index 632599f37a..4382f87409 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.h @@ -10,7 +10,7 @@ #include #if defined PARALLEL_AWARE_EXODUS -#include +#include "Ioss_CodeTypes.h" #include #include "ioexnl_export.h" @@ -22,9 +22,9 @@ #if !defined(NO_ZOLTAN_SUPPORT) #include #endif -#include -#include -#include +#include "Ioss_Decomposition.h" +#include "Ioss_Map.h" +#include "Ioss_PropertyManager.h" namespace Ioss { class Field; diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.h index a3e38102d4..6a82598b44 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.h @@ -6,9 +6,9 @@ #pragma once -#include -#include // for DatabaseUsage -#include // for IOFactory +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_IOFactory.h" // for IOFactory #include // for string #include "Ioss_DatabaseIO.h" // for DatabaseIO diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.C index f0c4975c21..4a604e55f0 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.C @@ -11,7 +11,7 @@ // // See packages/seacas/LICENSE for details -#include +#include "Ioss_CodeTypes.h" #include #if defined PARALLEL_AWARE_EXODUS #include @@ -42,39 +42,39 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include "Ioss_Assembly.h" +#include "Ioss_Blob.h" +#include "Ioss_CommSet.h" +#include "Ioss_CoordinateFrame.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_EdgeBlock.h" +#include "Ioss_EdgeSet.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementSet.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_EntityBlock.h" +#include "Ioss_EntitySet.h" +#include "Ioss_EntityType.h" +#include "Ioss_FaceBlock.h" +#include "Ioss_FaceSet.h" +#include "Ioss_Field.h" +#include "Ioss_FileInfo.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_Map.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Property.h" +#include "Ioss_Region.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_State.h" +#include "Ioss_SurfaceSplit.h" +#include "Ioss_Utils.h" +#include "Ioss_VariableType.h" + +#include "Ioss_FileInfo.h" #undef MPICPP // ======================================================================== diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h index 4afb5f0599..65efbfd12b 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h @@ -11,10 +11,10 @@ #include "ioexnl_export.h" #if defined PARALLEL_AWARE_EXODUS -#include -#include // for DatabaseUsage -#include // for Map -#include // for State +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_Map.h" // for Map +#include "Ioss_State.h" // for State #include // for DatabaseIO #include // for less #include // for map, map<>::value_compare diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.C index 8231d69ed9..b99275b16c 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.C @@ -4,12 +4,12 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include -#include +#include "Ioss_Field.h" +#include "Ioss_FieldManager.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_Property.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Utils.h" #include #include #include // for SuperElement diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.h index 7faf1f6277..655b5bec62 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.h @@ -5,7 +5,7 @@ // See packages/seacas/LICENSE for details #pragma once -#include // for GroupingEntity +#include "Ioss_GroupingEntity.h" // for GroupingEntity #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.C index 1f5f14a92f..004be38d50 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.C @@ -4,11 +4,11 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include +#include "Ioss_ElementTopology.h" +#include "Ioss_Region.h" +#include "Ioss_SmartAssert.h" +#include "Ioss_Utils.h" +#include "Ioss_VariableType.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.h index 679b83c5ae..77054e6577 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.h @@ -7,10 +7,10 @@ */ #pragma once -#include -#include -#include -#include +#include "Ioss_CoordinateFrame.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.C b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.C index 3047e3320e..1d462a53fa 100644 --- a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.C @@ -9,15 +9,15 @@ #include "faodel/Iofaodel_PropertySerialization.h" #include "faodel/Iofaodel_Utils.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_CommSet.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_SubSystem.h" +#include "Ioss_Utils.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.h b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.h index e19d3789dc..209117a45f 100644 --- a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_DatabaseIO.h @@ -8,14 +8,14 @@ #include "iofaodel_export.h" -#include -#include // for DatabaseUsage -#include // for DatabaseIO -#include // for IOFactory -#include // for Map -#include // for Region -#include // for State -#include // for VariableType +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_IOFactory.h" // for IOFactory +#include "Ioss_Map.h" // for Map +#include "Ioss_Region.h" // for Region +#include "Ioss_State.h" // for State +#include "Ioss_VariableType.h" // for VariableType #include // for atomic #include // for size_t #include // for int64_t diff --git a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_FieldSerialization.h b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_FieldSerialization.h index 14e55cf8d4..50ab629d1b 100644 --- a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_FieldSerialization.h +++ b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_FieldSerialization.h @@ -10,27 +10,27 @@ #include "Iofaodel_Utils.h" -#include -#include -#include // for DatabaseIO -#include -#include -#include -#include -#include -#include -#include // for Region -#include -#include -#include -#include -#include // for Region -#include -#include // for Region -#include -#include -#include // for State -#include +#include "Ioss_CommSet.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_EdgeBlock.h" +#include "Ioss_EdgeSet.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementSet.h" +#include "Ioss_FaceBlock.h" +#include "Ioss_FaceSet.h" +#include "Ioss_Field.h" // for Region +#include "Ioss_GroupingEntity.h" +#include "Ioss_IOFactory.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_Property.h" // for Region +#include "Ioss_Region.h" +#include "Ioss_Region.h" // for Region +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_State.h" // for State +#include "Ioss_StructuredBlock.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_PropertySerialization.C b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_PropertySerialization.C index ed860a4da6..ac95468733 100644 --- a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_PropertySerialization.C +++ b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_PropertySerialization.C @@ -7,27 +7,27 @@ #include "Iofaodel_PropertySerialization.h" #include "Iofaodel_Utils.h" -#include -#include -#include // for DatabaseIO -#include -#include -#include -#include -#include -#include -#include // for Region -#include -#include -#include -#include -#include // for Region -#include -#include // for Region -#include -#include -#include // for State -#include +#include "Ioss_CommSet.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_EdgeBlock.h" +#include "Ioss_EdgeSet.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementSet.h" +#include "Ioss_FaceBlock.h" +#include "Ioss_FaceSet.h" +#include "Ioss_Field.h" // for Region +#include "Ioss_GroupingEntity.h" +#include "Ioss_IOFactory.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_Property.h" // for Region +#include "Ioss_Region.h" +#include "Ioss_Region.h" // for Region +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_State.h" // for State +#include "Ioss_StructuredBlock.h" #ifdef NDEBUG #undef NDEBUG diff --git a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_PropertySerialization.h b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_PropertySerialization.h index 13bac7acb7..68ac3d4237 100644 --- a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_PropertySerialization.h +++ b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_PropertySerialization.h @@ -9,9 +9,9 @@ #include "iofaodel_export.h" #include "Iofaodel_Utils.h" -#include -#include -#include +#include "Ioss_Field.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_Property.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_Utils.C b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_Utils.C index 95575c9f4c..e30364a885 100644 --- a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_Utils.C +++ b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_Utils.C @@ -6,27 +6,27 @@ #include "Iofaodel_Utils.h" -#include -#include -#include // for DatabaseIO -#include -#include -#include -#include -#include -#include -#include // for Region -#include -#include -#include -#include -#include // for Region -#include -#include // for Region -#include -#include -#include // for State -#include +#include "Ioss_CommSet.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_EdgeBlock.h" +#include "Ioss_EdgeSet.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementSet.h" +#include "Ioss_FaceBlock.h" +#include "Ioss_FaceSet.h" +#include "Ioss_Field.h" // for Region +#include "Ioss_GroupingEntity.h" +#include "Ioss_IOFactory.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_Property.h" // for Region +#include "Ioss_Region.h" +#include "Ioss_Region.h" // for Region +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_State.h" // for State +#include "Ioss_StructuredBlock.h" #include "cereal/archives/portable_binary.hpp" #include "cereal/types/array.hpp" diff --git a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_Utils.h b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_Utils.h index 5f832aa07c..90a82a51d6 100644 --- a/packages/seacas/libraries/ioss/src/faodel/Iofaodel_Utils.h +++ b/packages/seacas/libraries/ioss/src/faodel/Iofaodel_Utils.h @@ -8,9 +8,9 @@ #include "iofaodel_export.h" -#include -#include -#include +#include "Ioss_GroupingEntity.h" +#include "Ioss_Property.h" +#include "Ioss_Region.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C index 88b38037f2..4a2749890f 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C @@ -4,9 +4,9 @@ // // See packages/seacas/LICENSE for details -#include // for Int64Vector, IntVector -#include // for SideBlock -#include // for Utils, IOSS_ERROR +#include "Ioss_CodeTypes.h" // for Int64Vector, IntVector +#include "Ioss_SideBlock.h" // for SideBlock +#include "Ioss_Utils.h" // for Utils, IOSS_ERROR #include // for assert #include // for sqrt #include diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h index 7ee0497a43..0018a91c89 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h @@ -6,11 +6,11 @@ #pragma once -#include -#include // for DatabaseUsage -#include // for DatabaseIO -#include // for IOFactory -#include // for Map +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_IOFactory.h" // for IOFactory +#include "Ioss_Map.h" // for Map #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C index 40a7cd81af..b982f77d63 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C @@ -4,9 +4,9 @@ // // See packages/seacas/LICENSE for details -#include // for EntityType, etc -#include -#include +#include "Ioss_EntityType.h" // for EntityType, etc +#include "Ioss_Hex8.h" +#include "Ioss_Utils.h" #include // for assert #include // for atan2, cos, sin #include diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.h b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.h index 7a7cbf60bc..33db27acd4 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.h +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.h @@ -6,8 +6,8 @@ #pragma once -#include -#include // for EntityType +#include "Ioss_CodeTypes.h" +#include "Ioss_EntityType.h" // for EntityType #include #include // for size_t #include // for int64_t diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h b/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h index ade5c4ee20..c5eec5ecdd 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h @@ -6,9 +6,9 @@ #pragma once -#include -#include -#include +#include "Ioss_Beam2.h" +#include "Ioss_Hex8.h" +#include "Ioss_Shell4.h" #include // for size_t #include // for int64_t #include // for exception diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C index 5bff68d07a..a1ec1fe930 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C @@ -4,9 +4,9 @@ // // See packages/seacas/LICENSE for details -#include // for Int64Vector, IntVector -#include // for SideBlock -#include // for Utils, IOSS_ERROR +#include "Ioss_CodeTypes.h" // for Int64Vector, IntVector +#include "Ioss_SideBlock.h" // for SideBlock +#include "Ioss_Utils.h" // for Utils, IOSS_ERROR #include // for assert #include // for sqrt #include diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h index bfb7e51c92..bb33621398 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h @@ -6,11 +6,11 @@ #pragma once -#include -#include // for DatabaseUsage -#include // for DatabaseIO -#include // for IOFactory -#include // for Map +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_IOFactory.h" // for IOFactory +#include "Ioss_Map.h" // for Map #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C index f7c5dcf261..2adffc9910 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C @@ -4,12 +4,12 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include -#include +#include "Ioss_Hex8.h" +#include "Ioss_Pyramid5.h" +#include "Ioss_Shell4.h" +#include "Ioss_Tet4.h" +#include "Ioss_TriShell3.h" +#include "Ioss_Utils.h" #include // for assert #include // for atan2, cos, sin #include diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.h b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.h index 06aef29799..76e48dfa72 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.h +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.h @@ -6,8 +6,8 @@ #pragma once -#include -#include // for EntityType +#include "Ioss_CodeTypes.h" +#include "Ioss_EntityType.h" // for EntityType #include #include // for size_t #include // for int64_t diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C index 8560a480fc..57f6ce43e8 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C @@ -4,7 +4,7 @@ // // See packages/seacas/LICENSE for details -#include +#include "Ioss_CodeTypes.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h index 5ba262df9f..a4bf800350 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h @@ -6,12 +6,12 @@ #pragma once +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_IOFactory.h" +#include "Ioss_State.h" #include -#include -#include -#include -#include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C index eb0fb9af8c..eef3a775cd 100644 --- a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C +++ b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C @@ -6,7 +6,7 @@ #include "Ionit_Initializer.h" -#include +#include "Ioss_CodeTypes.h" #if defined(SEACAS_HAVE_EXODUS) #include @@ -38,8 +38,8 @@ #include #endif -#include -#include +#include "Ioss_ConcreteVariableType.h" +#include "Ioss_Initializer.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C index c3bff98f79..f4f1fd9b59 100644 --- a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C +++ b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C @@ -7,15 +7,15 @@ // Make asserts active even in non-debug build #undef NDEBUG +#include "Ioss_DatabaseIO.h" +#include "Ioss_GetLongOpt.h" +#include "Ioss_IOFactory.h" +#include "Ioss_Property.h" +#include "Ioss_Region.h" +#include "Ioss_SmartAssert.h" +#include "Ioss_Utils.h" +#include "Ioss_ZoneConnectivity.h" #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -31,10 +31,10 @@ #include #include -#include "Ioss_ScopeGuard.h" #include "Ioss_DBUsage.h" #include "Ioss_ParallelUtils.h" #include "Ioss_PropertyManager.h" +#include "Ioss_ScopeGuard.h" #include "Ioss_StructuredBlock.h" #if !defined __NVCC__ diff --git a/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C b/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C index a254a0b7b8..a6182f5db0 100644 --- a/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C +++ b/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details +#include "Ioss_Utils.h" #include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/io_info.C b/packages/seacas/libraries/ioss/src/main/io_info.C index 62f0d46bf4..12efe9d93b 100644 --- a/packages/seacas/libraries/ioss/src/main/io_info.C +++ b/packages/seacas/libraries/ioss/src/main/io_info.C @@ -6,10 +6,10 @@ #include "io_info.h" -#include -#include -#include -#include +#include "Ioss_Hex8.h" +#include "Ioss_Sort.h" +#include "Ioss_StructuredBlock.h" +#include "Ioss_ZoneConnectivity.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/io_info.h b/packages/seacas/libraries/ioss/src/main/io_info.h index b8eb542fe1..20e3a2ae13 100644 --- a/packages/seacas/libraries/ioss/src/main/io_info.h +++ b/packages/seacas/libraries/ioss/src/main/io_info.h @@ -7,10 +7,10 @@ */ #pragma once +#include "Ioss_CodeTypes.h" +#include "Ioss_SurfaceSplit.h" +#include "Ioss_Utils.h" #include -#include -#include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/io_modify.C b/packages/seacas/libraries/ioss/src/main/io_modify.C index 1df14c3b5a..177b789122 100644 --- a/packages/seacas/libraries/ioss/src/main/io_modify.C +++ b/packages/seacas/libraries/ioss/src/main/io_modify.C @@ -4,26 +4,26 @@ // // See packages/seacas/LICENSE for details +#include "Ioss_Assembly.h" +#include "Ioss_Blob.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_FileInfo.h" +#include "Ioss_Getline.h" +#include "Ioss_Glob.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_IOFactory.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_Property.h" +#include "Ioss_Region.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_StructuredBlock.h" +#include "Ioss_Utils.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -43,10 +43,10 @@ #include #include -#include "Ioss_ScopeGuard.h" #include "Ioss_EntityType.h" #include "Ioss_ParallelUtils.h" #include "Ioss_PropertyManager.h" +#include "Ioss_ScopeGuard.h" #include "Ioss_State.h" #include "SEACASIoss_config.h" #include "modify_interface.h" diff --git a/packages/seacas/libraries/ioss/src/main/io_shell.C b/packages/seacas/libraries/ioss/src/main/io_shell.C index d1c5bfd831..688411e2ec 100644 --- a/packages/seacas/libraries/ioss/src/main/io_shell.C +++ b/packages/seacas/libraries/ioss/src/main/io_shell.C @@ -4,17 +4,17 @@ // // See packages/seacas/LICENSE for details +#include "Ioss_Compare.h" +#include "Ioss_CopyDatabase.h" +#include "Ioss_FileInfo.h" +#include "Ioss_MemoryUtils.h" +#include "Ioss_MeshCopyOptions.h" +#include "Ioss_MeshType.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_SerializeIO.h" +#include "Ioss_SurfaceSplit.h" +#include "Ioss_Utils.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -26,7 +26,6 @@ #include #include -#include "Ioss_ScopeGuard.h" #include "Ioss_DBUsage.h" #include "Ioss_DataSize.h" #include "Ioss_DatabaseIO.h" @@ -35,6 +34,7 @@ #include "Ioss_Property.h" #include "Ioss_PropertyManager.h" #include "Ioss_Region.h" +#include "Ioss_ScopeGuard.h" #include "Ioss_VariableType.h" #include "shell_interface.h" diff --git a/packages/seacas/libraries/ioss/src/main/io_shell_ts.C b/packages/seacas/libraries/ioss/src/main/io_shell_ts.C index 6f6d589914..7fb060f321 100644 --- a/packages/seacas/libraries/ioss/src/main/io_shell_ts.C +++ b/packages/seacas/libraries/ioss/src/main/io_shell_ts.C @@ -4,19 +4,19 @@ // // See packages/seacas/LICENSE for details +#include "Ioss_CodeTypes.h" +#include "Ioss_DataPool.h" +#include "Ioss_FileInfo.h" +#include "Ioss_MemoryUtils.h" +#include "Ioss_MeshType.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_ScopeGuard.h" +#include "Ioss_SerializeIO.h" +#include "Ioss_SubSystem.h" +#include "Ioss_SurfaceSplit.h" +#include "Ioss_Transform.h" +#include "Ioss_Utils.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/shell_to_hex.C b/packages/seacas/libraries/ioss/src/main/shell_to_hex.C index 87f3767c67..6619f65127 100644 --- a/packages/seacas/libraries/ioss/src/main/shell_to_hex.C +++ b/packages/seacas/libraries/ioss/src/main/shell_to_hex.C @@ -4,9 +4,9 @@ // // See packages/seacas/LICENSE for details +#include "Ioss_Hex8.h" +#include "Ioss_Wedge6.h" #include -#include -#include #include #include #include @@ -17,7 +17,6 @@ #include #include -#include "Ioss_ScopeGuard.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" #include "Ioss_ElementBlock.h" @@ -28,6 +27,7 @@ #include "Ioss_ParallelUtils.h" #include "Ioss_Property.h" #include "Ioss_Region.h" +#include "Ioss_ScopeGuard.h" #include "Ioss_State.h" #include "Ioss_Utils.h" #include "vector3d.h" diff --git a/packages/seacas/libraries/ioss/src/main/sphgen.C b/packages/seacas/libraries/ioss/src/main/sphgen.C index 4d4b19532e..fc7393e7b5 100644 --- a/packages/seacas/libraries/ioss/src/main/sphgen.C +++ b/packages/seacas/libraries/ioss/src/main/sphgen.C @@ -4,9 +4,9 @@ // // See packages/seacas/LICENSE for details +#include "Ioss_Hex8.h" +#include "Ioss_Utils.h" #include -#include -#include #include #include #include @@ -16,7 +16,6 @@ #include #include -#include "Ioss_ScopeGuard.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" #include "Ioss_ElementBlock.h" @@ -28,6 +27,7 @@ #include "Ioss_ParallelUtils.h" #include "Ioss_Property.h" #include "Ioss_Region.h" +#include "Ioss_ScopeGuard.h" #include "Ioss_State.h" // ======================================================================== diff --git a/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C b/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C index dd50499476..69d0815fd7 100644 --- a/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C +++ b/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C @@ -4,12 +4,12 @@ // // See packages/seacas/LICENSE for details +#include "Ioss_CodeTypes.h" +#include "Ioss_FileInfo.h" +#include "Ioss_Hex8.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Utils.h" #include -#include -#include -#include -#include -#include #include #include #include @@ -19,7 +19,6 @@ #include #include -#include "Ioss_ScopeGuard.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" #include "Ioss_ElementBlock.h" @@ -34,6 +33,7 @@ #include "Ioss_Property.h" #include "Ioss_PropertyManager.h" #include "Ioss_Region.h" +#include "Ioss_ScopeGuard.h" #include "Ioss_SideBlock.h" #include "Ioss_SideSet.h" #include "Ioss_State.h" diff --git a/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C b/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C index d3865c1b6c..51fab47657 100644 --- a/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C @@ -4,7 +4,7 @@ // // See packages/seacas/LICENSE for details -#include +#include "Ioss_CodeTypes.h" #include #include "Ioss_DBUsage.h" diff --git a/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.h b/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.h index 144377f7c9..2f0dc99a13 100644 --- a/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.h @@ -7,8 +7,8 @@ // -*- Mode: c++ -*- #pragma once -#include -#include +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.h b/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.h index d37614cdd7..11cfcb788f 100644 --- a/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.h @@ -6,9 +6,9 @@ #pragma once -#include -#include // for DatabaseUsage -#include // for IOFactory +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_IOFactory.h" // for IOFactory #include // for string #include "Ioss_DatabaseIO.h" // for DatabaseIO diff --git a/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C b/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C index 79a0fec71f..5051296734 100644 --- a/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C @@ -10,9 +10,9 @@ #include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_SubSystem.h" +#include "Ioss_Utils.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.h b/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.h index 9c794707ef..b676dda27d 100644 --- a/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.h @@ -8,12 +8,12 @@ #include "iopg_export.h" -#include "Ioss_State.h" // for State -#include -#include // for DatabaseUsage -#include // for DatabaseIO -#include // for IOFactory -#include // for Map +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_IOFactory.h" // for IOFactory +#include "Ioss_Map.h" // for Map +#include "Ioss_State.h" // for State #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C index 17614f379b..9746e2920d 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C @@ -6,9 +6,9 @@ #include "Iotm_DatabaseIO.h" -#include // for Int64Vector, IntVector -#include // for SideBlock -#include +#include "Ioss_CodeTypes.h" // for Int64Vector, IntVector +#include "Ioss_SideBlock.h" // for SideBlock +#include "Ioss_SmartAssert.h" #include // for assert #include // for sqrt #include diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.h index 4400279621..a85c3bcc36 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.h @@ -6,11 +6,11 @@ #pragma once -#include -#include // for DatabaseUsage -#include // for DatabaseIO -#include // for IOFactory -#include // for Map +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_IOFactory.h" // for IOFactory +#include "Ioss_Map.h" // for Map #include // for size_t #include // for int64_t #include // for string diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C index cf6f8675d4..58e22a1b7e 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C +++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C @@ -6,7 +6,7 @@ #include "Iotm_TextMesh.h" -#include +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.h index b4b9dff00b..91a7ae97e3 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.h +++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.h @@ -6,8 +6,8 @@ #pragma once -#include -#include // for EntityType +#include "Ioss_CodeTypes.h" +#include "Ioss_EntityType.h" // for EntityType #include // for size_t #include // for int64_t #include // for map, etc diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshTopologyMapping.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshTopologyMapping.h index 52373d75d9..6a17ff1f6a 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshTopologyMapping.h +++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshTopologyMapping.h @@ -8,8 +8,8 @@ #include "iotm_export.h" -#include -#include // for EntityType +#include "Ioss_CodeTypes.h" +#include "Ioss_EntityType.h" // for EntityType #include // for size_t #include // for int64_t diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C index 0e2cb5de94..4a1fc8a0ae 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C @@ -4,7 +4,7 @@ // // See packages/seacas/LICENSE for details -#include +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.h index 36a5b49cdf..211b7daf5e 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "Ioss_CodeTypes.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C index 60250b8871..b96006a5e9 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for Field, etc -#include // for VariableType +#include "Ioss_Field.h" // for Field, etc +#include "Ioss_VariableType.h" // for VariableType #include // for fabs #include // for size_t #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h index 16f1439acf..f9b93d83d1 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h @@ -6,8 +6,8 @@ #pragma once -#include // for Transform, Factory -#include // for VariableType +#include "Ioss_Transform.h" // for Transform, Factory +#include "Ioss_VariableType.h" // for VariableType #include #include // for string #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C index e3adba362e..eaf2229145 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_Field.h" +#include "Ioss_VariableType.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h index af9417a4c9..13d4ec8f5b 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h @@ -6,7 +6,7 @@ #pragma once -#include // for Transform, Factory +#include "Ioss_Transform.h" // for Transform, Factory #include #include // for string #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C index 9bdbeb82c6..65bf6ff58a 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_Field.h" +#include "Ioss_VariableType.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h index 2d15cf1f8d..4d81a492bf 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h @@ -6,8 +6,8 @@ #pragma once -#include // for Transform, Factory -#include // for VariableType +#include "Ioss_Transform.h" // for Transform, Factory +#include "Ioss_VariableType.h" // for VariableType #include #include // for string #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C index 8c9fb74b8d..ca68a4657c 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_Field.h" +#include "Ioss_VariableType.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h index c005d71707..56ccbac6cd 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h @@ -6,8 +6,8 @@ #pragma once -#include -#include +#include "Ioss_Transform.h" +#include "Ioss_VariableType.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C index 1d465efc02..1bfc7c863a 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_Field.h" +#include "Ioss_VariableType.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h index 1987e7efcc..95f74f5426 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h @@ -6,8 +6,8 @@ #pragma once -#include // for Transform, Factory -#include // for VariableType +#include "Ioss_Transform.h" // for Transform, Factory +#include "Ioss_VariableType.h" // for VariableType #include #include #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C index 70625a1a1e..ca77b82087 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_Field.h" +#include "Ioss_VariableType.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h index 8b0efe7129..cf9b63d19e 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h @@ -6,8 +6,8 @@ #pragma once -#include // for Transform, Factory -#include // for VariableType +#include "Ioss_Transform.h" // for Transform, Factory +#include "Ioss_VariableType.h" // for VariableType #include #include // for string #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C index d7edac940f..e8ca57e75e 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_Field.h" +#include "Ioss_VariableType.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h index bd2a35a2cf..674c4a13c5 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h @@ -6,8 +6,8 @@ #pragma once -#include // for Transform, Factory -#include // for VariableType +#include "Ioss_Transform.h" // for Transform, Factory +#include "Ioss_VariableType.h" // for VariableType #include #include // for string #include diff --git a/packages/seacas/libraries/ioss/src/unit_tests/UnitTestElementBlockBatchRead.C b/packages/seacas/libraries/ioss/src/unit_tests/UnitTestElementBlockBatchRead.C index d4ab6b91e5..d559bfef76 100644 --- a/packages/seacas/libraries/ioss/src/unit_tests/UnitTestElementBlockBatchRead.C +++ b/packages/seacas/libraries/ioss/src/unit_tests/UnitTestElementBlockBatchRead.C @@ -20,20 +20,20 @@ #include // for unlink +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_Field.h" // for Field, etc +#include "Ioss_IOFactory.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Property.h" #include -#include -#include // for DatabaseIO -#include // for Field, etc -#include -#include -#include - -#include -#include -#include -#include - -#include + +#include "Ioss_ElementBlock.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_Region.h" + +#include "Ioss_Utils.h" namespace { diff --git a/packages/seacas/libraries/ioss/src/unit_tests/UnitTestIotmTextMeshFixture.h b/packages/seacas/libraries/ioss/src/unit_tests/UnitTestIotmTextMeshFixture.h index df7958985d..f7bb0a0a96 100644 --- a/packages/seacas/libraries/ioss/src/unit_tests/UnitTestIotmTextMeshFixture.h +++ b/packages/seacas/libraries/ioss/src/unit_tests/UnitTestIotmTextMeshFixture.h @@ -6,28 +6,28 @@ #pragma once -#include - +#include "Ioss_CodeTypes.h" + +#include "Ioss_Assembly.h" +#include "Ioss_CommSet.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" // for DatabaseIO +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_EntityType.h" // for EntityType, etc +#include "Ioss_Field.h" // for Field, etc +#include "Ioss_GroupingEntity.h" // for GroupingEntity +#include "Ioss_IOFactory.h" // for IOFactory +#include "Ioss_MeshType.h" // for MeshType, etc +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Region.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" +#include "Ioss_StandardElementTypes.h" #include -#include -#include -#include -#include // for DatabaseIO -#include -#include -#include // for EntityType, etc -#include // for Field, etc -#include // for GroupingEntity -#include // for IOFactory -#include // for MeshType, etc -#include -#include -#include -#include -#include -#include -#include -#include #include #ifdef SEACAS_HAVE_MPI diff --git a/packages/seacas/libraries/ioss/src/unit_tests/unitMain.C b/packages/seacas/libraries/ioss/src/unit_tests/unitMain.C index 946339640e..a902594dba 100644 --- a/packages/seacas/libraries/ioss/src/unit_tests/unitMain.C +++ b/packages/seacas/libraries/ioss/src/unit_tests/unitMain.C @@ -4,7 +4,7 @@ // // See packages/seacas/LICENSE for details -#include +#include "Ioss_CodeTypes.h" #include #ifdef SEACAS_HAVE_MPI diff --git a/packages/seacas/libraries/ioss/src/utest/Ut_ioad.C b/packages/seacas/libraries/ioss/src/utest/Ut_ioad.C index e96b6f23ba..22d4503893 100644 --- a/packages/seacas/libraries/ioss/src/utest/Ut_ioad.C +++ b/packages/seacas/libraries/ioss/src/utest/Ut_ioad.C @@ -20,8 +20,8 @@ #include "Ioss_Region.h" #include "Ioss_SideBlock.h" #include "Ioss_SideSet.h" +#include "Ioss_SubSystem.h" #include "Ioss_VariableType.h" -#include #include "Ioss_DatabaseIO.h" // for DatabaseIO diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C b/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C index a55d9936f2..0183781822 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C @@ -7,18 +7,18 @@ #define DOCTEST_CONFIG_IMPLEMENT #define DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS +#include "Ioss_DBUsage.h" +#include "Ioss_ElementBlock.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_Hex8.h" +#include "Ioss_NodeBlock.h" +#include "Ioss_NodeSet.h" +#include "Ioss_PropertyManager.h" +#include "Ioss_Region.h" +#include "Ioss_Shell4.h" +#include "Ioss_SideBlock.h" +#include "Ioss_SideSet.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -27,11 +27,11 @@ #include #include -#include "Ioss_ScopeGuard.h" #include "Ioss_CodeTypes.h" #include "Ioss_Field.h" #include "Ioss_ParallelUtils.h" #include "Ioss_Property.h" +#include "Ioss_ScopeGuard.h" #include "Ioss_State.h" #include "Ioss_SurfaceSplit.h" diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C b/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C index 2e9a26acc8..bb3527ccad 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C @@ -4,26 +4,26 @@ // // See packages/seacas/LICENSE for details +#include "Ioss_Blob.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_IOFactory.h" +#include "Ioss_Property.h" +#include "Ioss_Region.h" +#include "Ioss_Sort.h" +#include "Ioss_Utils.h" #include -#include -#include -#include -#include -#include -#include -#include #include #include #include #include #include -#include "Ioss_ScopeGuard.h" #include "Ioss_CodeTypes.h" #include "Ioss_DBUsage.h" #include "Ioss_Field.h" #include "Ioss_ParallelUtils.h" #include "Ioss_PropertyManager.h" +#include "Ioss_ScopeGuard.h" #include "Ioss_State.h" #include "Ioss_VariableType.h" diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_ioel.C b/packages/seacas/libraries/ioss/src/utest/Utst_ioel.C index f98f6f4951..a5714f2e4b 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_ioel.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_ioel.C @@ -4,14 +4,14 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_ConcreteVariableType.h" +#include "Ioss_ElementPermutation.h" +#include "Ioss_ElementTopology.h" +#include "Ioss_Initializer.h" +#include "Ioss_NullEntity.h" +#include "Ioss_Utils.h" +#include "Ioss_VariableType.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_map.C b/packages/seacas/libraries/ioss/src/utest/Utst_map.C index 8188e535de..274c98c9af 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_map.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_map.C @@ -8,9 +8,9 @@ #define DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS #define DOCTEST_CONFIG_NO_MULTITHREADING -#include -#include -#include +#include "Ioss_ConcreteVariableType.h" +#include "Ioss_Field.h" +#include "Ioss_Map.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_sort.C b/packages/seacas/libraries/ioss/src/utest/Utst_sort.C index e85a3b6ab4..8fdc0f3f38 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_sort.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_sort.C @@ -4,7 +4,7 @@ // // See packages/seacas/LICENSE for details -#include +#include "Ioss_Sort.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C index ed12ccc9a4..0b1190b194 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C @@ -8,7 +8,7 @@ #define DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS #define DOCTEST_CONFIG_NO_MULTITHREADING -#include +#include "Ioss_ZoneConnectivity.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C b/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C index 73e222b7da..d17bff936b 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C @@ -13,14 +13,14 @@ #endif #undef NDEBUG -#include +#include "Ioss_ConcreteVariableType.h" #include #include #include -#include "Ioss_ScopeGuard.h" #include "Ioss_Field.h" #include "Ioss_Property.h" +#include "Ioss_ScopeGuard.h" #include "Ioss_Utils.h" int main(int argc, char *argv[]) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossApplication.cxx b/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossApplication.cxx index c7044db03b..e0300887fb 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossApplication.cxx +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossApplication.cxx @@ -7,14 +7,14 @@ #include "IossApplication.h" #include "CatalystPluginPaths.h" #include "IossRegionReport.h" +#include "Ioss_CopyDatabase.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_FileInfo.h" +#include "Ioss_IOFactory.h" +#include "Ioss_MeshCopyOptions.h" +#include "Ioss_Region.h" +#include "Ioss_Utils.h" #include -#include -#include -#include -#include -#include -#include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossRegionReport.cxx b/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossRegionReport.cxx index 55f8b2b67e..b68877d5cf 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossRegionReport.cxx +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossRegionReport.cxx @@ -5,398 +5,365 @@ // See packages/seacas/LICENSE for details #include "IossRegionReport.h" -#include -#include -#include -#include -#include -#include +#include "Ioss_Assembly.h" +#include "Ioss_Blob.h" +#include "Ioss_Field.h" +#include "Ioss_GroupingEntity.h" +#include "Ioss_Property.h" +#include "Ioss_SubSystem.h" namespace ioss_region_report { -std::string sep1 = " "; -std::string sep2 = " | "; + std::string sep1 = " "; + std::string sep2 = " | "; -std::ostream& operator<<(std::ostream& os, const Messages& messages) -{ - for(auto msg : messages.messages) - os << msg << std::endl; + std::ostream &operator<<(std::ostream &os, const Messages &messages) + { + for (auto msg : messages.messages) + os << msg << std::endl; return os; -} + } -Messages grouping_entity_report(bool report_transient, const Ioss::GroupingEntity& entity); + Messages grouping_entity_report(bool report_transient, const Ioss::GroupingEntity &entity); -Messages entity_block_report(bool report_transient, const Ioss::EntityBlock& entity); -Messages entity_set_report(bool report_transient, const Ioss::EntitySet& entity); + Messages entity_block_report(bool report_transient, const Ioss::EntityBlock &entity); + Messages entity_set_report(bool report_transient, const Ioss::EntitySet &entity); -Messages node_block_report(bool report_transient, const Ioss::NodeBlock& entity); -Messages elem_block_report(bool report_transient, const Ioss::ElementBlock& entity); -Messages face_block_report(bool report_transient, const Ioss::FaceBlock& entity); -Messages edge_block_report(bool report_transient, const Ioss::EdgeBlock& entity); + Messages node_block_report(bool report_transient, const Ioss::NodeBlock &entity); + Messages elem_block_report(bool report_transient, const Ioss::ElementBlock &entity); + Messages face_block_report(bool report_transient, const Ioss::FaceBlock &entity); + Messages edge_block_report(bool report_transient, const Ioss::EdgeBlock &entity); -Messages node_set_report(bool report_transient, const Ioss::NodeSet& entity); -Messages elem_set_report(bool report_transient, const Ioss::ElementSet& entity); -Messages face_set_report(bool report_transient, const Ioss::FaceSet& entity); -Messages edge_set_report(bool report_transient, const Ioss::EdgeSet& entity); + Messages node_set_report(bool report_transient, const Ioss::NodeSet &entity); + Messages elem_set_report(bool report_transient, const Ioss::ElementSet &entity); + Messages face_set_report(bool report_transient, const Ioss::FaceSet &entity); + Messages edge_set_report(bool report_transient, const Ioss::EdgeSet &entity); -Messages side_set_report(bool report_transient, const Ioss::SideSet& entity); -Messages comm_set_report(bool report_transient, const Ioss::CommSet& entity); -Messages struct_block_report(bool report_transient, const Ioss::StructuredBlock& entity); -Messages assembly_report(bool report_transient, const Ioss::Assembly& entity); -Messages blob_report(bool report_transient, const Ioss::Blob& entity); -Messages coord_frame_report(bool report_transient, const Ioss::CoordinateFrame& entity); + Messages side_set_report(bool report_transient, const Ioss::SideSet &entity); + Messages comm_set_report(bool report_transient, const Ioss::CommSet &entity); + Messages struct_block_report(bool report_transient, const Ioss::StructuredBlock &entity); + Messages assembly_report(bool report_transient, const Ioss::Assembly &entity); + Messages blob_report(bool report_transient, const Ioss::Blob &entity); + Messages coord_frame_report(bool report_transient, const Ioss::CoordinateFrame &entity); -Messages property_report(const Ioss::Property& property); -Messages field_report(const Ioss::Field& field); -std::string field_role(const int id); -std::string property_type(const int id); + Messages property_report(const Ioss::Property &property); + Messages field_report(const Ioss::Field &field); + std::string field_role(const int id); + std::string property_type(const int id); -Messages entity_block_report(bool report_transient, const Ioss::EntityBlock& entity) -{ + Messages entity_block_report(bool report_transient, const Ioss::EntityBlock &entity) + { Messages msgs; msgs += "EntityBlock" + sep2; msgs.begin = "\t"; msgs += grouping_entity_report(report_transient, entity); return msgs; -} + } - -Messages entity_set_report(bool report_transient, const Ioss::EntitySet& entity) -{ + Messages entity_set_report(bool report_transient, const Ioss::EntitySet &entity) + { Messages msgs; msgs += "EntitySet" + sep2; msgs.begin = "\t"; msgs += grouping_entity_report(report_transient, entity); return msgs; -} - + } -Messages side_set_report(bool report_transient, const Ioss::SideSet& entity) -{ + Messages side_set_report(bool report_transient, const Ioss::SideSet &entity) + { Messages msgs; msgs += "SideSet" + sep2; msgs.begin = "\t"; msgs += grouping_entity_report(report_transient, entity); return msgs; -} + } -Messages comm_set_report(bool report_transient, const Ioss::CommSet& entity) -{ + Messages comm_set_report(bool report_transient, const Ioss::CommSet &entity) + { Messages msgs; msgs += "CommSet" + sep2; msgs.begin = "\t"; msgs += grouping_entity_report(report_transient, entity); return msgs; -} + } -Messages struct_block_report(bool report_transient, const Ioss::StructuredBlock& entity) -{ + Messages struct_block_report(bool report_transient, const Ioss::StructuredBlock &entity) + { Messages msgs; msgs += "StructuredBlock" + sep2; msgs.begin = "\t"; msgs += entity_block_report(report_transient, entity); return msgs; -} + } -Messages assembly_report(bool report_transient, const Ioss::Assembly& entity) -{ + Messages assembly_report(bool report_transient, const Ioss::Assembly &entity) + { Messages msgs; msgs += "Assembly" + sep2; msgs.begin = "\t"; msgs += grouping_entity_report(report_transient, entity); return msgs; -} + } -Messages blob_report(bool report_transient, const Ioss::Blob& entity) -{ + Messages blob_report(bool report_transient, const Ioss::Blob &entity) + { Messages msgs; msgs += "Blob" + sep2; msgs.begin = "\t"; msgs += grouping_entity_report(report_transient, entity); return msgs; -} + } -Messages coord_frame_report(bool report_transient, const Ioss::CoordinateFrame& entity) -{ + Messages coord_frame_report(bool report_transient, const Ioss::CoordinateFrame &entity) + { Messages msgs; msgs += "CoordinateFrame" + sep2; msgs.begin = "\t"; msgs += sep2 + "Id" + sep1 + std::to_string(entity.id()); return msgs; -} + } -Messages node_block_report(bool report_transient, const Ioss::NodeBlock& entity) -{ + Messages node_block_report(bool report_transient, const Ioss::NodeBlock &entity) + { Messages msgs; msgs += "NodeBlock" + sep2; msgs.begin = "\t"; msgs += entity_block_report(report_transient, entity); return msgs; -} + } - -Messages elem_block_report(bool report_transient, const Ioss::ElementBlock& entity) -{ + Messages elem_block_report(bool report_transient, const Ioss::ElementBlock &entity) + { Messages msgs; msgs += "ElemBlock" + sep2; msgs.begin = "\t"; msgs += entity_block_report(report_transient, entity); return msgs; -} - + } -Messages face_block_report(bool report_transient, const Ioss::FaceBlock& entity) -{ + Messages face_block_report(bool report_transient, const Ioss::FaceBlock &entity) + { Messages msgs; msgs += "FaceBlock" + sep2; msgs.begin = "\t"; msgs += entity_block_report(report_transient, entity); return msgs; -} + } - -Messages edge_block_report(bool report_transient, const Ioss::EdgeBlock& entity) -{ + Messages edge_block_report(bool report_transient, const Ioss::EdgeBlock &entity) + { Messages msgs; msgs += "EdgeBlock" + sep2; msgs.begin = "\t"; msgs += entity_block_report(report_transient, entity); return msgs; -} - + } - -Messages node_set_report(bool report_transient, const Ioss::NodeSet& entity) -{ + Messages node_set_report(bool report_transient, const Ioss::NodeSet &entity) + { Messages msgs; msgs += "NodeSet" + sep2; msgs.begin = "\t"; msgs += entity_set_report(report_transient, entity); return msgs; -} - + } -Messages elem_set_report(bool report_transient, const Ioss::ElementSet& entity) -{ + Messages elem_set_report(bool report_transient, const Ioss::ElementSet &entity) + { Messages msgs; msgs += "ElemSet" + sep2; msgs.begin = "\t"; msgs += entity_set_report(report_transient, entity); return msgs; -} + } - -Messages face_set_report(bool report_transient, const Ioss::FaceSet& entity) -{ + Messages face_set_report(bool report_transient, const Ioss::FaceSet &entity) + { Messages msgs; msgs += "FaceSet" + sep2; msgs.begin = "\t"; msgs += entity_set_report(report_transient, entity); return msgs; -} - + } -Messages edge_set_report(bool report_transient, const Ioss::EdgeSet& entity) -{ + Messages edge_set_report(bool report_transient, const Ioss::EdgeSet &entity) + { Messages msgs; msgs += "EdgeSet" + sep2; msgs.begin = "\t"; msgs += entity_set_report(report_transient, entity); return msgs; -} - - + } - - -Messages grouping_entity_report(bool report_transient, const Ioss::GroupingEntity& entity) -{ - auto filename = entity.get_filename(); - auto state = entity.get_database()->get_region()->get_current_state(); + Messages grouping_entity_report(bool report_transient, const Ioss::GroupingEntity &entity) + { + auto filename = entity.get_filename(); + auto state = entity.get_database()->get_region()->get_current_state(); auto entity_name = entity.get_property("name").get_string(); Messages msgs; { - Message msg = "GroupingEntity" + sep1; - if(!entity_name.empty()) - msg += sep2 + entity_name; - msg += sep2 + "State" + sep1 + std::to_string(state); - msgs += msg; + Message msg = "GroupingEntity" + sep1; + if (!entity_name.empty()) + msg += sep2 + entity_name; + msg += sep2 + "State" + sep1 + std::to_string(state); + msgs += msg; } { - msgs.begin = "\t"; - - // Transient Region Fields - std::vector names; - std::vector valid_role_types; - if(report_transient) + msgs.begin = "\t"; + + // Transient Region Fields + std::vector names; + std::vector valid_role_types; + if (report_transient) { + valid_role_types.push_back(Ioss::Field::RoleType::REDUCTION); + valid_role_types.push_back(Ioss::Field::RoleType::TRANSIENT); + } + else { + // Properties { - valid_role_types.push_back(Ioss::Field::RoleType::REDUCTION); - valid_role_types.push_back(Ioss::Field::RoleType::TRANSIENT); - } - else - { - // Properties - { - names.clear(); - entity.property_describe(&names); - for(auto name : names) - msgs += property_report(entity.get_property(name)); - } - - valid_role_types.push_back(Ioss::Field::RoleType::INTERNAL); - valid_role_types.push_back(Ioss::Field::RoleType::MESH); - valid_role_types.push_back(Ioss::Field::RoleType::ATTRIBUTE); - valid_role_types.push_back(Ioss::Field::RoleType::COMMUNICATION); - valid_role_types.push_back(Ioss::Field::RoleType::MESH_REDUCTION); - } - - // Fields - for(auto role_type : valid_role_types) - { - names.clear(); - entity.field_describe(role_type, &names); - for(auto name : names) - msgs += field_report(entity.get_field(name)); + names.clear(); + entity.property_describe(&names); + for (auto name : names) + msgs += property_report(entity.get_property(name)); } + valid_role_types.push_back(Ioss::Field::RoleType::INTERNAL); + valid_role_types.push_back(Ioss::Field::RoleType::MESH); + valid_role_types.push_back(Ioss::Field::RoleType::ATTRIBUTE); + valid_role_types.push_back(Ioss::Field::RoleType::COMMUNICATION); + valid_role_types.push_back(Ioss::Field::RoleType::MESH_REDUCTION); + } + + // Fields + for (auto role_type : valid_role_types) { + names.clear(); + entity.field_describe(role_type, &names); + for (auto name : names) + msgs += field_report(entity.get_field(name)); + } } - return msgs; -} + } - -Messages region_report(const Ioss::Region& region) -{ - auto filename = region.get_filename(); - auto state = region.get_current_state(); - auto region_name = region.get_property("name").get_string(); + Messages region_report(const Ioss::Region ®ion) + { + auto filename = region.get_filename(); + auto state = region.get_current_state(); + auto region_name = region.get_property("name").get_string(); auto report_transient = state > 0 ? true : false; Messages msgs; { - Message msg = "Region" + sep1 + filename; - if(!region_name.empty()) - msg += sep2 + region_name; - msg += sep2 + "State" + sep1 + std::to_string(state); - msgs += msg; + Message msg = "Region" + sep1 + filename; + if (!region_name.empty()) + msg += sep2 + region_name; + msg += sep2 + "State" + sep1 + std::to_string(state); + msgs += msg; } - { - msgs.begin = "\t"; - msgs += grouping_entity_report(report_transient, region); - - for(auto block : region.get_node_blocks()) - msgs += node_block_report(report_transient, *block); - for(auto block : region.get_element_blocks()) - msgs += elem_block_report(report_transient, *block); - for(auto block : region.get_face_blocks()) - msgs += face_block_report(report_transient, *block); - for(auto block : region.get_edge_blocks()) - msgs += edge_block_report(report_transient, *block); - - for(auto set : region.get_nodesets()) - msgs += node_set_report(report_transient, *set); - for(auto set : region.get_elementsets()) - msgs += elem_set_report(report_transient, *set); - for(auto set : region.get_facesets()) - msgs += face_set_report(report_transient, *set); - for(auto set : region.get_edgesets()) - msgs += edge_set_report(report_transient, *set); - - for(auto set : region.get_sidesets()) - msgs += side_set_report(report_transient, *set); - for(auto set : region.get_commsets()) - msgs += comm_set_report(report_transient, *set); - for(auto set : region.get_structured_blocks()) - msgs += struct_block_report(report_transient, *set); - for(auto set : region.get_assemblies()) - msgs += assembly_report(report_transient, *set); - for(auto set : region.get_blobs()) - msgs += blob_report(report_transient, *set); - for(auto set : region.get_coordinate_frames()) - msgs += coord_frame_report(report_transient, set); - - + msgs.begin = "\t"; + msgs += grouping_entity_report(report_transient, region); + + for (auto block : region.get_node_blocks()) + msgs += node_block_report(report_transient, *block); + for (auto block : region.get_element_blocks()) + msgs += elem_block_report(report_transient, *block); + for (auto block : region.get_face_blocks()) + msgs += face_block_report(report_transient, *block); + for (auto block : region.get_edge_blocks()) + msgs += edge_block_report(report_transient, *block); + + for (auto set : region.get_nodesets()) + msgs += node_set_report(report_transient, *set); + for (auto set : region.get_elementsets()) + msgs += elem_set_report(report_transient, *set); + for (auto set : region.get_facesets()) + msgs += face_set_report(report_transient, *set); + for (auto set : region.get_edgesets()) + msgs += edge_set_report(report_transient, *set); + + for (auto set : region.get_sidesets()) + msgs += side_set_report(report_transient, *set); + for (auto set : region.get_commsets()) + msgs += comm_set_report(report_transient, *set); + for (auto set : region.get_structured_blocks()) + msgs += struct_block_report(report_transient, *set); + for (auto set : region.get_assemblies()) + msgs += assembly_report(report_transient, *set); + for (auto set : region.get_blobs()) + msgs += blob_report(report_transient, *set); + for (auto set : region.get_coordinate_frames()) + msgs += coord_frame_report(report_transient, set); } return msgs; -} - - + } -Messages property_report(const Ioss::Property& property) { + Messages property_report(const Ioss::Property &property) + { Messages msgs; { - Message msg; - msg += "Property" + sep1 + property.get_name(); - msg += sep2 + "PropertyType" + sep1 + property_type(property.get_type()); - if(property.get_type() == Ioss::Property::REAL) { - msg += sep2 + "PropertyValue" + sep1 + std::to_string(property.get_real()); - } - else if(property.get_type() == Ioss::Property::STRING) { - msg += sep2 + "PropertyValue" + sep1 + property.get_string(); - } - else if(property.get_type() == Ioss::Property::INTEGER) { - msg += sep2 + "PropertyValue" + sep1 + std::to_string(property.get_int()); - } - msgs += msg; + Message msg; + msg += "Property" + sep1 + property.get_name(); + msg += sep2 + "PropertyType" + sep1 + property_type(property.get_type()); + if (property.get_type() == Ioss::Property::REAL) { + msg += sep2 + "PropertyValue" + sep1 + std::to_string(property.get_real()); + } + else if (property.get_type() == Ioss::Property::STRING) { + msg += sep2 + "PropertyValue" + sep1 + property.get_string(); + } + else if (property.get_type() == Ioss::Property::INTEGER) { + msg += sep2 + "PropertyValue" + sep1 + std::to_string(property.get_int()); + } + msgs += msg; } return msgs; -} + } -std::string property_type(const int id) { + std::string property_type(const int id) + { - if(id == -1) { - return std::string("INVALID"); + if (id == -1) { + return std::string("INVALID"); } - std::vector property_type_string{ - "REAL", - "INTEGER", - "POINTER", - "STRING", - "VEC_INTEGER", - "VEC_DOUBLE" - }; + std::vector property_type_string{"REAL", "INTEGER", "POINTER", + "STRING", "VEC_INTEGER", "VEC_DOUBLE"}; return property_type_string[id]; -} + } -Messages field_report(const Ioss::Field& field) { + Messages field_report(const Ioss::Field &field) + { Messages messages; { - Message msg; - msg += "Field" + sep1 + field.get_name(); - msg += sep2 + "RoleType" + sep1 + field_role(field.get_role()); - msg += sep2 + "NumItemsInField" + sep1 + std::to_string(field.raw_count()); - msg += sep2 + "SizeInBytes" + sep1 + std::to_string(field.get_size()); - messages += msg; + Message msg; + msg += "Field" + sep1 + field.get_name(); + msg += sep2 + "RoleType" + sep1 + field_role(field.get_role()); + msg += sep2 + "NumItemsInField" + sep1 + std::to_string(field.raw_count()); + msg += sep2 + "SizeInBytes" + sep1 + std::to_string(field.get_size()); + messages += msg; } return messages; -} + } -std::string field_role(const int id) { + std::string field_role(const int id) + { - std::vector field_role_string{ - "INTERNAL", - "MESH", - "ATTRIBUTE", - "COMMUNICATION", - "MESH_REDUCTION", - "REDUCTION", - "TRANSIENT" - }; + std::vector field_role_string{"INTERNAL", "MESH", "ATTRIBUTE", + "COMMUNICATION", "MESH_REDUCTION", "REDUCTION", + "TRANSIENT"}; return field_role_string[id]; -} + } } // End namespace ioss_region_report diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossRegionReport.h b/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossRegionReport.h index 7571e4ea98..8ecf243658 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossRegionReport.h +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossRegionReport.h @@ -7,35 +7,38 @@ #ifndef Ioss_Region_Report_h #define Ioss_Region_Report_h +#include "Ioss_Region.h" #include #include #include -#include namespace ioss_region_report { -using Message = std::string; -using Key = std::string; + using Message = std::string; + using Key = std::string; -struct Messages { - std::string begin{""}; + struct Messages + { + std::string begin{""}; std::vector messages; - Messages& operator+=(const Message & rhs) { - messages.push_back(begin + rhs); - return *this; + Messages &operator+=(const Message &rhs) + { + messages.push_back(begin + rhs); + return *this; } - Messages& operator+=(const Messages & rhs) { - for(auto msg : rhs.messages) - messages.push_back(begin + msg); - return *this; + Messages &operator+=(const Messages &rhs) + { + for (auto msg : rhs.messages) + messages.push_back(begin + msg); + return *this; } -}; + }; -std::ostream& operator<<(std::ostream& os, const Messages& messages); -Messages region_report(const Ioss::Region& region); + std::ostream &operator<<(std::ostream &os, const Messages &messages); + Messages region_report(const Ioss::Region ®ion); -} +} // namespace ioss_region_report #endif diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/test/pipeline/CatalystLoggingPipelineTests.cxx b/packages/seacas/libraries/ioss/src/visualization/catalyst/test/pipeline/CatalystLoggingPipelineTests.cxx index c71d6fc587..a20e5568d2 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/test/pipeline/CatalystLoggingPipelineTests.cxx +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/test/pipeline/CatalystLoggingPipelineTests.cxx @@ -5,13 +5,13 @@ // See packages/seacas/LICENSE for details #include "CatalystTestFixture.h" +#include "Ioss_PropertyManager.h" #include "catch.hpp" -#include #include TEST_CASE_METHOD(CatalystTestFixture, "CatalystLoggingDefault", "[catalyst logging]") { - std::string logFileName = "log.csv"; + std::string logFileName = "log.csv"; Ioss::PropertyManager props; props.add(Ioss::Property("CATALYST_LOGGING_ENABLED", true)); props.add(Ioss::Property("CATALYST_LOGGING_FILE_NAME", logFileName)); diff --git a/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_DatabaseIO.h b/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_DatabaseIO.h index d1e2d5b68a..fc7f4059d2 100644 --- a/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_DatabaseIO.h @@ -7,7 +7,7 @@ #ifndef Iovs_cgns_DatabaseIO_h #define Iovs_cgns_DatabaseIO_h -#include +#include "Ioss_DatabaseIO.h" #include namespace Iovs_cgns { diff --git a/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_IOFactory.h b/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_IOFactory.h index 7336b98846..3a0e75b6d3 100644 --- a/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/visualization/cgns/Iovs_cgns_IOFactory.h @@ -9,11 +9,11 @@ #include "iovs_export.h" +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage #include "Ioss_DatabaseIO.h" // for DatabaseIO -#include -#include // for DatabaseUsage -#include // for IOFactory -#include // for string +#include "Ioss_IOFactory.h" // for IOFactory +#include // for string namespace Ioss { class PropertyManager; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.C b/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.C index de26537a6f..7da7e82bd1 100644 --- a/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.C @@ -4,7 +4,7 @@ // // See packages/seacas/LICENSE for details -#include +#include "Ioss_CodeTypes.h" #include #include #include @@ -14,13 +14,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "Ioss_ElementTopology.h" +#include "Ioss_FileInfo.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_SerializeIO.h" +#include "Ioss_SubSystem.h" +#include "Ioss_SurfaceSplit.h" +#include "Ioss_Utils.h" namespace { // Internal helper functions int64_t get_id(const Ioss::GroupingEntity *entity, Iovs_exodus::EntityIdSet *idset); diff --git a/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.h b/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.h index 252129c3fa..eee7fa52cc 100644 --- a/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_DatabaseIO.h @@ -10,13 +10,13 @@ #include "iovs_export.h" -#include -#include -#include -#include -#include -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" +#include "Ioss_DatabaseIO.h" +#include "Ioss_EntityType.h" +#include "Ioss_Field.h" +#include "Ioss_Map.h" +#include "Ioss_Utils.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_IOFactory.h b/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_IOFactory.h index 0ca48d7bb6..28a5d01441 100644 --- a/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/visualization/exodus/Iovs_exodus_IOFactory.h @@ -9,11 +9,11 @@ #include "iovs_export.h" +#include "Ioss_CodeTypes.h" +#include "Ioss_DBUsage.h" // for DatabaseUsage #include "Ioss_DatabaseIO.h" // for DatabaseIO -#include -#include // for DatabaseUsage -#include // for IOFactory -#include // for string +#include "Ioss_IOFactory.h" // for IOFactory +#include // for string namespace Ioss { class PropertyManager; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystLogging.C b/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystLogging.C index 121715f079..7de0584b13 100644 --- a/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystLogging.C +++ b/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystLogging.C @@ -1,4 +1,4 @@ -#include +#include "Ioss_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystLogging.h b/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystLogging.h index 66c31f14ca..9d6485e626 100644 --- a/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystLogging.h +++ b/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystLogging.h @@ -9,8 +9,8 @@ #include "iovs_export.h" -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_PropertyManager.h" #include #include diff --git a/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_Utils.C b/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_Utils.C index f82200592f..f4f533a5b4 100644 --- a/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_Utils.C +++ b/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_Utils.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "Ioss_CodeTypes.h" +#include "Ioss_Utils.h" #include #include #include @@ -417,7 +417,7 @@ namespace Iovs { #if defined(__IOSS_WINDOWS__) char *cbuf = _fullpath(nullptr, sierraInsDir.c_str(), _MAX_PATH); #else - char *cbuf = realpath(sierraInsDir.c_str(), nullptr); + char *cbuf = realpath(sierraInsDir.c_str(), nullptr); #endif std::string sierraInsPath = cbuf; free(cbuf); diff --git a/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_Utils.h b/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_Utils.h index e82ecfce46..064749dfa9 100644 --- a/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_Utils.h +++ b/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_Utils.h @@ -10,9 +10,9 @@ #include "iovs_export.h" #include "CatalystManagerBase.h" -#include -#include -#include +#include "Ioss_DBUsage.h" +#include "Ioss_ParallelUtils.h" +#include "Ioss_PropertyManager.h" #include namespace Iovs { @@ -48,10 +48,10 @@ namespace Iovs { std::unique_ptr createCatalystCGNSMesh(const DatabaseInfo &dbinfo, const Ioss::PropertyManager &props); - std::string getDatabaseOutputFilePath(const std::string & databaseFilename, + std::string getDatabaseOutputFilePath(const std::string &databaseFilename, const Ioss::PropertyManager &properties); - void reportCatalystErrorMessages(const std::vector & error_codes, + void reportCatalystErrorMessages(const std::vector &error_codes, const std::vector &error_messages, int myRank); void writeToCatalystLogFile(const DatabaseInfo &dbinfo, const Ioss::PropertyManager &props); @@ -61,13 +61,13 @@ namespace Iovs { private: Utils(); ~Utils(); - Utils(const Utils &) = delete; + Utils(const Utils &) = delete; Utils &operator=(const Utils &) = delete; CatalystManagerBase *catalystManager = nullptr; CatalystManagerBase *createCatalystManagerInstance(); - void checkCatalystInterfaceAndPluginVersions(); + void checkCatalystInterfaceAndPluginVersions(); void initMeshFromIOSSProps(CatalystManagerBase::CatalystMeshInit &cmInit, const DatabaseInfo &dbinfo, const Ioss::PropertyManager &props); diff --git a/packages/seacas/scripts/exodus3.in.py b/packages/seacas/scripts/exodus3.in.py index 542121007e..bd43153f82 100644 --- a/packages/seacas/scripts/exodus3.in.py +++ b/packages/seacas/scripts/exodus3.in.py @@ -687,7 +687,11 @@ def __init__(self, file, mode=None, array_type='ctype', title=None, # the import only occurs if the user specifies a numpy array type. # This way, platforms without numpy installed can still import the # exodus.py module and just use ctype arrays.) - import numpy as np + try: + import numpy as np + except ModuleNotFoundError as err: + # Error handling + print(err) self.np = np self.use_numpy = True # Warnings module is needed to suppress the invalid warning when From 199ffaae5a9079144cd52dbd49728e6d1c5bceca Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 20 Nov 2023 14:53:00 -0700 Subject: [PATCH 075/110] IOSS: round two -- non Ioss_ --- .../seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h | 2 +- packages/seacas/libraries/ioss/src/main/cgns_decomp.C | 2 +- packages/seacas/libraries/ioss/src/main/cth_pressure_map.C | 2 +- packages/seacas/libraries/ioss/src/main/io_info.h | 2 +- packages/seacas/libraries/ioss/src/main/io_modify.C | 2 +- packages/seacas/libraries/ioss/src/main/io_shell.C | 2 +- packages/seacas/libraries/ioss/src/main/io_shell_ts.C | 2 +- packages/seacas/libraries/ioss/src/main/shell_to_hex.C | 2 +- packages/seacas/libraries/ioss/src/main/sphgen.C | 2 +- packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C | 2 +- .../ioss/src/unit_tests/UnitTestElementBlockBatchRead.C | 2 +- .../ioss/src/unit_tests/UnitTestIotmTextMeshFixture.h | 2 +- .../seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C | 2 +- .../seacas/libraries/ioss/src/utest/Utst_blob_write_read.C | 2 +- packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h index a4bf800350..2d8817b21e 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h @@ -6,12 +6,12 @@ #pragma once +#include "Iohb_Layout.h" #include "Ioss_CodeTypes.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" #include "Ioss_IOFactory.h" #include "Ioss_State.h" -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C index f4f1fd9b59..8358e8057c 100644 --- a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C +++ b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C @@ -7,6 +7,7 @@ // Make asserts active even in non-debug build #undef NDEBUG +#include "Ionit_Initializer.h" #include "Ioss_DatabaseIO.h" #include "Ioss_GetLongOpt.h" #include "Ioss_IOFactory.h" @@ -15,7 +16,6 @@ #include "Ioss_SmartAssert.h" #include "Ioss_Utils.h" #include "Ioss_ZoneConnectivity.h" -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C b/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C index a6182f5db0..7163be2760 100644 --- a/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C +++ b/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details +#include "Ionit_Initializer.h" #include "Ioss_Utils.h" -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/io_info.h b/packages/seacas/libraries/ioss/src/main/io_info.h index 20e3a2ae13..fc03093ae2 100644 --- a/packages/seacas/libraries/ioss/src/main/io_info.h +++ b/packages/seacas/libraries/ioss/src/main/io_info.h @@ -7,10 +7,10 @@ */ #pragma once +#include "Ionit_Initializer.h" #include "Ioss_CodeTypes.h" #include "Ioss_SurfaceSplit.h" #include "Ioss_Utils.h" -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/io_modify.C b/packages/seacas/libraries/ioss/src/main/io_modify.C index 177b789122..d37f3a9a87 100644 --- a/packages/seacas/libraries/ioss/src/main/io_modify.C +++ b/packages/seacas/libraries/ioss/src/main/io_modify.C @@ -4,6 +4,7 @@ // // See packages/seacas/LICENSE for details +#include "Ionit_Initializer.h" #include "Ioss_Assembly.h" #include "Ioss_Blob.h" #include "Ioss_DBUsage.h" @@ -23,7 +24,6 @@ #include "Ioss_SideSet.h" #include "Ioss_StructuredBlock.h" #include "Ioss_Utils.h" -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/io_shell.C b/packages/seacas/libraries/ioss/src/main/io_shell.C index 688411e2ec..31f30104ac 100644 --- a/packages/seacas/libraries/ioss/src/main/io_shell.C +++ b/packages/seacas/libraries/ioss/src/main/io_shell.C @@ -4,6 +4,7 @@ // // See packages/seacas/LICENSE for details +#include "Ionit_Initializer.h" #include "Ioss_Compare.h" #include "Ioss_CopyDatabase.h" #include "Ioss_FileInfo.h" @@ -14,7 +15,6 @@ #include "Ioss_SerializeIO.h" #include "Ioss_SurfaceSplit.h" #include "Ioss_Utils.h" -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/io_shell_ts.C b/packages/seacas/libraries/ioss/src/main/io_shell_ts.C index 7fb060f321..6aac2e94d4 100644 --- a/packages/seacas/libraries/ioss/src/main/io_shell_ts.C +++ b/packages/seacas/libraries/ioss/src/main/io_shell_ts.C @@ -4,6 +4,7 @@ // // See packages/seacas/LICENSE for details +#include "Ionit_Initializer.h" #include "Ioss_CodeTypes.h" #include "Ioss_DataPool.h" #include "Ioss_FileInfo.h" @@ -16,7 +17,6 @@ #include "Ioss_SurfaceSplit.h" #include "Ioss_Transform.h" #include "Ioss_Utils.h" -#include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/shell_to_hex.C b/packages/seacas/libraries/ioss/src/main/shell_to_hex.C index 6619f65127..c98cf1499d 100644 --- a/packages/seacas/libraries/ioss/src/main/shell_to_hex.C +++ b/packages/seacas/libraries/ioss/src/main/shell_to_hex.C @@ -4,9 +4,9 @@ // // See packages/seacas/LICENSE for details +#include "Ionit_Initializer.h" #include "Ioss_Hex8.h" #include "Ioss_Wedge6.h" -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/sphgen.C b/packages/seacas/libraries/ioss/src/main/sphgen.C index fc7393e7b5..67249e26ba 100644 --- a/packages/seacas/libraries/ioss/src/main/sphgen.C +++ b/packages/seacas/libraries/ioss/src/main/sphgen.C @@ -4,9 +4,9 @@ // // See packages/seacas/LICENSE for details +#include "Ionit_Initializer.h" #include "Ioss_Hex8.h" #include "Ioss_Utils.h" -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C b/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C index 69d0815fd7..17b123f4be 100644 --- a/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C +++ b/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C @@ -4,12 +4,12 @@ // // See packages/seacas/LICENSE for details +#include "Ionit_Initializer.h" #include "Ioss_CodeTypes.h" #include "Ioss_FileInfo.h" #include "Ioss_Hex8.h" #include "Ioss_ParallelUtils.h" #include "Ioss_Utils.h" -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/unit_tests/UnitTestElementBlockBatchRead.C b/packages/seacas/libraries/ioss/src/unit_tests/UnitTestElementBlockBatchRead.C index d559bfef76..cb90ab20fa 100644 --- a/packages/seacas/libraries/ioss/src/unit_tests/UnitTestElementBlockBatchRead.C +++ b/packages/seacas/libraries/ioss/src/unit_tests/UnitTestElementBlockBatchRead.C @@ -20,13 +20,13 @@ #include // for unlink +#include "Ionit_Initializer.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" // for DatabaseIO #include "Ioss_Field.h" // for Field, etc #include "Ioss_IOFactory.h" #include "Ioss_ParallelUtils.h" #include "Ioss_Property.h" -#include #include "Ioss_ElementBlock.h" #include "Ioss_NodeBlock.h" diff --git a/packages/seacas/libraries/ioss/src/unit_tests/UnitTestIotmTextMeshFixture.h b/packages/seacas/libraries/ioss/src/unit_tests/UnitTestIotmTextMeshFixture.h index f7bb0a0a96..371ae32dff 100644 --- a/packages/seacas/libraries/ioss/src/unit_tests/UnitTestIotmTextMeshFixture.h +++ b/packages/seacas/libraries/ioss/src/unit_tests/UnitTestIotmTextMeshFixture.h @@ -8,6 +8,7 @@ #include "Ioss_CodeTypes.h" +#include "Ionit_Initializer.h" #include "Ioss_Assembly.h" #include "Ioss_CommSet.h" #include "Ioss_DBUsage.h" @@ -27,7 +28,6 @@ #include "Ioss_SideBlock.h" #include "Ioss_SideSet.h" #include "Ioss_StandardElementTypes.h" -#include #include #ifdef SEACAS_HAVE_MPI diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C b/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C index 0183781822..946ce89fa9 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C @@ -7,6 +7,7 @@ #define DOCTEST_CONFIG_IMPLEMENT #define DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS +#include "Ionit_Initializer.h" #include "Ioss_DBUsage.h" #include "Ioss_ElementBlock.h" #include "Ioss_ElementTopology.h" @@ -18,7 +19,6 @@ #include "Ioss_Shell4.h" #include "Ioss_SideBlock.h" #include "Ioss_SideSet.h" -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C b/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C index bb3527ccad..bcf4ac5fa3 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C @@ -4,6 +4,7 @@ // // See packages/seacas/LICENSE for details +#include "Ionit_Initializer.h" #include "Ioss_Blob.h" #include "Ioss_DatabaseIO.h" #include "Ioss_IOFactory.h" @@ -11,7 +12,6 @@ #include "Ioss_Region.h" #include "Ioss_Sort.h" #include "Ioss_Utils.h" -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C b/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C index b7de61dacb..54e0b726f3 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C @@ -1,7 +1,7 @@ #define DOCTEST_CONFIG_IMPLEMENT #define DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS -#include +#include "Ionit_Initializer.h" #include #include #include @@ -9,7 +9,6 @@ #include #include -#include "Ioss_ScopeGuard.h" #include "Ioss_CodeTypes.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" @@ -19,6 +18,7 @@ #include "Ioss_Property.h" #include "Ioss_PropertyManager.h" #include "Ioss_Region.h" +#include "Ioss_ScopeGuard.h" #include "Ioss_State.h" namespace { From 0f4142e2c0483421c9b11919658705f0dd5a4c88 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 20 Nov 2023 16:12:58 -0700 Subject: [PATCH 076/110] IOSS: Replace bracket with quotes ioss includes in subdirectories --- .../ioss/src/adios/Ioad_DatabaseIO.C | 2 +- .../libraries/ioss/src/adios/Ioad_IOFactory.C | 4 +-- .../ioss/src/adios/Ioad_Initializer.C | 4 +-- .../ioss/src/cgns/Iocgns_DatabaseIO.C | 6 ++--- .../ioss/src/cgns/Iocgns_DatabaseIO.h | 2 +- .../ioss/src/cgns/Iocgns_DecompositionData.C | 6 ++--- .../ioss/src/cgns/Iocgns_DecompositionData.h | 2 +- .../ioss/src/cgns/Iocgns_IOFactory.C | 8 +++--- .../ioss/src/cgns/Iocgns_Initializer.C | 4 +-- .../ioss/src/cgns/Iocgns_ParallelDatabaseIO.C | 6 ++--- .../ioss/src/cgns/Iocgns_ParallelDatabaseIO.h | 4 +-- .../ioss/src/cgns/Iocgns_StructuredZoneData.C | 2 +- .../libraries/ioss/src/cgns/Iocgns_Utils.C | 6 ++--- .../libraries/ioss/src/cgns/Iocgns_Utils.h | 2 +- .../ioss/src/exodus/Ioex_BaseDatabaseIO.C | 4 +-- .../ioss/src/exodus/Ioex_DatabaseIO.C | 6 ++--- .../ioss/src/exodus/Ioex_DatabaseIO.h | 2 +- .../ioss/src/exodus/Ioex_DecompositionData.C | 4 +-- .../ioss/src/exodus/Ioex_IOFactory.C | 6 ++--- .../ioss/src/exodus/Ioex_Internals.C | 4 +-- .../ioss/src/exodus/Ioex_ParallelDatabaseIO.C | 8 +++--- .../ioss/src/exodus/Ioex_ParallelDatabaseIO.h | 2 +- .../ioss/src/exodus/Ioex_SuperElement.C | 2 +- .../libraries/ioss/src/exodus/Ioex_Utils.C | 2 +- .../ioss/src/exonull/Ioexnl_BaseDatabaseIO.C | 2 +- .../ioss/src/exonull/Ioexnl_DatabaseIO.C | 6 ++--- .../ioss/src/exonull/Ioexnl_DatabaseIO.h | 2 +- .../src/exonull/Ioexnl_DecompositionData.C | 4 +-- .../ioss/src/exonull/Ioexnl_IOFactory.C | 6 ++--- .../ioss/src/exonull/Ioexnl_Internals.C | 4 +-- .../src/exonull/Ioexnl_ParallelDatabaseIO.C | 8 +++--- .../src/exonull/Ioexnl_ParallelDatabaseIO.h | 2 +- .../ioss/src/exonull/Ioexnl_SuperElement.C | 2 +- .../libraries/ioss/src/exonull/Ioexnl_Utils.C | 2 +- .../ioss/src/gen_struc/Iogs_DatabaseIO.C | 8 +++--- .../ioss/src/gen_struc/Iogs_GeneratedMesh.C | 2 +- .../ioss/src/generated/Iogn_DashSurfaceMesh.C | 2 +- .../ioss/src/generated/Iogn_DashSurfaceMesh.h | 2 +- .../ioss/src/generated/Iogn_DatabaseIO.C | 10 +++---- .../ioss/src/generated/Iogn_GeneratedMesh.C | 2 +- .../ioss/src/heartbeat/Iohb_DatabaseIO.C | 4 +-- .../ioss/src/heartbeat/Iohb_Layout.C | 2 +- .../ioss/src/init/Ionit_Initializer.C | 26 +++++++++---------- .../libraries/ioss/src/main/cgns_decomp.C | 4 +-- .../libraries/ioss/src/main/io_modify.C | 6 ++--- .../libraries/ioss/src/main/io_shell_ts.C | 2 +- .../ioss/src/main/struc_to_unstruc.C | 2 +- .../ioss/src/null/Ionull_DatabaseIO.C | 2 +- .../ioss/src/null/Ionull_IOFactory.C | 4 +-- .../ioss/src/pamgen/Iopg_DatabaseIO.C | 2 +- .../ioss/src/transform/Iotr_Factory.C | 2 +- .../ioss/src/transform/Iotr_Initializer.C | 16 ++++++------ .../ioss/src/transform/Iotr_MinMax.C | 6 ++--- .../ioss/src/transform/Iotr_MinMax.h | 2 +- .../ioss/src/transform/Iotr_Offset.C | 2 +- .../ioss/src/transform/Iotr_Offset.h | 2 +- .../ioss/src/transform/Iotr_Offset3D.C | 2 +- .../ioss/src/transform/Iotr_Offset3D.h | 2 +- .../libraries/ioss/src/transform/Iotr_Scale.C | 2 +- .../libraries/ioss/src/transform/Iotr_Scale.h | 2 +- .../ioss/src/transform/Iotr_Scale3D.C | 2 +- .../ioss/src/transform/Iotr_Scale3D.h | 2 +- .../ioss/src/transform/Iotr_Tensor.C | 2 +- .../ioss/src/transform/Iotr_Tensor.h | 2 +- .../ioss/src/transform/Iotr_VectorMagnitude.C | 2 +- .../ioss/src/transform/Iotr_VectorMagnitude.h | 2 +- .../seacas/libraries/ioss/src/utest/Ut_ioad.C | 2 +- .../ioss/src/utest/Utst_IofxDatabaseIO.C | 2 +- .../ioss/src/utest/Utst_structured_decomp.C | 4 +-- .../ioss/src/utest/Utst_structured_decomp.h | 2 +- .../ioss/src/utest/Utst_superelement.C | 2 +- 71 files changed, 139 insertions(+), 139 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C b/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C index 26a9248e5d..13894625ba 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C @@ -35,7 +35,7 @@ #include -#include +#include "adios/Ioad_DatabaseIO.h" namespace Ioss { class PropertyManager; diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.C b/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.C index 651457cc23..328f47919a 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.C @@ -6,8 +6,8 @@ #include "Ioss_DBUsage.h" // for DatabaseUsage #include "Ioss_IOFactory.h" // for IOFactory -#include // for DatabaseIO -#include +#include "adios/Ioad_DatabaseIO.h" // for DatabaseIO +#include "adios/Ioad_IOFactory.h" #include // for nullptr #include // for string diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_Initializer.C b/packages/seacas/libraries/ioss/src/adios/Ioad_Initializer.C index 588d401522..f1644f93e9 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_Initializer.C +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_Initializer.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "adios/Ioad_IOFactory.h" +#include "adios/Ioad_Initializer.h" namespace Ioad { int Initializer::useCount = 0; diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C index 7f93cc1ea2..3ec50f94e3 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C @@ -12,10 +12,10 @@ #include "Ioss_CodeTypes.h" #include "Ioss_Utils.h" +#include "cgns/Iocgns_DatabaseIO.h" +#include "cgns/Iocgns_Utils.h" #include #include -#include -#include #include #include #include @@ -31,7 +31,7 @@ #include #endif -#include +#include "cgns/Iocgns_Defines.h" #if !defined(CGNSLIB_H) #error "Could not include cgnslib.h" diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h index cfec2ef521..98e19d9577 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h @@ -13,7 +13,7 @@ #include "Ioss_IOFactory.h" // for IOFactory #include "Ioss_Map.h" // for Map #include "Ioss_State.h" // for State -#include +#include "cgns/Iocgns_Defines.h" #include #include #include // for size_t diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.C index e4dc6088d6..ef5ac7748a 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.C @@ -6,7 +6,7 @@ #include #if CG_BUILD_PARALLEL -#include +#include "cgns/Iocgns_Defines.h" #include "Ioss_CodeTypes.h" #include "Ioss_ParallelUtils.h" @@ -14,8 +14,8 @@ #include "Ioss_Sort.h" #include "Ioss_StructuredBlock.h" #include "Ioss_Utils.h" -#include -#include +#include "cgns/Iocgns_DecompositionData.h" +#include "cgns/Iocgns_Utils.h" #include #include #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.h index 77b9c17b0d..39415afaa5 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.h @@ -34,7 +34,7 @@ #include "Ioss_MeshType.h" #include "Ioss_PropertyManager.h" #include "Ioss_StructuredBlock.h" -#include +#include "cgns/Iocgns_StructuredZoneData.h" #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.C index 3e8e3b2fe7..26c87a87ff 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.C @@ -4,9 +4,9 @@ // // See packages/seacas/LICENSE for details -#include // for DatabaseIO -- serial -#include -#include +#include "cgns/Iocgns_DatabaseIO.h" // for DatabaseIO -- serial +#include "cgns/Iocgns_IOFactory.h" +#include "cgns/Iocgns_Utils.h" #include #include // for string @@ -14,7 +14,7 @@ #include "Ioss_DBUsage.h" // for DatabaseUsage #include "Ioss_IOFactory.h" // for IOFactory #if CG_BUILD_PARALLEL -#include // for DatabaseIO -- parallel +#include "cgns/Iocgns_ParallelDatabaseIO.h" // for DatabaseIO -- parallel #endif namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Initializer.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Initializer.C index 564adea0fe..57481abe15 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Initializer.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Initializer.C @@ -3,8 +3,8 @@ // NTESS, the U.S. Government retains certain rights in this software. // // See packages/seacas/LICENSE for details -#include -#include +#include "cgns/Iocgns_IOFactory.h" +#include "cgns/Iocgns_Initializer.h" namespace Iocgns { diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C index 2976fb374a..868787cd86 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C @@ -11,14 +11,14 @@ #include #if CG_BUILD_PARALLEL -#include +#include "cgns/Iocgns_Defines.h" #include "Ioss_CodeTypes.h" #include "Ioss_Sort.h" #include "Ioss_Utils.h" +#include "cgns/Iocgns_ParallelDatabaseIO.h" +#include "cgns/Iocgns_Utils.h" #include -#include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h index 367eae1198..24ae08f57f 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h @@ -24,8 +24,8 @@ #include #include // for string -#include -#include +#include "cgns/Iocgns_DecompositionData.h" +#include "cgns/Iocgns_Defines.h" #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C index 23103d2e1c..98def353b2 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C @@ -6,8 +6,8 @@ #include "Ioss_CodeTypes.h" #include "Ioss_SmartAssert.h" +#include "cgns/Iocgns_StructuredZoneData.h" #include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C index ca3826d4a3..8c1a30ccf8 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C @@ -42,8 +42,8 @@ #if !defined __NVCC__ #include #endif -#include -#include +#include "cgns/Iocgns_StructuredZoneData.h" +#include "cgns/Iocgns_Utils.h" #include #include #include @@ -79,7 +79,7 @@ #include #endif -#include +#include "cgns/Iocgns_Defines.h" #define CGERR(funcall) \ do { \ diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h index 484aeab658..d0e9d131b4 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h @@ -15,8 +15,8 @@ #include "Ioss_SideSet.h" #include "Ioss_StructuredBlock.h" #include "Ioss_Utils.h" +#include "cgns/Iocgns_Defines.h" #include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C index e3731aa94d..39282787e7 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C @@ -10,13 +10,13 @@ #include "Ioss_ParallelUtils.h" #include "Ioss_SerializeIO.h" #include "Ioss_Utils.h" +#include "exodus/Ioex_BaseDatabaseIO.h" +#include "exodus/Ioex_Internals.h" #include #include #include #include #include -#include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C index 5086242b11..ffa2558ba5 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C @@ -11,14 +11,14 @@ #include "Ioss_SmartAssert.h" #include "Ioss_SurfaceSplit.h" #include "Ioss_Utils.h" +#include "exodus/Ioex_DatabaseIO.h" +#include "exodus/Ioex_Internals.h" +#include "exodus/Ioex_Utils.h" #include #include #include #include #include -#include -#include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h index 0fa38abbf7..558b020a62 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h @@ -11,10 +11,10 @@ #include "Ioss_Field.h" #include "Ioss_Map.h" #include "Ioss_Utils.h" +#include "exodus/Ioex_BaseDatabaseIO.h" #include #include #include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C index 2c759b4dd5..c821fbfe7f 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C @@ -5,7 +5,7 @@ // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" -#include +#include "exodus/Ioex_DecompositionData.h" #if defined PARALLEL_AWARE_EXODUS #include "Ioss_ElementTopology.h" // for ElementTopology #include "Ioss_Field.h" // for Field, etc @@ -14,7 +14,7 @@ #include "Ioss_SmartAssert.h" #include "Ioss_Sort.h" #include "Ioss_Utils.h" -#include +#include "exodus/Ioex_Utils.h" #include // for lower_bound, copy, etc #include // for assert diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.C index c8a70c026b..4fd5aee3f5 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.C @@ -4,11 +4,11 @@ // // See packages/seacas/LICENSE for details -#include // for Ioex DatabaseIO -#include // for Ioex IOFactory +#include "exodus/Ioex_DatabaseIO.h" // for Ioex DatabaseIO +#include "exodus/Ioex_IOFactory.h" // for Ioex IOFactory #if defined(PARALLEL_AWARE_EXODUS) // Defined in exodusII.h -#include // for Ioex ParallelDatabaseIO +#include "exodus/Ioex_ParallelDatabaseIO.h" // for Ioex ParallelDatabaseIO #endif #include #include diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C index 01450270f3..21c580cd06 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for Internals, ElemBlock, etc -#include +#include "exodus/Ioex_Internals.h" // for Internals, ElemBlock, etc +#include "exodus/Ioex_Utils.h" #include #include "Ioss_ElementTopology.h" diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C index 3340ef8d18..0c30fc68ca 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C @@ -12,7 +12,7 @@ // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" -#include +#include "exodus/Ioex_ParallelDatabaseIO.h" #if defined PARALLEL_AWARE_EXODUS #include #include @@ -37,9 +37,9 @@ #include #include -#include -#include -#include +#include "exodus/Ioex_DecompositionData.h" +#include "exodus/Ioex_Internals.h" +#include "exodus/Ioex_Utils.h" #include #include "Ioss_Assembly.h" diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h index c225a4e4e5..d039fefd3f 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h @@ -15,7 +15,7 @@ #include "Ioss_DBUsage.h" // for DatabaseUsage #include "Ioss_Map.h" // for Map #include "Ioss_State.h" // for State -#include // for DatabaseIO +#include "exodus/Ioex_BaseDatabaseIO.h" // for DatabaseIO #include // for less #include // for map, map<>::value_compare #include diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C index 961a431b39..15d71c99e7 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C @@ -10,9 +10,9 @@ #include "Ioss_Property.h" #include "Ioss_PropertyManager.h" #include "Ioss_Utils.h" +#include "exodus/Ioex_SuperElement.h" // for SuperElement #include #include -#include // for SuperElement #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C index 084d79a8ff..3caf47df5b 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C @@ -9,8 +9,8 @@ #include "Ioss_SmartAssert.h" #include "Ioss_Utils.h" #include "Ioss_VariableType.h" +#include "exodus/Ioex_Utils.h" #include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C index 945edd0b2a..24f226535a 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_BaseDatabaseIO.C @@ -8,10 +8,10 @@ #include "Ioss_IOFactory.h" #include "Ioss_ParallelUtils.h" #include "Ioss_Utils.h" +#include "exonull/Ioexnl_BaseDatabaseIO.h" #include #include #include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C index 29753a8570..cf829f6baa 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C @@ -8,13 +8,13 @@ #include "Ioss_ParallelUtils.h" #include "Ioss_SmartAssert.h" #include "Ioss_Utils.h" +#include "exonull/Ioexnl_DatabaseIO.h" +#include "exonull/Ioexnl_Internals.h" +#include "exonull/Ioexnl_Utils.h" #include #include #include #include -#include -#include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h index 83f6e969fd..9f5542a674 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.h @@ -11,11 +11,11 @@ #include "Ioss_Field.h" #include "Ioss_Map.h" #include "Ioss_Utils.h" +#include "exonull/Ioexnl_BaseDatabaseIO.h" #include #include #include #include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.C index edb06d2456..e1d58bebfc 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DecompositionData.C @@ -5,7 +5,7 @@ // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" -#include +#include "exonull/Ioexnl_DecompositionData.h" #if defined PARALLEL_AWARE_EXODUS #include "Ioss_ElementTopology.h" // for ElementTopology #include "Ioss_Field.h" // for Field, etc @@ -14,7 +14,7 @@ #include "Ioss_SmartAssert.h" #include "Ioss_Sort.h" #include "Ioss_Utils.h" -#include +#include "exonull/Ioexnl_Utils.h" #include // for lower_bound, copy, etc #include // for assert diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.C index e9d8e795fa..6c6f3faa40 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_IOFactory.C @@ -4,11 +4,11 @@ // // See packages/seacas/LICENSE for details -#include // for Ioexnl DatabaseIO -#include // for Ioexnl IOFactory +#include "exonull/Ioexnl_DatabaseIO.h" // for Ioexnl DatabaseIO +#include "exonull/Ioexnl_IOFactory.h" // for Ioexnl IOFactory #if defined(PARALLEL_AWARE_EXODUS) // Defined in exodusII.h -#include // for Ioexnl ParallelDatabaseIO +#include "exonull/Ioexnl_ParallelDatabaseIO.h" // for Ioexnl ParallelDatabaseIO #endif #include // for string diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.C index 4741a99882..be3150443f 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Internals.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include // for Internals, ElemBlock, etc -#include +#include "exonull/Ioexnl_Internals.h" // for Internals, ElemBlock, etc +#include "exonull/Ioexnl_Utils.h" extern "C" { } diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.C index 4a604e55f0..b22316ce3b 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.C @@ -12,7 +12,7 @@ // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" -#include +#include "exonull/Ioexnl_ParallelDatabaseIO.h" #if defined PARALLEL_AWARE_EXODUS #include #include @@ -37,10 +37,10 @@ #include #include +#include "exonull/Ioexnl_DecompositionData.h" +#include "exonull/Ioexnl_Internals.h" +#include "exonull/Ioexnl_Utils.h" #include -#include -#include -#include #include "Ioss_Assembly.h" #include "Ioss_Blob.h" diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h index 65efbfd12b..7bd9106329 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.h @@ -15,7 +15,7 @@ #include "Ioss_DBUsage.h" // for DatabaseUsage #include "Ioss_Map.h" // for Map #include "Ioss_State.h" // for State -#include // for DatabaseIO +#include "exonull/Ioexnl_BaseDatabaseIO.h" // for DatabaseIO #include // for less #include // for map, map<>::value_compare #include diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.C index b99275b16c..06dd09104c 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_SuperElement.C @@ -10,9 +10,9 @@ #include "Ioss_Property.h" #include "Ioss_PropertyManager.h" #include "Ioss_Utils.h" +#include "exonull/Ioexnl_SuperElement.h" // for SuperElement #include #include -#include // for SuperElement #include #include #include diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.C index 004be38d50..694c53f6cc 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_Utils.C @@ -9,10 +9,10 @@ #include "Ioss_SmartAssert.h" #include "Ioss_Utils.h" #include "Ioss_VariableType.h" +#include "exonull/Ioexnl_Utils.h" #include #include #include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C index 4a2749890f..3d1b83f842 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C @@ -7,10 +7,10 @@ #include "Ioss_CodeTypes.h" // for Int64Vector, IntVector #include "Ioss_SideBlock.h" // for SideBlock #include "Ioss_Utils.h" // for Utils, IOSS_ERROR -#include // for assert -#include // for sqrt -#include -#include // for GeneratedMesh +#include "gen_struc/Iogs_DatabaseIO.h" +#include "gen_struc/Iogs_GeneratedMesh.h" // for GeneratedMesh +#include // for assert +#include // for sqrt #include // for ostringstream, operator<<, etc #include #include // for string, operator==, etc diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C index b982f77d63..00d93b2882 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C @@ -7,12 +7,12 @@ #include "Ioss_EntityType.h" // for EntityType, etc #include "Ioss_Hex8.h" #include "Ioss_Utils.h" +#include "gen_struc/Iogs_GeneratedMesh.h" #include // for assert #include // for atan2, cos, sin #include #include #include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.C b/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.C index 6d157e65a3..953ffaa7d1 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.C +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.C @@ -4,7 +4,7 @@ // // See packages/seacas/LICENSE for details -#include +#include "generated/Iogn_DashSurfaceMesh.h" #include // for vector #include "Ioss_CodeTypes.h" diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h b/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h index c5eec5ecdd..d95cc296b8 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h @@ -9,10 +9,10 @@ #include "Ioss_Beam2.h" #include "Ioss_Hex8.h" #include "Ioss_Shell4.h" +#include "generated/Iogn_GeneratedMesh.h" // for GeneratedMesh #include // for size_t #include // for int64_t #include // for exception -#include // for GeneratedMesh #include // for string #include // for pair #include // for vector diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C index a1ec1fe930..438e0b0ae9 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C @@ -7,13 +7,13 @@ #include "Ioss_CodeTypes.h" // for Int64Vector, IntVector #include "Ioss_SideBlock.h" // for SideBlock #include "Ioss_Utils.h" // for Utils, IOSS_ERROR -#include // for assert -#include // for sqrt +#include "generated/Iogn_DatabaseIO.h" +#include "generated/Iogn_GeneratedMesh.h" // for GeneratedMesh +#include // for assert +#include // for sqrt #include #include -#include -#include // for GeneratedMesh -#include // for ostringstream +#include // for ostringstream #include #include // for string, operator==, etc diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C index 2adffc9910..03bce1bbb8 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C @@ -10,11 +10,11 @@ #include "Ioss_Tet4.h" #include "Ioss_TriShell3.h" #include "Ioss_Utils.h" +#include "generated/Iogn_GeneratedMesh.h" #include // for assert #include // for atan2, cos, sin #include #include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C index 57f6ce43e8..04762ad752 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C @@ -5,13 +5,13 @@ // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" +#include "heartbeat/Iohb_DatabaseIO.h" +#include "heartbeat/Iohb_Layout.h" #include #include #include #include #include -#include -#include #include #include diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.C b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.C index 27db8d2ae8..f37da24977 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.C +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.C @@ -4,7 +4,7 @@ // // See packages/seacas/LICENSE for details -#include +#include "heartbeat/Iohb_Layout.h" #include namespace Iohb { diff --git a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C index eef3a775cd..87a4d83850 100644 --- a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C +++ b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C @@ -9,17 +9,17 @@ #include "Ioss_CodeTypes.h" #if defined(SEACAS_HAVE_EXODUS) -#include -#include +#include "exodus/Ioex_IOFactory.h" +#include "exonull/Ioexnl_IOFactory.h" #endif -#include -#include -#include -#include +#include "gen_struc/Iogs_DatabaseIO.h" +#include "generated/Iogn_DatabaseIO.h" +#include "heartbeat/Iohb_DatabaseIO.h" +#include "text_mesh/Iotm_DatabaseIO.h" #ifdef HAVE_SEACASIOSS_ADIOS2 -#include +#include "adios/Ioad_Initializer.h" #endif #if defined(SEACAS_HAVE_CATALYST2) @@ -27,7 +27,7 @@ #endif #if defined(SEACAS_HAVE_PAMGEN) -#include +#include "pamgen/Iopg_DatabaseIO.h" #endif #if defined(SEACAS_HAVE_FAODEL) @@ -35,15 +35,15 @@ #endif #if defined(SEACAS_HAVE_CGNS) -#include +#include "cgns/Iocgns_IOFactory.h" #endif #include "Ioss_ConcreteVariableType.h" #include "Ioss_Initializer.h" -#include -#include -#include -#include +#include "null/Ionull_IOFactory.h" +#include "transform/Iotr_Initializer.h" +#include "visualization/cgns/Iovs_cgns_IOFactory.h" +#include "visualization/exodus/Iovs_exodus_IOFactory.h" #include "Ioss_IOFactory.h" #include "SEACASIoss_config.h" diff --git a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C index 8358e8057c..d793f3941c 100644 --- a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C +++ b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C @@ -16,9 +16,9 @@ #include "Ioss_SmartAssert.h" #include "Ioss_Utils.h" #include "Ioss_ZoneConnectivity.h" +#include "cgns/Iocgns_StructuredZoneData.h" +#include "cgns/Iocgns_Utils.h" #include -#include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/io_modify.C b/packages/seacas/libraries/ioss/src/main/io_modify.C index d37f3a9a87..8d5ca33302 100644 --- a/packages/seacas/libraries/ioss/src/main/io_modify.C +++ b/packages/seacas/libraries/ioss/src/main/io_modify.C @@ -52,13 +52,13 @@ #include "modify_interface.h" #if defined(SEACAS_HAVE_EXODUS) -#include -#include +#include "exodus/Ioex_Internals.h" +#include "exodus/Ioex_Utils.h" #include #endif #if defined(SEACAS_HAVE_CGNS) -#include +#include "cgns/Iocgns_Utils.h" #endif #if defined(__IOSS_WINDOWS__) diff --git a/packages/seacas/libraries/ioss/src/main/io_shell_ts.C b/packages/seacas/libraries/ioss/src/main/io_shell_ts.C index 6aac2e94d4..42cad47cbc 100644 --- a/packages/seacas/libraries/ioss/src/main/io_shell_ts.C +++ b/packages/seacas/libraries/ioss/src/main/io_shell_ts.C @@ -17,8 +17,8 @@ #include "Ioss_SurfaceSplit.h" #include "Ioss_Transform.h" #include "Ioss_Utils.h" +#include "transform/Iotr_Factory.h" #include -#include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C b/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C index 17b123f4be..9cffb761d3 100644 --- a/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C +++ b/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C @@ -10,8 +10,8 @@ #include "Ioss_Hex8.h" #include "Ioss_ParallelUtils.h" #include "Ioss_Utils.h" +#include "cgns/Iocgns_Utils.h" #include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C b/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C index 51fab47657..30cb05ebc6 100644 --- a/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/null/Ionull_DatabaseIO.C @@ -5,7 +5,7 @@ // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" -#include +#include "null/Ionull_DatabaseIO.h" #include "Ioss_DBUsage.h" #include "Ioss_DatabaseIO.h" diff --git a/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.C b/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.C index cec2f7e34a..74fb95fde9 100644 --- a/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/null/Ionull_IOFactory.C @@ -4,8 +4,8 @@ // // See packages/seacas/LICENSE for details -#include -#include +#include "null/Ionull_DatabaseIO.h" +#include "null/Ionull_IOFactory.h" #include "Ioss_CodeTypes.h" // for Ioss_MPI_Comm #include "Ioss_DBUsage.h" // for DatabaseUsage diff --git a/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C b/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C index 5051296734..b7f13f96cf 100644 --- a/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C @@ -8,7 +8,7 @@ #include #include -#include +#include "pamgen/Iopg_DatabaseIO.h" #include "Ioss_CodeTypes.h" #include "Ioss_SubSystem.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C index 4a1fc8a0ae..9c07d16106 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C @@ -5,10 +5,10 @@ // See packages/seacas/LICENSE for details #include "Ioss_Utils.h" +#include "transform/Iotr_Factory.h" #include #include #include -#include #include "Ioss_CodeTypes.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Initializer.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Initializer.C index 2da968c73e..76160970d5 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Initializer.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Initializer.C @@ -4,14 +4,14 @@ // // See packages/seacas/LICENSE for details -#include -#include -#include -#include -#include -#include -#include -#include +#include "transform/Iotr_Initializer.h" +#include "transform/Iotr_MinMax.h" +#include "transform/Iotr_Offset.h" +#include "transform/Iotr_Offset3D.h" +#include "transform/Iotr_Scale.h" +#include "transform/Iotr_Scale3D.h" +#include "transform/Iotr_Tensor.h" +#include "transform/Iotr_VectorMagnitude.h" namespace Iotr { Initializer::Initializer() diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C index b96006a5e9..69ec7571c9 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C @@ -6,11 +6,11 @@ #include "Ioss_Field.h" // for Field, etc #include "Ioss_VariableType.h" // for VariableType -#include // for fabs -#include // for size_t +#include "transform/Iotr_MinMax.h" +#include // for fabs +#include // for size_t #include #include // for operator==, string -#include #include "Ioss_Transform.h" // for Factory, Transform #include "Iotr_Factory.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h index f9b93d83d1..1f32d021c9 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h @@ -8,9 +8,9 @@ #include "Ioss_Transform.h" // for Transform, Factory #include "Ioss_VariableType.h" // for VariableType +#include "transform/Iotr_Factory.h" #include #include // for string -#include #include "iotr_export.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C index eaf2229145..372aaeec3b 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C @@ -6,9 +6,9 @@ #include "Ioss_Field.h" #include "Ioss_VariableType.h" +#include "transform/Iotr_Offset.h" #include #include -#include #include "Ioss_Transform.h" #include "Iotr_Factory.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h index 13d4ec8f5b..fb664be0a8 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h @@ -7,9 +7,9 @@ #pragma once #include "Ioss_Transform.h" // for Transform, Factory +#include "transform/Iotr_Factory.h" #include #include // for string -#include #include "Ioss_VariableType.h" #include "iotr_export.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C index 65bf6ff58a..9da2906869 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C @@ -6,10 +6,10 @@ #include "Ioss_Field.h" #include "Ioss_VariableType.h" +#include "transform/Iotr_Offset3D.h" #include #include #include -#include #include #include "Ioss_Transform.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h index 4d81a492bf..71c6dc194f 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h @@ -8,9 +8,9 @@ #include "Ioss_Transform.h" // for Transform, Factory #include "Ioss_VariableType.h" // for VariableType +#include "transform/Iotr_Factory.h" #include #include // for string -#include #include // for vector #include "iotr_export.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C index ca68a4657c..c75f151e93 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C @@ -6,9 +6,9 @@ #include "Ioss_Field.h" #include "Ioss_VariableType.h" +#include "transform/Iotr_Scale.h" #include #include -#include #include "Ioss_Transform.h" #include "Iotr_Factory.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h index 56ccbac6cd..9ebd1f08be 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h @@ -8,9 +8,9 @@ #include "Ioss_Transform.h" #include "Ioss_VariableType.h" +#include "transform/Iotr_Factory.h" #include #include -#include #include "iotr_export.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C index 1bfc7c863a..6947013222 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C @@ -6,10 +6,10 @@ #include "Ioss_Field.h" #include "Ioss_VariableType.h" +#include "transform/Iotr_Scale3D.h" #include #include #include -#include #include #include "Ioss_Transform.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h index 95f74f5426..995e2d3d09 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h @@ -8,9 +8,9 @@ #include "Ioss_Transform.h" // for Transform, Factory #include "Ioss_VariableType.h" // for VariableType +#include "transform/Iotr_Factory.h" #include #include -#include #include #include "iotr_export.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C index ca77b82087..4ae2b2a459 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C @@ -6,10 +6,10 @@ #include "Ioss_Field.h" #include "Ioss_VariableType.h" +#include "transform/Iotr_Tensor.h" #include #include #include -#include #include "Ioss_Transform.h" #include "Iotr_Factory.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h index cf9b63d19e..8c15b8f145 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h @@ -8,9 +8,9 @@ #include "Ioss_Transform.h" // for Transform, Factory #include "Ioss_VariableType.h" // for VariableType +#include "transform/Iotr_Factory.h" #include #include // for string -#include #include "iotr_export.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C index e8ca57e75e..2d14c2489f 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C @@ -6,9 +6,9 @@ #include "Ioss_Field.h" #include "Ioss_VariableType.h" +#include "transform/Iotr_VectorMagnitude.h" #include #include -#include #include "Ioss_Transform.h" #include "Iotr_Factory.h" diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h index 674c4a13c5..85642d35f5 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h @@ -8,9 +8,9 @@ #include "Ioss_Transform.h" // for Transform, Factory #include "Ioss_VariableType.h" // for VariableType +#include "transform/Iotr_Factory.h" #include #include // for string -#include #include "iotr_export.h" diff --git a/packages/seacas/libraries/ioss/src/utest/Ut_ioad.C b/packages/seacas/libraries/ioss/src/utest/Ut_ioad.C index 22d4503893..8ea6458dfd 100644 --- a/packages/seacas/libraries/ioss/src/utest/Ut_ioad.C +++ b/packages/seacas/libraries/ioss/src/utest/Ut_ioad.C @@ -26,7 +26,7 @@ #include "Ioss_DatabaseIO.h" // for DatabaseIO #include "Ioss_IOFactory.h" // for IOFactory -#include +#include "init/Ionit_Initializer.h" #include "adios/Ioad_Constants.h" #include "adios/Ioad_Helper.h" diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C b/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C index 946ce89fa9..56873975f0 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C @@ -19,8 +19,8 @@ #include "Ioss_Shell4.h" #include "Ioss_SideBlock.h" #include "Ioss_SideSet.h" +#include "exodus/Ioex_DatabaseIO.h" #include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C index 0b1190b194..27441b17f5 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C @@ -9,9 +9,9 @@ #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS #define DOCTEST_CONFIG_NO_MULTITHREADING #include "Ioss_ZoneConnectivity.h" +#include "cgns/Iocgns_StructuredZoneData.h" +#include "cgns/Iocgns_Utils.h" #include -#include -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.h b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.h index 3163bd01e3..d7abc498e6 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.h +++ b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include "cgns/Iocgns_StructuredZoneData.h" #include void cleanup(std::vector &zones); diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C b/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C index d17bff936b..9f997c7443 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C @@ -14,8 +14,8 @@ #undef NDEBUG #include "Ioss_ConcreteVariableType.h" +#include "exodus/Ioex_SuperElement.h" #include -#include #include #include "Ioss_Field.h" From ab02d93d45e2ed5f74cc76fb759f8745f9bf6749 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 20 Nov 2023 16:16:56 -0700 Subject: [PATCH 077/110] Accidentally included in PR --- packages/seacas/scripts/exodus3.in.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/seacas/scripts/exodus3.in.py b/packages/seacas/scripts/exodus3.in.py index bd43153f82..542121007e 100644 --- a/packages/seacas/scripts/exodus3.in.py +++ b/packages/seacas/scripts/exodus3.in.py @@ -687,11 +687,7 @@ def __init__(self, file, mode=None, array_type='ctype', title=None, # the import only occurs if the user specifies a numpy array type. # This way, platforms without numpy installed can still import the # exodus.py module and just use ctype arrays.) - try: - import numpy as np - except ModuleNotFoundError as err: - # Error handling - print(err) + import numpy as np self.np = np self.use_numpy = True # Warnings module is needed to suppress the invalid warning when From 7a597be255efbb9a42c6cc979c17c5b3c1151140 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 20 Nov 2023 17:48:09 -0700 Subject: [PATCH 078/110] IOSS: A few more include fixes --- packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h | 2 +- .../seacas/libraries/ioss/src/init/Ionit_Initializer.C | 4 ++-- .../catalyst/ioss2catalyst/IossApplication.cxx | 4 ++-- .../ioss/src/visualization/utils/Iovs_CatalystLogging.C | 2 +- .../ioss/src/visualization/utils/Iovs_CatalystVersion.C | 2 +- .../libraries/ioss/src/visualization/utils/Iovs_Utils.C | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h b/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h index 2ec40e4278..55d83606e2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h +++ b/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h @@ -38,7 +38,7 @@ inline std::string IOSS_SYM_TENSOR() { return {"sym_tensor_33"}; } /* #undef SEACAS_HAVE_FAODEL */ #define SEACAS_HAVE_PAMGEN #else -#include +#include "SEACASIoss_config.h" #endif #if defined(IOSS_THREADSAFE) diff --git a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C index 87a4d83850..ff94b46d9b 100644 --- a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C +++ b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C @@ -23,7 +23,7 @@ #endif #if defined(SEACAS_HAVE_CATALYST2) -#include +#include "catalyst/Iocatalyst_Initializer.h" #endif #if defined(SEACAS_HAVE_PAMGEN) @@ -31,7 +31,7 @@ #endif #if defined(SEACAS_HAVE_FAODEL) -#include +#include "faodel/Iofaodel_DatabaseIO.h" #endif #if defined(SEACAS_HAVE_CGNS) diff --git a/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossApplication.cxx b/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossApplication.cxx index e0300887fb..0448044a48 100644 --- a/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossApplication.cxx +++ b/packages/seacas/libraries/ioss/src/visualization/catalyst/ioss2catalyst/IossApplication.cxx @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2022 National Technology & Engineering Solutions +// Copyright(C) 1999-2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -6,6 +6,7 @@ #include "IossApplication.h" #include "CatalystPluginPaths.h" +#include "Ionit_Initializer.h" #include "IossRegionReport.h" #include "Ioss_CopyDatabase.h" #include "Ioss_DatabaseIO.h" @@ -14,7 +15,6 @@ #include "Ioss_MeshCopyOptions.h" #include "Ioss_Region.h" #include "Ioss_Utils.h" -#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystLogging.C b/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystLogging.C index 7de0584b13..82a7045877 100644 --- a/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystLogging.C +++ b/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystLogging.C @@ -1,8 +1,8 @@ #include "Ioss_Utils.h" +#include "visualization/utils/Iovs_CatalystLogging.h" #include #include #include -#include namespace Iovs { diff --git a/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystVersion.C b/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystVersion.C index 081dfad904..fe0195e30f 100644 --- a/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystVersion.C +++ b/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_CatalystVersion.C @@ -1,7 +1,7 @@ +#include "visualization/utils/Iovs_CatalystVersion.h" #include #include #include -#include namespace Iovs { diff --git a/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_Utils.C b/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_Utils.C index f4f533a5b4..2fe06dc797 100644 --- a/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_Utils.C +++ b/packages/seacas/libraries/ioss/src/visualization/utils/Iovs_Utils.C @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2022 National Technology & Engineering Solutions +// Copyright(C) 1999-2023 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -6,13 +6,13 @@ #include "Ioss_CodeTypes.h" #include "Ioss_Utils.h" +#include "visualization/utils/Iovs_CatalystLogging.h" +#include "visualization/utils/Iovs_CatalystVersion.h" +#include "visualization/utils/Iovs_Utils.h" #include #include #include #include -#include -#include -#include #if defined(__IOSS_WINDOWS__) #ifndef NOMINMAX From 541c819e6b22ed30fb8403e6b8ef4b910c63566a Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 27 Nov 2023 14:17:09 -0700 Subject: [PATCH 079/110] IOSS: Fix coverity recommendations --- .../libraries/ioss/src/Ioss_Decomposition.h | 4 +++- .../libraries/ioss/src/Ioss_EntitySet.h | 2 -- .../libraries/ioss/src/Ioss_FaceGenerator.C | 3 +-- packages/seacas/libraries/ioss/src/Ioss_Map.C | 4 +--- .../seacas/libraries/ioss/src/Ioss_Property.C | 3 +-- .../libraries/ioss/src/Ioss_VariableType.C | 24 +++++++++---------- 6 files changed, 18 insertions(+), 22 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h index 1bd6600b67..d1d949235d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h @@ -136,7 +136,9 @@ namespace Ioss { class IOSS_EXPORT ElementBlockBatchOffset { public: - ElementBlockBatchOffset(const std::vector &data) : m_data(data) {} + explicit ElementBlockBatchOffset(const std::vector &data) : m_data(data) + { + } ElementBlockBatchOffset() = delete; ElementBlockBatchOffset(const ElementBlockBatchOffset &) = delete; diff --git a/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h b/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h index 310cb38ee2..77a612306e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h @@ -44,7 +44,5 @@ namespace Ioss { EntitySet(DatabaseIO *io_database, const std::string &my_name, size_t entity_cnt); EntitySet(const EntitySet &) = default; ~EntitySet() override = default; - - void count_attributes() const; }; } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C index f8211e6eb7..466e8d25a3 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C @@ -127,12 +127,11 @@ namespace { // can only be shared with one other processor... // get nodal communication data CommSet... - Ioss::CommSet *css = region.get_commset("commset_node"); - std::vector> proc_entity; { // entity_processor consists of node,proc, node,proc, entries. std::vector entity_processor; + Ioss::CommSet *css = region.get_commset("commset_node"); css->get_field_data("entity_processor_raw", entity_processor); proc_entity.reserve(entity_processor.size() / 2); diff --git a/packages/seacas/libraries/ioss/src/Ioss_Map.C b/packages/seacas/libraries/ioss/src/Ioss_Map.C index 672df41209..0386dd7054 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Map.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Map.C @@ -615,9 +615,7 @@ int64_t Ioss::Map::global_to_local_nl(int64_t global, bool must_exist) const m_reverse.begin(), m_reverse.end(), global, [](const Ioss::IdPair &lhs, int64_t val) -> bool { return lhs.first < val; }); if (iter != m_reverse.end() && iter->first == global) { - if (iter != m_reverse.end()) { - local = iter->second; - } + local = iter->second; } else { local = 0; diff --git a/packages/seacas/libraries/ioss/src/Ioss_Property.C b/packages/seacas/libraries/ioss/src/Ioss_Property.C index 0edc7e5bb1..b61304b106 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Property.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Property.C @@ -132,9 +132,8 @@ Ioss::Property::Property(std::string name, void *value, Origin origin) * \param[in] type The property type. */ Ioss::Property::Property(const Ioss::GroupingEntity *ge, std::string name, const BasicType type) - : name_(std::move(name)), type_(type), origin_(IMPLICIT) + : name_(std::move(name)), type_(type), origin_(IMPLICIT), data_(ge) { - data_ = ge; } bool Ioss::Property::operator==(const Ioss::Property &rhs) const diff --git a/packages/seacas/libraries/ioss/src/Ioss_VariableType.C b/packages/seacas/libraries/ioss/src/Ioss_VariableType.C index 0aa3053951..c72bb962bc 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_VariableType.C +++ b/packages/seacas/libraries/ioss/src/Ioss_VariableType.C @@ -146,13 +146,13 @@ namespace Ioss { const VariableType *VariableType::factory(const std::string &raw_name, int copies) { - VariableType *inst = nullptr; - std::string name = Utils::lowercase(raw_name); - auto iter = registry().find(name); + VariableType *inst = nullptr; + std::string lc_name = Utils::lowercase(raw_name); + auto iter = registry().find(lc_name); if (iter == registry().end()) { - bool can_construct = build_variable_type(name); + bool can_construct = build_variable_type(lc_name); if (can_construct) { - iter = registry().find(name); + iter = registry().find(lc_name); assert(iter != registry().end()); inst = (*iter).second; } @@ -182,7 +182,7 @@ namespace Ioss { return nullptr; // All storage types must have at least 2 components. } - bool match = false; + bool matches = false; for (const auto &vtype : registry()) { auto *tst_ivt = vtype.second; if (ignore_realn_fields && Ioss::Utils::substr_equal("Real", tst_ivt->name())) { @@ -190,15 +190,15 @@ namespace Ioss { } if (tst_ivt->suffix_count() == static_cast(size)) { if (tst_ivt->match(suffices)) { - ivt = tst_ivt; - match = true; + ivt = tst_ivt; + matches = true; break; } } } - if (!match && !ignore_realn_fields) { - match = true; + if (!matches && !ignore_realn_fields) { + matches = true; // Check if the suffices form a sequence (1,2,3,...,N) // This indicates a "component" variable type that is // constructed "on-the-fly" for use in Sierra @@ -207,11 +207,11 @@ namespace Ioss { for (size_t i = 0; i < size; i++) { std::string digits = fmt::format("{:0{}}", i + 1, width); if (!Ioss::Utils::str_equal(suffices[i].m_data, digits)) { - match = false; + matches = false; break; } } - if (match) { + if (matches) { // Create a new type. For now, assume that the base type is // "Real" (Sierra type). The name of the new type is // "Real[component_count]" From 677123b33188f9e9ba2a84d9d43449a79c0312d5 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 27 Nov 2023 14:17:54 -0700 Subject: [PATCH 080/110] NEM_SPREAD: Better code layout --- packages/seacas/applications/nem_spread/ps_restart.C | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/seacas/applications/nem_spread/ps_restart.C b/packages/seacas/applications/nem_spread/ps_restart.C index 0924cd8720..4b6e363adf 100644 --- a/packages/seacas/applications/nem_spread/ps_restart.C +++ b/packages/seacas/applications/nem_spread/ps_restart.C @@ -92,8 +92,6 @@ template void NemSpread::read_restart_data(); template void NemSpread::read_restart_data(); template void NemSpread::read_restart_data(); -template void NemSpread::read_restart_data() - /* Function which reads the restart variable data from the EXODUS II * database which contains the results information. Then distribute * it to the processors, and write it to the parallel exodus files. @@ -110,7 +108,7 @@ template void NemSpread::read_restart_data() * *---------------------------------------------------------------------------- */ - +template void NemSpread::read_restart_data() { /* need to get the element block ids and counts */ std::vector eb_ids_global(globals.Num_Elem_Blk); From 25cf8cbdca0c19ca125d25cf2b2cb3184b372fa0 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 27 Nov 2023 14:18:32 -0700 Subject: [PATCH 081/110] SLICE: Fix ifdef / if --- packages/seacas/applications/slice/SL_Decompose.C | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/seacas/applications/slice/SL_Decompose.C b/packages/seacas/applications/slice/SL_Decompose.C index 786c592e72..f3cbb19f1c 100644 --- a/packages/seacas/applications/slice/SL_Decompose.C +++ b/packages/seacas/applications/slice/SL_Decompose.C @@ -116,7 +116,7 @@ namespace { } } -#ifdef USE_ZOLTAN +#if USE_ZOLTAN template std::tuple, std::vector, std::vector> get_element_centroid(const Ioss::Region ®ion, IOSS_MAYBE_UNUSED INT dummy) @@ -927,19 +927,18 @@ void output_decomposition_statistics(const std::vector &elem_to_proc, int p if (elem_per_rank[i] == max_work) { fmt::print( #if !defined __NVCC__ - fg(fmt::color::red), + fg(fmt::color::red), #endif - format, i, proc_width, fmt::group_digits(elem_per_rank[i]), - work_width, (double)elem_per_rank[i] / avg_work, stars); + format, i, proc_width, fmt::group_digits(elem_per_rank[i]), work_width, + (double)elem_per_rank[i] / avg_work, stars); } else if (elem_per_rank[i] == min_work) { fmt::print( #if !defined __NVCC__ - fg(fmt::color::green), + fg(fmt::color::green), #endif - format, i, proc_width, - fmt::group_digits(elem_per_rank[i]), work_width, elem_per_rank[i] / avg_work, - stars); + format, i, proc_width, fmt::group_digits(elem_per_rank[i]), work_width, + elem_per_rank[i] / avg_work, stars); } else { fmt::print(format, i, proc_width, fmt::group_digits(elem_per_rank[i]), work_width, From 973a1dabf286c70a8d82a3a26ba8b4a6178020f3 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 28 Nov 2023 09:47:17 -0700 Subject: [PATCH 082/110] IOSS: Address security scanner issue --- .../libraries/ioss/src/text_mesh/Iotm_TextMeshAdjacencyGraph.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshAdjacencyGraph.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshAdjacencyGraph.h index 0012f9855d..8ae74a7525 100644 --- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshAdjacencyGraph.h +++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshAdjacencyGraph.h @@ -412,7 +412,7 @@ namespace Iotm { std::pair get_permutation(const Topology &topology, const std::vector &controlNodes, const std::vector &permutedNodes, - unsigned numPermutations) + PermutationType numPermutations) { PermutationType permutation = Topology::InvalidPermutation; bool equivalent = false; From a745dba2019c8c29a726e6dd38ef9d3fafde65dc Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 28 Nov 2023 09:52:44 -0700 Subject: [PATCH 083/110] CHACO: Address security scan overflow warning --- .../libraries/chaco/util/chaco_random.h | 12 +++--- packages/seacas/libraries/chaco/util/random.c | 40 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/seacas/libraries/chaco/util/chaco_random.h b/packages/seacas/libraries/chaco/util/chaco_random.h index 6f451c063e..03b83b9379 100644 --- a/packages/seacas/libraries/chaco/util/chaco_random.h +++ b/packages/seacas/libraries/chaco/util/chaco_random.h @@ -1,5 +1,5 @@ /* - * Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions + * Copyright(C) 1999-2020, 2022, 2023 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. * @@ -11,11 +11,11 @@ extern "C" { #endif -long init_rand_port(long seed); -long get_init_rand_port(void); -long genr_rand_port(long init_rand); -long rand_port(void); -double rand_rect_port(void); +unsigned long init_rand_port(unsigned long seed); +unsigned long get_init_rand_port(void); +unsigned long genr_rand_port(unsigned long init_rand); +unsigned long rand_port(void); +double rand_rect_port(void); #ifdef __cplusplus } /* close brackets on extern "C" declaration */ diff --git a/packages/seacas/libraries/chaco/util/random.c b/packages/seacas/libraries/chaco/util/random.c index 2a76ac2fac..a9607d053d 100644 --- a/packages/seacas/libraries/chaco/util/random.c +++ b/packages/seacas/libraries/chaco/util/random.c @@ -6,7 +6,7 @@ * L'Ecuyer and Cote, ACM Transactions on Mathematical * Software, March 1991 * Russian peasant algorithm -- Knuth, vol. II, pp. 442-43 - * Copyright(C) 1999-2020 National Technology & Engineering Solutions + * Copyright(C) 1999-2020, 2023 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. * @@ -20,11 +20,11 @@ #include "chaco_random.h" -#define MOD 2147483647L /* modulus for generator */ -#define MULT 41358L /* multiplier */ - /* modulus = mult*quotient + remainder */ -#define Q 51924L /* int(modulus / multiplier) */ -#define R 10855L /* remainder */ +#define MOD 2147483647L /* modulus for generator */ +#define MULT 41358L /* multiplier */ + /* modulus = mult*quotient + remainder */ +#define Q 51924L /* int(modulus / multiplier) */ +#define R 10855L /* remainder */ #define MAX_VALUE (MOD - 1) #define IMPOSSIBLE_RAND (-1) @@ -32,13 +32,13 @@ 16 /* throw away this number of \ initial random numbers */ -static long rand_num = IMPOSSIBLE_RAND; +static unsigned long rand_num = IMPOSSIBLE_RAND; /* initialize random number generator with seed */ -long init_rand_port(long seed) +unsigned long init_rand_port(unsigned long seed) { - extern long rand_num; - int i; + extern unsigned long rand_num; + int i; if (seed < 1 || seed > MAX_VALUE) { /* if seed out of range */ seed = get_init_rand_port(); /* get seed */ @@ -55,14 +55,14 @@ long init_rand_port(long seed) /* get a long initial seed for gererator assumes that rand returns a short integer */ -long get_init_rand_port(void) +unsigned long get_init_rand_port(void) { - long seed; + unsigned long seed; srand((unsigned int)time(NULL)); /* initialize system generator */ do { - seed = ((long)rand()) * rand(); - seed += ((long)rand()) * rand(); + seed = ((unsigned long)rand()) * rand(); + seed += ((unsigned long)rand()) * rand(); } while (seed > MAX_VALUE); assert(seed > 0); @@ -90,9 +90,9 @@ long get_init_rand_port(void) a * a <= modulus [a*x/a*q]-[a*x/modulus] <= 1 (for only one addition of modulus below) */ -long genr_rand_port(long init_rand) +unsigned long genr_rand_port(unsigned long init_rand) { - long k, residue; + unsigned long k, residue; k = init_rand / Q; residue = MULT * (init_rand - Q * k) - R * k; @@ -105,9 +105,9 @@ long genr_rand_port(long init_rand) } /* get a random number */ -long rand_port(void) +unsigned long rand_port(void) { - extern long rand_num; + extern unsigned long rand_num; if (rand_num == IMPOSSIBLE_RAND) { /* if not initialized, do it now */ rand_num = 1; @@ -140,8 +140,8 @@ double rand_rect_port(void) { return (double)rand_port() / (double)(MAX_VALUE + #include int main(void) { - long seed; - int i; + unsigned long seed; + int i; seed = init_rand_port(1); printf("Seed for random number generator is %ld\n", seed); i = STARTUP_RANDS; /* threw away STARTUP_RANDS */ From a80ac04bb97868e5d8fd53081a8f316ff040f77d Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 28 Nov 2023 09:53:33 -0700 Subject: [PATCH 084/110] EPU: Add comment justifying free vs delete --- packages/seacas/applications/epu/epu.C | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/seacas/applications/epu/epu.C b/packages/seacas/applications/epu/epu.C index 23bfb8245d..ec2a211202 100644 --- a/packages/seacas/applications/epu/epu.C +++ b/packages/seacas/applications/epu/epu.C @@ -1680,6 +1680,7 @@ namespace { for (int i = 0; i < global.assemblyCount; i++) { delete[] assemblies[i].entity_list; + // This is `calloc`d in `ex_get_assemblies` call. free(assemblies[i].name); } } @@ -1775,13 +1776,13 @@ namespace { copy_string(qaRecord[num_qa_records].qa_record[0][0], qainfo[0], MAX_STR_LENGTH + 1); // Code copy_string(qaRecord[num_qa_records].qa_record[0][1], qainfo[2], MAX_STR_LENGTH + 1); // Version - time_t date_time = std::time(nullptr); + time_t date_time = std::time(nullptr); #if defined __NVCC__ - auto *lt = std::localtime(&date_time); - buffer = fmt::format("{:%Y/%m/%d}", *lt); + auto *lt = std::localtime(&date_time); + buffer = fmt::format("{:%Y/%m/%d}", *lt); #else - auto const lt = fmt::localtime(date_time); - buffer = fmt::format("{:%Y/%m/%d}", lt); + auto const lt = fmt::localtime(date_time); + buffer = fmt::format("{:%Y/%m/%d}", lt); #endif copy_string(qaRecord[num_qa_records].qa_record[0][2], buffer, MAX_STR_LENGTH + 1); From 01613b94afb3c23fb665e4c02fdf2866027ca87e Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 28 Nov 2023 10:04:29 -0700 Subject: [PATCH 085/110] SUPLIB: Remove extra file access check The extra check to see if file ok for write followed by the file open was causing "race condition" warnings in a security scanner. Since the extra check is not really needed since we already check if the file open fails, I removed the extra check. --- packages/seacas/libraries/suplib/addlog.c | 86 +++++++++---------- .../seacas/libraries/suplib_c/add_to_log.c | 80 +++++++++-------- 2 files changed, 81 insertions(+), 85 deletions(-) diff --git a/packages/seacas/libraries/suplib/addlog.c b/packages/seacas/libraries/suplib/addlog.c index 1522a8650b..6b843c9262 100644 --- a/packages/seacas/libraries/suplib/addlog.c +++ b/packages/seacas/libraries/suplib/addlog.c @@ -1,5 +1,5 @@ /* - * Copyright(C) 1999-2022 National Technology & Engineering Solutions + * Copyright(C) 1999-2023 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. * @@ -46,56 +46,54 @@ void addlog(char *name, int len) if (access_dir != NULL) { char filename[LEN]; snprintf(filename, LEN, "%s/etc/audit.log", access_dir); - if (0 == access(filename, W_OK)) { - FILE *audit = fopen(filename, "a"); - if (audit != NULL) { - char *codename = strrchr(name, '/'); + FILE *audit = fopen(filename, "a"); + if (audit != NULL) { + char *codename = strrchr(name, '/'); - const char *username = getlogin(); - if (username == NULL) { - username = getenv("LOGNAME"); - } - if (username == NULL) { - username = "UNKNOWN"; - } + const char *username = getlogin(); + if (username == NULL) { + username = getenv("LOGNAME"); + } + if (username == NULL) { + username = "UNKNOWN"; + } - if (codename == NULL) { - codename = name; - } - else { - codename++; - } - char time_string[LEN]; - time_t calendar_time = time(NULL); - struct tm *local_time = localtime(&calendar_time); - strftime(time_string, LEN, "%a %b %d %H:%M:%S %Z %Y", local_time); + if (codename == NULL) { + codename = name; + } + else { + codename++; + } + char time_string[LEN]; + time_t calendar_time = time(NULL); + struct tm *local_time = localtime(&calendar_time); + strftime(time_string, LEN, "%a %b %d %H:%M:%S %Z %Y", local_time); - int ticks_per_second; - struct tms time_buf; - times(&time_buf); - ticks_per_second = sysconf(_SC_CLK_TCK); - double u_time = (double)(time_buf.tms_utime + time_buf.tms_cutime) / ticks_per_second; - double s_time = (double)(time_buf.tms_stime + time_buf.tms_cstime) / ticks_per_second; + int ticks_per_second; + struct tms time_buf; + times(&time_buf); + ticks_per_second = sysconf(_SC_CLK_TCK); + double u_time = (double)(time_buf.tms_utime + time_buf.tms_cutime) / ticks_per_second; + double s_time = (double)(time_buf.tms_stime + time_buf.tms_cstime) / ticks_per_second; - struct utsname sys_info; - uname(&sys_info); + struct utsname sys_info; + uname(&sys_info); - char log_string[LEN]; - for (size_t i = 0; i < strlen(codename); i++) { - if (!isalnum(codename[i]) && codename[i] != '.' && codename[i] != '-' && - codename[i] != '_') { - codename[i] = '\0'; - break; - } + char log_string[LEN]; + for (size_t i = 0; i < strlen(codename); i++) { + if (!isalnum(codename[i]) && codename[i] != '.' && codename[i] != '-' && + codename[i] != '_') { + codename[i] = '\0'; + break; } - snprintf(log_string, LEN, "%s %s %s %.3fu %.3fs 0:00.00 0.0%% 0+0k 0+0io 0pf+0w %s\n", - codename, username, time_string, u_time, s_time, sys_info.nodename) < 0 - ? abort() - : (void)0; - - fprintf(audit, "%s", log_string); - fclose(audit); } + snprintf(log_string, LEN, "%s %s %s %.3fu %.3fs 0:00.00 0.0%% 0+0k 0+0io 0pf+0w %s\n", + codename, username, time_string, u_time, s_time, sys_info.nodename) < 0 + ? abort() + : (void)0; + + fprintf(audit, "%s", log_string); + fclose(audit); } } #else diff --git a/packages/seacas/libraries/suplib_c/add_to_log.c b/packages/seacas/libraries/suplib_c/add_to_log.c index 2dba28e92d..a2f862c416 100644 --- a/packages/seacas/libraries/suplib_c/add_to_log.c +++ b/packages/seacas/libraries/suplib_c/add_to_log.c @@ -1,5 +1,5 @@ /* - * Copyright(C) 1999-2021 National Technology & Engineering Solutions + * Copyright(C) 1999-2021, 2023 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. * @@ -41,54 +41,52 @@ void add_to_log(const char *my_name, double elapsed) if (access_dir != NULL) { char filename[LEN]; snprintf(filename, LEN, "%s/etc/audit.log", access_dir); - if (0 == access(filename, W_OK)) { - FILE *audit = fopen(filename, "a"); - if (audit != NULL) { - const char *codename = strrchr(my_name, '/'); + FILE *audit = fopen(filename, "a"); + if (audit != NULL) { + const char *codename = strrchr(my_name, '/'); - const char *username = getlogin(); - if (username == NULL) { - username = getenv("LOGNAME"); - } - if (username == NULL) { - username = "UNKNOWN"; - } + const char *username = getlogin(); + if (username == NULL) { + username = getenv("LOGNAME"); + } + if (username == NULL) { + username = "UNKNOWN"; + } - if (codename == NULL) { - codename = my_name; - } - else { - codename++; - } + if (codename == NULL) { + codename = my_name; + } + else { + codename++; + } - char time_string[LEN]; - time_t calendar_time = time(NULL); - struct tm *local_time = localtime(&calendar_time); - strftime(time_string, LEN, "%a %b %d %H:%M:%S %Z %Y", local_time); + char time_string[LEN]; + time_t calendar_time = time(NULL); + struct tm *local_time = localtime(&calendar_time); + strftime(time_string, LEN, "%a %b %d %H:%M:%S %Z %Y", local_time); - int ticks_per_second; - struct tms time_buf; - times(&time_buf); - ticks_per_second = sysconf(_SC_CLK_TCK); - double u_time = (double)(time_buf.tms_utime + time_buf.tms_cutime) / ticks_per_second; - double s_time = (double)(time_buf.tms_stime + time_buf.tms_cstime) / ticks_per_second; + int ticks_per_second; + struct tms time_buf; + times(&time_buf); + ticks_per_second = sysconf(_SC_CLK_TCK); + double u_time = (double)(time_buf.tms_utime + time_buf.tms_cutime) / ticks_per_second; + double s_time = (double)(time_buf.tms_stime + time_buf.tms_cstime) / ticks_per_second; - struct utsname sys_info; - uname(&sys_info); + struct utsname sys_info; + uname(&sys_info); - int minutes = (int)(elapsed / 60.0); - double seconds = elapsed - minutes * 60.0; + int minutes = (int)(elapsed / 60.0); + double seconds = elapsed - minutes * 60.0; - char log_string[LEN]; - snprintf(log_string, LEN, "%s %s %s %.3fu %.3fs %d:%5.2f 0.0%% 0+0k 0+0io 0pf+0w %s\n", - codename, username, time_string, u_time, s_time, minutes, seconds, - sys_info.nodename) < 0 - ? abort() - : (void)0; + char log_string[LEN]; + snprintf(log_string, LEN, "%s %s %s %.3fu %.3fs %d:%5.2f 0.0%% 0+0k 0+0io 0pf+0w %s\n", + codename, username, time_string, u_time, s_time, minutes, seconds, + sys_info.nodename) < 0 + ? abort() + : (void)0; - fprintf(audit, "%s", log_string); - fclose(audit); - } + fprintf(audit, "%s", log_string); + fclose(audit); } } #else From fd444bcce6943abd1a4fede5458fbb68e7129b91 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 28 Nov 2023 11:11:20 -0700 Subject: [PATCH 086/110] Create codeql.yml --- .github/workflows/codeql.yml | 82 ++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000000..98a5a31d86 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,82 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ "master" ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ "master" ] + schedule: + - cron: '17 1 * * 3' + +jobs: + analyze: + name: Analyze + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners + # Consider using larger runners for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'c-cpp', 'python' ] + # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ] + # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + + # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + # ℹ️ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + # If the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 + with: + category: "/language:${{matrix.language}}" From 2ec8e3b286b695f567662b84673cc271a2947507 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 28 Nov 2023 11:25:54 -0700 Subject: [PATCH 087/110] Delete .github/workflows/codeql.yml Not worth getting working at this point I don't think. --- .github/workflows/codeql.yml | 82 ------------------------------------ 1 file changed, 82 deletions(-) delete mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml deleted file mode 100644 index 98a5a31d86..0000000000 --- a/.github/workflows/codeql.yml +++ /dev/null @@ -1,82 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ "master" ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ "master" ] - schedule: - - cron: '17 1 * * 3' - -jobs: - analyze: - name: Analyze - # Runner size impacts CodeQL analysis time. To learn more, please see: - # - https://gh.io/recommended-hardware-resources-for-running-codeql - # - https://gh.io/supported-runners-and-hardware-resources - # - https://gh.io/using-larger-runners - # Consider using larger runners for possible analysis time improvements. - runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} - timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'c-cpp', 'python' ] - # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ] - # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both - # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - - # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 - - # ℹ️ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - with: - category: "/language:${{matrix.language}}" From 8b3e9dfaef8bf42491ff3ed85c5a712a2950212b Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 28 Nov 2023 11:44:10 -0700 Subject: [PATCH 088/110] Create flawfinder.yml --- .github/workflows/flawfinder.yml | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/flawfinder.yml diff --git a/.github/workflows/flawfinder.yml b/.github/workflows/flawfinder.yml new file mode 100644 index 0000000000..9effcd57cc --- /dev/null +++ b/.github/workflows/flawfinder.yml @@ -0,0 +1,38 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +name: flawfinder + +on: + push: + branches: [ "master" ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ "master" ] + schedule: + - cron: '33 16 * * 1' + +jobs: + flawfinder: + name: Flawfinder + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: flawfinder_scan + uses: david-a-wheeler/flawfinder@8e4a779ad59dbfaee5da586aa9210853b701959c + with: + arguments: '--sarif ./' + output: 'flawfinder_results.sarif' + + - name: Upload analysis results to GitHub Security tab + uses: github/codeql-action/upload-sarif@v2 + with: + sarif_file: ${{github.workspace}}/flawfinder_results.sarif From 4a8584c5b8c0de736c1df87c3a8a050e1cf9090d Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 28 Nov 2023 11:54:23 -0700 Subject: [PATCH 089/110] CI: flawfinder has too many false positives... --- .github/workflows/flawfinder.yml | 38 -------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 .github/workflows/flawfinder.yml diff --git a/.github/workflows/flawfinder.yml b/.github/workflows/flawfinder.yml deleted file mode 100644 index 9effcd57cc..0000000000 --- a/.github/workflows/flawfinder.yml +++ /dev/null @@ -1,38 +0,0 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -name: flawfinder - -on: - push: - branches: [ "master" ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ "master" ] - schedule: - - cron: '33 16 * * 1' - -jobs: - flawfinder: - name: Flawfinder - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: flawfinder_scan - uses: david-a-wheeler/flawfinder@8e4a779ad59dbfaee5da586aa9210853b701959c - with: - arguments: '--sarif ./' - output: 'flawfinder_results.sarif' - - - name: Upload analysis results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v2 - with: - sarif_file: ${{github.workspace}}/flawfinder_results.sarif From 6b116105cf96d51e1e05807827c53bc6ebcd4fbf Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 29 Nov 2023 13:32:51 -0700 Subject: [PATCH 090/110] Address global variables should be const --- packages/seacas/applications/conjoin/CJ_Version.h | 2 +- packages/seacas/applications/cpup/CP_Version.h | 2 +- packages/seacas/applications/ejoin/EJ_Version.h | 2 +- packages/seacas/applications/epu/EP_Version.h | 2 +- packages/seacas/applications/exo2mat/exo2mat.C | 2 +- packages/seacas/applications/exodiff/ED_Version.h | 4 ++-- packages/seacas/applications/exomatlab/exomatlab.C | 4 ++-- packages/seacas/applications/mat2exo/mat2exo.C | 2 +- packages/seacas/applications/slice/SL_Version.h | 2 +- packages/seacas/applications/zellij/ZE_Version.h | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/seacas/applications/conjoin/CJ_Version.h b/packages/seacas/applications/conjoin/CJ_Version.h index 60bea34e5d..d66cfd712c 100644 --- a/packages/seacas/applications/conjoin/CJ_Version.h +++ b/packages/seacas/applications/conjoin/CJ_Version.h @@ -7,7 +7,7 @@ #include #include -static std::array qainfo{ +static const std::array qainfo{ "conjoin", "1.4.10", "2023/08/18", diff --git a/packages/seacas/applications/cpup/CP_Version.h b/packages/seacas/applications/cpup/CP_Version.h index a4ad07f722..8ba908eaf3 100644 --- a/packages/seacas/applications/cpup/CP_Version.h +++ b/packages/seacas/applications/cpup/CP_Version.h @@ -8,4 +8,4 @@ #pragma once #include #include -static std::array qainfo{"cpup", "0.95 beta", "2023/04/25"}; +static const std::array qainfo{"cpup", "0.95 beta", "2023/04/25"}; diff --git a/packages/seacas/applications/ejoin/EJ_Version.h b/packages/seacas/applications/ejoin/EJ_Version.h index 44eb43fd01..a0bb72b7c5 100644 --- a/packages/seacas/applications/ejoin/EJ_Version.h +++ b/packages/seacas/applications/ejoin/EJ_Version.h @@ -7,7 +7,7 @@ #include #include -static std::array qainfo{ +static const std::array qainfo{ "ejoin", "2023/06/16", "1.6.1", diff --git a/packages/seacas/applications/epu/EP_Version.h b/packages/seacas/applications/epu/EP_Version.h index ed98a44852..a5ebd49927 100644 --- a/packages/seacas/applications/epu/EP_Version.h +++ b/packages/seacas/applications/epu/EP_Version.h @@ -9,7 +9,7 @@ #include #include -static std::array qainfo{ +static const std::array qainfo{ "epu -- E Pluribus Unum", "6.07", "2023/05/17", diff --git a/packages/seacas/applications/exo2mat/exo2mat.C b/packages/seacas/applications/exo2mat/exo2mat.C index 91b72d25f8..19ed70dac5 100644 --- a/packages/seacas/applications/exo2mat/exo2mat.C +++ b/packages/seacas/applications/exo2mat/exo2mat.C @@ -58,7 +58,7 @@ namespace { mat_t *mat_file = nullptr; /* file for binary .mat output */ bool debug = false; - std::array qainfo{"exo2mat", "2021/09/27", "4.08"}; + const std::array qainfo{"exo2mat", "2021/09/27", "4.08"}; void logger(const char *message) { diff --git a/packages/seacas/applications/exodiff/ED_Version.h b/packages/seacas/applications/exodiff/ED_Version.h index 4efbd0b7b7..5cc927bbd0 100644 --- a/packages/seacas/applications/exodiff/ED_Version.h +++ b/packages/seacas/applications/exodiff/ED_Version.h @@ -5,5 +5,5 @@ // See packages/seacas/LICENSE for details #pragma once -static std::string version("3.28"); -static std::string verdate("2023-11-14"); +static const std::string version("3.28"); +static const std::string verdate("2023-11-14"); diff --git a/packages/seacas/applications/exomatlab/exomatlab.C b/packages/seacas/applications/exomatlab/exomatlab.C index 2c27a3bf33..f162725655 100644 --- a/packages/seacas/applications/exomatlab/exomatlab.C +++ b/packages/seacas/applications/exomatlab/exomatlab.C @@ -51,8 +51,8 @@ namespace { // ======================================================================== namespace { - std::string codename; - std::string version = "1.2"; + std::string codename; + const std::string version = "1.2"; } // namespace int main(int argc, char *argv[]) diff --git a/packages/seacas/applications/mat2exo/mat2exo.C b/packages/seacas/applications/mat2exo/mat2exo.C index 399cc92c97..68d94c2f80 100644 --- a/packages/seacas/applications/mat2exo/mat2exo.C +++ b/packages/seacas/applications/mat2exo/mat2exo.C @@ -53,7 +53,7 @@ mat_t *mat_file = nullptr; /* file for binary .mat input */ /**********************************************************************/ namespace { - std::array qainfo{"mat2exo", "2021/09/27", "4.06"}; + const std::array qainfo{"mat2exo", "2021/09/27", "4.06"}; } /**********************************************************************/ diff --git a/packages/seacas/applications/slice/SL_Version.h b/packages/seacas/applications/slice/SL_Version.h index 93e1aebcc1..cb5e6cb057 100644 --- a/packages/seacas/applications/slice/SL_Version.h +++ b/packages/seacas/applications/slice/SL_Version.h @@ -7,7 +7,7 @@ #include #include -static std::array qainfo{ +static const std::array qainfo{ "slice", "2023/09/14", "2.1.05", diff --git a/packages/seacas/applications/zellij/ZE_Version.h b/packages/seacas/applications/zellij/ZE_Version.h index f98047543f..ba32353dbf 100644 --- a/packages/seacas/applications/zellij/ZE_Version.h +++ b/packages/seacas/applications/zellij/ZE_Version.h @@ -7,7 +7,7 @@ #include #include -static std::array qainfo{ +static const std::array qainfo{ "zellij", "2023/01/11", "1.5.4", From e2d882dc70ff6ac00229a42a5ce1dad9e16f2a09 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 29 Nov 2023 16:33:07 -0700 Subject: [PATCH 091/110] EXOMERGE: Fix style --- packages/seacas/scripts/exomerge3.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/seacas/scripts/exomerge3.py b/packages/seacas/scripts/exomerge3.py index 06ec11e687..bb321c6cc0 100644 --- a/packages/seacas/scripts/exomerge3.py +++ b/packages/seacas/scripts/exomerge3.py @@ -571,10 +571,10 @@ def __getattr__(self, name): """ # for special methods, use default behavior - if name[:2] == "__": + if name.startswith("__"): raise AttributeError # get non-special function names - names = [x for x in dir(self.__class__) if x[:2] != "__"] + names = [x for x in dir(self.__class__) if !x.startswith("__")] # if the name appears to be singular, search for the plural version if not name.endswith("s"): trial = name + "s" From ef6653dc97513dbb52b4a8127414a1f00ecceb23 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 29 Nov 2023 16:57:06 -0700 Subject: [PATCH 092/110] EXOMERGE: Fix syntax error introduced in last commit --- packages/seacas/scripts/exomerge3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/seacas/scripts/exomerge3.py b/packages/seacas/scripts/exomerge3.py index bb321c6cc0..3fdd9e757e 100644 --- a/packages/seacas/scripts/exomerge3.py +++ b/packages/seacas/scripts/exomerge3.py @@ -574,7 +574,7 @@ def __getattr__(self, name): if name.startswith("__"): raise AttributeError # get non-special function names - names = [x for x in dir(self.__class__) if !x.startswith("__")] + names = [x for x in dir(self.__class__) if not x.startswith("__")] # if the name appears to be singular, search for the plural version if not name.endswith("s"): trial = name + "s" From 84aaf0880edbd3cb8be1787ea01331d4a7d10249 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 5 Dec 2023 09:17:41 -0700 Subject: [PATCH 093/110] CHACO: Revert unsigned changes --- .../libraries/chaco/util/chaco_random.h | 10 +++---- packages/seacas/libraries/chaco/util/random.c | 30 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/seacas/libraries/chaco/util/chaco_random.h b/packages/seacas/libraries/chaco/util/chaco_random.h index 03b83b9379..6b8f642f35 100644 --- a/packages/seacas/libraries/chaco/util/chaco_random.h +++ b/packages/seacas/libraries/chaco/util/chaco_random.h @@ -11,11 +11,11 @@ extern "C" { #endif -unsigned long init_rand_port(unsigned long seed); -unsigned long get_init_rand_port(void); -unsigned long genr_rand_port(unsigned long init_rand); -unsigned long rand_port(void); -double rand_rect_port(void); +long init_rand_port(long seed); +long get_init_rand_port(void); +long genr_rand_port(long init_rand); +long rand_port(void); +double rand_rect_port(void); #ifdef __cplusplus } /* close brackets on extern "C" declaration */ diff --git a/packages/seacas/libraries/chaco/util/random.c b/packages/seacas/libraries/chaco/util/random.c index a9607d053d..3778cbe57f 100644 --- a/packages/seacas/libraries/chaco/util/random.c +++ b/packages/seacas/libraries/chaco/util/random.c @@ -32,13 +32,13 @@ 16 /* throw away this number of \ initial random numbers */ -static unsigned long rand_num = IMPOSSIBLE_RAND; +static long rand_num = IMPOSSIBLE_RAND; /* initialize random number generator with seed */ -unsigned long init_rand_port(unsigned long seed) +long init_rand_port(long seed) { - extern unsigned long rand_num; - int i; + extern long rand_num; + int i; if (seed < 1 || seed > MAX_VALUE) { /* if seed out of range */ seed = get_init_rand_port(); /* get seed */ @@ -55,14 +55,14 @@ unsigned long init_rand_port(unsigned long seed) /* get a long initial seed for gererator assumes that rand returns a short integer */ -unsigned long get_init_rand_port(void) +long get_init_rand_port(void) { - unsigned long seed; + long seed; - srand((unsigned int)time(NULL)); /* initialize system generator */ + srand((int)time(NULL)); /* initialize system generator */ do { - seed = ((unsigned long)rand()) * rand(); - seed += ((unsigned long)rand()) * rand(); + seed = ((long)rand()) * rand(); + seed += ((long)rand()) * rand(); } while (seed > MAX_VALUE); assert(seed > 0); @@ -90,9 +90,9 @@ unsigned long get_init_rand_port(void) a * a <= modulus [a*x/a*q]-[a*x/modulus] <= 1 (for only one addition of modulus below) */ -unsigned long genr_rand_port(unsigned long init_rand) +long genr_rand_port(long init_rand) { - unsigned long k, residue; + long k, residue; k = init_rand / Q; residue = MULT * (init_rand - Q * k) - R * k; @@ -105,9 +105,9 @@ unsigned long genr_rand_port(unsigned long init_rand) } /* get a random number */ -unsigned long rand_port(void) +long rand_port(void) { - extern unsigned long rand_num; + extern long rand_num; if (rand_num == IMPOSSIBLE_RAND) { /* if not initialized, do it now */ rand_num = 1; @@ -140,8 +140,8 @@ double rand_rect_port(void) { return (double)rand_port() / (double)(MAX_VALUE + #include int main(void) { - unsigned long seed; - int i; + long seed; + int i; seed = init_rand_port(1); printf("Seed for random number generator is %ld\n", seed); i = STARTUP_RANDS; /* threw away STARTUP_RANDS */ From 39d2e30fa271a218b2171a88c48e5aac9772d8b5 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 5 Dec 2023 09:19:07 -0700 Subject: [PATCH 094/110] EXODUS: Address static analyzer suggestions --- .../exodus/src/ex__get_glob_vars_multi_time.c | 16 +-- .../exodus/src/ex__get_nodal_var_multi_time.c | 23 ++-- .../seacas/libraries/exodus/src/ex_copy.c | 27 ++-- .../seacas/libraries/exodus/src/ex_inquire.c | 122 +++++++++--------- 4 files changed, 93 insertions(+), 95 deletions(-) diff --git a/packages/seacas/libraries/exodus/src/ex__get_glob_vars_multi_time.c b/packages/seacas/libraries/exodus/src/ex__get_glob_vars_multi_time.c index f5bd51e450..1a1886985e 100644 --- a/packages/seacas/libraries/exodus/src/ex__get_glob_vars_multi_time.c +++ b/packages/seacas/libraries/exodus/src/ex__get_glob_vars_multi_time.c @@ -33,18 +33,16 @@ int exi_get_glob_vars_multi_time(int exoid, int num_glob_vars, int beg_time_step, int end_time_step, void *glob_var_vals) { - int varid; - int status; - size_t start[2], count[2]; - char errmsg[MAX_ERR_LENGTH]; - EX_FUNC_ENTER(); if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* inquire previously defined variable */ + int varid; + int status; if ((status = nc_inq_varid(exoid, VAR_GLO_VAR, &varid)) != NC_NOERR) { + char errmsg[MAX_ERR_LENGTH]; snprintf(errmsg, MAX_ERR_LENGTH, "Warning: failed to locate global variables in file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); @@ -52,11 +50,8 @@ int exi_get_glob_vars_multi_time(int exoid, int num_glob_vars, int beg_time_step } /* read values of global variables */ - start[0] = --beg_time_step; - start[1] = 0; - - count[0] = end_time_step - beg_time_step; - count[1] = num_glob_vars; + size_t start[] = {--beg_time_step, 0}; + size_t count[] = {end_time_step - beg_time_step, num_glob_vars}; if (exi_comp_ws(exoid) == 4) { status = nc_get_vara_float(exoid, varid, start, count, glob_var_vals); @@ -66,6 +61,7 @@ int exi_get_glob_vars_multi_time(int exoid, int num_glob_vars, int beg_time_step } if (status != NC_NOERR) { + char errmsg[MAX_ERR_LENGTH]; snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get global variable values from file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); diff --git a/packages/seacas/libraries/exodus/src/ex__get_nodal_var_multi_time.c b/packages/seacas/libraries/exodus/src/ex__get_nodal_var_multi_time.c index a9f190b66a..9bb94d1fe2 100644 --- a/packages/seacas/libraries/exodus/src/ex__get_nodal_var_multi_time.c +++ b/packages/seacas/libraries/exodus/src/ex__get_nodal_var_multi_time.c @@ -67,29 +67,28 @@ error = exi_get_nodal_var_multi_time(exoid, var_index, num_nodes, int exi_get_nodal_var_multi_time(int exoid, int nodal_var_index, int64_t num_nodes, int beg_time_step, int end_time_step, void *nodal_var_vals) { - int varid; - int status; - size_t start[3], count[3]; - char errmsg[MAX_ERR_LENGTH]; - if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { EX_FUNC_LEAVE(EX_FATAL); } /* inquire previously defined variable */ - /* Need to see how this works in the parallel-aware exodus... */ if (num_nodes == 0) { - return (EX_NOERR); + return EX_NOERR; } + size_t start[3]; + size_t count[3]; + int status; + int varid; if (ex_large_model(exoid) == 0) { /* read values of the nodal variable */ if ((status = nc_inq_varid(exoid, VAR_NOD_VAR, &varid)) != NC_NOERR) { + char errmsg[MAX_ERR_LENGTH]; snprintf(errmsg, MAX_ERR_LENGTH, "Warning: could not find nodal variables in file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_WARN); + return EX_WARN; } start[0] = --beg_time_step; @@ -104,10 +103,11 @@ int exi_get_nodal_var_multi_time(int exoid, int nodal_var_index, int64_t num_nod /* read values of the nodal variable -- stored as separate variables... */ /* Get the varid.... */ if ((status = nc_inq_varid(exoid, VAR_NOD_VAR_NEW(nodal_var_index), &varid)) != NC_NOERR) { + char errmsg[MAX_ERR_LENGTH]; snprintf(errmsg, MAX_ERR_LENGTH, "Warning: could not find nodal variable %d in file id %d", nodal_var_index, exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_WARN); + return EX_WARN; } start[0] = --beg_time_step; @@ -125,9 +125,10 @@ int exi_get_nodal_var_multi_time(int exoid, int nodal_var_index, int64_t num_nod } if (status != NC_NOERR) { + char errmsg[MAX_ERR_LENGTH]; snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get nodal variables in file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } - return (EX_NOERR); + return EX_NOERR; } diff --git a/packages/seacas/libraries/exodus/src/ex_copy.c b/packages/seacas/libraries/exodus/src/ex_copy.c index 878c9b11f8..e7807dc9d4 100644 --- a/packages/seacas/libraries/exodus/src/ex_copy.c +++ b/packages/seacas/libraries/exodus/src/ex_copy.c @@ -1,5 +1,5 @@ /* - * Copyright(C) 1999-2022 National Technology & Engineering Solutions + * Copyright(C) 1999-2023 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. * @@ -173,7 +173,7 @@ int ex_copy_transient(int in_exoid, int out_exoid) } /*! \cond INTERNAL */ -int cpy_variable_data(int in_exoid, int out_exoid, int in_large, int mesh_only) +static int cpy_variable_data(int in_exoid, int out_exoid, int in_large, int mesh_only) { int nvars; /* number of variables */ EXCHECKI(nc_inq(in_exoid, NULL, &nvars, NULL, NULL)); @@ -212,7 +212,7 @@ int cpy_variable_data(int in_exoid, int out_exoid, int in_large, int mesh_only) } /*! \cond INTERNAL */ -int cpy_variables(int in_exoid, int out_exoid, int in_large, int mesh_only) +static int cpy_variables(int in_exoid, int out_exoid, int in_large, int mesh_only) { int recdimid; /* id of unlimited dimension */ int nvars; /* number of variables */ @@ -253,7 +253,7 @@ int cpy_variables(int in_exoid, int out_exoid, int in_large, int mesh_only) /*! \endcond */ /*! \cond INTERNAL */ -int cpy_dimension(int in_exoid, int out_exoid, int mesh_only) +static int cpy_dimension(int in_exoid, int out_exoid, int mesh_only) { int dim_out_id; /* dimension id */ @@ -339,7 +339,7 @@ int cpy_dimension(int in_exoid, int out_exoid, int mesh_only) } /*! \cond INTERNAL */ -int cpy_global_att(int in_exoid, int out_exoid) +static int cpy_global_att(int in_exoid, int out_exoid) { struct ncatt att; /* attribute */ @@ -389,7 +389,7 @@ int cpy_global_att(int in_exoid, int out_exoid) /*! \endcond */ /*! \cond INTERNAL */ -int cpy_att(int in_id, int out_id, int var_in_id, int var_out_id) +static int cpy_att(int in_id, int out_id, int var_in_id, int var_out_id) { /* Routine to copy all the attributes from the input netCDF file to the output netCDF file. If var_in_id == NC_GLOBAL, @@ -418,7 +418,7 @@ int cpy_att(int in_id, int out_id, int var_in_id, int var_out_id) /*! \endcond */ /*! \internal */ -int cpy_coord_def(int in_id, int out_id, int rec_dim_id, char *var_nm, int in_large) +static int cpy_coord_def(int in_id, int out_id, int rec_dim_id, char *var_nm, int in_large) { /* Handle easiest situation first: in_large matches out_large (1) */ if (in_large == 1) { @@ -476,7 +476,7 @@ int cpy_coord_def(int in_id, int out_id, int rec_dim_id, char *var_nm, int in_la /*! \endcond */ /*! \internal */ -int cpy_var_def(int in_id, int out_id, int rec_dim_id, char *var_nm) +static int cpy_var_def(int in_id, int out_id, int rec_dim_id, char *var_nm) { /* Routine to copy the variable metadata from an input netCDF file * to an output netCDF file. @@ -547,7 +547,7 @@ int cpy_var_def(int in_id, int out_id, int rec_dim_id, char *var_nm) } /* end cpy_var_def() */ /*! \internal */ -int cpy_var_val(int in_id, int out_id, char *var_nm) +static int cpy_var_val(int in_id, int out_id, char *var_nm) { void *void_ptr = NULL; /* Routine to copy the variable data from an input netCDF file @@ -727,7 +727,7 @@ int cpy_var_val(int in_id, int out_id, char *var_nm) } /* end cpy_var_val() */ /*! \internal */ -int cpy_coord_val(int in_id, int out_id, char *var_nm, int in_large) +static int cpy_coord_val(int in_id, int out_id, char *var_nm, int in_large) { /* Routine to copy the coordinate data from an input netCDF file * to an output netCDF file. @@ -794,7 +794,7 @@ int cpy_coord_val(int in_id, int out_id, char *var_nm, int in_large) } /* end cpy_coord_val() */ /*! \internal */ -void update_structs(int out_exoid) +static void update_structs(int out_exoid) { update_internal_structs(out_exoid, EX_INQ_EDGE_BLK, exi_get_counter_list(EX_EDGE_BLOCK)); update_internal_structs(out_exoid, EX_INQ_FACE_BLK, exi_get_counter_list(EX_FACE_BLOCK)); @@ -815,7 +815,8 @@ void update_structs(int out_exoid) } /*! \internal */ -void update_internal_structs(int out_exoid, ex_inquiry inqcode, struct exi_list_item **ctr_list) +static void update_internal_structs(int out_exoid, ex_inquiry inqcode, + struct exi_list_item **ctr_list) { int64_t number = ex_inquire_int(out_exoid, inqcode); if (number > 0) { @@ -825,7 +826,7 @@ void update_internal_structs(int out_exoid, ex_inquiry inqcode, struct exi_list_ } } -size_t type_size(nc_type type) +static size_t type_size(nc_type type) { if (type == NC_CHAR) { return sizeof(char); /* OK */ diff --git a/packages/seacas/libraries/exodus/src/ex_inquire.c b/packages/seacas/libraries/exodus/src/ex_inquire.c index 0c521b2ec1..b104dbb420 100644 --- a/packages/seacas/libraries/exodus/src/ex_inquire.c +++ b/packages/seacas/libraries/exodus/src/ex_inquire.c @@ -1,5 +1,5 @@ /* - * Copyright(C) 1999-2022 National Technology & Engineering Solutions + * Copyright(C) 1999-2023 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. * @@ -19,13 +19,13 @@ static int exi_get_dimension_value(int exoid, int64_t *var, int default_value, if ((status = nc_inq_dimid(exoid, dimension_name, &dimid)) != NC_NOERR) { *var = default_value; if (missing_ok) { - return (EX_NOERR); + return EX_NOERR; } char errmsg[MAX_ERR_LENGTH]; snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to retrieve dimension %s for file id %d", dimension_name, exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } size_t idum; if ((status = nc_inq_dimlen(exoid, dimid, &idum)) != NC_NOERR) { @@ -35,10 +35,10 @@ static int exi_get_dimension_value(int exoid, int64_t *var, int default_value, "ERROR: failed to retrieve value for dimension %s for file id %d", dimension_name, exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } *var = idum; - return (EX_NOERR); + return EX_NOERR; } static int ex_get_concat_set_len(int exoid, int64_t *set_length, const char *set_name, @@ -56,7 +56,7 @@ static int ex_get_concat_set_len(int exoid, int64_t *set_length, const char *set snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get number of %s sets in file id %d", set_name, exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } /* Allocate space for stat array */ @@ -68,7 +68,7 @@ static int ex_get_concat_set_len(int exoid, int64_t *set_length, const char *set "array for file id %d", set_name, exoid); ex_err_fn(exoid, __func__, errmsg, EX_MEMFAIL); - return (EX_FATAL); + return EX_FATAL; } /* get variable id of status array */ @@ -82,7 +82,7 @@ static int ex_get_concat_set_len(int exoid, int64_t *set_length, const char *set snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get %s set status array from file id %d", set_name, exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } } else { /* default: status is true */ @@ -104,14 +104,14 @@ static int ex_get_concat_set_len(int exoid, int64_t *set_length, const char *set else { *set_length = 0; free(stat_vals); - return (EX_FATAL); + return EX_FATAL; } } else { if (nc_inq_dimlen(exoid, dimid, &idum) != NC_NOERR) { *set_length = 0; free(stat_vals); - return (EX_FATAL); + return EX_FATAL; } } @@ -120,7 +120,7 @@ static int ex_get_concat_set_len(int exoid, int64_t *set_length, const char *set free(stat_vals); } - return (EX_NOERR); + return EX_NOERR; } static void flt_cvt(float *xptr, double x) { *xptr = (float)x; } @@ -138,7 +138,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float int num_var; if (exi_check_valid_file_id(exoid, __func__) == EX_FATAL) { - return (EX_FATAL); + return EX_FATAL; } if (ret_char) { @@ -147,7 +147,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float if (!ret_int) { snprintf(errmsg, MAX_ERR_LENGTH, "Warning: integer argument is NULL which is not allowed."); ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); - return (EX_FATAL); + return EX_FATAL; } int rootid = exoid & EX_FILE_ID_MASK; @@ -156,10 +156,10 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_FILE_TYPE: /* obsolete call */ - /*returns "r" for regular EXODUS file or "h" for history EXODUS file*/ + /*return "r" for regular EXODUS file or "h" for history EXODUS file*/ snprintf(errmsg, MAX_ERR_LENGTH, "Warning: file type inquire is obsolete"); ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); - return (EX_WARN); + return EX_WARN; case EX_INQ_API_VERS: /* returns the EXODUS API version number */ @@ -168,7 +168,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float "Warning: float argument is NULL for EX_INQ_API_VERS " "which is not allowed."); ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); - return (EX_FATAL); + return EX_FATAL; } if (nc_get_att_float(rootid, NC_GLOBAL, ATT_API_VERSION, ret_float) != @@ -178,7 +178,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get EXODUS API version for file id %d", rootid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } } @@ -191,14 +191,14 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float "Warning: float argument is NULL for EX_INQ_DB_VERS " "which is not allowed."); ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); - return (EX_FATAL); + return EX_FATAL; } if ((status = nc_get_att_float(rootid, NC_GLOBAL, ATT_VERSION, ret_float)) != NC_NOERR) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get EXODUS database version for file id %d", rootid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } break; @@ -230,7 +230,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get name string length in file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } *ret_int = name_length - 1; @@ -288,7 +288,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float "for file id %d", rootid); ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); - return (EX_FATAL); + return EX_FATAL; } else { /* returns the title of the database */ @@ -299,7 +299,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get database title for file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } ex_copy_string(ret_char, tmp_title, MAX_LINE_LENGTH + 1); } @@ -309,7 +309,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float /* returns the dimensionality (2 or 3, for 2-d or 3-d) of the database */ if (exi_get_dimension(exoid, DIM_NUM_DIM, "database dimensionality", &ldum, &dimid, __func__) != NC_NOERR) { - return (EX_FATAL); + return EX_FATAL; } *ret_int = ldum; break; @@ -402,7 +402,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get number of node sets in file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } for (size_t i = 0; i < num_sets; i++) { @@ -417,7 +417,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float "ERROR: failed to locate number of dist fact for %zu'th node set in file id %d", i, exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } } else { @@ -427,7 +427,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float "ERROR: failed to locate number of nodes in %zu'th node set in file id %d", i, exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } if ((status = nc_inq_dimlen(exoid, dimid, &idum)) != NC_NOERR) { *ret_int = 0; @@ -435,7 +435,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float "ERROR: failed to get number of nodes in %zu'th node set in file id %d", i, exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } } *ret_int += idum; @@ -465,7 +465,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get number of side sets in file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } int *ids = NULL; @@ -474,14 +474,14 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to allocate memory for side set ids for file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, EX_MEMFAIL); - return (EX_FATAL); + return EX_FATAL; } if (ex_get_ids(exoid, EX_SIDE_SET, ids) == EX_FATAL) { snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get side set ids in file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, EX_LASTERR); free(ids); - return (EX_FATAL); + return EX_FATAL; } /* allocate space for stat array */ @@ -492,7 +492,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float "array for file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, EX_MEMFAIL); - return (EX_FATAL); + return EX_FATAL; } /* get variable id of status array */ if (nc_inq_varid(exoid, VAR_SS_STAT, &varid) == NC_NOERR) { @@ -505,7 +505,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get element block status array from file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } } else { /* default: status is true */ @@ -546,7 +546,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float ex_err_fn(exoid, __func__, errmsg, status); free(stat_vals); free(ids); - return (EX_FATAL); + return EX_FATAL; } } @@ -583,7 +583,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get number of side sets in file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } for (size_t i = 0; i < num_sets; i++) { @@ -598,7 +598,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float "ERROR: failed to locate number of dist fact for %zu'th side set in file id %d", i, exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } } else { @@ -608,7 +608,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float "ERROR: failed to get number of dist factors in %zu'th side set in file id %d", i, exoid); ex_err_fn(exoid, __func__, errmsg, status); - return (EX_FATAL); + return EX_FATAL; } } *ret_int += ldum; @@ -640,7 +640,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_TIME: /* returns the number of time steps stored in the database */ if (exi_get_dimension(exoid, DIM_TIME, "time dimension", &ldum, &dimid, __func__) != NC_NOERR) { - return (EX_FATAL); + return EX_FATAL; } *ret_int = ldum; break; @@ -693,21 +693,21 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_EDGE: /* returns the number of edges (defined across all edge blocks). */ if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_EDGE, 1) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } break; case EX_INQ_EDGE_BLK: /* returns the number of edge blocks. */ if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_ED_BLK, 1) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } break; case EX_INQ_EDGE_SETS: /* returns the number of edge sets. */ if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_ES, 1) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } break; @@ -737,21 +737,21 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_FACE: /* returns the number of faces (defined across all face blocks). */ if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_FACE, 1) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } break; case EX_INQ_FACE_BLK: /* returns the number of face blocks. */ if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_FA_BLK, 1) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } break; case EX_INQ_FACE_SETS: /* returns the number of face sets. */ if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_FS, 1) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } break; @@ -781,7 +781,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_ELEM_SETS: /* returns the number of element sets. */ if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_ELS, 1) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } break; @@ -804,83 +804,83 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_EDGE_MAP: /* returns the number of edge maps. */ if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_EDM, 1) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } break; case EX_INQ_FACE_MAP: /* returns the number of face maps. */ if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_FAM, 1) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } break; case EX_INQ_NUM_NODE_VAR: if (ex_get_variable_param(exoid, EX_NODAL, &num_var) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } *ret_int = num_var; break; case EX_INQ_NUM_EDGE_BLOCK_VAR: if (ex_get_variable_param(exoid, EX_EDGE_BLOCK, &num_var) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } *ret_int = num_var; break; case EX_INQ_NUM_FACE_BLOCK_VAR: if (ex_get_variable_param(exoid, EX_FACE_BLOCK, &num_var) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } *ret_int = num_var; break; case EX_INQ_NUM_ELEM_BLOCK_VAR: if (ex_get_variable_param(exoid, EX_ELEM_BLOCK, &num_var) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } *ret_int = num_var; break; case EX_INQ_NUM_NODE_SET_VAR: if (ex_get_variable_param(exoid, EX_NODE_SET, &num_var) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } *ret_int = num_var; break; case EX_INQ_NUM_EDGE_SET_VAR: if (ex_get_variable_param(exoid, EX_EDGE_SET, &num_var) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } *ret_int = num_var; break; case EX_INQ_NUM_FACE_SET_VAR: if (ex_get_variable_param(exoid, EX_FACE_SET, &num_var) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } *ret_int = num_var; break; case EX_INQ_NUM_ELEM_SET_VAR: if (ex_get_variable_param(exoid, EX_ELEM_SET, &num_var) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } *ret_int = num_var; break; case EX_INQ_NUM_SIDE_SET_VAR: if (ex_get_variable_param(exoid, EX_SIDE_SET, &num_var) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } *ret_int = num_var; break; case EX_INQ_NUM_GLOBAL_VAR: if (ex_get_variable_param(exoid, EX_GLOBAL, &num_var) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } *ret_int = num_var; break; @@ -888,7 +888,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float case EX_INQ_COORD_FRAMES: /* return the number of coordinate frames */ if (exi_get_dimension_value(exoid, ret_int, 0, DIM_NUM_CFRAMES, 1) != EX_NOERR) { - return (EX_FATAL); + return EX_FATAL; } break; @@ -936,7 +936,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float "null for file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); - return (EX_FATAL); + return EX_FATAL; } #if NC_HAS_HDF5 nc_inq_grpname(exoid, ret_char); @@ -968,7 +968,7 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float "null for file id %d", exoid); ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); - return (EX_FATAL); + return EX_FATAL; } #if NC_HAS_HDF5 nc_inq_grpname_full(exoid, NULL, ret_char); @@ -990,9 +990,9 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float *ret_int = 0; snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: invalid inquiry %d", req_info); ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); - return (EX_FATAL); + return EX_FATAL; } - return (EX_NOERR); + return EX_NOERR; } /*! From 4d28f6b314164f937a0091680b169f0c2b1a4aba Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 18 Dec 2023 14:25:41 -0700 Subject: [PATCH 095/110] IO_MODIFY: Add geometry mirror; update geometry help output --- .../libraries/ioss/src/main/io_modify.C | 48 +++++++++++++++---- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/main/io_modify.C b/packages/seacas/libraries/ioss/src/main/io_modify.C index 8d5ca33302..51bfa9a6ab 100644 --- a/packages/seacas/libraries/ioss/src/main/io_modify.C +++ b/packages/seacas/libraries/ioss/src/main/io_modify.C @@ -72,7 +72,7 @@ using real = double; namespace { std::string codename; - std::string version = "2.03 (2022-05-26)"; + std::string version = "2.04 (2023-12-18)"; std::vector attributes_modified; @@ -653,17 +653,21 @@ namespace { } if (all || Ioss::Utils::substr_equal(topic, "geometry")) { fmt::print(fmt::emphasis::bold, "\n\tGEOMETRY ROTATE "); - fmt::print("{{X|Y|Z}} {{angle}}\n"); + fmt::print("{{X|Y|Z}} {{angle}} ...\n"); + fmt::print(fmt::emphasis::bold, "\tGEOMETRY MIRROR "); + fmt::print("{{X|Y|Z}} ...\n"); fmt::print(fmt::emphasis::bold, "\tGEOMETRY SCALE "); - fmt::print("{{x}} {{y}} {{z}}\n"); + fmt::print("{{X|Y|Z}} {{scale_factor}} ...\n"); fmt::print(fmt::emphasis::bold, "\tGEOMETRY OFFSET "); - fmt::print("{{x}} {{y}} {{z}}\n"); + fmt::print("{{X|Y|Z}} {{offset}} ...\n"); fmt::print(fmt::emphasis::bold, "\tGEOMETRY ROTATE "); - fmt::print("{{ELEMENTBLOCKS|BLOCKS|ASSEMBLY}} {{names}} {{X|Y|Z}} {{angle}}\n"); + fmt::print("{{ELEMENTBLOCKS|BLOCKS|ASSEMBLY}} {{names}} {{X|Y|Z}} {{angle}} ...\n"); + fmt::print(fmt::emphasis::bold, "\tGEOMETRY MIRROR "); + fmt::print("{{ELEMENTBLOCKS|BLOCKS|ASSEMBLY}} {{names}} {{X|Y|Z}} ...\n"); fmt::print(fmt::emphasis::bold, "\tGEOMETRY SCALE "); - fmt::print("{{ELEMENTBLOCKS|BLOCKS|ASSEMBLY}} {{names}} {{x}} {{y}} {{z}}\n"); + fmt::print("{{ELEMENTBLOCKS|BLOCKS|ASSEMBLY}} {{names}} {{X|Y|Z}} {{scale_factor}} ...\n"); fmt::print(fmt::emphasis::bold, "\tGEOMETRY OFFSET "); - fmt::print("{{ELEMENTBLOCKS|BLOCKS|ASSEMBLY}} {{names}} {{x}} {{y}} {{z}}\n"); + fmt::print("{{ELEMENTBLOCKS|BLOCKS|ASSEMBLY}} {{names}} {{X|Y|Z}} {{offset}} ...\n"); } if (all || Ioss::Utils::substr_equal(topic, "time")) { fmt::print(fmt::emphasis::bold, "\n\tTIME SCALE "); @@ -1236,13 +1240,14 @@ namespace { { // 0 1 2 3 4 5... // GEOMETRY ROTATE {{X|Y|Z}} {{angle}} ... + // GEOMETRY MIRROR {{X|Y|Z}} ... // GEOMETRY SCALE {{X|Y|Z}} {{scale}} ... // GEOMETRY OFFSET {{X|Y|Z}} {{offset}} ... // GEOMETRY ROTATE {{ELEMENTBLOCKS|BLOCKS|ASSEMBLY}} {{names}} {{X|Y|Z}} {{angle}} ... // GEOMETRY SCALE {{ELEMENTBLOCKS|BLOCKS|ASSEMBLY}} {{names}} {{X|Y|Z}} {{scale}} ... // GEOMETRY OFFSET {{ELEMENTBLOCKS|BLOCKS|ASSEMBLY}} {{names}} {{X|Y|Z}} {{offset}} ... - if (tokens.size() < 4) { + if (tokens.size() < 3) { fmt::print(stderr, #if !defined __NVCC__ fg(fmt::color::red), @@ -1348,7 +1353,30 @@ namespace { // Do the transformation... scale_filtered_coordinates(region, scale, node_filter); - fmt::print(fg(fmt::color::cyan), "\t*** Database coordinates scaled.\n"); + fmt::print(fg(fmt::color::cyan), "\t*** Database coordinate(s) scaled.\n"); + return false; + } + + if (Ioss::Utils::substr_equal(tokens[1], "mirror")) { + real scale[3] = {1.0, 1.0, 1.0}; + + // Get mirror axis ... + do { + const std::string &axis = tokens[idx++]; + if (Ioss::Utils::substr_equal(axis, "x")) { + scale[0] = -1.0; + } + else if (Ioss::Utils::substr_equal(axis, "y")) { + scale[1] = -1.0; + } + else if (Ioss::Utils::substr_equal(axis, "z")) { + scale[2] = -1.0; + } + } while (idx < tokens.size()); + + // Do the transformation... + scale_filtered_coordinates(region, scale, node_filter); + fmt::print(fg(fmt::color::cyan), "\t*** Database coordinate(s) mirrored.\n"); return false; } @@ -1372,7 +1400,7 @@ namespace { // Do the transformation... offset_filtered_coordinates(region, offset, node_filter); - fmt::print(fg(fmt::color::cyan), "\t*** Database coordinates offset.\n"); + fmt::print(fg(fmt::color::cyan), "\t*** Database coordinate(s) offset.\n"); return false; } From 8399fb60532ff9bd39305a9c92eced468adc306c Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 19 Dec 2023 11:04:44 -0700 Subject: [PATCH 096/110] CONJOIN: Fix handling of parts with different sideset counts --- .../seacas/applications/conjoin/CJ_Version.h | 4 +- .../seacas/applications/conjoin/Conjoin.C | 108 ++++++++++-------- 2 files changed, 64 insertions(+), 48 deletions(-) diff --git a/packages/seacas/applications/conjoin/CJ_Version.h b/packages/seacas/applications/conjoin/CJ_Version.h index d66cfd712c..7a9afb3600 100644 --- a/packages/seacas/applications/conjoin/CJ_Version.h +++ b/packages/seacas/applications/conjoin/CJ_Version.h @@ -9,6 +9,6 @@ static const std::array qainfo{ "conjoin", - "1.4.10", - "2023/08/18", + "1.5.00", + "2023/12/19", }; diff --git a/packages/seacas/applications/conjoin/Conjoin.C b/packages/seacas/applications/conjoin/Conjoin.C index b350e4f576..3117bed6d1 100644 --- a/packages/seacas/applications/conjoin/Conjoin.C +++ b/packages/seacas/applications/conjoin/Conjoin.C @@ -288,19 +288,23 @@ namespace { const std::vector> &sets) { bool problem = false; - for (size_t i = 0; i < global_sets.size(); i++) { - size_t loc_pos = global_sets[i].position_; - for (size_t p = 0; p < part_count; p++) { - if (global_sets[i].id != sets[p][loc_pos].id || - case_compare(global_sets[i].name_, sets[p][loc_pos].name_) != 0 || - sets[p][loc_pos].position_ != i) { + for (size_t p = 0; p < part_count; p++) { + for (size_t i = 0; i < sets[p].size(); i++) { + if (sets[p][i].id == 0) { + continue; + } + auto glob_pos = sets[p][i].position_; + if (global_sets[glob_pos].id != sets[p][i].id || + case_compare(global_sets[glob_pos].name_, sets[p][i].name_) != 0) { problem = true; fmt::print(stderr, - "\nERROR: Mismatch for global {0} at position {1} and local {0} in part {2} " - "position {3}\n", - type, i, p + 1, loc_pos); - global_sets[i].dump(); - sets[p][loc_pos].dump(); + "\nERROR: {0} Mismatch on part {1}:\n" + "\tpart {0} at position {2} has id {3} and name {4}\n" + "\tglobal {0} at position {5} has id {6} and name {7}\n", + type, p+1, i, sets[p][i].id, sets[p][i].name_, + glob_pos, global_sets[glob_pos].id, global_sets[glob_pos].name_); + global_sets[glob_pos].dump(); + sets[p][i].dump(); } } } @@ -2340,7 +2344,7 @@ namespace { size_t i = 0; for (auto set_id : set_ids) { glob_ssets[i].id = set_id; - glob_ssets[i].position_ = i; + glob_ssets[i].position_ = i; // Not used i++; } } @@ -2368,7 +2372,6 @@ namespace { } } SMART_ASSERT(gi != gsset_size); - glob_ssets[gi].position_ = i; sets[p][i].position_ = gi; // Get the parameters for this sideset... @@ -2418,21 +2421,24 @@ namespace { int ss_id = glob_ssets[ss].id; size_t offset = 0; - size_t lss = glob_ssets[ss].position_; for (size_t p = 0; p < part_count; p++) { - - Excn::ExodusFile id(p); - sets[p][lss].elems.resize(sets[p][lss].sideCount); - sets[p][lss].sides.resize(sets[p][lss].sideCount); - ex_get_set(id, EX_SIDE_SET, ss_id, sets[p][lss].elems.data(), sets[p][lss].sides.data()); - - // Add these to the elem_side vector... - for (size_t i = 0; i < sets[p][lss].sideCount; i++) { - size_t global_elem = local_mesh[p].localElementToGlobal[sets[p][lss].elems[i] - 1] + 1; - elem_side[offset + i] = std::make_pair((INT)global_elem, (INT)sets[p][lss].sides[i]); - } - offset += sets[p][lss].sideCount; - } + for (size_t lss = 0; lss < sets[p].size(); lss++) { + if (sets[p][lss].position_ == ss) { + Excn::ExodusFile id(p); + sets[p][lss].elems.resize(sets[p][lss].sideCount); + sets[p][lss].sides.resize(sets[p][lss].sideCount); + ex_get_set(id, EX_SIDE_SET, ss_id, sets[p][lss].elems.data(), sets[p][lss].sides.data()); + + // Add these to the elem_side vector... + for (size_t i = 0; i < sets[p][lss].sideCount; i++) { + size_t global_elem = local_mesh[p].localElementToGlobal[sets[p][lss].elems[i] - 1] + 1; + elem_side[offset + i] = std::make_pair((INT)global_elem, (INT)sets[p][lss].sides[i]); + } + offset += sets[p][lss].sideCount; + break; + } + } + } uniquify(elem_side); @@ -2455,32 +2461,42 @@ namespace { // Try the lower_bound searching of elem_side for now. If // inefficient, fix later... for (size_t p = 0; p < part_count; p++) { - sets[p][lss].elemOrderMap.resize(sets[p][lss].sideCount); - for (size_t i = 0; i < sets[p][lss].sideCount; i++) { - size_t global_elem = - local_mesh[p].localElementToGlobal[sets[p][lss].elems[i] - 1] + 1; - std::pair es = std::make_pair((INT)global_elem, (INT)sets[p][lss].sides[i]); - - auto iter = std::lower_bound(elem_side.begin(), elem_side.end(), es); - size_t pos = iter - elem_side.begin(); - sets[p][lss].elemOrderMap[i] = pos; - } + for (size_t lss = 0; lss < sets[p].size(); lss++) { + if (sets[p][lss].position_ == ss) { + sets[p][lss].elemOrderMap.resize(sets[p][lss].sideCount); + for (size_t i = 0; i < sets[p][lss].sideCount; i++) { + size_t global_elem = + local_mesh[p].localElementToGlobal[sets[p][lss].elems[i] - 1] + 1; + std::pair es = std::make_pair((INT)global_elem, (INT)sets[p][lss].sides[i]); + + auto iter = std::lower_bound(elem_side.begin(), elem_side.end(), es); + size_t pos = iter - elem_side.begin(); + sets[p][lss].elemOrderMap[i] = pos; + } + break; + } + } } } } // Calculate sideset offset - for (size_t b = 0; b < glob_ssets.size(); b++) { + for (size_t ss = 0; ss < glob_ssets.size(); ss++) { size_t sum = 0; for (size_t p = 0; p < part_count; p++) { - sets[p][b].offset_ = sum; - sum += sets[p][b].entity_count(); - - if (debug_level & 16) { - fmt::print("Part {} ", p + 1); - sets[p][b].dump(); - } - } + for (size_t lss = 0; lss < sets[p].size(); lss++) { + if (sets[p][lss].position_ == ss) { + sets[p][lss].offset_ = sum; + sum += sets[p][lss].entity_count(); + + if (debug_level & 16) { + fmt::print("Part {} ", p + 1); + sets[p][lss].dump(); + } + break; + } + } + } } // Free some memory which is no longer needed... From d93913dc93c21430a66f509fa3d83d7f164f0d2c Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 20 Dec 2023 13:43:56 -0700 Subject: [PATCH 097/110] GREPOS: Add check for filtered sideset with variables --- packages/seacas/applications/grepos/gp_qainfo.blk | 4 ++-- packages/seacas/applications/grepos/grepos.f | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/seacas/applications/grepos/gp_qainfo.blk b/packages/seacas/applications/grepos/gp_qainfo.blk index 2f913f29f9..a95a383a55 100644 --- a/packages/seacas/applications/grepos/gp_qainfo.blk +++ b/packages/seacas/applications/grepos/gp_qainfo.blk @@ -6,5 +6,5 @@ C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- QAINFO(1) = 'Grepos ' - QAINFO(2) = '2022/10/06 ' - QAINFO(3) = ' 1.92 ' + QAINFO(2) = '2023/12/20 ' + QAINFO(3) = ' 1.93 ' diff --git a/packages/seacas/applications/grepos/grepos.f b/packages/seacas/applications/grepos/grepos.f index b84030f3c2..76befa0932 100644 --- a/packages/seacas/applications/grepos/grepos.f +++ b/packages/seacas/applications/grepos/grepos.f @@ -863,7 +863,7 @@ PROGRAM GREPOS do i=0,numnps0-1 if (ia(kinpss+i) .eq.0) then if (IA(KNNNS0+i) .ne. IA(KNNNS+i1)) then - write (*,900) 'Nodeset', ia(kidns0+i) + write (*,900) 'Nodeset', ia(kidns0+i), 'nodeset' end if i1 = i1 + 1 end if @@ -946,15 +946,18 @@ PROGRAM GREPOS call muntt(numess0, numess, nvarss, $ ia(kssvok0), ia(kssvok), ia(kiesss)) + endif C ... check that the sidesets that are retained contain the same number C of faces that the original sidesets contain. At the current time, C can only map sideset variables if the sidesets are the same... + if (delel .and. nvarss .gt. 0) then i1 = 0 do i=0,numess0-1 if (ia(kiesss+i) .eq.0) then if (IA(KNESS0+i) .ne. IA(KNESS+i1)) then - write (*,900) 'Sideset', ia(kidss0+i) + write (*,900) 'Sideset', ia(kidss0+i), 'sideset' + stop 'Cannot Map Sideset Variables' end if i1 = i1 + 1 end if @@ -1283,8 +1286,8 @@ PROGRAM GREPOS & 14X,'GG GG RR RR EE PP OO OO SS'/ & 14X,' GGGGG RR RR EEEEEEE PP OOOOO SSSSSS ') 900 FORMAT(/,'WARNING: ',A,i5,' is a different size in the output', - $ /,9x,'database than in the input database. If there are', - $ /,9x,'variables on this sideset, they will be transferred', + $ /,9x,'database than in the input database. The ', + $ /,9x,'variables on this ',A,' will be transferred', $ /,9x,'incorrectly. Contact gdsjaar@sandia.gov', $ /,9x,'if you need this capability.') END From 4fc628229260c6ca6f0c3140223e50e9b82908d7 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 20 Dec 2023 07:55:07 -0700 Subject: [PATCH 098/110] IOSS: Add filename to error message output --- .../ioss/src/exodus/Ioex_DatabaseIO.C | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C index ffa2558ba5..eb3c0b5ea1 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C @@ -792,7 +792,8 @@ namespace Ioex { nemesis_file = false; if (isParallel && util().parallel_size() > 1) { std::ostringstream errmsg; - fmt::print(errmsg, "ERROR: Exodus file does not contain nemesis information.\n"); + fmt::print(errmsg, "ERROR: Exodus file '{}' does not contain nemesis information.\n", + get_filename()); IOSS_ERROR(errmsg); } file_type[0] = 'p'; @@ -809,25 +810,28 @@ namespace Ioex { if (isParallel && num_proc != util().parallel_size() && util().parallel_size() > 1) { std::ostringstream errmsg; - fmt::print(errmsg, - "ERROR: Exodus file was decomposed for {} processors; application is currently " - "being run on {} processors", - num_proc, util().parallel_size()); + fmt::print( + errmsg, + "ERROR: Exodus file '{}' was decomposed for {} processors; application is currently " + "being run on {} processors", + get_filename(), num_proc, util().parallel_size()); IOSS_ERROR(errmsg); } if (num_proc_in_file != 1) { std::ostringstream errmsg; fmt::print(errmsg, - "ERROR: Exodus file contains data for {} processors; application requires 1 " + "ERROR: Exodus file '{}' contains data for {} processors; application requires 1 " "processor per file.", - num_proc_in_file); + get_filename(), num_proc_in_file); IOSS_ERROR(errmsg); } if (file_type[0] != 'p') { std::ostringstream errmsg; - fmt::print(errmsg, - "ERROR: Exodus file contains scalar nemesis data; application requires parallel " - "nemesis data."); + fmt::print( + errmsg, + "ERROR: Exodus file '{}' contains scalar nemesis data; application requires parallel " + "nemesis data.", + get_filename()); IOSS_ERROR(errmsg); } From 7c0bf671dcbb7a56724326739d14a73289567fda Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 21 Dec 2023 11:22:51 -0700 Subject: [PATCH 099/110] IOSS: Eliminate config includes added by iwyu --- packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h | 1 - packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h | 1 - packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C | 1 - packages/seacas/libraries/ioss/src/main/info_interface.C | 1 - packages/seacas/libraries/ioss/src/main/io_info.h | 3 +-- packages/seacas/libraries/ioss/src/main/io_modify.C | 1 - packages/seacas/libraries/ioss/src/main/modify_interface.C | 3 +-- packages/seacas/libraries/ioss/src/main/shell_interface.C | 1 - packages/seacas/libraries/ioss/src/main/skinner_interface.C | 1 - 9 files changed, 2 insertions(+), 11 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h index b8e2b33ef0..d6e3f005ca 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h @@ -23,7 +23,6 @@ #include #include "Ioss_EntityType.h" -#include "SEACASIoss_config.h" #include "ioss_export.h" #if defined(SEACAS_HAVE_CGNS) && !defined(BUILT_IN_SIERRA) diff --git a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h index f0ca50a4a1..a609e57ea4 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h @@ -17,7 +17,6 @@ #include #include -#include "SEACASIoss_config.h" #include "ioss_export.h" #if defined(SEACAS_HAVE_CGNS) && !defined(BUILT_IN_SIERRA) diff --git a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C index ff94b46d9b..9018a7af82 100644 --- a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C +++ b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C @@ -46,7 +46,6 @@ #include "visualization/exodus/Iovs_exodus_IOFactory.h" #include "Ioss_IOFactory.h" -#include "SEACASIoss_config.h" namespace { #if defined(IOSS_THREADSAFE) diff --git a/packages/seacas/libraries/ioss/src/main/info_interface.C b/packages/seacas/libraries/ioss/src/main/info_interface.C index 69a969ff27..dc991e804d 100644 --- a/packages/seacas/libraries/ioss/src/main/info_interface.C +++ b/packages/seacas/libraries/ioss/src/main/info_interface.C @@ -14,7 +14,6 @@ #include "Ioss_GetLongOpt.h" // for GetLongOption, etc #include "Ioss_Utils.h" -#include "SEACASIoss_config.h" #include "info_interface.h" Info::Interface::Interface() { enroll_options(); } diff --git a/packages/seacas/libraries/ioss/src/main/io_info.h b/packages/seacas/libraries/ioss/src/main/io_info.h index fc03093ae2..beb6be062c 100644 --- a/packages/seacas/libraries/ioss/src/main/io_info.h +++ b/packages/seacas/libraries/ioss/src/main/io_info.h @@ -1,5 +1,5 @@ /* - * Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions + * Copyright(C) 1999-2020, 2022, 2023 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. * @@ -20,7 +20,6 @@ #include #include -#include "SEACASIoss_config.h" #include "info_interface.h" #include "io_info_lib_export.h" #if defined(SEACAS_HAVE_EXODUS) diff --git a/packages/seacas/libraries/ioss/src/main/io_modify.C b/packages/seacas/libraries/ioss/src/main/io_modify.C index 51bfa9a6ab..68d9be15fc 100644 --- a/packages/seacas/libraries/ioss/src/main/io_modify.C +++ b/packages/seacas/libraries/ioss/src/main/io_modify.C @@ -48,7 +48,6 @@ #include "Ioss_PropertyManager.h" #include "Ioss_ScopeGuard.h" #include "Ioss_State.h" -#include "SEACASIoss_config.h" #include "modify_interface.h" #if defined(SEACAS_HAVE_EXODUS) diff --git a/packages/seacas/libraries/ioss/src/main/modify_interface.C b/packages/seacas/libraries/ioss/src/main/modify_interface.C index 24306c47aa..291520b0e0 100644 --- a/packages/seacas/libraries/ioss/src/main/modify_interface.C +++ b/packages/seacas/libraries/ioss/src/main/modify_interface.C @@ -1,5 +1,5 @@ /* - * Copyright(C) 1999-2022 National Technology & Engineering Solutions + * Copyright(C) 1999-2023 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. * @@ -14,7 +14,6 @@ #include "Ioss_GetLongOpt.h" #include "Ioss_Utils.h" -#include "SEACASIoss_config.h" #include "modify_interface.h" Modify::Interface::Interface() { enroll_options(); } diff --git a/packages/seacas/libraries/ioss/src/main/shell_interface.C b/packages/seacas/libraries/ioss/src/main/shell_interface.C index b1bb4cc93f..5334f58fb8 100644 --- a/packages/seacas/libraries/ioss/src/main/shell_interface.C +++ b/packages/seacas/libraries/ioss/src/main/shell_interface.C @@ -16,7 +16,6 @@ #include "Ioss_GetLongOpt.h" // for GetLongOption, etc #include "Ioss_Sort.h" #include "Ioss_Utils.h" // for Utils -#include "SEACASIoss_config.h" #include "shell_interface.h" #include "tokenize.h" diff --git a/packages/seacas/libraries/ioss/src/main/skinner_interface.C b/packages/seacas/libraries/ioss/src/main/skinner_interface.C index fafebe8b97..93fbf86d00 100644 --- a/packages/seacas/libraries/ioss/src/main/skinner_interface.C +++ b/packages/seacas/libraries/ioss/src/main/skinner_interface.C @@ -14,7 +14,6 @@ #include "Ioss_GetLongOpt.h" // for GetLongOption, etc #include "Ioss_Sort.h" #include "Ioss_Utils.h" -#include "SEACASIoss_config.h" #include "skinner_interface.h" #include "tokenize.h" From 4843398240ac3451a0dc17f2fbcb11feb3476fdf Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 21 Dec 2023 11:23:20 -0700 Subject: [PATCH 100/110] IOSS: Replace individual element includes with standard element type include --- .../libraries/ioss/src/Ioss_Initializer.C | 64 +------------------ 1 file changed, 1 insertion(+), 63 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_Initializer.C b/packages/seacas/libraries/ioss/src/Ioss_Initializer.C index e549672748..36c78d654f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Initializer.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Initializer.C @@ -5,70 +5,8 @@ // See packages/seacas/LICENSE for details #include "Ioss_ElementPermutation.h" +#include "Ioss_StandardElementTypes.h" -#include "Ioss_Beam2.h" -#include "Ioss_Beam3.h" -#include "Ioss_Beam4.h" -#include "Ioss_Edge2.h" -#include "Ioss_Edge3.h" -#include "Ioss_Edge4.h" -#include "Ioss_Hex16.h" -#include "Ioss_Hex20.h" -#include "Ioss_Hex27.h" -#include "Ioss_Hex32.h" -#include "Ioss_Hex64.h" -#include "Ioss_Hex8.h" -#include "Ioss_Hex9.h" -#include "Ioss_Initializer.h" -#include "Ioss_Node.h" -#include "Ioss_Pyramid13.h" -#include "Ioss_Pyramid14.h" -#include "Ioss_Pyramid18.h" -#include "Ioss_Pyramid19.h" -#include "Ioss_Pyramid5.h" -#include "Ioss_Quad12.h" -#include "Ioss_Quad16.h" -#include "Ioss_Quad4.h" -#include "Ioss_Quad6.h" -#include "Ioss_Quad8.h" -#include "Ioss_Quad9.h" -#include "Ioss_Shell4.h" -#include "Ioss_Shell8.h" -#include "Ioss_Shell9.h" -#include "Ioss_ShellLine2D2.h" -#include "Ioss_ShellLine2D3.h" -#include "Ioss_Sphere.h" -#include "Ioss_Spring2.h" -#include "Ioss_Spring3.h" -#include "Ioss_Super.h" -#include "Ioss_Tet10.h" -#include "Ioss_Tet11.h" -#include "Ioss_Tet14.h" -#include "Ioss_Tet15.h" -#include "Ioss_Tet16.h" -#include "Ioss_Tet4.h" -#include "Ioss_Tet40.h" -#include "Ioss_Tet8.h" -#include "Ioss_Tri13.h" -#include "Ioss_Tri3.h" -#include "Ioss_Tri4.h" -#include "Ioss_Tri6.h" -#include "Ioss_Tri7.h" -#include "Ioss_Tri9.h" -#include "Ioss_TriShell3.h" -#include "Ioss_TriShell4.h" -#include "Ioss_TriShell6.h" -#include "Ioss_TriShell7.h" -#include "Ioss_Unknown.h" -#include "Ioss_Wedge12.h" -#include "Ioss_Wedge15.h" -#include "Ioss_Wedge16.h" -#include "Ioss_Wedge18.h" -#include "Ioss_Wedge20.h" -#include "Ioss_Wedge21.h" -#include "Ioss_Wedge24.h" -#include "Ioss_Wedge52.h" -#include "Ioss_Wedge6.h" #if defined IOSS_THREADSAFE #include #endif From ae37547c71926cb1d0c6040ae4e072e5cd5222ed Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 21 Dec 2023 15:59:50 -0700 Subject: [PATCH 101/110] TPL: Update matio version --- install-tpl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-tpl.sh b/install-tpl.sh index 00d852a2e9..3ea00db27b 100755 --- a/install-tpl.sh +++ b/install-tpl.sh @@ -723,7 +723,7 @@ then check_exec automake check_exec autoconf - matio_version="1.5.23" + matio_version="v1.5.26" if [ "$FORCE" == "YES" ] || ! [ -e $INSTALL_PATH/lib/libmatio.${LD_EXT} ] then echo "${txtgrn}+++ MatIO${txtrst}" From 0c4493d85aa897f2120d8b650155a6a61b63fd18 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 2 Jan 2024 10:17:21 -0700 Subject: [PATCH 102/110] IOSS: Sierra uses sorted vector; [ci skip] --- packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h b/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h index 55d83606e2..a5683bab87 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h +++ b/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h @@ -30,6 +30,7 @@ inline std::string IOSS_VECTOR_3D() { return {"vector_3d"}; } inline std::string IOSS_SYM_TENSOR() { return {"sym_tensor_33"}; } #if defined(BUILT_IN_SIERRA) +#define MAP_USE_SORTED_VECTOR #define SEACAS_HAVE_MPI /* #undef IOSS_THREADSAFE */ /* #undef SEACAS_HAVE_KOKKOS */ From a861746e8b09bada3ec42e8123203946fa73671c Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 2 Jan 2024 10:47:03 -0700 Subject: [PATCH 103/110] EXODUS: Fix doxygen comment [ci skip] --- packages/seacas/libraries/exodus/src/ex_get_group_ids.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/seacas/libraries/exodus/src/ex_get_group_ids.c b/packages/seacas/libraries/exodus/src/ex_get_group_ids.c index 596b55bd6c..64ca846b29 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_group_ids.c +++ b/packages/seacas/libraries/exodus/src/ex_get_group_ids.c @@ -1,5 +1,5 @@ /* - * Copyright(C) 1999-2020 National Technology & Engineering Solutions + * Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. * @@ -10,7 +10,8 @@ #include "exodusII_int.h" // for EX_FATAL, EX_NOERR /** - * \ingroup Utilities Given a file or group 'parent' id, return the + * \ingroup Utilities + * Given a file or group 'parent' id, return the * number of child groups and the ids of the child groups below the * parent. If num_groups is NULL, do not return count; if group_ids * is NULL, do not return ids. From 8970de936fd31e237f676ba302a6f6a83517d2cf Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 2 Jan 2024 10:47:34 -0700 Subject: [PATCH 104/110] TPL: New versions of cgns, fmt --- install-tpl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-tpl.sh b/install-tpl.sh index 3ea00db27b..0e1a76c8a5 100755 --- a/install-tpl.sh +++ b/install-tpl.sh @@ -608,7 +608,7 @@ then then echo "${txtgrn}+++ Configuring, Building, and Installing...${txtrst}" cd CGNS || exit - git checkout v4.3.0 + git checkout v4.4.0 rm -rf build mkdir build cd build || exit @@ -770,7 +770,7 @@ then echo "${txtgrn}+++ FMT${txtrst}" cd $ACCESS || exit cd TPL/fmt || exit - fmt_version="10.1.0" + fmt_version="10.2.0" if [ "$DOWNLOAD" == "YES" ] then From b737feead130279e340ec8e5f26f652c12c8d5e3 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 2 Jan 2024 13:43:25 -0700 Subject: [PATCH 105/110] TPL: netCDF - disable byterange support to eliminate curl dependency --- TPL/netcdf/runcmake.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/TPL/netcdf/runcmake.sh b/TPL/netcdf/runcmake.sh index 7ab3326a29..3b37d34a81 100755 --- a/TPL/netcdf/runcmake.sh +++ b/TPL/netcdf/runcmake.sh @@ -66,6 +66,7 @@ cmake .. -DCMAKE_C_COMPILER:FILEPATH=${CC} \ -DENABLE_CDF5=ON \ -DENABLE_MMAP:BOOL=ON \ -DENABLE_DAP:BOOL=OFF \ + -DENABLE_BYTERANGE:BOOL=OFF \ -DENABLE_V2_API:BOOL=OFF \ -DENABLE_FILTER_TESTING:BOOL=OFF \ -DENABLE_TESTS:BOOL=OFF \ From c1e7dce7ab22f0203810288475b7a4b4d41668f9 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 2 Jan 2024 10:18:54 -0700 Subject: [PATCH 106/110] from sierra build [ci skip] --- packages/seacas/Jamfile | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/seacas/Jamfile b/packages/seacas/Jamfile index 23dc6d5766..2b32e6cc16 100644 --- a/packages/seacas/Jamfile +++ b/packages/seacas/Jamfile @@ -1508,6 +1508,7 @@ exe slice ioinit : $(seacas-root)/applications/slice USE_METIS + USE_ZOLTAN @utility-exec-tag ; From f484404dbcaa365083a4c162df2e9cbbce518ad8 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 2 Jan 2024 16:33:45 -0700 Subject: [PATCH 107/110] IOSS: Heartbeat -- enable timestamp output if timestamp format specified --- .../seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C index 04762ad752..ee019a6a46 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C @@ -213,7 +213,7 @@ namespace Iohb { new_this->tsFormat = properties.get("TIME_STAMP_FORMAT").get_string(); } - bool show_time_stamp = false; + bool show_time_stamp = !new_this->tsFormat.empty(); Ioss::Utils::check_set_bool_property(properties, "SHOW_TIME_STAMP", show_time_stamp); if (show_time_stamp) { if (tsFormat.empty()) { @@ -231,6 +231,10 @@ namespace Iohb { if (properties.exists("FIELD_WIDTH")) { new_this->fieldWidth_ = properties.get("FIELD_WIDTH").get_int(); } + else { + // +1.xxxxxxe+00 The x count is the precision the "+1.e+00" is the 7 + new_this->fieldWidth_ = precision_ + 7; + } Ioss::Utils::check_set_bool_property(properties, "SHOW_LABELS", new_this->showLabels); From ff6336d8ca857d6909987a82526cefdfd34aaf2c Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 2 Jan 2024 17:25:41 -0700 Subject: [PATCH 108/110] FMT: Fixes for latest releast of lib::fmt --- packages/seacas/applications/cpup/cpup.C | 1 + packages/seacas/applications/exodiff/check.C | 1 + packages/seacas/applications/slice/SL_Decompose.C | 1 + packages/seacas/applications/zellij/Cell.C | 1 + packages/seacas/applications/zellij/Grid.C | 1 + packages/seacas/applications/zellij/UnitCell.C | 1 + packages/seacas/libraries/aprepro_lib/apr_scanner.cc | 1 + packages/seacas/libraries/ioss/src/Ioss_IOFactory.C | 1 + packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C | 1 + packages/seacas/libraries/ioss/src/Ioss_Utils.C | 1 + packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C | 1 + packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h | 1 + packages/seacas/libraries/ioss/src/main/io_info.C | 1 + packages/seacas/libraries/ioss/src/main/io_modify.C | 1 + packages/seacas/libraries/ioss/src/main/sphgen.C | 1 + 15 files changed, 15 insertions(+) diff --git a/packages/seacas/applications/cpup/cpup.C b/packages/seacas/applications/cpup/cpup.C index 59b38a3186..a382b488ca 100644 --- a/packages/seacas/applications/cpup/cpup.C +++ b/packages/seacas/applications/cpup/cpup.C @@ -13,6 +13,7 @@ #include "add_to_log.h" #define FMT_DEPRECATED_OSTREAM #include "fmt/ostream.h" +#include "fmt/ranges.h" #include "format_time.h" #include "hwm.h" #include "open_file_limit.h" diff --git a/packages/seacas/applications/exodiff/check.C b/packages/seacas/applications/exodiff/check.C index e6a4ed0259..db9d47d138 100644 --- a/packages/seacas/applications/exodiff/check.C +++ b/packages/seacas/applications/exodiff/check.C @@ -16,6 +16,7 @@ #include "exo_block.h" #include "exodusII.h" #include "fmt/ostream.h" +#include "fmt/ranges.h" #include "node_set.h" #include "side_set.h" #include "smart_assert.h" diff --git a/packages/seacas/applications/slice/SL_Decompose.C b/packages/seacas/applications/slice/SL_Decompose.C index f3cbb19f1c..b239094672 100644 --- a/packages/seacas/applications/slice/SL_Decompose.C +++ b/packages/seacas/applications/slice/SL_Decompose.C @@ -26,6 +26,7 @@ #endif #include #include +#include #include #if USE_METIS diff --git a/packages/seacas/applications/zellij/Cell.C b/packages/seacas/applications/zellij/Cell.C index 20841364e8..30d13d8014 100644 --- a/packages/seacas/applications/zellij/Cell.C +++ b/packages/seacas/applications/zellij/Cell.C @@ -12,6 +12,7 @@ #include #include #include +#include #include //! \file diff --git a/packages/seacas/applications/zellij/Grid.C b/packages/seacas/applications/zellij/Grid.C index 7f9b69f663..85b4f8d6a1 100644 --- a/packages/seacas/applications/zellij/Grid.C +++ b/packages/seacas/applications/zellij/Grid.C @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/packages/seacas/applications/zellij/UnitCell.C b/packages/seacas/applications/zellij/UnitCell.C index 0f69d03275..ccd98e996a 100644 --- a/packages/seacas/applications/zellij/UnitCell.C +++ b/packages/seacas/applications/zellij/UnitCell.C @@ -14,6 +14,7 @@ #include "Ioss_SmartAssert.h" #include "Ioss_Sort.h" #include "fmt/format.h" +#include "fmt/ranges.h" //! \file diff --git a/packages/seacas/libraries/aprepro_lib/apr_scanner.cc b/packages/seacas/libraries/aprepro_lib/apr_scanner.cc index 17c31a764d..07dcb983a6 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_scanner.cc +++ b/packages/seacas/libraries/aprepro_lib/apr_scanner.cc @@ -980,6 +980,7 @@ static yyconst flex_int16_t yy_rule_linenum[102] = { #include "aprepro.h" #include "fmt/format.h" #include "fmt/ostream.h" +#include "fmt/ranges.h" #define YY_NO_UNISTD_H /* import the parser's token type into a local typedef */ diff --git a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C index cc5d87e93a..e020d8dd37 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C @@ -10,6 +10,7 @@ #include "Ioss_Version.h" #include #include +#include #include // for _Rb_tree_iterator, etc #include // for basic_ostream, etc #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C index d650c38c84..581c21b158 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C @@ -16,6 +16,7 @@ #include // for size_t #include #include +#include #include #include #include // for string diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.C b/packages/seacas/libraries/ioss/src/Ioss_Utils.C index effcfd6199..6e98057473 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.C @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C index edee536489..b0f9706b7c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C @@ -8,6 +8,7 @@ #include "Ioss_ZoneConnectivity.h" #include #include +#include #include // for string #include // for vector diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h index 15979fddbd..dcbabe7f6d 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/io_info.C b/packages/seacas/libraries/ioss/src/main/io_info.C index 12efe9d93b..9634b7c74c 100644 --- a/packages/seacas/libraries/ioss/src/main/io_info.C +++ b/packages/seacas/libraries/ioss/src/main/io_info.C @@ -11,6 +11,7 @@ #include "Ioss_StructuredBlock.h" #include "Ioss_ZoneConnectivity.h" #include +#include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/io_modify.C b/packages/seacas/libraries/ioss/src/main/io_modify.C index 68d9be15fc..74e86b674f 100644 --- a/packages/seacas/libraries/ioss/src/main/io_modify.C +++ b/packages/seacas/libraries/ioss/src/main/io_modify.C @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/main/sphgen.C b/packages/seacas/libraries/ioss/src/main/sphgen.C index 67249e26ba..b41d5b9832 100644 --- a/packages/seacas/libraries/ioss/src/main/sphgen.C +++ b/packages/seacas/libraries/ioss/src/main/sphgen.C @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include From afe063fa7c9036f43d5a7810561e4243fa2b2add Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 3 Jan 2024 08:50:56 -0700 Subject: [PATCH 109/110] CI: Newer intel has problems with non-header-only fmt --- cmake-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-config b/cmake-config index 2ae29736b1..8575bf104e 100755 --- a/cmake-config +++ b/cmake-config @@ -164,7 +164,7 @@ then CC=icx FC=ifx CFLAGS="-Wall -Wunused" - CXXFLAGS="-Wall -Wextra -Wunused" + CXXFLAGS="-Wall -Wextra -Wunused -DFMT_HEADER_ONLY" fi # When building: "scan-build make -j8" From 9f9ac60c9257da2eb18afa370d78fd34730c1a1f Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 3 Jan 2024 08:53:02 -0700 Subject: [PATCH 110/110] IOSS: Address coverity concerns --- packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C | 10 +++++----- packages/seacas/libraries/ioss/src/Ioss_Utils.C | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C b/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C index 334aa2f9dd..66e86628a5 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C +++ b/packages/seacas/libraries/ioss/src/Ioss_CopyDatabase.C @@ -1,4 +1,4 @@ -// Copyright(C) 2021, 2022, 2023 National Technology & Engineering Solutions +// Copyright(C) 2021, 2022, 2023, 2024 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -482,8 +482,8 @@ namespace { // really matter. const auto &blocks = region.get_element_blocks(); const auto *topo = blocks[0]->topology(); - auto elem_topo = topo->name(); - auto face_topo = topo->boundary_type(0)->name(); + const auto &elem_topo = topo->name(); + const auto &face_topo = topo->boundary_type(0)->name(); auto *ss = new Ioss::SideSet(output_region.get_database(), "boundary"); output_region.add(ss); @@ -1021,8 +1021,8 @@ namespace { const auto &fbs = ss->get_side_blocks(); for (const auto &ifb : fbs) { if (ifb->parent_block() != nullptr) { - auto fb_name = ifb->parent_block()->name(); - auto *parent = dynamic_cast( + const auto &fb_name = ifb->parent_block()->name(); + auto *parent = dynamic_cast( output_region.get_entity(fb_name, Ioss::ELEMENTBLOCK)); if (parent == nullptr) { parent = dynamic_cast( diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.C b/packages/seacas/libraries/ioss/src/Ioss_Utils.C index 6e98057473..d42b91e482 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.C @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2023 National Technology & Engineering Solutions +// Copyright(C) 1999-2024 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -1333,7 +1333,7 @@ std::string Ioss::Utils::get_type_from_file(const std::string &filename) if (all_dig) { auto tokens = Ioss::tokenize(filename, "."); if (tokens.size() >= 4) { - auto proc_count = tokens[tokens.size() - 2]; + const auto &proc_count = tokens[tokens.size() - 2]; if (proc_count.find_first_not_of("0123456789") == std::string::npos) { extension = tokens[tokens.size() - 3]; }