Skip to content

Commit 2a3e4f2

Browse files
authored
- Update submodule pointer for spack for the changes in spack#556 (add [email protected]; this also includes a recent PR to the spack submodule that added iotaa and uwtools, but neither of these two packages is used yet in any of our environments --> zero impact) - Update configs/**: replace [email protected] with [email protected]
1 parent 875e04d commit 2a3e4f2

File tree

7 files changed

+17
-13
lines changed

7 files changed

+17
-13
lines changed

configs/common/modules_lmod.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ modules:
140140
^[email protected]+debug snapshot=b09: 'esmf-8.9.0b09-debug'
141141
^[email protected]~debug snapshot=b11: 'esmf-8.9.0b11'
142142
^[email protected]+debug snapshot=b11: 'esmf-8.9.0b11-debug'
143+
^[email protected]~debug snapshot=b12: 'esmf-8.9.0b12'
144+
^[email protected]+debug snapshot=b12: 'esmf-8.9.0b12-debug'
143145
openmpi:
144146
environment:
145147
set:

configs/common/modules_tcl.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ modules:
138138
^[email protected]+debug snapshot=b09: 'esmf-8.9.0b09-debug'
139139
^[email protected]~debug snapshot=b11: 'esmf-8.9.0b11'
140140
^[email protected]+debug snapshot=b11: 'esmf-8.9.0b11-debug'
141+
^[email protected]~debug snapshot=b12: 'esmf-8.9.0b12'
142+
^[email protected]+debug snapshot=b12: 'esmf-8.9.0b12-debug'
141143
openmpi:
142144
environment:
143145
set:

configs/common/packages.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ packages:
7070
esmf:
7171
require:
7272
- '~xerces ~pnetcdf +shared +external-parallelio'
73-
- any_of: ['@=8.6.1 snapshot=none', '@=8.8.0 snapshot=none', '@=8.9.0b11 snapshot=b11']
73+
- any_of: ['@=8.6.1 snapshot=none', '@=8.8.0 snapshot=none', '@=8.9.0b12 snapshot=b12']
7474
- any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"']
7575
when: "%intel"
7676
message: "Extra ESMF compile options for Intel"

configs/templates/neptune-dev/spack.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ spack:
88
definitions:
99
- compilers: ['%aocc', '%apple-clang', '%gcc', '%intel', '%oneapi']
1010
- packages:
11-
- neptune-env ~debug +espc ^esmf@=8.9.0b11 snapshot=b11
12-
- neptune-env +debug +espc ^esmf@=8.9.0b11 snapshot=b11
13-
- neptune-python-env +xnrl ^neptune-env ~debug +espc ^esmf@=8.9.0b11 snapshot=b11
11+
- neptune-env ~debug +espc ^esmf@=8.9.0b12 snapshot=b12
12+
- neptune-env +debug +espc ^esmf@=8.9.0b12 snapshot=b12
13+
- neptune-python-env +xnrl ^neptune-env ~debug +espc ^esmf@=8.9.0b12 snapshot=b12
1414

1515
specs:
1616
- matrix:

configs/templates/skylab-dev/spack.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ spack:
1414
- jedi-fv3-env
1515
- jedi-geos-env ^esmf@=8.6.1
1616
- jedi-mpas-env
17-
- jedi-neptune-env ^esmf@=8.9.0b11
17+
- jedi-neptune-env ^esmf@=8.9.0b12
1818
- jedi-tools-env
1919
- jedi-ufs-env ^esmf@=8.8.0
2020
- jedi-um-env
21-
- neptune-env ^esmf@=8.9.0b11
22-
- neptune-python-env ^esmf@=8.9.0b11
21+
- neptune-env ^esmf@=8.9.0b12
22+
- neptune-python-env ^esmf@=8.9.0b12
2323
- soca-env
2424

2525
# Various crtm tags (list all to avoid duplicate packages)
@@ -34,7 +34,7 @@ spack:
3434
# Various esmf tags (list all to avoid duplicate packages)
3535
- esmf@=8.6.1 snapshot=none
3636
- esmf@=8.8.0 snapshot=none
37-
- esmf@=8.9.0b11 snapshot=b11
37+
- esmf@=8.9.0b12 snapshot=b12
3838

3939
specs:
4040
- matrix:

configs/templates/unified-dev/spack.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ spack:
1717
- jedi-fv3-env
1818
- jedi-geos-env ^esmf@=8.6.1
1919
- jedi-mpas-env
20-
- jedi-neptune-env ^esmf@=8.9.0b11
20+
- jedi-neptune-env ^esmf@=8.9.0b12
2121
- jedi-tools-env
2222
- jedi-ufs-env ^esmf@=8.8.0
2323
- jedi-um-env
24-
- neptune-env ^esmf@=8.9.0b11
25-
- neptune-python-env ^esmf@=8.9.0b11
24+
- neptune-env ^esmf@=8.9.0b12
25+
- neptune-python-env ^esmf@=8.9.0b12
2626
- soca-env
2727
- ufs-srw-app-env ^esmf@=8.8.0 ^crtm@=3.1.2
2828
- ufs-weather-model-env ^esmf@=8.8.0 ^crtm@=3.1.2
@@ -39,7 +39,7 @@ spack:
3939
# Various esmf tags (list all to avoid duplicate packages)
4040
- esmf@=8.6.1 snapshot=none
4141
- esmf@=8.8.0 snapshot=none
42-
- esmf@=8.9.0b11 snapshot=b11
42+
- esmf@=8.9.0b12 snapshot=b12
4343

4444
# MADIS for WCOSS2 decoders.
4545

0 commit comments

Comments
 (0)