From 76ad666de7d3b81361d7309bf9b5f665e5215f2a Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 3 Jul 2024 17:57:51 +1000
Subject: [PATCH 1/6] spack.yaml: Updated to version 2024.06.1, added comments

---
 spack.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spack.yaml b/spack.yaml
index f1db83b..1caa8eb 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -8,9 +8,10 @@
 spack:
   # add package specs to the `specs` list
   specs:
-    - access-om2-bgc@git.2024.06.0
+    - access-om2-bgc@git.2024.06.1
   packages:
     cice5:
+      # Direct ACCESS-NRI Dependencies
       require:
         - '@git.2023.10.19'
     mom5:
@@ -22,6 +23,7 @@ spack:
     oasis3-mct:
       require:
         - '@git.2023.11.09'
+    # Other Dependencies
     netcdf-c:
       require:
         - '@4.9.2'
@@ -63,7 +65,7 @@ spack:
               'SPACK_{name}_ROOT': '{prefix}'
         projections:
           all: '{name}/{version}'
-          access-om2-bgc: '{name}/2024.06.0'
+          access-om2-bgc: '{name}/2024.06.1'
           cice5: '{name}/2023.10.19'
           mom5: '{name}-bgc/2024.06.27'
           libaccessom2: '{name}/2023.10.26'

From 73718eb45da00c381e3cca2edab3a3d62e5f4044 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 3 Jul 2024 17:59:34 +1000
Subject: [PATCH 2/6] versions.json: Updated spack-config to 2024.07.02 to
 avoid hdf5 bug, spack-packages 2024.07.03

---
 config/versions.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/versions.json b/config/versions.json
index 20d4952..23b4506 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.21",
-    "spack-packages": "2024.04.20",
-    "spack-config": "2024.04.23"
+    "spack-packages": "2024.07.03",
+    "spack-config": "2024.07.02"
 }

From 0f20bd90153b9139b2fa36c4e3471f34f7ac7356 Mon Sep 17 00:00:00 2001
From: Dougie Squire <42455466+dougiesquire@users.noreply.github.com>
Date: Mon, 8 Jul 2024 09:42:46 +1000
Subject: [PATCH 3/6] Revert parallelio to 2.5.2

---
 spack.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spack.yaml b/spack.yaml
index 1caa8eb..241aebc 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -32,7 +32,7 @@ spack:
         - '@4.6.1'
     parallelio:
       require:
-        - '@2.6.2'
+        - '@2.5.2'
     openmpi:
       require:
         - '@4.1.5'

From c2b3df3c1993f52abe2ba2e553bef23bc80399ad Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Mon, 8 Jul 2024 14:19:44 +1000
Subject: [PATCH 4/6] Update spack-packages, spack-config, update to spack
 0.22, remove cppflags arg from openmpi

---
 config/versions.json | 6 +++---
 spack.yaml           | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/config/versions.json b/config/versions.json
index 23b4506..b31d731 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.21",
-    "spack-packages": "2024.07.03",
-    "spack-config": "2024.07.02"
+    "spack": "0.22",
+    "spack-packages": "2024.07.07",
+    "spack-config": "2024.07.05"
 }
diff --git a/spack.yaml b/spack.yaml
index 241aebc..7700598 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -36,7 +36,6 @@ spack:
     openmpi:
       require:
         - '@4.1.5'
-        - 'cppflags="-diag-disable=10441"'
     all:
       require:
         - '%intel@2021.10.0'

From 0a8b0d9043fbebc4c7e4a75506fc4bde51b2a440 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Mon, 8 Jul 2024 14:30:14 +1000
Subject: [PATCH 5/6] spack.yaml: exclude_implicits and autoload: run changes

---
 spack.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spack.yaml b/spack.yaml
index 7700598..3256d57 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -54,9 +54,9 @@ spack:
         hash_length: 0
         include:
         - access-om2-bgc
-        hide_implicits: true
+        exclude_implicits: true
         all:
-          autoload: direct
+          autoload: run
           conflict:
           - '{name}'
           environment:

From e01d0abef77d05474881be9018221528165fc3a3 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Mon, 8 Jul 2024 18:22:24 +1000
Subject: [PATCH 6/6] spack-packages 2024.07.08, updated includes

---
 config/versions.json | 2 +-
 spack.yaml           | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/versions.json b/config/versions.json
index b31d731..7341f3a 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.07",
+    "spack-packages": "2024.07.08",
     "spack-config": "2024.07.05"
 }
diff --git a/spack.yaml b/spack.yaml
index 3256d57..449d293 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -54,6 +54,10 @@ spack:
         hash_length: 0
         include:
         - access-om2-bgc
+        - mom5
+        - cice5
+        - libaccessom2
+        - oasis3-mct
         exclude_implicits: true
         all:
           autoload: run