Skip to content

Commit

Permalink
Merge pull request #97 from GEOS-ESM/feature/mathomp4/update-to-basel…
Browse files Browse the repository at this point in the history
…ibs-7.13.0

Update to Baselibs 7.13.0
  • Loading branch information
mathomp4 committed May 25, 2023
2 parents e36d733 + e98a139 commit 81de14e
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 21 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed
### Added

## [4.17.0] - 2023-05-25

### Changed

- Moved to Baselibs 7.13.0
- esmf v8.5.0b22
- curl 8.1.1
- HDF5 1.10.10
- netCDF-C 4.9.2
- netCDF-Fortran 4.6.1
- CDO 2.2.0

## [4.16.1] - 2023-05-24

### Fixed
Expand Down
28 changes: 7 additions & 21 deletions g5_modules
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,6 @@ else if (($node =~ pfe*) || ($node =~ tfe*) || \
# We are on NAS...
set site = "NAS"

# Are we on TOSS4
set LSB_RELEASE = `lsb_release -sr | cut -d'.' -f 1`
if ($LSB_RELEASE == '8') then
set nasos = "TOSS4"
else
set nasos = "TOSS3"
endif

else if ( -d /ford1/share/gmao_SIteam/ && -d /ford1/local/ && $arch == Linux ) then
set site = "GMAO.desktop"

Expand Down Expand Up @@ -138,7 +130,7 @@ if ( $site == NCCS ) then

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.12.0/x86_64-pc-linux-gnu/ifort_2021.6.0-intelmpi_2021.6.0
set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.13.0/x86_64-pc-linux-gnu/ifort_2021.6.0-intelmpi_2021.6.0

set mods = ( $mod1 $mod2 $mod3 $mod4 $mod5 )
set modinit = /usr/share/modules/init/csh
Expand All @@ -154,17 +146,11 @@ if ( $site == NCCS ) then
else if ( $site == NAS ) then

set mod1 = GEOSenv
if ( $nasos == TOSS3 ) then
set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-7.12.0/x86_64-pc-linux-gnu/ifort_2022.1.0-mpt_2.25
set mod2 = comp-gcc/11.2.0-TOSS3
set mod3 = comp-intel/2022.1.0
set mod4 = mpi-hpe/mpt.2.25
else
set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-7.12.0/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
endif

set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-7.13.0/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

set mod5 = python/GEOSpyD/Min4.11.0_py3.9_AND_Min4.8.3_py2.7

Expand All @@ -183,7 +169,7 @@ else if ( $site == NAS ) then
#=================#
else if ( $site == GMAO.desktop ) then

set basedir=/ford1/share/gmao_SIteam/Baselibs/ESMA-Baselibs-7.12.0/x86_64-pc-linux-gnu/ifort_2022.1.0-intelmpi_2022.1.0
set basedir=/ford1/share/gmao_SIteam/Baselibs/ESMA-Baselibs-7.13.0/x86_64-pc-linux-gnu/ifort_2022.1.0-intelmpi_2022.1.0

set mod1 = GEOSenv

Expand Down

0 comments on commit 81de14e

Please sign in to comment.