From 91362787d0e3ea0bb46a0317747395d99f004a7d Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 16 May 2024 09:14:27 -0600 Subject: [PATCH] EXODUS: Import a specific exodus version from exomerge --- packages/seacas/scripts/exomerge2.py | 7 ++----- packages/seacas/scripts/exomerge3.py | 5 +---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/seacas/scripts/exomerge2.py b/packages/seacas/scripts/exomerge2.py index 6ec456a6c7..0388975bf0 100755 --- a/packages/seacas/scripts/exomerge2.py +++ b/packages/seacas/scripts/exomerge2.py @@ -1,7 +1,7 @@ """ Exomerge is a lightweight Python interface for manipulating ExodusII files. -Copyright(C) 1999-2020, 2023 National Technology & Engineering Solutions +Copyright(C) 1999-2020, 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. @@ -53,10 +53,7 @@ # import exodus module # (exodus.py should be in the same directory as this file) -try: - import exodus -except: - import exodus2 as exodus +import exodus2 as exodus # informal version number of this module __version__ = 8.6 diff --git a/packages/seacas/scripts/exomerge3.py b/packages/seacas/scripts/exomerge3.py index d07e1ea5e1..76779addcb 100644 --- a/packages/seacas/scripts/exomerge3.py +++ b/packages/seacas/scripts/exomerge3.py @@ -54,10 +54,7 @@ # import exodus module # (exodus.py should be in the same directory as this file) -try: - import exodus -except Exception: - import exodus3 as exodus +import exodus3 as exodus # informal version number of this module __version__ = "8.6.1"