Merge pull request #108 from GEOS-ESM/feature/mathomp4/update-to-base…

…libs-7.15.1

Update to Baselibs 7.15.1

CHANGELOG.md

@@ -12,6 +12,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 ### Added
 
+## [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
+  - 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

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,7 +160,7 @@ 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 mod4 = mpi-hpe/mpt
@@ -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"

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

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