Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions configs/common/modules_lmod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ modules:
^esmf@8.8.0+debug snapshot=none: 'esmf-8.8.0-debug'
^esmf@8.9.0~debug snapshot=none: 'esmf-8.9.0'
^esmf@8.9.0+debug snapshot=none: 'esmf-8.9.0-debug'
^esmf@8.9.1~debug snapshot=none: 'esmf-8.9.1'
^esmf@8.9.1+debug snapshot=none: 'esmf-8.9.1-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 @@ -134,6 +134,8 @@ modules:
^esmf@8.8.0+debug snapshot=none: 'esmf-8.8.0-debug'
^esmf@8.9.0~debug snapshot=none: 'esmf-8.9.0'
^esmf@8.9.0+debug snapshot=none: 'esmf-8.9.0-debug'
^esmf@8.9.1~debug snapshot=none: 'esmf-8.9.1'
^esmf@8.9.1+debug snapshot=none: 'esmf-8.9.1-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 @@ -70,7 +70,7 @@ packages:
esmf:
require:
- '~xerces ~pnetcdf +shared +external-parallelio'
- any_of: ['@=8.6.1 snapshot=none', '@=8.8.0 snapshot=none', '@=8.9.0 snapshot=none']
- any_of: ['@=8.6.1 snapshot=none', '@=8.8.0 snapshot=none', '@=8.9.1 snapshot=none']
- any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"']
when: "%intel"
message: "Extra ESMF compile options for Intel"
Expand Down
6 changes: 3 additions & 3 deletions configs/templates/neptune-dev/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ spack:
definitions:
- compilers: ['%aocc', '%apple-clang', '%gcc', '%intel', '%oneapi']
- packages:
- neptune-env ~debug +espc ^esmf@=8.9.0 snapshot=none
- neptune-env +debug +espc ^esmf@=8.9.0 snapshot=none
- neptune-python-env ^neptune-env ~debug +espc ^esmf@=8.9.0 snapshot=none
- neptune-env ~debug +espc ^esmf@=8.9.1 snapshot=none
- neptune-env +debug +espc ^esmf@=8.9.1 snapshot=none
- neptune-python-env ^neptune-env ~debug +espc ^esmf@=8.9.1 snapshot=none

specs:
- matrix:
Expand Down
8 changes: 4 additions & 4 deletions configs/templates/skylab-dev/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ spack:
- jedi-fv3-env
- jedi-geos-env ^esmf@=8.6.1
- jedi-mpas-env
- jedi-neptune-env ^esmf@=8.9.0
- jedi-neptune-env ^esmf@=8.9.1
- jedi-tools-env
- jedi-ufs-env ^esmf@=8.8.0
- jedi-um-env
- neptune-env ^esmf@=8.9.0
- neptune-python-env ^esmf@=8.9.0
- neptune-env ^esmf@=8.9.1
- neptune-python-env ^esmf@=8.9.1
- soca-env

# Various crtm tags (list all to avoid duplicate packages)
Expand All @@ -34,7 +34,7 @@ spack:
# Various esmf tags (list all to avoid duplicate packages)
- esmf@=8.6.1
- esmf@=8.8.0
- esmf@=8.9.0
- esmf@=8.9.1

specs:
- matrix:
Expand Down
8 changes: 4 additions & 4 deletions configs/templates/unified-dev/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ spack:
- jedi-fv3-env
- jedi-geos-env ^esmf@=8.6.1
- jedi-mpas-env
- jedi-neptune-env ^esmf@=8.9.0
- jedi-neptune-env ^esmf@=8.9.1
- jedi-tools-env
- jedi-ufs-env ^esmf@=8.8.0
- jedi-um-env
- neptune-env ^esmf@=8.9.0
- neptune-python-env ^esmf@=8.9.0
- neptune-env ^esmf@=8.9.1
- neptune-python-env ^esmf@=8.9.1
- soca-env
- ufs-srw-app-env ^esmf@=8.8.0 ^crtm@=3.1.2
- ufs-weather-model-env ^esmf@=8.8.0 ^crtm@=3.1.2
Expand All @@ -39,7 +39,7 @@ spack:
# Various esmf tags (list all to avoid duplicate packages)
- esmf@=8.6.1
- esmf@=8.8.0
- esmf@=8.9.0
- esmf@=8.9.1

# MADIS for WCOSS2 decoders.
- madis@4.5
Expand Down
2 changes: 1 addition & 1 deletion spack