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*/,