From 21c554d7d07fcb8e5574bf3cf31eca767e95c615 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 10 Jun 2024 10:59:54 +0200 Subject: [PATCH] CONFIG: bump adios and paraview versions - adios: 2.9.2 -> 2.10.1 - paraview: 5.11.2 -> 5.12.1 Ancillary libs: - hdf5: 1.14.4.3 - hypre: 2.23.0 -> 2.31.0 - petsc: 3.19.2 -> 3.21.2 --- etc/config.csh/adios2 | 4 +-- etc/config.csh/hypre | 4 +-- etc/config.csh/paraview | 4 +-- etc/config.csh/petsc | 4 +-- etc/config.sh/adios2 | 4 +-- etc/config.sh/hdf5 | 61 +++++++++++++++++++++++++++++++++++++++++ etc/config.sh/hypre | 4 +-- etc/config.sh/paraview | 4 +-- etc/config.sh/petsc | 4 +-- 9 files changed, 77 insertions(+), 16 deletions(-) create mode 100644 etc/config.sh/hdf5 diff --git a/etc/config.csh/adios2 b/etc/config.csh/adios2 index bd134ea444..eaf0eeab4e 100644 --- a/etc/config.csh/adios2 +++ b/etc/config.csh/adios2 @@ -5,7 +5,7 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2017-2023 OpenCFD Ltd. +# Copyright (C) 2017-2024 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM, distributed under GPL-3.0-or-later. @@ -20,7 +20,7 @@ #------------------------------------------------------------------------------ # USER EDITABLE PART: Changes made here may be lost with the next upgrade -set adios2_version=ADIOS2-2.9.2 +set adios2_version=ADIOS2-2.10.1 setenv ADIOS2_ARCH_PATH "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios2_version" # END OF (NORMAL) USER EDITABLE PART diff --git a/etc/config.csh/hypre b/etc/config.csh/hypre index 56c45ad1eb..9e3d4af9fa 100644 --- a/etc/config.csh/hypre +++ b/etc/config.csh/hypre @@ -5,7 +5,7 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2018-2021 OpenCFD Ltd. +# Copyright (C) 2018-2024 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM, distributed under GPL-3.0-or-later. @@ -30,7 +30,7 @@ #------------------------------------------------------------------------------ # USER EDITABLE PART: Changes made here may be lost with the next upgrade -set hypre_version=hypre-2.23.0 +set hypre_version=hypre-2.31.0 setenv HYPRE_ARCH_PATH "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$hypre_version" # END OF (NORMAL) USER EDITABLE PART diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview index 2e6819a744..bf990e749e 100644 --- a/etc/config.csh/paraview +++ b/etc/config.csh/paraview @@ -6,7 +6,7 @@ # \\/ M anipulation | #------------------------------------------------------------------------------ # Copyright (C) 2011-2016 OpenFOAM Foundation -# Copyright (C) 2016-2023 OpenCFD Ltd. +# Copyright (C) 2016-2024 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM, distributed under GPL-3.0-or-later. @@ -52,7 +52,7 @@ #------------------------------------------------------------------------------ # USER EDITABLE PART: Changes made here may be lost with the next upgrade -set ParaView_VERSION=5.11.2 +set ParaView_VERSION=5.12.1 set ParaView_QT=qt-system # END OF (NORMAL) USER EDITABLE PART diff --git a/etc/config.csh/petsc b/etc/config.csh/petsc index b4518e6053..b118ea0f5e 100644 --- a/etc/config.csh/petsc +++ b/etc/config.csh/petsc @@ -5,7 +5,7 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2018-2023 OpenCFD Ltd. +# Copyright (C) 2018-2024 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM, distributed under GPL-3.0-or-later. @@ -30,7 +30,7 @@ #------------------------------------------------------------------------------ # USER EDITABLE PART: Changes made here may be lost with the next upgrade -set petsc_version=petsc-3.19.2 +set petsc_version=petsc-3.21.2 setenv PETSC_ARCH_PATH "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$petsc_version" # END OF (NORMAL) USER EDITABLE PART diff --git a/etc/config.sh/adios2 b/etc/config.sh/adios2 index ae967dc7c8..7243944759 100644 --- a/etc/config.sh/adios2 +++ b/etc/config.sh/adios2 @@ -5,7 +5,7 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2017-2023 OpenCFD Ltd. +# Copyright (C) 2017-2024 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM, distributed under GPL-3.0-or-later. @@ -21,7 +21,7 @@ #------------------------------------------------------------------------------ # USER EDITABLE PART: Changes made here may be lost with the next upgrade -adios2_version=ADIOS2-2.9.2 +adios2_version=ADIOS2-2.10.1 export ADIOS2_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios2_version" # END OF (NORMAL) USER EDITABLE PART diff --git a/etc/config.sh/hdf5 b/etc/config.sh/hdf5 new file mode 100644 index 0000000000..61ecb63748 --- /dev/null +++ b/etc/config.sh/hdf5 @@ -0,0 +1,61 @@ +#----------------------------------*-sh-*-------------------------------------- +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | +# \\ / A nd | www.openfoam.com +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# Copyright (C) 2024 OpenCFD Ltd. +#------------------------------------------------------------------------------ +# License +# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. +# +# File +# etc/config.sh/hdf5 +# [optional/experimental: not sourced by OpenFOAM-*/etc/bashrc] +# +# Description +# Setup for HDF5 include/libraries (usually ThirdParty installation). +# +# To disable its use: hdf5_version=hdf5-none +# For system-wide installations: hdf5_version=hdf5-system +# +# For central installations not located under ThirdParty: +# 1. use hdf5-system +# 2. and provide full path for HDF5_ARCH_PATH +# +#------------------------------------------------------------------------------ +# USER EDITABLE PART: Changes made here may be lost with the next upgrade + +hdf5_version=hdf5-1.14.4.3 +export HDF5_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$hdf5_version" + +# END OF (NORMAL) USER EDITABLE PART +#------------------------------------------------------------------------------ +if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ] +then + echo "Using hdf5 ($hdf5_version) -> $HDF5_ARCH_PATH" 1>&2 +fi + +if command -v _foamAddLibAuto >/dev/null +then + # Normal sourcing (not makeHDF5) + + _foamAddLibAuto $HDF5_ARCH_PATH + + unset hdf5_version + +elif [ "$1" = "-force" ] +then + # Forced command-line sourcing + + if output="$($WM_PROJECT_DIR/bin/tools/lib-dir -sh $HDF5_ARCH_PATH 2>/dev/null)" + then + eval "$output" + fi + + unset hdf5_version output +fi + + +#------------------------------------------------------------------------------ diff --git a/etc/config.sh/hypre b/etc/config.sh/hypre index 6f2648f2a3..ba2564c03c 100644 --- a/etc/config.sh/hypre +++ b/etc/config.sh/hypre @@ -5,7 +5,7 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2018-2021 OpenCFD Ltd. +# Copyright (C) 2018-2024 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM, distributed under GPL-3.0-or-later. @@ -27,7 +27,7 @@ #------------------------------------------------------------------------------ # USER EDITABLE PART: Changes made here may be lost with the next upgrade -hypre_version=hypre-2.23.0 +hypre_version=hypre-2.31.0 export HYPRE_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$hypre_version" # END OF (NORMAL) USER EDITABLE PART diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview index 304ea7f4d2..66e2eb2677 100644 --- a/etc/config.sh/paraview +++ b/etc/config.sh/paraview @@ -6,7 +6,7 @@ # \\/ M anipulation | #------------------------------------------------------------------------------ # Copyright (C) 2011-2016 OpenFOAM Foundation -# Copyright (C) 2016-2023 OpenCFD Ltd. +# Copyright (C) 2016-2024 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM, distributed under GPL-3.0-or-later. @@ -57,7 +57,7 @@ #------------------------------------------------------------------------------ # USER EDITABLE PART: Changes made here may be lost with the next upgrade -ParaView_VERSION=5.11.2 +ParaView_VERSION=5.12.1 ParaView_QT=qt-system # END OF (NORMAL) USER EDITABLE PART diff --git a/etc/config.sh/petsc b/etc/config.sh/petsc index c512ebb376..93054546c6 100644 --- a/etc/config.sh/petsc +++ b/etc/config.sh/petsc @@ -5,7 +5,7 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2018-2023 OpenCFD Ltd. +# Copyright (C) 2018-2024 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM, distributed under GPL-3.0-or-later. @@ -27,7 +27,7 @@ #------------------------------------------------------------------------------ # USER EDITABLE PART: Changes made here may be lost with the next upgrade -petsc_version=petsc-3.19.2 +petsc_version=petsc-3.21.2 export PETSC_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$petsc_version" # END OF (NORMAL) USER EDITABLE PART