From bca8f25e63c140e07831c70aab6e7f1c0b829f33 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 7 Nov 2023 12:48:44 -0500 Subject: [PATCH 1/3] Update to Baselibs 7.15.1 --- CHANGELOG.md | 18 ++++++++++++++++++ g5_modules | 19 +++++++++++++------ g5_modules.sh | 6 +++++- g5_modules.zsh | 6 +++++- 4 files changed, 41 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42cec2c..de47eb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### Added +## [4.21.0] - 2023-11-07 + +### Changed + +- Moved to Baselibs 7.15.1 + - zlib 1.3 + - curl 8.4.0 + - HDF4 4.2.16-2 + - HDF5 1.10.11 + - nco 5.1.8 + - CDO 2.2.2 + - udunits2 2.2.28 + - fortran\_udunits2 v1.0.0-rc.2 (GMAO-SI-Team fork) + +### Added + +- `g5_modules` now exports `UDUNITS2_XML_PATH` + ## [4.20.6] - 2023-10-30 ### Fixed diff --git a/g5_modules b/g5_modules index b529ab7..2179374 100755 --- a/g5_modules +++ b/g5_modules @@ -132,16 +132,16 @@ if ( $site == NCCS ) then set mod3 = comp/intel/2021.6.0 set mod4 = mpi/impi/2021.6.0 set mod5 = python/GEOSpyD/Min4.11.0_py3.9_AND_Min4.8.3_py2.7 - set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.14.0/x86_64-pc-linux-gnu/ifort_2021.6.0-intelmpi_2021.6.0 + set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.15.1/x86_64-pc-linux-gnu/ifort_2021.6.0-intelmpi_2021.6.0-SLES12 set usemod1 = /discover/swdev/gmao_SIteam/modulefiles-SLES12 else set mod2 = comp/gcc/12.3.0 set mod3 = comp/intel/2021.6.0 - set mod4 = mpi/openmpi/4.1.5/intel-2021.6.0 + set mod4 = mpi/openmpi/5.0.0/intel-2021.6.0 set mod5 = python/GEOSpyD/Min23.5.2-0_py3.11 - set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.14.0/x86_64-pc-linux-gnu/ifort_2021.6.0-openmpi_4.1.5-SLES15 + set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.15.1/x86_64-pc-linux-gnu/ifort_2021.6.0-openmpi_5.0.0-SLES15 set usemod1 = /discover/swdev/gmao_SIteam/modulefiles-SLES15 endif @@ -160,9 +160,9 @@ else if ( $site == NAS ) then set mod1 = GEOSenv - set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-7.14.0/x86_64-pc-linux-gnu/ifort_2022.1.0-mpt_2.28_25Apr23_rhel87-TOSS4 + set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-7.15.1/x86_64-pc-linux-gnu/ifort_2022.1.0-mpt_2.28_25Apr23_rhel87-TOSS4 set mod2 = comp-gcc/11.2.0-TOSS4 - set mod3 = comp-intel/2022.1.0 + set mod3 = comp-intel/2022.1.0-nccs set mod4 = mpi-hpe/mpt set mod5 = python/GEOSpyD/Min4.11.0_py3.9_AND_Min4.8.3_py2.7 @@ -182,7 +182,7 @@ else if ( $site == NAS ) then #=================# else if ( $site == GMAO.desktop ) then - set basedir=/ford1/share/gmao_SIteam/Baselibs/ESMA-Baselibs-7.14.0/x86_64-pc-linux-gnu/ifort_2022.1.0-intelmpi_2022.1.0 + set basedir=/ford1/share/gmao_SIteam/Baselibs/ESMA-Baselibs-7.15.1/x86_64-pc-linux-gnu/ifort_2022.1.0-intelmpi_2022.1.0 set mod1 = GEOSenv @@ -317,6 +317,10 @@ if ($?LD_LIBRARY64_PATH) then endif endif +# Set UDUNITS2_XML_PATH +# --------------------- +setenv UDUNITS2_XML_PATH $BASEDIR/$arch/share/udunits/udunits2.xml + # load library modules #--------------------- if (-e $modinit) then @@ -361,6 +365,9 @@ if ($wrapper) then if ($?LD_LIBRARY64_PATH) then echo "export LD_LIBRARY64_PATH=$LD_LIBRARY64_PATH" >> $outfil endif + if ($?UDUNITS2_XML_PATH) then + echo "export UDUNITS2_XML_PATH=$UDUNITS2_XML_PATH" >> $outfil + endif set modulecmd = `which modulecmd` if ($status) set modulecmd = "/usr/bin/modulecmd" diff --git a/g5_modules.sh b/g5_modules.sh index 5ee327e..5f6fbd4 100644 --- a/g5_modules.sh +++ b/g5_modules.sh @@ -1,7 +1,7 @@ #!/usr/bin/sh #======================================================================= # name - g5_modules.bash -# purpose - +# purpose - # This script can be "sourced" from the bash shell to set environment # variables and modules needed for building and running the GEOS system. # @@ -23,6 +23,10 @@ fi # Basedir export BASEDIR=$(csh $g5modules basedir) +# UDUNITS2_XML_PATH +arch=$(uname -s) +export UDUNITS2_XML_PATH=$BASEDIR/$arch/share/udunits/udunits2.xml + # Modules source $MODULESHOME/init/bash module purge diff --git a/g5_modules.zsh b/g5_modules.zsh index 4fe8c6f..dc5acb9 100644 --- a/g5_modules.zsh +++ b/g5_modules.zsh @@ -1,7 +1,7 @@ #!/usr/bin/sh #======================================================================= # name - g5_modules.zsh -# purpose - +# purpose - # This script can be "sourced" from the zsh shell to set environment # variables and modules needed for building and running the GEOS system. # @@ -23,6 +23,10 @@ fi # Basedir export BASEDIR=$(csh $g5modules basedir) +# UDUNITS2_XML_PATH +arch=$(uname -s) +export UDUNITS2_XML_PATH=$BASEDIR/$arch/share/udunits/udunits2.xml + # Modules source $MODULESHOME/init/zsh module purge From 1b4c723a23a873863e1432068af2f0ce88d2b30a Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 8 Nov 2023 07:45:13 -0500 Subject: [PATCH 2/3] Move back to original NAS module --- g5_modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g5_modules b/g5_modules index 2179374..3b06627 100755 --- a/g5_modules +++ b/g5_modules @@ -162,7 +162,7 @@ else if ( $site == NAS ) then set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-7.15.1/x86_64-pc-linux-gnu/ifort_2022.1.0-mpt_2.28_25Apr23_rhel87-TOSS4 set mod2 = comp-gcc/11.2.0-TOSS4 - set mod3 = comp-intel/2022.1.0-nccs + set mod3 = comp-intel/2022.1.0 set mod4 = mpi-hpe/mpt set mod5 = python/GEOSpyD/Min4.11.0_py3.9_AND_Min4.8.3_py2.7 From f1bd97123ad43a21ad82b0f0ce72c6342dac5cd5 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 20 Nov 2023 14:59:07 -0500 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de47eb4..d34585a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,10 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### Added -## [4.21.0] - 2023-11-07 +## [4.21.0] - 2023-11-20 ### Changed +- Move to Open MPI 5.0.0 on SLES15 at NCCS - Moved to Baselibs 7.15.1 - zlib 1.3 - curl 8.4.0