Skip to content

Commit

Permalink
Remove some unneeded destructors
Browse files Browse the repository at this point in the history
  • Loading branch information
gsjaardema committed Jan 24, 2024
1 parent 8a67d9c commit bbf955b
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 33 deletions.
9 changes: 0 additions & 9 deletions packages/seacas/applications/epu/EP_ExodusEntity.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ namespace Excn {
class Mesh
{
public:
Mesh() = default;

size_t count(ObjectType type) const
{
switch (type) {
Expand Down Expand Up @@ -64,8 +62,6 @@ namespace Excn {
class Assembly
{
public:
Assembly() = default;

size_t entity_count() const { return entityCount; }
ObjectType entity_type() const { return type_; }

Expand Down Expand Up @@ -119,8 +115,6 @@ namespace Excn {
template <typename INT> class NodeSet
{
public:
NodeSet() = default;

ex_entity_id id{0};
int64_t nodeCount{0};
int64_t dfCount{0};
Expand Down Expand Up @@ -153,8 +147,6 @@ namespace Excn {
template <typename INT> class SideSet
{
public:
SideSet() = default;

ex_entity_id id{0};
int64_t sideCount{0};
int64_t dfCount{0};
Expand Down Expand Up @@ -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)
{
Expand Down
5 changes: 1 addition & 4 deletions packages/seacas/applications/zellij/Cell.h
Original file line number Diff line number Diff line change
@@ -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.
//
Expand Down Expand Up @@ -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<double, double> get_coordinate_range(enum Axis) const;
void initialize(size_t i, size_t j, std::shared_ptr<UnitCell> unit_cell);

Expand Down
40 changes: 20 additions & 20 deletions packages/seacas/libraries/ioss/src/elements/Ioss_Hex8.C
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit bbf955b

Please sign in to comment.