diff --git a/config/versions.json b/config/versions.json index 20ad2f1..20d4952 100644 --- a/config/versions.json +++ b/config/versions.json @@ -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" } diff --git a/config/versions.schema.json b/config/versions.schema.json deleted file mode 100644 index 9184352..0000000 --- a/config/versions.schema.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2020-12/schema", - "title": "Deployment Environments", - "description": "A list of deployment targets that are supported", - "type": "object", - "properties": { - "$schema": { - "type": "string" - }, - "spack-packages": { - "type": "string" - }, - "spack-config": { - "type": "string" - } - }, - "required": [ "$schema", "spack-packages", "spack-config" ], - "additionalProperties": false -} \ No newline at end of file diff --git a/spack.yaml b/spack.yaml index 152d4e2..a0d69ea 100644 --- a/spack.yaml +++ b/spack.yaml @@ -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 @@ -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: @@ -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'