Skip to content

Commit

Permalink
Add support for SLES15 off of 4.8.0 for GEOS-CF
Browse files Browse the repository at this point in the history
  • Loading branch information
mathomp4 committed Nov 29, 2023
1 parent aac06d8 commit 114c49e
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 6 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed
### Added

## [4.8.1] - 2023-11-30

### Changed

- Add support for SLES 15

## [4.8.0] - 2022-11-29

### Changed
Expand Down
25 changes: 19 additions & 6 deletions g5_modules
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ if (($node =~ discover*) || ($node =~ borg*) || \

set site = "NCCS"

# NCCS now has both SLES15 and SLES12 machines
set OS_VERSION=`grep VERSION_ID /etc/os-release | cut -d= -f2 | cut -d. -f1 | sed 's/"//g'`

else if (($node =~ pfe*) || ($node =~ tfe*) || \
($node =~ r[0-9]*i[0-9]*n[0-9]*) || \
($node =~ r[0-9]*c[0-9]*t[0-9]*n[0-9]*)) then
Expand Down Expand Up @@ -131,20 +134,30 @@ if ( $site == NCCS ) then

set mod1 = GEOSenv

set mod2 = comp/gcc/10.3.0
set mod3 = comp/intel/2021.6.0
if ( $OS_VERSION == 12 ) then

set mod4 = mpi/impi/2021.6.0
set mod2 = comp/gcc/10.3.0
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.7.0/x86_64-pc-linux-gnu/ifort_2021.6.0-intelmpi_2021.6.0
set usemod1 = /discover/swdev/gmao_SIteam/modulefiles-SLES12

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

set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/x86_64-pc-linux-gnu/ifort_2021.6.0-intelmpi_2021.6.0
set mod2 = comp/gcc/12.3.0
set mod3 = comp/intel/2021.6.0
set mod4 = mpi/openmpi/4.1.6/intel-2021.6.0
set mod5 = python/GEOSpyD/Min23.5.2-0_py3.11
set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/x86_64-pc-linux-gnu/ifort_2021.6.0-openmpi_4.1.6-SLES15
set usemod1 = /discover/swdev/gmao_SIteam/modulefiles-SLES15

endif

set mods = ( $mod1 $mod2 $mod3 $mod4 $mod5 )
set modinit = /usr/share/modules/init/csh
set loadmodules = 0

set usemod1 = /discover/swdev/gmao_SIteam/modulefiles-SLES12
set usemods = ( $usemod1 )
set usemodules = 1

Expand Down

0 comments on commit 114c49e

Please sign in to comment.