From 88b005a3c839df596de3704db5f8d30b5bbfd320 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 4 Sep 2024 15:10:43 -0600 Subject: [PATCH 1/3] EXODUS: Clean up some error output/handling --- packages/seacas/libraries/exodus/include/exodusII.h | 4 ++-- packages/seacas/libraries/exodus/src/ex_err.c | 3 ++- packages/seacas/libraries/exodus/src/ex_utils.c | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/seacas/libraries/exodus/include/exodusII.h b/packages/seacas/libraries/exodus/include/exodusII.h index 90784f0b34..d3511618e9 100644 --- a/packages/seacas/libraries/exodus/include/exodusII.h +++ b/packages/seacas/libraries/exodus/include/exodusII.h @@ -1955,9 +1955,9 @@ enum ex_error_return_code { EX_LASTERR = -1003, /**< in ex_err, use existing err_num value */ EX_NULLENTITY = -1006, /**< null entity found */ EX_NOENTITY = -1007, /**< no entities of that type on database */ + EX_NOTFOUND = -1008, /**< could not find requested variable on database */ EX_INTSIZEMISMATCH = - -1008, /**< integer sizes do not match on input/output databases in ex_copy */ - EX_NOTFOUND = -1008, /**< could not find requested variable on database */ + -1009, /**< integer sizes do not match on input/output databases in ex_copy */ EX_FATAL = -1, /**< fatal error flag def */ EX_NOERR = 0, /**< no error flag def */ diff --git a/packages/seacas/libraries/exodus/src/ex_err.c b/packages/seacas/libraries/exodus/src/ex_err.c index a2400ab978..99f2429b1f 100644 --- a/packages/seacas/libraries/exodus/src/ex_err.c +++ b/packages/seacas/libraries/exodus/src/ex_err.c @@ -1,5 +1,5 @@ /* - * 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. * @@ -345,6 +345,7 @@ const char *ex_strerror(int err_num) case EX_INTERNAL: return "Internal logic error in exodus library."; case EX_NOTROOTID: return "File id is not the root id; it is a subgroup id."; case EX_NULLENTITY: return "Null entity found."; + case EX_NOTFOUND: return "Could not find requested variable on database."; case EX_INTSIZEMISMATCH: return "Integer sizes must match for input and output file in ex_copy."; case EX_MSG: return "Message printed; no error implied."; default: return nc_strerror(err_num); diff --git a/packages/seacas/libraries/exodus/src/ex_utils.c b/packages/seacas/libraries/exodus/src/ex_utils.c index a95f844529..7513e665c5 100644 --- a/packages/seacas/libraries/exodus/src/ex_utils.c +++ b/packages/seacas/libraries/exodus/src/ex_utils.c @@ -193,7 +193,7 @@ int exi_check_file_type(const char *path, int *type) FILE *fp; if (!(fp = fopen(path, "r"))) { char errmsg[MAX_ERR_LENGTH]; - snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: Could not open file '%s', error = %s.", path, + snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: Could not open file '%s',\n\t\terror = %s.", path, strerror(errno)); ex_err(__func__, errmsg, EX_WRONGFILETYPE); EX_FUNC_LEAVE(EX_FATAL); @@ -203,8 +203,9 @@ int exi_check_file_type(const char *path, int *type) fclose(fp); if (i != MAGIC_NUMBER_LEN) { char errmsg[MAX_ERR_LENGTH]; - snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: Could not read magic data from file '%s', err = %s.", - path, strerror(errno)); + snprintf(errmsg, MAX_ERR_LENGTH, + "ERROR: Could not read magic data from file '%s',\n\t\terror = %s.", path, + strerror(errno)); ex_err(__func__, errmsg, EX_WRONGFILETYPE); EX_FUNC_LEAVE(EX_FATAL); } From fb897c32803b71b2db9ffd5cfff0082897fe0c8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 15:29:32 -0600 Subject: [PATCH 2/3] Bump ubuntu from 22.04 to 24.04 in /docker/exodus (#483) Bumps ubuntu from 22.04 to 24.04. --- updated-dependencies: - dependency-name: ubuntu dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker/exodus/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/exodus/Dockerfile b/docker/exodus/Dockerfile index c6f58c6a13..8acdf3b474 100644 --- a/docker/exodus/Dockerfile +++ b/docker/exodus/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04@sha256:adbb90115a21969d2fe6fa7f9af4253e16d45f8d4c1e930182610c4731962658 +FROM ubuntu:24.04@sha256:8a37d68f4f73ebf3d4efafbcf66379bf3728902a8038616808f04e34a9ab63ee ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install --no-install-recommends -y \ From 35c4663fbb8a89955d762e58a808895228e84680 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 15:29:47 -0600 Subject: [PATCH 3/3] Bump sphinx from 4.0.2 to 8.0.2 in /cmake/tribits/doc/sphinx (#484) Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 4.0.2 to 8.0.2. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/v8.0.2/CHANGES.rst) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v4.0.2...v8.0.2) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cmake/tribits/doc/sphinx/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/tribits/doc/sphinx/requirements.txt b/cmake/tribits/doc/sphinx/requirements.txt index 8c7b1fdb5d..bf765bad1d 100644 --- a/cmake/tribits/doc/sphinx/requirements.txt +++ b/cmake/tribits/doc/sphinx/requirements.txt @@ -1,2 +1,2 @@ -Sphinx==4.0.2 +Sphinx==8.0.2 sphinx-rtd-theme==0.5.2