Skip to content

Commit 2fe9598

Browse files
authored
Merge pull request #84 from ACCESS-NRI/34-clean
Build ACCESS-OM3 using spack packages for each component (ACCESS-NRI/spack-packages#163) and intel oneapi compiler
2 parents f2032cb + 2cbdd45 commit 2fe9598

File tree

2 files changed

+27
-10
lines changed

2 files changed

+27
-10
lines changed

config/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"$schema": "http://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json",
33
"spack": "0.22",
4-
"spack-packages": "2025.03.005"
4+
"spack-packages": "2025.04.002"
55
}

spack.yaml

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,27 @@
66
# https://github.com/ACCESS-NRI/model-deployment-template/blob/main/spack.yaml
77
spack:
88
specs:
9-
9+
1010
packages:
1111
# Main Dependencies
12-
access-om3-nuopc:
12+
access3:
1313
require:
14-
- '@git.0.4.1'
15-
- configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3
14+
- '@git.2025.03.0'
15+
- configurations=MOM6-CICE6,MOM6-CICE6-WW3
16+
access-cice:
17+
require:
18+
- '@git.CICE6.6.0-1'
19+
- io_type=PIO
20+
access-mom6:
21+
require:
22+
- '@git.2025.02.000'
23+
- '+asymmetric_mem'
24+
access-ww3:
25+
require:
26+
- '@git.2025.03.0'
27+
access3-share:
28+
require:
29+
- '@git.2025.03.0'
1630

1731
# Other Dependencies
1832
esmf:
@@ -37,11 +51,14 @@ spack:
3751
fortranxml:
3852
require:
3953
- '@4.1.2'
54+
gcc-runtime:
55+
require:
56+
- '%gcc'
4057

4158
all:
4259
require:
43-
44-
- 'target=x86_64'
60+
61+
- 'target=x86_64_v4'
4562
view: true
4663
concretizer:
4764
unify: true
@@ -50,7 +67,7 @@ spack:
5067
tcl:
5168
include:
5269
- access-om3
53-
- access-om3-nuopc
70+
- access3
5471
projections:
55-
access-om3: '{name}/2025.01.2'
56-
access-om3-nuopc: '{name}/0.4.1-{hash:7}'
72+
access-om3: '{name}/2025.05.000'
73+
access3: '{name}/2025.03.0-{hash:7}'

0 commit comments

Comments
 (0)