Skip to content

Commit

Permalink
MOM5 WOMBAT Fix without Dependency Update (#17)
Browse files Browse the repository at this point in the history
* Revert both "Merge pull request #11 from ACCESS-NRI/dougiesquire/issue8" and "Update MOM5 to include ice-ocean BGC coupling bug fix (#12)"

This reverts commit 1d521f0, reversing
changes made to 92ae023.
This also reverts commit 2cf4904.

* Deleted versions.schema.json, updated spack-packages 2024.07.03, spack-config 2024.07.05

* Updated mom5 2024.06.27 (wombat fix), updated model version 2024.07.0, updated formatting, made compiler version/target required

* versions.json: Added required field 'spack'

* versions.json: spack-packages 2024.07.06 (abgc runs type for dependencies)

* spack.yaml: Added comments, rebuilding using ACCESS-NRI/spack@42e3100

* versions.json: Update spack-packages 2024.07.08
  • Loading branch information
CodeGat committed Jul 9, 2024
1 parent 2cf4904 commit dcd452b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
6 changes: 3 additions & 3 deletions config/versions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$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"
"spack": "0.22",
"spack-packages": "2024.07.08",
"spack-config": "2024.07.05"
}
26 changes: 16 additions & 10 deletions spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
spack:
# add package specs to the `specs` list
specs:
- [email protected].06.0
- [email protected].07.0
packages:
# Direct ACCESS-NRI Dependencies
cice5:
require:
- '@git.2023.10.19'
Expand All @@ -22,22 +23,23 @@ spack:
oasis3-mct:
require:
- '@git.2023.11.09'
# Other Dependencies
netcdf-c:
require:
- '@4.9.2'
- '@4.7.4'
netcdf-fortran:
require:
- '@4.6.1'
- '@4.5.2'
parallelio:
require:
- '@2.6.2'
- '@2.5.2'
openmpi:
require:
- '@4.1.5'
- 'cppflags="-diag-disable=10441"'
- '@4.0.2'
all:
# Enforce these versions rather than a preference, as in 'spack.packages.all.compilers/target'
require:
- '%intel@2021.10.0'
- '%intel@19.0.5.281'
- 'target=x86_64'
view: true
concretizer:
Expand All @@ -53,17 +55,21 @@ spack:
hash_length: 0
include:
- access-om2-bgc
hide_implicits: true
- mom5
- cice5
- libaccessom2
- oasis3-mct
exclude_implicits: true
all:
autoload: direct
autoload: run
conflict:
- '{name}'
environment:
set:
'SPACK_{name}_ROOT': '{prefix}'
projections:
all: '{name}/{version}'
access-om2-bgc: '{name}/2024.06.0'
access-om2-bgc: '{name}/2024.07.0'
cice5: '{name}/2023.10.19'
mom5: '{name}-bgc/2024.06.27'
libaccessom2: '{name}/2023.10.26'
Expand Down

0 comments on commit dcd452b

Please sign in to comment.