Merge branch 'master' into catalyst_api_2_structured_blocks

sandialabs · Feb 1, 2024 · 4b3cdfd · 4b3cdfd
2 parents 33e11c1 + 9cad5d7
commit 4b3cdfd
Show file tree

Hide file tree

Showing 212 changed files with 939 additions and 919 deletions.
diff --git a/packages/seacas/applications/conjoin/CJ_ExodusEntity.h b/packages/seacas/applications/conjoin/CJ_ExodusEntity.h
@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2020, 2022, 2023 National Technology & Engineering Solutions
+// Copyright(C) 1999-2020, 2022, 2023, 2024 National Technology & Engineering Solutions
 // of Sandia, LLC (NTESS).  Under the terms of Contract DE-NA0003525 with
 // NTESS, the U.S. Government retains certain rights in this software.
 //
@@ -22,8 +22,6 @@ namespace Excn {
 
   template <typename INT> struct Mesh
   {
-    Mesh() = default;
-
     size_t count(ObjectType type) const
     {
       switch (type) {
@@ -56,11 +54,6 @@ namespace Excn {
 
   struct Block
   {
-    Block()                              = default;
-    Block(const Block &other)            = default;
-    ~Block()                             = default;
-    Block &operator=(const Block &other) = default;
-
     size_t entity_count() const { return elementCount; }
 
     IntVector                truthTable{};
@@ -77,8 +70,6 @@ namespace Excn {
 
   template <typename INT> struct NodeSet
   {
-    NodeSet() = default;
-
     IntVector    truthTable{};
     ex_entity_id id{0};
     size_t       nodeCount{0};
@@ -111,8 +102,6 @@ namespace Excn {
 
   template <typename INT> struct SideSet
   {
-    SideSet() = default;
-
     IntVector    truthTable{};
     ex_entity_id id{0};
     size_t       sideCount{0};
@@ -140,7 +129,6 @@ namespace Excn {
 
   struct CommunicationMap
   {
-    CommunicationMap() = default;
     CommunicationMap(size_t the_id, size_t count, char the_type)
         : id(the_id), entityCount(count), type(the_type)
     {

diff --git a/packages/seacas/applications/conjoin/CJ_Internals.C b/packages/seacas/applications/conjoin/CJ_Internals.C
@@ -567,7 +567,7 @@ int Excn::Internals::put_metadata(const std::vector<Block> &blocks)
 
     // store element type as attribute of connectivity variable
     status = nc_put_att_text(exodusFilePtr, connid, ATT_NAME_ELB,
-                             static_cast<int>(std::strlen(blocks[iblk].elType.c_str())) + 1,
+                             static_cast<int>(blocks[iblk].elType.size()) + 1,
                              blocks[iblk].elType.c_str());
     if (status != NC_NOERR) {
       ex_opts(EX_VERBOSE);

diff --git a/packages/seacas/applications/conjoin/CJ_SystemInterface.C b/packages/seacas/applications/conjoin/CJ_SystemInterface.C
@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2023 National Technology & Engineering Solutions
+// Copyright(C) 1999-2024 National Technology & Engineering Solutions
 // of Sandia, LLC (NTESS).  Under the terms of Contract DE-NA0003525 with
 // NTESS, the U.S. Government retains certain rights in this software.
 //
@@ -23,8 +23,6 @@ namespace {
 
 Excn::SystemInterface::SystemInterface() { enroll_options(); }
 
-Excn::SystemInterface::~SystemInterface() = default;
-
 void Excn::SystemInterface::enroll_options()
 {
   options_.usage("[options] list_of_files_to_join");

diff --git a/packages/seacas/applications/conjoin/CJ_SystemInterface.h b/packages/seacas/applications/conjoin/CJ_SystemInterface.h
@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions
+// Copyright(C) 1999-2020, 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.
 //
@@ -15,8 +15,6 @@ namespace Excn {
   {
   public:
     SystemInterface();
-    ~SystemInterface();
-
     bool parse_options(int argc, char **argv);
 
     int  debug() const { return debugLevel_; }