Skip to content

Commit

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

Update ESMA_env to Baselibs 7.7.0
  • Loading branch information
mathomp4 committed Nov 29, 2022
2 parents bae4d75 + 9497e15 commit aac06d8
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed
### Added

## [4.8.0] - 2022-11-29

### Changed

- Moved to Baselibs 7.7.0
- Updated
- GFE v1.8.0
- fArgParse v1.4.1
- pFUnit v4.6.1

## [4.7.0] - 2022-11-09

### Changed
Expand Down
12 changes: 6 additions & 6 deletions g5_modules
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# 21Jul2008 Takacs New modules and BASEDIR on discover after OS upgrade
# 13Apr2009 Stassi Updated for pleiades
# 22Apr2010 Kokron Updated for Fortuna-2.1 on pleiades
# 21Jul2011 Kokron Overlay older MKL module as on discover to gain reproducible results from dgeev in GSI
# 21Jul2011 Kokron Overlay older MKL module as on discover to gain reproducible results from dgeev in GSI
# 24Aug2012 Stassi Added sh option to write bash source-able file
# 03Nov2016 Thompson Remove JIBB
########################################################################
Expand Down Expand Up @@ -138,7 +138,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.6.0/x86_64-pc-linux-gnu/ifort_2021.6.0-intelmpi_2021.6.0
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 mods = ( $mod1 $mod2 $mod3 $mod4 $mod5 )
set modinit = /usr/share/modules/init/csh
Expand All @@ -154,9 +154,9 @@ if ( $site == NCCS ) then
else if ( $site == NAS ) then

if ( $nasos == TOSS3 ) then
set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-7.6.0/x86_64-pc-linux-gnu/ifort_2022.1.0-mpt_2.25
set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/x86_64-pc-linux-gnu/ifort_2022.1.0-mpt_2.25
else
set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-7.6.0/x86_64-pc-linux-gnu/ifort_2022.1.0-mpt_2.25-TOSS4-BuiltOnRome
set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/x86_64-pc-linux-gnu/ifort_2022.1.0-mpt_2.25-TOSS4-BuiltOnRome
endif

set mod1 = GEOSenv
Expand All @@ -180,7 +180,7 @@ else if ( $site == NAS ) then
#=================#
else if ( $site == GMAO.desktop ) then

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

set mod1 = GEOSenv

Expand Down Expand Up @@ -400,7 +400,7 @@ DESCRIPTION
add the BASEDIR lib directory to LD_LIBRARY_PATH (if necessary), and will
load library modules when sourced.
If the script is called with "basedir", "modules", "modinit", or
If the script is called with "basedir", "modules", "modinit", or
"loadmodules", then it will echo the values to standard output without
modifying the environment.
Expand Down

0 comments on commit aac06d8

Please sign in to comment.