From 6094d2fd96b93d4a2422efa28bb3aa829a7f7d48 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 22 May 2024 10:55:39 +1000
Subject: [PATCH 01/36] Added initial spack.yaml and config

---
 config/versions.json        |  5 +++
 config/versions.schema.json | 19 ++++++++++
 spack.yaml                  | 69 +++++++++++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+)
 create mode 100644 config/versions.json
 create mode 100644 config/versions.schema.json
 create mode 100644 spack.yaml

diff --git a/config/versions.json b/config/versions.json
new file mode 100644
index 0000000..c4c00f5
--- /dev/null
+++ b/config/versions.json
@@ -0,0 +1,5 @@
+{
+    "spack": "0.21",
+    "spack-packages": "2024.05.22",
+    "spack-config": "2024.04.23"
+}
\ No newline at end of file
diff --git a/config/versions.schema.json b/config/versions.schema.json
new file mode 100644
index 0000000..69dadb9
--- /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", "spack-packages", "spack-config" ],
+    "additionalProperties": false
+}
\ No newline at end of file
diff --git a/spack.yaml b/spack.yaml
new file mode 100644
index 0000000..c2867cd
--- /dev/null
+++ b/spack.yaml
@@ -0,0 +1,69 @@
+# This is a Spack Environment file.
+#
+# It describes a set of packages to be installed, along with
+# configuration settings.
+spack:
+  # add package specs to the `specs` list
+  specs:
+    - access-esm1p5@git.2024.05.0
+  packages:
+    # Direct ACCESS-NRI dependencies
+    mom5:
+      require:
+        - '@access-esm1.5'  # commit: 3739503752d15355e396312ba8c3d8a05471a7e6
+    cice4:
+      require:
+        - '@git.2024.05.21'
+    um7:
+      require:
+        - '@git.2024.05.21'
+
+    # Lower-level ACCESS-NRI dependencies
+    gcom4:
+      require:
+        - '@git.2024.05.21'
+    oasis3-mct:
+      require:
+        - '@access-esm1.5'  # commit: 797bd2712d0dc133772c49ae6afbf10943ce3ded
+
+    # Other dependencies
+    openmpi:
+      require:
+        - '@4.0.2'
+
+    # Preferences for all packages
+    all:
+      compiler: [intel@19.1.3.304]
+      target: [x86_64]
+  view: true
+  concretizer:
+    unify: true
+  modules:
+    default:
+      enable:
+        - tcl
+      roots:
+        tcl: $spack/../release/modules
+        lmod: $spack/../release/lmod
+      tcl:
+        hash_length: 0
+        include:
+          - access-esm1p5
+        hide_implicits: true
+        all:
+          autoload: direct
+          conflict:
+            - '{name}'
+          environment:
+            set:
+              'SPACK_{name}_ROOT': '{prefix}'
+        projections:
+          all: '{name}/{version}'
+          access-esm1p5: '{name}/2024.05.0'
+  config:
+    install_tree:
+      root: "$spack/../restricted/ukmo/release"
+    source_cache:
+      - "$spack/../restricted/ukmo/source_cache"
+    build_stage:
+      - "$TMPDIR/restricted/spack-stage"

From bc0ccb2694a28a2a35515522d7d032f4426ae76e Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 22 May 2024 12:14:40 +1000
Subject: [PATCH 02/36] Deleted versions.schema.json, added $schema property

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

diff --git a/config/versions.json b/config/versions.json
index c4c00f5..fdee19b 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,4 +1,5 @@
 {
+    "$schema": "https://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.05.22",
     "spack-config": "2024.04.23"
diff --git a/config/versions.schema.json b/config/versions.schema.json
deleted file mode 100644
index 69dadb9..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", "spack-packages", "spack-config" ],
-    "additionalProperties": false
-}
\ No newline at end of file

From be0fd7a88a1d2c672aa67ad060836ccb20ba6139 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 22 May 2024 12:54:35 +1000
Subject: [PATCH 03/36] spack.yaml: Changed `spack.config.source_cache` to a
 string rather than array

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

diff --git a/spack.yaml b/spack.yaml
index c2867cd..829259b 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -63,7 +63,6 @@ spack:
   config:
     install_tree:
       root: "$spack/../restricted/ukmo/release"
-    source_cache:
-      - "$spack/../restricted/ukmo/source_cache"
+    source_cache: "$spack/../restricted/ukmo/source_cache"
     build_stage:
       - "$TMPDIR/restricted/spack-stage"

From 800889be801af9186a0f6c9fa3f5cfe95716edb1 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 22 May 2024 14:49:30 +1000
Subject: [PATCH 04/36] Changed spack-packages to 2024.05.21 and intel compiler
 to intel@19.0.5.281

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

diff --git a/config/versions.json b/config/versions.json
index fdee19b..1ff1bab 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://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.05.22",
+    "spack-packages": "2024.05.21",
     "spack-config": "2024.04.23"
 }
\ No newline at end of file
diff --git a/spack.yaml b/spack.yaml
index 829259b..eeb6298 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -33,7 +33,7 @@ spack:
 
     # Preferences for all packages
     all:
-      compiler: [intel@19.1.3.304]
+      compiler: [intel@19.0.5.281]
       target: [x86_64]
   view: true
   concretizer:

From aee1828775404818616cba04f26b69d2ce53485c Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 22 May 2024 15:20:01 +1000
Subject: [PATCH 05/36] Added newline

---
 config/versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/versions.json b/config/versions.json
index 1ff1bab..5b58ab5 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -3,4 +3,4 @@
     "spack": "0.21",
     "spack-packages": "2024.05.21",
     "spack-config": "2024.04.23"
-}
\ No newline at end of file
+}

From c34af4791f6231749350e7b5f78da9fa55999bb0 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 22 May 2024 15:38:50 +1000
Subject: [PATCH 06/36] Reformatting spack.yaml

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

diff --git a/spack.yaml b/spack.yaml
index eeb6298..6abefca 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -3,7 +3,6 @@
 # It describes a set of packages to be installed, along with
 # configuration settings.
 spack:
-  # add package specs to the `specs` list
   specs:
     - access-esm1p5@git.2024.05.0
   packages:

From eb5784bb8fea64d4828f167351f058c956292d50 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 22 May 2024 16:29:00 +1000
Subject: [PATCH 07/36] spack.yaml: Updated gcom4 to 2024.05.22 (HEAD of dev
 branch rather than master)

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

diff --git a/spack.yaml b/spack.yaml
index 6abefca..dc72a99 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -20,7 +20,7 @@ spack:
     # Lower-level ACCESS-NRI dependencies
     gcom4:
       require:
-        - '@git.2024.05.21'
+        - '@git.2024.05.22'
     oasis3-mct:
       require:
         - '@access-esm1.5'  # commit: 797bd2712d0dc133772c49ae6afbf10943ce3ded

From 7fe337aac1aae99abbf5b1f2ca7300daa466821b Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 22 May 2024 16:55:42 +1000
Subject: [PATCH 08/36] spack.yaml: Added extra comments around the use of
 branches

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

diff --git a/spack.yaml b/spack.yaml
index dc72a99..0fe119a 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -7,6 +7,8 @@ spack:
     - access-esm1p5@git.2024.05.0
   packages:
     # Direct ACCESS-NRI dependencies
+    # Note: mom5, oasis3-mct have branch-specific logic and hence can't use
+    # the usual '@git.DATE' format.
     mom5:
       require:
         - '@access-esm1.5'  # commit: 3739503752d15355e396312ba8c3d8a05471a7e6

From b44e4cd95ea9a9c604d6609542df2a770c29c8be Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Thu, 23 May 2024 09:22:13 +1000
Subject: [PATCH 09/36] spack.yaml: Explicitly include cice4, um7, mom5

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

diff --git a/spack.yaml b/spack.yaml
index 0fe119a..236c2b4 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -50,6 +50,9 @@ spack:
         hash_length: 0
         include:
           - access-esm1p5
+          - cice4
+          - um7
+          - mom5
         hide_implicits: true
         all:
           autoload: direct

From e62050902048bc042b7b4eb0688950489834af17 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Thu, 23 May 2024 09:27:33 +1000
Subject: [PATCH 10/36] spack.yaml: Added associated projections for cice4,
 um7, mom5, git attributes for mom5 and oasis3-mct

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

diff --git a/spack.yaml b/spack.yaml
index 236c2b4..f90b958 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -11,7 +11,7 @@ spack:
     # the usual '@git.DATE' format.
     mom5:
       require:
-        - '@access-esm1.5'  # commit: 3739503752d15355e396312ba8c3d8a05471a7e6
+        - '@git.access-esm1.5'  # commit: 3739503752d15355e396312ba8c3d8a05471a7e6
     cice4:
       require:
         - '@git.2024.05.21'
@@ -25,7 +25,7 @@ spack:
         - '@git.2024.05.22'
     oasis3-mct:
       require:
-        - '@access-esm1.5'  # commit: 797bd2712d0dc133772c49ae6afbf10943ce3ded
+        - '@git.access-esm1.5'  # commit: 797bd2712d0dc133772c49ae6afbf10943ce3ded
 
     # Other dependencies
     openmpi:
@@ -64,6 +64,9 @@ spack:
         projections:
           all: '{name}/{version}'
           access-esm1p5: '{name}/2024.05.0'
+          cice4: '{name}/2024.05.21'
+          um7: '{name}/2024.05.21'
+          mom5: '{name}/access-esm1.5'
   config:
     install_tree:
       root: "$spack/../restricted/ukmo/release"

From ced3a9a9a6455228de7e23b070d2b084812bd134 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Thu, 23 May 2024 09:45:42 +1000
Subject: [PATCH 11/36] spack.yaml: Removed git attributes on mom5, oasis3-mct

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

diff --git a/spack.yaml b/spack.yaml
index f90b958..8c0fb58 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -11,7 +11,7 @@ spack:
     # the usual '@git.DATE' format.
     mom5:
       require:
-        - '@git.access-esm1.5'  # commit: 3739503752d15355e396312ba8c3d8a05471a7e6
+        - '@access-esm1.5'  # commit: 3739503752d15355e396312ba8c3d8a05471a7e6
     cice4:
       require:
         - '@git.2024.05.21'
@@ -25,7 +25,7 @@ spack:
         - '@git.2024.05.22'
     oasis3-mct:
       require:
-        - '@git.access-esm1.5'  # commit: 797bd2712d0dc133772c49ae6afbf10943ce3ded
+        - '@access-esm1.5'  # commit: 797bd2712d0dc133772c49ae6afbf10943ce3ded
 
     # Other dependencies
     openmpi:

From eca8de61cef005289e1455c6a2f79c312a8627d5 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Fri, 24 May 2024 13:42:28 +1000
Subject: [PATCH 12/36] spack.yaml: Updating the version of the overall model
 to 2024.05.1

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

diff --git a/spack.yaml b/spack.yaml
index 8c0fb58..09483e1 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -4,7 +4,7 @@
 # configuration settings.
 spack:
   specs:
-    - access-esm1p5@git.2024.05.0
+    - access-esm1p5@git.2024.05.1
   packages:
     # Direct ACCESS-NRI dependencies
     # Note: mom5, oasis3-mct have branch-specific logic and hence can't use
@@ -63,7 +63,7 @@ spack:
               'SPACK_{name}_ROOT': '{prefix}'
         projections:
           all: '{name}/{version}'
-          access-esm1p5: '{name}/2024.05.0'
+          access-esm1p5: '{name}/2024.05.1'
           cice4: '{name}/2024.05.21'
           um7: '{name}/2024.05.21'
           mom5: '{name}/access-esm1.5'

From 5c700e8374dda9ae018982d5d8bdb2700d6462f5 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Tue, 28 May 2024 14:01:59 +1000
Subject: [PATCH 13/36] Changed to '@git.TAG=VERSION' syntax in spack.yaml,
 updated spack-packages to 2024.05.28

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

diff --git a/config/versions.json b/config/versions.json
index 5b58ab5..297c19d 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://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.05.21",
+    "spack-packages": "2024.05.28",
     "spack-config": "2024.04.23"
 }
diff --git a/spack.yaml b/spack.yaml
index 09483e1..de75bbc 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -11,7 +11,7 @@ spack:
     # the usual '@git.DATE' format.
     mom5:
       require:
-        - '@access-esm1.5'  # commit: 3739503752d15355e396312ba8c3d8a05471a7e6
+        - '@git.access-esm1.5_2024.05.24=access-esm1.5'
     cice4:
       require:
         - '@git.2024.05.21'
@@ -25,7 +25,7 @@ spack:
         - '@git.2024.05.22'
     oasis3-mct:
       require:
-        - '@access-esm1.5'  # commit: 797bd2712d0dc133772c49ae6afbf10943ce3ded
+        - '@git.access-esm1.5_2024.05.24=access-esm1.5'
 
     # Other dependencies
     openmpi:
@@ -66,7 +66,7 @@ spack:
           access-esm1p5: '{name}/2024.05.1'
           cice4: '{name}/2024.05.21'
           um7: '{name}/2024.05.21'
-          mom5: '{name}/access-esm1.5'
+          mom5: '{name}/access-esm1.5_2024.05.24'
   config:
     install_tree:
       root: "$spack/../restricted/ukmo/release"

From b5f5a20856304defa7b826243e21d14a69bf8e4e Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Tue, 28 May 2024 15:00:47 +1000
Subject: [PATCH 14/36] Modified overall version of package to `2024.05.0`

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

diff --git a/spack.yaml b/spack.yaml
index de75bbc..49788ec 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -4,7 +4,7 @@
 # configuration settings.
 spack:
   specs:
-    - access-esm1p5@git.2024.05.1
+    - access-esm1p5@git.2024.05.0
   packages:
     # Direct ACCESS-NRI dependencies
     # Note: mom5, oasis3-mct have branch-specific logic and hence can't use
@@ -63,7 +63,7 @@ spack:
               'SPACK_{name}_ROOT': '{prefix}'
         projections:
           all: '{name}/{version}'
-          access-esm1p5: '{name}/2024.05.1'
+          access-esm1p5: '{name}/2024.05.0'
           cice4: '{name}/2024.05.21'
           um7: '{name}/2024.05.21'
           mom5: '{name}/access-esm1.5_2024.05.24'

From d438300222b6e01e629d3b613362cc794dc5414d Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Tue, 28 May 2024 15:29:25 +1000
Subject: [PATCH 15/36] spack.yaml: Updated GCOM4 to 2024.05.28

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

diff --git a/spack.yaml b/spack.yaml
index 49788ec..9c99ea1 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -22,7 +22,7 @@ spack:
     # Lower-level ACCESS-NRI dependencies
     gcom4:
       require:
-        - '@git.2024.05.22'
+        - '@git.2024.05.28'
     oasis3-mct:
       require:
         - '@git.access-esm1.5_2024.05.24=access-esm1.5'

From 5dd174946917836ecd3f69f613a2250ab0511443 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Tue, 28 May 2024 15:34:32 +1000
Subject: [PATCH 16/36] spack.yaml: Changed require versions back to branch

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

diff --git a/spack.yaml b/spack.yaml
index 9c99ea1..832093e 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -11,7 +11,7 @@ spack:
     # the usual '@git.DATE' format.
     mom5:
       require:
-        - '@git.access-esm1.5_2024.05.24=access-esm1.5'
+        - '@access-esm1.5'
     cice4:
       require:
         - '@git.2024.05.21'
@@ -25,7 +25,7 @@ spack:
         - '@git.2024.05.28'
     oasis3-mct:
       require:
-        - '@git.access-esm1.5_2024.05.24=access-esm1.5'
+        - '@access-esm1.5'
 
     # Other dependencies
     openmpi:
@@ -66,7 +66,7 @@ spack:
           access-esm1p5: '{name}/2024.05.0'
           cice4: '{name}/2024.05.21'
           um7: '{name}/2024.05.21'
-          mom5: '{name}/access-esm1.5_2024.05.24'
+          mom5: '{name}/access-esm1.5'
   config:
     install_tree:
       root: "$spack/../restricted/ukmo/release"

From 7908d2265a6825a2a81a41ca5db27e79e0eb32e1 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Mon, 3 Jun 2024 16:51:01 +1000
Subject: [PATCH 17/36] spack.yaml: Modified the other requirements to use the
 @git.TAG=VERSION syntax

---
 spack.yaml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/spack.yaml b/spack.yaml
index 832093e..be827f6 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -11,22 +11,20 @@ spack:
     # the usual '@git.DATE' format.
     mom5:
       require:
-        - '@access-esm1.5'
+        - '@git.access-esm1.5_2024.05.24=access-esm1.5'
     cice4:
       require:
-        - '@git.2024.05.21'
+        - '@git.2024.05.21=access-esm1.5'
     um7:
       require:
-        - '@git.2024.05.21'
-
+        - '@git.2024.05.21=7.3'
     # Lower-level ACCESS-NRI dependencies
     gcom4:
       require:
-        - '@git.2024.05.28'
+        - '@git.2024.05.28=access-esm1.5'
     oasis3-mct:
       require:
-        - '@access-esm1.5'
-
+        - '@git.access-esm1.5_2024.05.24=access-esm1.5'
     # Other dependencies
     openmpi:
       require:
@@ -66,10 +64,10 @@ spack:
           access-esm1p5: '{name}/2024.05.0'
           cice4: '{name}/2024.05.21'
           um7: '{name}/2024.05.21'
-          mom5: '{name}/access-esm1.5'
+          mom5: '{name}/access-esm1.5_2024.05.24'
   config:
     install_tree:
-      root: "$spack/../restricted/ukmo/release"
-    source_cache: "$spack/../restricted/ukmo/source_cache"
+      root: $spack/../restricted/ukmo/release
+    source_cache: $spack/../restricted/ukmo/source_cache
     build_stage:
-      - "$TMPDIR/restricted/spack-stage"
+    - $TMPDIR/restricted/spack-stage
\ No newline at end of file

From 1b8c9a204ed9f78131c587db86ffeb98f4a78a4b Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 12 Jun 2024 10:46:11 +1000
Subject: [PATCH 18/36] spack.yaml: Constrained netcdf-*, hdf5 versions

netcdf-c @4.7.4 (same as ACCESS-OM2 MOM5)
netcdf-fortran @4.5.1
hdf5 @1.10.5
---
 spack.yaml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/spack.yaml b/spack.yaml
index be827f6..d438377 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -29,11 +29,21 @@ spack:
     openmpi:
       require:
         - '@4.0.2'
+    netcdf-c:
+      require:
+        - '@4.7.4'
+    netcdf-fortran:
+      require:
+        - '@4.5.1'
+    hdf5:
+      require:
+        - '@1.10.5'
 
     # Preferences for all packages
     all:
-      compiler: [intel@19.0.5.281]
-      target: [x86_64]
+      require:
+        - '%intel@19.0.5.281'
+        - 'target=x86_64'
   view: true
   concretizer:
     unify: true
@@ -70,4 +80,4 @@ spack:
       root: $spack/../restricted/ukmo/release
     source_cache: $spack/../restricted/ukmo/source_cache
     build_stage:
-    - $TMPDIR/restricted/spack-stage
\ No newline at end of file
+    - $TMPDIR/restricted/spack-stage

From b73ab472d6f34b81080578cd26446a765a34fc5c Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 12 Jun 2024 10:59:43 +1000
Subject: [PATCH 19/36] spack.yaml: Updated netcdf-fortran to @4.6.1

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

diff --git a/spack.yaml b/spack.yaml
index d438377..d3ac6b3 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -34,7 +34,7 @@ spack:
         - '@4.7.4'
     netcdf-fortran:
       require:
-        - '@4.5.1'
+        - '@4.6.1'
     hdf5:
       require:
         - '@1.10.5'

From 34ed057cfc8f8dad6819b4194d1ec4caa5ce52e4 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Mon, 24 Jun 2024 16:16:29 +1000
Subject: [PATCH 20/36] spack.yaml: Updating dependencies to be in line with
 https://github.com/ACCESS-NRI/spack-packages/pull/121 netcdf-c uses gcc
 compiler target updated to x86_64_v4 multiple updates to dependency versions

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

diff --git a/spack.yaml b/spack.yaml
index d3ac6b3..b30637b 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -7,8 +7,8 @@ spack:
     - access-esm1p5@git.2024.05.0
   packages:
     # Direct ACCESS-NRI dependencies
-    # Note: mom5, oasis3-mct have branch-specific logic and hence can't use
-    # the usual '@git.DATE' format.
+    # Note: some packages have branch-specific logic and hence can't use
+    # the usual '@git.DATE' calver (https://calver.org) format.
     mom5:
       require:
         - '@git.access-esm1.5_2024.05.24=access-esm1.5'
@@ -31,19 +31,20 @@ spack:
         - '@4.0.2'
     netcdf-c:
       require:
-        - '@4.7.4'
+        - '@4.7.1'
+        - '%gcc@8.5.0'
     netcdf-fortran:
       require:
-        - '@4.6.1'
+        - '@4.5.2'
     hdf5:
       require:
-        - '@1.10.5'
+        - '@1.10.11'
 
     # Preferences for all packages
     all:
       require:
         - '%intel@19.0.5.281'
-        - 'target=x86_64'
+        - 'target=x86_64_v4'
   view: true
   concretizer:
     unify: true

From fbf203791daf91d73eef0a3767e47bc9d27d90f7 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Tue, 2 Jul 2024 10:02:28 +1000
Subject: [PATCH 21/36] Updated spack-packages/config, put spack.yaml versions
 in line with reproducible pre-industrial output

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

diff --git a/config/versions.json b/config/versions.json
index 297c19d..502005e 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://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.05.28",
-    "spack-config": "2024.04.23"
+    "spack-packages": "2024.07.02",
+    "spack-config": "2024.07.02"
 }
diff --git a/spack.yaml b/spack.yaml
index b30637b..1067142 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -32,10 +32,9 @@ spack:
     netcdf-c:
       require:
         - '@4.7.1'
-        - '%gcc@8.5.0'
     netcdf-fortran:
       require:
-        - '@4.5.2'
+        - '@4.5.1'
     hdf5:
       require:
         - '@1.10.11'
@@ -43,7 +42,7 @@ spack:
     # Preferences for all packages
     all:
       require:
-        - '%intel@19.0.5.281'
+        - '%intel@19.0.3.199'
         - 'target=x86_64_v4'
   view: true
   concretizer:

From 4523f6c3b78b65e2e997498d8e2a54d14619f763 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Tue, 2 Jul 2024 10:21:20 +1000
Subject: [PATCH 22/36] spack.yaml: Update netcdf-fortran to 4.5.2

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

diff --git a/spack.yaml b/spack.yaml
index 1067142..9221a5a 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -34,7 +34,7 @@ spack:
         - '@4.7.1'
     netcdf-fortran:
       require:
-        - '@4.5.1'
+        - '@4.5.2'
     hdf5:
       require:
         - '@1.10.11'

From 8df2b74c61d7f31012b48ce57a43ee632bef4086 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 3 Jul 2024 09:44:16 +1000
Subject: [PATCH 23/36] spack.yaml: put um7 on access-esm1.5 branch, tagged new
 mom5 commit

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

diff --git a/spack.yaml b/spack.yaml
index 9221a5a..002d7ba 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -11,13 +11,13 @@ spack:
     # the usual '@git.DATE' calver (https://calver.org) format.
     mom5:
       require:
-        - '@git.access-esm1.5_2024.05.24=access-esm1.5'
+        - '@git.access-esm1.5_2024.06.20=access-esm1.5'
     cice4:
       require:
         - '@git.2024.05.21=access-esm1.5'
     um7:
       require:
-        - '@git.2024.05.21=7.3'
+        - '@git.2024.05.21=access-esm1.5'
     # Lower-level ACCESS-NRI dependencies
     gcom4:
       require:

From 96581034c8be56382e66af6a5f13508d51d512bc Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 3 Jul 2024 09:47:16 +1000
Subject: [PATCH 24/36] spack.yaml: Update modulefile version in line with
 package version

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

diff --git a/spack.yaml b/spack.yaml
index 002d7ba..ea8796d 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -74,7 +74,7 @@ spack:
           access-esm1p5: '{name}/2024.05.0'
           cice4: '{name}/2024.05.21'
           um7: '{name}/2024.05.21'
-          mom5: '{name}/access-esm1.5_2024.05.24'
+          mom5: '{name}/access-esm1.5_2024.06.20'
   config:
     install_tree:
       root: $spack/../restricted/ukmo/release

From 5a1a94b6ed6f34c06301453a81cccdaf203daa9e Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 3 Jul 2024 11:24:21 +1000
Subject: [PATCH 25/36] spack.yaml: Update netcdf-c to 4.7.4

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

diff --git a/spack.yaml b/spack.yaml
index ea8796d..068bc26 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -31,7 +31,7 @@ spack:
         - '@4.0.2'
     netcdf-c:
       require:
-        - '@4.7.1'
+        - '@4.7.4'
     netcdf-fortran:
       require:
         - '@4.5.2'

From 4b14d19f989b576c25891f081205b6e0e505a550 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 3 Jul 2024 11:38:56 +1000
Subject: [PATCH 26/36] spack.yaml: Updated comments

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

diff --git a/spack.yaml b/spack.yaml
index 068bc26..7470059 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -8,7 +8,8 @@ spack:
   packages:
     # Direct ACCESS-NRI dependencies
     # Note: some packages have branch-specific logic and hence can't use
-    # the usual '@git.DATE' calver (https://calver.org) format.
+    # the usual '@git.DATE' calver (https://calver.org) format, instead
+    # requiring a `@git.DATE=BRANCH` version.
     mom5:
       require:
         - '@git.access-esm1.5_2024.06.20=access-esm1.5'

From e9040c0d71bfebb4958fdb6b9c7bafbd6f9bf910 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 3 Jul 2024 14:10:36 +1000
Subject: [PATCH 27/36] spack.yaml: Updated um7 to 2024.07.03

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

diff --git a/spack.yaml b/spack.yaml
index 7470059..88ca570 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -18,7 +18,7 @@ spack:
         - '@git.2024.05.21=access-esm1.5'
     um7:
       require:
-        - '@git.2024.05.21=access-esm1.5'
+        - '@git.2024.07.03=access-esm1.5'
     # Lower-level ACCESS-NRI dependencies
     gcom4:
       require:
@@ -74,7 +74,7 @@ spack:
           all: '{name}/{version}'
           access-esm1p5: '{name}/2024.05.0'
           cice4: '{name}/2024.05.21'
-          um7: '{name}/2024.05.21'
+          um7: '{name}/2024.07.03'
           mom5: '{name}/access-esm1.5_2024.06.20'
   config:
     install_tree:

From 038f7ed52a7bdfc679e10721205fc7f1a4d387a6 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 3 Jul 2024 14:29:39 +1000
Subject: [PATCH 28/36] versions.json: Reverted to 2024.07.01 spack-config

---
 config/versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/versions.json b/config/versions.json
index 502005e..5760097 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -2,5 +2,5 @@
     "$schema": "https://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.02",
-    "spack-config": "2024.07.02"
+    "spack-config": "2024.07.01"
 }

From 814316083878fe7b5be85d24a0841777d1458fb6 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 3 Jul 2024 16:45:49 +1000
Subject: [PATCH 29/36] versions.json: spack-packages version to 2024.07.03,
 spack-config back to 2024.07.02

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

diff --git a/config/versions.json b/config/versions.json
index 5760097..29bf04b 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://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.02",
-    "spack-config": "2024.07.01"
+    "spack-packages": "2024.07.03",
+    "spack-config": "2024.07.02"
 }

From 45fa48040afd7c8cc14768f26dcbc543f5a6f355 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Thu, 4 Jul 2024 15:31:12 +1000
Subject: [PATCH 30/36] versions.json: Updated to spack 0.22

---
 config/versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/versions.json b/config/versions.json
index 29bf04b..ff03a67 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/2-0-0.json",
-    "spack": "0.21",
+    "spack": "0.22",
     "spack-packages": "2024.07.03",
     "spack-config": "2024.07.02"
 }

From 1edb1aa7d7bf603596481a2ec3016474ffd53ae3 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Thu, 4 Jul 2024 16:51:18 +1000
Subject: [PATCH 31/36] spack.yaml: hide_implicits: false and autoload: run

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

diff --git a/spack.yaml b/spack.yaml
index 88ca570..2a4af9f 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -62,9 +62,9 @@ spack:
           - cice4
           - um7
           - mom5
-        hide_implicits: true
+        hide_implicits: false
         all:
-          autoload: direct
+          autoload: run
           conflict:
             - '{name}'
           environment:

From cfe0953bdecadab3842e30d29e88584b396b89cb Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Fri, 5 Jul 2024 11:51:14 +1000
Subject: [PATCH 32/36] spack-config 2024.07.05 using exclude_implicits: true

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

diff --git a/config/versions.json b/config/versions.json
index ff03a67..3a72bfc 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -2,5 +2,5 @@
     "$schema": "https://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.02"
+    "spack-config": "2024.07.05"
 }
diff --git a/spack.yaml b/spack.yaml
index 2a4af9f..6082f0c 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -62,7 +62,7 @@ spack:
           - cice4
           - um7
           - mom5
-        hide_implicits: false
+        exclude_implicits: true
         all:
           autoload: run
           conflict:

From 5198074ac3ece8be963fe1593ae06c25b768361a Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Fri, 5 Jul 2024 12:18:44 +1000
Subject: [PATCH 33/36] versions.json: spack-packages 2024.07.05

---
 config/versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/versions.json b/config/versions.json
index 3a72bfc..03bebb4 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://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.05",
     "spack-config": "2024.07.05"
 }

From fca0010505930f361132780eedfd79862b5fb8a5 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Mon, 8 Jul 2024 14:54:17 +1000
Subject: [PATCH 34/36] versions.json: Updated spack-packages 2024.07.07,
 rebuilding with
 https://github.com/ACCESS-NRI/spack/commit/42e310074a69cb4ee052a73e830e07ad26a15440

---
 config/versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/versions.json b/config/versions.json
index 03bebb4..d1ba74d 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://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.05",
+    "spack-packages": "2024.07.07",
     "spack-config": "2024.07.05"
 }

From 298a0c5e1940e93cf39800d1ac4583c806c84d01 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Mon, 8 Jul 2024 18:27:56 +1000
Subject: [PATCH 35/36] versions.json: Update spack-packages 2024.07.08

---
 config/versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/versions.json b/config/versions.json
index d1ba74d..02d625a 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://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"
 }

From ff26a948b6fed522d357c92db77a0badc60253ce Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 10 Jul 2024 09:59:29 +1000
Subject: [PATCH 36/36] versions.json: Update spack-packages 2024.07.10
 (updated um7 spd)

---
 config/versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/versions.json b/config/versions.json
index 02d625a..4af2f44 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://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.08",
+    "spack-packages": "2024.07.10",
     "spack-config": "2024.07.05"
 }