Skip to content

Commit

Permalink
Merge pull request #125 from GEOS-ESM/feature/mathomp4/update-intel-2…
Browse files Browse the repository at this point in the history
…021.12

Update to Baselibs 8.3.1, Intel ifort 2021.12 (save NCCS SLES12), and GEOSpyD 24.4
  • Loading branch information
mathomp4 committed Jul 5, 2024
2 parents 60a2fc1 + c423e10 commit 98cffb6
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 14 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed
### Added

## [5.1.0] - 2024-07-05

### Changed

- Update to Baselibs 8.3.1
- ESMF 8.6.1
- FMS 2024.01.02
- curl 8.8.0
- NCO 5.2.6
- Various make system updates for other compilers and machines
- Move to use Intel ifort 2021.12 on SLES 15 at NCCS, at NAS, and on GMAO Desktops
- Update to GEOSpyD Min24.0.0 for Python3

## [5.0.0] - 2024-05-20

### Changed
Expand Down
28 changes: 14 additions & 14 deletions g5_modules
Original file line number Diff line number Diff line change
Expand Up @@ -131,17 +131,17 @@ if ( $site == NCCS ) then
set mod2 = comp/gcc/11.2.0
set mod3 = comp/intel/2021.6.0
set mod4 = mpi/impi/2021.6.0
set mod5 = python/GEOSpyD/Min23.5.2-0_py3.11_AND_Min4.8.3_py2.7
set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-8.0.2/x86_64-pc-linux-gnu/ifort_2021.6.0-intelmpi_2021.6.0-SLES12
set mod5 = python/GEOSpyD/Min24.4.0-0_py3.11_AND_Min4.8.3_py2.7
set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-8.3.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/11.4.0
set mod3 = comp/intel/2021.6.0
set mod3 = comp/intel/2024.1.0
set mod4 = mpi/impi/2021.12
set mod5 = python/GEOSpyD/Min23.5.2-0_py3.11
set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-8.0.2/x86_64-pc-linux-gnu/ifort_2021.6.0-intelmpi_2021.12-SLES15
set mod5 = python/GEOSpyD/Min24.4.0-0_py3.11
set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-8.3.1/x86_64-pc-linux-gnu/ifort_2021.12.0-intelmpi_2021.12.0-SLES15
set usemod1 = /discover/swdev/gmao_SIteam/modulefiles-SLES15

endif
Expand All @@ -161,12 +161,12 @@ else if ( $site == NAS ) then

set mod1 = GEOSenv

set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-8.0.2/x86_64-pc-linux-gnu/ifort_2022.1.0-mpt_2.28_25Apr23_rhel87
set mod2 = comp-gcc/11.2.0-TOSS4
set mod3 = comp-intel/2022.1.0
set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-8.3.1/x86_64-pc-linux-gnu/ifort_2021.12.0-mpt_2.28_25Apr23_rhel87
set mod2 = comp-gcc/12.3.0-TOSS4
set mod3 = comp-intel/2024.1.0-ifort
set mod4 = mpi-hpe/mpt

set mod5 = python/GEOSpyD/Min23.5.2-0_py3.11_AND_Min4.8.3_py2.7
set mod5 = python/GEOSpyD/Min24.4.0-0_py3.11_AND_Min4.8.3_py2.7

set mods = ( $mod1 $mod2 $mod3 $mod4 $mod5 )
set modinit = /usr/share/modules/init/tcsh
Expand All @@ -184,14 +184,14 @@ else if ( $site == NAS ) then
#=================#
else if ( $site == GMAO.desktop ) then

set basedir=/ford1/share/gmao_SIteam/Baselibs/ESMA-Baselibs-8.0.2/x86_64-pc-linux-gnu/ifort_2022.1.0-intelmpi_2022.1.0
set basedir=/ford1/share/gmao_SIteam/Baselibs/ESMA-Baselibs-8.3.1/x86_64-pc-linux-gnu/ifort_2021.12.0-intelmpi_2021.12

set mod1 = GEOSenv

set mod2 = comp/gcc/11.2.0
set mod3 = comp/intel/2022.1.0
set mod4 = mpi/impi/2022.1.0
set mod5 = other/python/GEOSpyD/Min23.5.2-0_py3.11_AND_Min4.8.3_py2.7
set mod2 = comp/gcc/12.1.0
set mod3 = comp/intel/2024.1-ifort
set mod4 = mpi/impi/2021.12
set mod5 = other/python/GEOSpyD/Min24.4.0-0_py3.11

set mods = ( $mod1 $mod2 $mod3 $mod4 $mod5 )
set modinit = /usr/share/Modules/init/tcsh
Expand Down

0 comments on commit 98cffb6

Please sign in to comment.