From bdd7e1cbe628909055453b4aedbc4777a4a8b344 Mon Sep 17 00:00:00 2001
From: dougiesquire <dougiesquire@gmail.com>
Date: Thu, 27 Jun 2024 11:05:20 +1000
Subject: [PATCH 1/3] config: update version.json schema,
 spack-packages=2024.04.20, spack-config=2024.04.23

---
 config/versions.json        |  7 ++++---
 config/versions.schema.json | 19 -------------------
 2 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 config/versions.schema.json

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

From ad5998f1a5ce7e15c91ce66b483baad92dcf9e83 Mon Sep 17 00:00:00 2001
From: dougiesquire <dougiesquire@gmail.com>
Date: Thu, 27 Jun 2024 11:09:55 +1000
Subject: [PATCH 2/3] spack.yaml: rename exclude_implicits to hide_implicits,
 remove components from include

---
 spack.yaml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/spack.yaml b/spack.yaml
index 152d4e2..daba57d 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -42,11 +42,7 @@ spack:
         hash_length: 0
         include:
         - access-om2-bgc
-        - mom5
-        - cice5
-        - libaccessom2
-        - oasis3-mct
-        exclude_implicits: true
+        hide_implicits: true
         all:
           autoload: direct
           conflict:

From bef480aff9bb79440c1f3c26fc988c1b1a4b8cc2 Mon Sep 17 00:00:00 2001
From: dougiesquire <dougiesquire@gmail.com>
Date: Thu, 27 Jun 2024 11:14:34 +1000
Subject: [PATCH 3/3] spack.yaml: update compiler and dependency versions

---
 spack.yaml | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/spack.yaml b/spack.yaml
index daba57d..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
@@ -52,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'