Skip to content

Commit

Permalink
Update esmf from 8.7.0b04 to 8.7.0b11 (#1234)
Browse files Browse the repository at this point in the history
* Replace [email protected] with [email protected] in configs/*
* Update submodule pointer for spack
  • Loading branch information
climbfuji authored Aug 12, 2024
1 parent 31fb419 commit 5051022
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 7 deletions.
2 changes: 2 additions & 0 deletions configs/common/modules_lmod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ modules:
^[email protected]+debug snapshot=none: 'esmf-8.6.1-debug'
^[email protected]~debug snapshot=b04: 'esmf-8.7.0b04'
^[email protected]+debug snapshot=b04: 'esmf-8.7.0b04-debug'
^[email protected]~debug snapshot=b04: 'esmf-8.7.0b11'
^[email protected]+debug snapshot=b04: 'esmf-8.7.0b11-debug'
openmpi:
environment:
set:
Expand Down
2 changes: 2 additions & 0 deletions configs/common/modules_tcl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ modules:
^[email protected]+debug snapshot=none: 'esmf-8.6.1-debug'
^[email protected]~debug snapshot=b04: 'esmf-8.7.0b04'
^[email protected]+debug snapshot=b04: 'esmf-8.7.0b04-debug'
^[email protected]~debug snapshot=b04: 'esmf-8.7.0b11'
^[email protected]+debug snapshot=b04: 'esmf-8.7.0b11-debug'
openmpi:
environment:
set:
Expand Down
2 changes: 1 addition & 1 deletion configs/common/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
esmf:
require:
- '~xerces ~pnetcdf +shared +external-parallelio'
- any_of: ['@=8.6.1 snapshot=none', '@=8.7.0b04 snapshot=b04']
- any_of: ['@=8.6.1 snapshot=none', '@=8.7.0b11 snapshot=b11']
- any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"']
when: "%intel"
message: "Extra ESMF compile options for Intel"
Expand Down
4 changes: 2 additions & 2 deletions configs/templates/skylab-dev/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spack:
- jedi-fv3-env
- jedi-geos-env ^esmf@=8.6.1
- jedi-mpas-env
- jedi-neptune-env ^esmf@=8.7.0b04
- jedi-neptune-env ^esmf@=8.7.0b11
- jedi-ufs-env ^esmf@=8.6.1
- jedi-um-env
- soca-env
Expand All @@ -25,7 +25,7 @@ spack:

# Various esmf tags (list all to avoid duplicate packages)
- esmf@=8.6.1 snapshot=none
- esmf@=8.7.0b04 snapshot=b04
- esmf@=8.7.0b11 snapshot=b11

specs:
- matrix:
Expand Down
6 changes: 3 additions & 3 deletions configs/templates/unified-dev/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ spack:
- jedi-fv3-env
- jedi-geos-env ^esmf@=8.6.1
- jedi-mpas-env
- jedi-neptune-env ^esmf@=8.7.0b04
- jedi-neptune-env ^esmf@=8.7.0b11
- jedi-tools-env
- jedi-ufs-env ^esmf@=8.6.1
- jedi-um-env
- neptune-env ~python ^esmf@=8.7.0b04
- neptune-env ~python ^esmf@=8.7.0b11
- soca-env
- ufs-srw-app-env ^esmf@=8.6.1
- ufs-weather-model-env ^esmf@=8.6.1
Expand All @@ -32,7 +32,7 @@ spack:

# Various esmf tags (list all to avoid duplicate packages)
- esmf@=8.6.1 snapshot=none
- esmf@=8.7.0b04 snapshot=b04
- esmf@=8.7.0b11 snapshot=b11

# MADIS for WCOSS2 decoders.
- [email protected]
Expand Down
2 changes: 1 addition & 1 deletion spack

0 comments on commit 5051022

Please sign in to comment.