From 1987f64a58cfb90b79a78be351470bc9293249db Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Jul 2024 15:45:18 +1000 Subject: [PATCH 1/5] 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 1d521f095fdcab8abe6103793d657acd66351f9c, reversing changes made to 92ae023409a31000338176e1f7484a2e21ac6729. This also reverts commit 2cf4904e33c5f364060d069f874619526ac9f372. --- config/versions.json | 7 +++---- config/versions.schema.json | 19 +++++++++++++++++ spack.yaml | 41 +++++++++++++++---------------------- 3 files changed, 39 insertions(+), 28 deletions(-) create mode 100644 config/versions.schema.json diff --git a/config/versions.json b/config/versions.json index 20d4952..20ad2f1 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,6 +1,5 @@ { - "$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" + "$schema": "./versions.schema.json", + "spack-packages": "2024.03.22", + "spack-config": "2024.03.22" } diff --git a/config/versions.schema.json b/config/versions.schema.json new file mode 100644 index 0000000..9184352 --- /dev/null +++ b/config/versions.schema.json @@ -0,0 +1,19 @@ +{ + "$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 f1db83b..152d4e2 100644 --- a/spack.yaml +++ b/spack.yaml @@ -8,37 +8,26 @@ spack: # add package specs to the `specs` list specs: - - access-om2-bgc@git.2024.06.0 + - access-om2-bgc@git.2024.03.0 packages: cice5: - require: - - '@git.2023.10.19' + require: '@git.2023.10.19' mom5: - require: - - '@git.2024.06.27' + 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.9.2' + require: '@4.7.4' netcdf-fortran: - require: - - '@4.6.1' + require: '@4.5.2' parallelio: - require: - - '@2.6.2' + require: '@2.5.2' openmpi: - require: - - '@4.1.5' - - 'cppflags="-diag-disable=10441"' + require: '@4.0.2' all: - require: - - '%intel@2021.10.0' - - 'target=x86_64' + compiler: [intel@19.0.5.281] view: true concretizer: unify: true @@ -53,7 +42,11 @@ spack: hash_length: 0 include: - access-om2-bgc - hide_implicits: true + - mom5 + - cice5 + - libaccessom2 + - oasis3-mct + exclude_implicits: true all: autoload: direct conflict: @@ -63,8 +56,8 @@ spack: 'SPACK_{name}_ROOT': '{prefix}' projections: all: '{name}/{version}' - access-om2-bgc: '{name}/2024.06.0' + access-om2-bgc: '{name}/2024.03.0' cice5: '{name}/2023.10.19' - mom5: '{name}-bgc/2024.06.27' + mom5: '{name}-bgc/2023.11.09' libaccessom2: '{name}/2023.10.26' oasis3-mct: '{name}/2023.11.09' From 7b2d443987da6a1a14f69386b8f2c67de899c3f1 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Jul 2024 15:52:41 +1000 Subject: [PATCH 2/5] Deleted versions.schema.json, updated spack-packages 2024.07.03, spack-config 2024.07.05 --- config/versions.json | 6 +++--- config/versions.schema.json | 19 ------------------- 2 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 config/versions.schema.json diff --git a/config/versions.json b/config/versions.json index 20ad2f1..23c5aca 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { - "$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-packages": "2024.07.03", + "spack-config": "2024.07.05" } 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 From e1dcce7c45fd39139174115abadd16e7b89f62ef Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Jul 2024 15:53:34 +1000 Subject: [PATCH 3/5] Updated mom5 2024.06.27 (wombat fix), updated model version 2024.07.0, updated formatting, made compiler version/target required --- spack.yaml | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/spack.yaml b/spack.yaml index 152d4e2..332dd91 100644 --- a/spack.yaml +++ b/spack.yaml @@ -8,26 +8,38 @@ spack: # add package specs to the `specs` list specs: - - access-om2-bgc@git.2024.03.0 + - access-om2-bgc@git.2024.07.0 packages: + # Direct ACCESS-NRI Dependencies cice5: - require: '@git.2023.10.19' + require: + - '@git.2023.10.19' mom5: - require: '@git.2023.11.09' + require: + - '@git.2024.06.27' libaccessom2: - require: '@git.2023.10.26' + require: + - '@git.2023.10.26' oasis3-mct: - require: '@git.2023.11.09' + require: + - '@git.2023.11.09' + # Other Dependencies netcdf-c: - require: '@4.7.4' + require: + - '@4.7.4' netcdf-fortran: - require: '@4.5.2' + require: + - '@4.5.2' parallelio: - require: '@2.5.2' + require: + - '@2.5.2' openmpi: - require: '@4.0.2' + require: + - '@4.0.2' all: - compiler: [intel@19.0.5.281] + require: + - '%intel@19.0.5.281' + - 'target=x86_64' view: true concretizer: unify: true @@ -48,7 +60,7 @@ spack: - oasis3-mct exclude_implicits: true all: - autoload: direct + autoload: run conflict: - '{name}' environment: @@ -56,8 +68,8 @@ spack: 'SPACK_{name}_ROOT': '{prefix}' projections: all: '{name}/{version}' - access-om2-bgc: '{name}/2024.03.0' + access-om2-bgc: '{name}/2024.07.0' cice5: '{name}/2023.10.19' - mom5: '{name}-bgc/2023.11.09' + mom5: '{name}-bgc/2024.06.27' libaccessom2: '{name}/2023.10.26' oasis3-mct: '{name}/2023.11.09' From eeeba464bbb280cb429e1825383afabc4329c71d Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Jul 2024 15:58:33 +1000 Subject: [PATCH 4/5] versions.json: Added required field 'spack' --- config/versions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config/versions.json b/config/versions.json index 23c5aca..600f95a 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +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.22", "spack-packages": "2024.07.03", "spack-config": "2024.07.05" } From 5e1575dc71f2feae5978300580483092eef08e77 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Jul 2024 19:52:02 +1000 Subject: [PATCH 5/5] versions.json: spack-packages 2024.07.06 (abgc runs type for dependencies) --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 600f95a..63fbb32 100644 --- a/config/versions.json +++ b/config/versions.json @@ -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.22", - "spack-packages": "2024.07.03", + "spack-packages": "2024.07.06", "spack-config": "2024.07.05" }