Skip to content

Commit

Permalink
Merge pull request #11 from ACCESS-NRI/dougiesquire/issue8
Browse files Browse the repository at this point in the history
Update dependencies and compiler
  • Loading branch information
dougiesquire authored Jun 27, 2024
2 parents 92ae023 + 3b732eb commit 1d521f0
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 38 deletions.
7 changes: 4 additions & 3 deletions config/versions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "./versions.schema.json",
"spack-packages": "2024.03.22",
"spack-config": "2024.03.22"
"$schema": "http://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/2-0-0.json",
"spack": "0.21",
"spack-packages": "2024.04.20",
"spack-config": "2024.04.23"
}
19 changes: 0 additions & 19 deletions config/versions.schema.json

This file was deleted.

39 changes: 23 additions & 16 deletions spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,37 @@
spack:
# add package specs to the `specs` list
specs:
- access-om2-bgc@git.2024.03.0
- access-om2-bgc@git.2024.03.1
packages:
cice5:
require: '@git.2023.10.19'
require:
- '@git.2023.10.19'
mom5:
require: '@git.2023.11.09'
require:
- '@git.2023.11.09'
libaccessom2:
require: '@git.2023.10.26'
require:
- '@git.2023.10.26'
oasis3-mct:
require: '@git.2023.11.09'
require:
- '@git.2023.11.09'
netcdf-c:
require: '@4.7.4'
require:
- '@4.9.2'
netcdf-fortran:
require: '@4.5.2'
require:
- '@4.6.1'
parallelio:
require: '@2.5.2'
require:
- '@2.6.2'
openmpi:
require: '@4.0.2'
require:
- '@4.1.5'
- 'cppflags="-diag-disable=10441"'
all:
compiler: [intel@19.0.5.281]
require:
- '%intel@2021.10.0'
- 'target=x86_64'
view: true
concretizer:
unify: true
Expand All @@ -42,11 +53,7 @@ spack:
hash_length: 0
include:
- access-om2-bgc
- mom5
- cice5
- libaccessom2
- oasis3-mct
exclude_implicits: true
hide_implicits: true
all:
autoload: direct
conflict:
Expand All @@ -56,7 +63,7 @@ spack:
'SPACK_{name}_ROOT': '{prefix}'
projections:
all: '{name}/{version}'
access-om2-bgc: '{name}/2024.03.0'
access-om2-bgc: '{name}/2024.03.1'
cice5: '{name}/2023.10.19'
mom5: '{name}-bgc/2023.11.09'
libaccessom2: '{name}/2023.10.26'
Expand Down

0 comments on commit 1d521f0

Please sign in to comment.