From dcb447ba74cf55c877527c37e2f82e5f93b8c015 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 24 Apr 2024 10:57:59 +1000
Subject: [PATCH 01/13] spack.yaml: Reformatted file

---
 spack.yaml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/spack.yaml b/spack.yaml
index 0754065..a447c40 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -8,21 +8,29 @@ spack:
     - access-om2@git.2024.03.0
   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.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]
   view: true

From 8eabdb18d5c57a808ae4eebb86547d6dc864b06c Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 24 Apr 2024 11:02:33 +1000
Subject: [PATCH 02/13] spack.yaml: Blanket bump for all components

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

diff --git a/spack.yaml b/spack.yaml
index a447c40..e295fb6 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -5,7 +5,7 @@
 spack:
   # add package specs to the `specs` list
   specs:
-    - access-om2@git.2024.03.0
+    - access-om2@git.2024.04.0
   packages:
     cice5:
       require:
@@ -21,16 +21,16 @@ spack:
         - '@git.2023.11.09'
     netcdf-c:
       require:
-        - '@4.7.4'
+        - '@4.9.2'
     netcdf-fortran:
       require:
-        - '@4.5.2'
+        - '@4.6.1'
     parallelio:
       require:
-        - '@2.5.2'
+        - '@2.6.2'
     openmpi:
       require:
-        - '@4.0.2'
+        - '@4.1.6'
     all:
       compiler: [intel@19.0.5.281]
   view: true
@@ -61,7 +61,7 @@ spack:
               'SPACK_{name}_ROOT': '{prefix}'
         projections:
           all: '{name}/{version}'
-          access-om2: '{name}/2024.03.0'
+          access-om2: '{name}/2024.04.0'
           cice5: '{name}/2023.10.19'
           mom5: '{name}/2023.11.09'
           libaccessom2: '{name}/2023.10.26'

From 742ebbe8a0228a521b5cec5a19e9261678cae21b Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 24 Apr 2024 11:03:57 +1000
Subject: [PATCH 03/13] versions.json: Updated spack-packages to 2024.04.20,
 spack-config to 2024.04.23

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

diff --git a/config/versions.json b/config/versions.json
index db8e43b..1f978a8 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"
+    "spack-packages": "2024.04.20",
+    "spack-config": "2024.04.23"
 }
\ No newline at end of file

From bb76f9701ae94de91120e70fbed09bcfa2767004 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Fri, 26 Apr 2024 14:03:32 +1000
Subject: [PATCH 04/13] spack.yaml: Compiler updated to 2021.6.0

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

diff --git a/spack.yaml b/spack.yaml
index e295fb6..625b62f 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -32,7 +32,7 @@ spack:
       require:
         - '@4.1.6'
     all:
-      compiler: [intel@19.0.5.281]
+      compiler: [intel@2021.6.0]
   view: true
   concretizer:
     unify: true

From ffab2b63210186529896cc701fd34b2efcaafaa6 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Fri, 26 Apr 2024 14:54:31 +1000
Subject: [PATCH 05/13] spack.yaml: Downgraded to openmpi@4.1.5 as it is not on
 Gadi yet

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

diff --git a/spack.yaml b/spack.yaml
index 625b62f..4662898 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -30,7 +30,7 @@ spack:
         - '@2.6.2'
     openmpi:
       require:
-        - '@4.1.6'
+        - '@4.1.5'
     all:
       compiler: [intel@2021.6.0]
   view: true

From f357de8f52cc6260e16473da1a26820a47a785ad Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Fri, 26 Apr 2024 16:21:35 +1000
Subject: [PATCH 06/13] spack.yaml: Updated to `intel@2021.10.0`

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

diff --git a/spack.yaml b/spack.yaml
index 4662898..b66d5d7 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -32,7 +32,7 @@ spack:
       require:
         - '@4.1.5'
     all:
-      compiler: [intel@2021.6.0]
+      compiler: [intel@2021.10.0]
   view: true
   concretizer:
     unify: true

From 8e8670fd98f491f3a5ff19ac56c2e1d83f03b522 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Mon, 6 May 2024 12:49:33 +1000
Subject: [PATCH 07/13] spack.yaml: renamed exclude_implicits to
 hide_implicits, removed components from include: array as part of #60

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

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

From a9ca2c5a65e5179ac0755165be87073a7ccde647 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Mon, 6 May 2024 15:47:24 +1000
Subject: [PATCH 08/13] spack.yaml: Added spack.packages.all.target: x86_64

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

diff --git a/spack.yaml b/spack.yaml
index c49be9c..875ce0d 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -33,6 +33,7 @@ spack:
         - '@4.1.5'
     all:
       compiler: [intel@2021.10.0]
+      target: [x86_64]
   view: true
   concretizer:
     unify: true

From d46d5998d293894d552e276d23847e99c18fae5c Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Fri, 24 May 2024 18:22:02 +1000
Subject: [PATCH 09/13] config: versions.json uses 2-0-0 schema, deleted local
 schema

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

diff --git a/config/versions.json b/config/versions.json
index 1f978a8..0aea3e0 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,5 +1,6 @@
 {
-    "$schema": "./versions.schema.json",
+    "$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"
 }
\ No newline at end of file
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 6ab1bd7bcd6f0635b462794a92950cca737be1a6 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Thu, 6 Jun 2024 09:50:47 +1000
Subject: [PATCH 10/13] spack.yaml: Updated model version to 2024.06.0

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

diff --git a/spack.yaml b/spack.yaml
index 875ce0d..80dc464 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -5,7 +5,7 @@
 spack:
   # add package specs to the `specs` list
   specs:
-    - access-om2@git.2024.04.0
+    - access-om2@git.2024.06.0
   packages:
     cice5:
       require:
@@ -58,7 +58,7 @@ spack:
               'SPACK_{name}_ROOT': '{prefix}'
         projections:
           all: '{name}/{version}'
-          access-om2: '{name}/2024.04.0'
+          access-om2: '{name}/2024.06.0'
           cice5: '{name}/2023.10.19'
           mom5: '{name}/2023.11.09'
           libaccessom2: '{name}/2023.10.26'

From 4ed4c7bbd51931478851de6ff0f0ac5124f6b3d3 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Thu, 6 Jun 2024 11:15:52 +1000
Subject: [PATCH 11/13] spack.yaml: Updated version to `2024.03.1` from
 `2024.06.0`

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

diff --git a/spack.yaml b/spack.yaml
index 80dc464..88f2efb 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -5,7 +5,7 @@
 spack:
   # add package specs to the `specs` list
   specs:
-    - access-om2@git.2024.06.0
+    - access-om2@git.2024.03.1
   packages:
     cice5:
       require:
@@ -58,7 +58,7 @@ spack:
               'SPACK_{name}_ROOT': '{prefix}'
         projections:
           all: '{name}/{version}'
-          access-om2: '{name}/2024.06.0'
+          access-om2: '{name}/2024.03.1'
           cice5: '{name}/2023.10.19'
           mom5: '{name}/2023.11.09'
           libaccessom2: '{name}/2023.10.26'

From f87c8f6ad677964e3132d565e1a8c69cd282d1dc Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Fri, 7 Jun 2024 13:08:39 +1000
Subject: [PATCH 12/13] spack.yaml: added cppflags arg to openmpi package

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

diff --git a/spack.yaml b/spack.yaml
index 88f2efb..35252fa 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -31,6 +31,7 @@ spack:
     openmpi:
       require:
         - '@4.1.5'
+        - 'cppflags="-diag-disable=10441"'
     all:
       compiler: [intel@2021.10.0]
       target: [x86_64]

From c49a105908d07edd074edf421a289588e2977f2a Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Tue, 11 Jun 2024 14:17:51 +1000
Subject: [PATCH 13/13] spack.yaml: Updated spack.packages.all to be a
 requirement rather than a preference

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

diff --git a/spack.yaml b/spack.yaml
index 35252fa..1eec2c4 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -33,8 +33,9 @@ spack:
         - '@4.1.5'
         - 'cppflags="-diag-disable=10441"'
     all:
-      compiler: [intel@2021.10.0]
-      target: [x86_64]
+      require:
+        - '%intel@2021.10.0'
+        - 'target=x86_64'
   view: true
   concretizer:
     unify: true