Skip to content

Commit d7ffcf2

Browse files
Change to test model component (#30)
* spack-packages: use latest commit on main * Add test model. Remove redundant packages and add all requirements for a compiler * Use gcc-runtime constraint directly * Change to access-test-component package * Remove mpi package flags * Add component to module includes --------- Co-authored-by: Tommy Gatti <[email protected]>
1 parent 7f2bab0 commit d7ffcf2

File tree

2 files changed

+10
-21
lines changed

2 files changed

+10
-21
lines changed

config/versions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"$schema": "https://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": "2024.09.20"
4+
"spack-packages": "main"
55
}

spack.yaml

+9-20
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
spack:
77
definitions:
88
- ROOT_PACKAGE:
9-
10-
9+
1110
# Specific case for Gadi - should be run
1211
- when: env['DEPLOYMENT_TARGET'] == 'gadi'
1312
compiler_targets:
@@ -25,24 +24,15 @@ spack:
2524
specs:
2625
- $ROOT_SPEC
2726
packages:
28-
oasis3-mct:
29-
require:
30-
- '@git.2023.11.09'
31-
netcdf-c:
32-
require:
33-
- '@4.9.2'
34-
netcdf-fortran:
35-
require:
36-
- '@4.6.1'
27+
access-test-component:
28+
require:
29+
- '@main'
3730
openmpi:
3831
require:
3932
- '@4.1.5'
40-
- 'cppflags="-diag-disable=10441"'
41-
# Specifications that apply to all packages - not relevant with multi-target builds
42-
# all:
43-
# require:
44-
45-
# - 'target=x86_64'
33+
gcc-runtime:
34+
require:
35+
- '%gcc'
4636
view: true
4737
concretizer:
4838
unify: true
@@ -51,7 +41,6 @@ spack:
5141
tcl:
5242
include:
5343
- access-test
54-
- oasis3-mct
44+
- access-test-component
5545
projections:
56-
access-test: '{name}/2025.01.1'
57-
oasis3-mct: '{name}/2023.11.09-{hash:7}'
46+
access-test: '{name}/2025.03.1'

0 commit comments

Comments
 (0)