From 3a972dbbb9879f0a9d29a77b32c56e04b3eaecaa Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 10 Jan 2024 13:56:46 -0700 Subject: [PATCH] EXODIFF: Fix so Size() works for assembly --- packages/seacas/applications/exodiff/ED_Version.h | 4 ++-- packages/seacas/applications/exodiff/assembly.h | 3 ++- packages/seacas/applications/exodiff/exo_entity.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/seacas/applications/exodiff/ED_Version.h b/packages/seacas/applications/exodiff/ED_Version.h index 861afe2af1..08b16c94c4 100644 --- a/packages/seacas/applications/exodiff/ED_Version.h +++ b/packages/seacas/applications/exodiff/ED_Version.h @@ -1,9 +1,9 @@ -// 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. // // See packages/seacas/LICENSE for details #pragma once -static const std::string version("3.30"); +static const std::string version("3.31"); static const std::string verdate("2024-01-10"); diff --git a/packages/seacas/applications/exodiff/assembly.h b/packages/seacas/applications/exodiff/assembly.h index 1554d6734a..65d76db6a8 100644 --- a/packages/seacas/applications/exodiff/assembly.h +++ b/packages/seacas/applications/exodiff/assembly.h @@ -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,6 +23,7 @@ template class Assembly : public Exo_Entity ex_entity_type Type() const { return assembly_type; } const std::vector &Entities() const { return entities; } + size_t Size() const override { return entities.size(); } private: int Check_State() const override; diff --git a/packages/seacas/applications/exodiff/exo_entity.h b/packages/seacas/applications/exodiff/exo_entity.h index e48ed77f28..c6fdf920f2 100644 --- a/packages/seacas/applications/exodiff/exo_entity.h +++ b/packages/seacas/applications/exodiff/exo_entity.h @@ -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. // @@ -32,7 +32,7 @@ class Exo_Entity Exo_Entity(const Exo_Entity &) = delete; const Exo_Entity &operator=(const Exo_Entity &) = delete; - size_t Size() const { return numEntity; } + virtual size_t Size() const { return numEntity; } size_t Id() const { return id_; } size_t Index() const { return index_; }