From bbf955bcdf10cfd164034573434618d09752a294 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 24 Jan 2024 16:34:00 -0700 Subject: [PATCH] Remove some unneeded destructors --- .../seacas/applications/epu/EP_ExodusEntity.h | 9 ----- packages/seacas/applications/zellij/Cell.h | 5 +-- .../libraries/ioss/src/elements/Ioss_Hex8.C | 40 +++++++++---------- 3 files changed, 21 insertions(+), 33 deletions(-) diff --git a/packages/seacas/applications/epu/EP_ExodusEntity.h b/packages/seacas/applications/epu/EP_ExodusEntity.h index cbec38333a..563db19319 100644 --- a/packages/seacas/applications/epu/EP_ExodusEntity.h +++ b/packages/seacas/applications/epu/EP_ExodusEntity.h @@ -24,8 +24,6 @@ namespace Excn { class Mesh { public: - Mesh() = default; - size_t count(ObjectType type) const { switch (type) { @@ -64,8 +62,6 @@ namespace Excn { class Assembly { public: - Assembly() = default; - size_t entity_count() const { return entityCount; } ObjectType entity_type() const { return type_; } @@ -119,8 +115,6 @@ namespace Excn { template class NodeSet { public: - NodeSet() = default; - ex_entity_id id{0}; int64_t nodeCount{0}; int64_t dfCount{0}; @@ -153,8 +147,6 @@ namespace Excn { template class SideSet { public: - SideSet() = default; - ex_entity_id id{0}; int64_t sideCount{0}; int64_t dfCount{0}; @@ -268,7 +260,6 @@ namespace Excn { class CommunicationMap { public: - CommunicationMap() = default; CommunicationMap(int the_id, int64_t count, char the_type) : id(the_id), entityCount(count), type(the_type) { diff --git a/packages/seacas/applications/zellij/Cell.h b/packages/seacas/applications/zellij/Cell.h index 8e058764d9..8db0dac916 100644 --- a/packages/seacas/applications/zellij/Cell.h +++ b/packages/seacas/applications/zellij/Cell.h @@ -1,4 +1,4 @@ -// Copyright(C) 2021, 2022 National Technology & Engineering Solutions +// Copyright(C) 2021, 2022, 2024 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -37,9 +37,6 @@ enum class Loc { C = 0, BL, B, BR, L, R, TL, T, TR }; class Cell { public: - Cell() = default; - Cell(const Cell &) = default; - std::pair get_coordinate_range(enum Axis) const; void initialize(size_t i, size_t j, std::shared_ptr unit_cell); diff --git a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.C b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.C index a55edd45f4..af7e5ac4e6 100644 --- a/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.C +++ b/packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.C @@ -39,26 +39,26 @@ namespace { static constexpr int nfacenode = 4; static constexpr int nfaceedge = 4; - // Edge numbers are zero-based [0..number_edges) - static constexpr int edge_node_order[nedge][nedgenode] = // [edge][edge_node] - {{0, 1}, {1, 2}, {2, 3}, {3, 0}, {4, 5}, {5, 6}, - {6, 7}, {7, 4}, {0, 4}, {1, 5}, {2, 6}, {3, 7}}; - - // Face numbers are zero-based [0..number_faces) - static constexpr int face_node_order[nface][nfacenode] = // [face][face_node] - {{0, 1, 5, 4}, {1, 2, 6, 5}, {2, 3, 7, 6}, {0, 4, 7, 3}, {0, 3, 2, 1}, {4, 5, 6, 7}}; - - static constexpr int face_edge_order[nface][nfaceedge] = // [face][face_edge] - {{0, 9, 4, 8}, {1, 10, 5, 9}, {2, 11, 6, 10}, {8, 7, 11, 3}, {3, 2, 1, 0}, {4, 5, 6, 7}}; - - // face 0 returns number of nodes for all faces if homogeneous - // returns -1 if faces have differing topology - static constexpr int nodes_per_face[nface + 1] = {4, 4, 4, 4, 4, 4, 4}; - - // face 0 returns number of edges for all faces if homogeneous - // returns -1 if faces have differing topology - static constexpr int edges_per_face[nface + 1] = {4, 4, 4, 4, 4, 4, 4}; -}; + // Edge numbers are zero-based [0..number_edges) + static constexpr int edge_node_order[nedge][nedgenode] = // [edge][edge_node] + {{0, 1}, {1, 2}, {2, 3}, {3, 0}, {4, 5}, {5, 6}, + {6, 7}, {7, 4}, {0, 4}, {1, 5}, {2, 6}, {3, 7}}; + + // Face numbers are zero-based [0..number_faces) + static constexpr int face_node_order[nface][nfacenode] = // [face][face_node] + {{0, 1, 5, 4}, {1, 2, 6, 5}, {2, 3, 7, 6}, {0, 4, 7, 3}, {0, 3, 2, 1}, {4, 5, 6, 7}}; + + static constexpr int face_edge_order[nface][nfaceedge] = // [face][face_edge] + {{0, 9, 4, 8}, {1, 10, 5, 9}, {2, 11, 6, 10}, {8, 7, 11, 3}, {3, 2, 1, 0}, {4, 5, 6, 7}}; + + // face 0 returns number of nodes for all faces if homogeneous + // returns -1 if faces have differing topology + static constexpr int nodes_per_face[nface + 1] = {4, 4, 4, 4, 4, 4, 4}; + + // face 0 returns number of edges for all faces if homogeneous + // returns -1 if faces have differing topology + static constexpr int edges_per_face[nface + 1] = {4, 4, 4, 4, 4, 4, 4}; + }; } // namespace void Ioss::Hex8::factory()