From b5d3a5684d63cde70dfb68f32f6849d36be49c54 Mon Sep 17 00:00:00 2001
From: Dougie Squire <42455466+dougiesquire@users.noreply.github.com>
Date: Mon, 12 May 2025 14:38:06 +1000
Subject: [PATCH 1/7] Update versions to test MOM5 CMake See ACCESS-NRI/MOM5#39

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

diff --git a/config/versions.json b/config/versions.json
index 7341f3a..7c4335b 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.22",
-    "spack-packages": "2024.07.08",
-    "spack-config": "2024.07.05"
+    "spack-packages": "2a7949b8602eed0e4c65280ab2aedb8055ab9f32"
 }
diff --git a/spack.yaml b/spack.yaml
index f147a59..f098af0 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -13,16 +13,16 @@ spack:
     # Direct ACCESS-NRI Dependencies
     cice5:
       require:
-        - '@git.2023.10.19'
+        - '@git.2023.10.19=access-om2'
     mom5:
       require:
-        - '@git.2024.06.27'
+        - '@git.1fdf6ffe8098189e159f8daae93c3b8a66c12add=legacy-access-om2-bgc' # On update_cmake
     libaccessom2:
       require:
-        - '@git.2023.10.26'
+        - '@git.db8a7352ebb2811693c8a2b698a861ba66189ea2=access-om2' # On fix-pkgconfig
     oasis3-mct:
       require:
-        - '@git.2023.11.09'
+        - '@git.2023.11.09=access-om2'
     # Other Dependencies
     netcdf-c:
       require:
@@ -36,6 +36,15 @@ spack:
     openmpi:
       require:
         - '@4.0.2'
+    access-fms:
+      require:
+        - '@git.c56cd23ed38ee84ae3c4e57fb4cb0d18ecfe1c70' # On mom5-preserve-answers
+    access-generic-tracers:
+      require:
+        - '@git.14922cbe00013f6f29b4f827f4dacdf8af634656' # On update-cmake
+    access-mocsy:
+      require:
+        - '@git.2017.12.0'
     all:
       # Enforce these versions rather than a preference, as in 'spack.packages.all.compilers/target'
       require:
@@ -46,31 +55,16 @@ spack:
     unify: true
   modules:
     default:
-      enable:
-      - tcl
-      roots:
-        tcl: $spack/../release/modules
-        lmod: $spack/../release/lmod
       tcl:
-        hash_length: 0
         include:
-        - access-om2-bgc
-        - mom5
-        - cice5
-        - libaccessom2
-        - oasis3-mct
-        exclude_implicits: true
-        all:
-          autoload: run
-          conflict:
-          - '{name}'
-          environment:
-            set:
-              'SPACK_{name}_ROOT': '{prefix}'
+          - access-om2-bgc
+          - mom5
+          - cice5
+          - libaccessom2
+          - oasis3-mct
         projections:
-          all: '{name}/{version}'
           access-om2-bgc: '{name}/2024.07.0'
-          cice5: '{name}/2023.10.19'
-          mom5: '{name}-bgc/2024.06.27'
-          libaccessom2: '{name}/2023.10.26'
-          oasis3-mct: '{name}/2023.11.09'
+          cice5: '{name}/2023.10.19-{hash:7}'
+          mom5: '{name}/1fdf6ffe8098189e159f8daae93c3b8a66c12add-{hash:7}'
+          libaccessom2: '{name}/db8a7352ebb2811693c8a2b698a861ba66189ea2-{hash:7}'
+          oasis3-mct: '{name}/2023.11.09-{hash:7}'

From a15720bd821e7ba61f47eb56435b08f83edda293 Mon Sep 17 00:00:00 2001
From: dougiesquire <dougiesquire@gmail.com>
Date: Tue, 13 May 2025 08:02:03 +1000
Subject: [PATCH 2/7] Update versions

---
 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 7c4335b..bbdc576 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,5 +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.22",
-    "spack-packages": "2a7949b8602eed0e4c65280ab2aedb8055ab9f32"
+    "spack-packages": "1dcfbf454c49a0a05c62f73a2eb250049732026f"
 }
diff --git a/spack.yaml b/spack.yaml
index f098af0..21a90ff 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -16,7 +16,7 @@ spack:
         - '@git.2023.10.19=access-om2'
     mom5:
       require:
-        - '@git.1fdf6ffe8098189e159f8daae93c3b8a66c12add=legacy-access-om2-bgc' # On update_cmake
+        - '@git.51f67bf4a554d62f7b1ce99caf2f39dc1ef6b7b3=access-om2-bgc-legacy' # On update_cmake
     libaccessom2:
       require:
         - '@git.db8a7352ebb2811693c8a2b698a861ba66189ea2=access-om2' # On fix-pkgconfig
@@ -41,7 +41,7 @@ spack:
         - '@git.c56cd23ed38ee84ae3c4e57fb4cb0d18ecfe1c70' # On mom5-preserve-answers
     access-generic-tracers:
       require:
-        - '@git.14922cbe00013f6f29b4f827f4dacdf8af634656' # On update-cmake
+        - '@git.bf2dbee5160929125c73b7d1ef32e6b0063e028b' # On update-cmake
     access-mocsy:
       require:
         - '@git.2017.12.0'
@@ -65,6 +65,6 @@ spack:
         projections:
           access-om2-bgc: '{name}/2024.07.0'
           cice5: '{name}/2023.10.19-{hash:7}'
-          mom5: '{name}/1fdf6ffe8098189e159f8daae93c3b8a66c12add-{hash:7}'
+          mom5: '{name}/51f67bf4a554d62f7b1ce99caf2f39dc1ef6b7b3-{hash:7}'
           libaccessom2: '{name}/db8a7352ebb2811693c8a2b698a861ba66189ea2-{hash:7}'
           oasis3-mct: '{name}/2023.11.09-{hash:7}'

From 035a594494688005c48555ea69852aa81ba3cfa7 Mon Sep 17 00:00:00 2001
From: dougiesquire <dougiesquire@gmail.com>
Date: Wed, 14 May 2025 10:16:19 +1000
Subject: [PATCH 3/7] Update versions

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

diff --git a/config/versions.json b/config/versions.json
index bbdc576..8c614ff 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,5 +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.22",
-    "spack-packages": "1dcfbf454c49a0a05c62f73a2eb250049732026f"
+    "spack-packages": "e7c653bd3b2ef11d719f2f22dd1582ebb3a55d6a"
 }
diff --git a/spack.yaml b/spack.yaml
index 21a90ff..eecfbab 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -16,10 +16,10 @@ spack:
         - '@git.2023.10.19=access-om2'
     mom5:
       require:
-        - '@git.51f67bf4a554d62f7b1ce99caf2f39dc1ef6b7b3=access-om2-bgc-legacy' # On update_cmake
+        - '@git.fcb3b49d389dcf36a6b0c7c0a9394c81a1170ee4=legacy-access-om2-bgc'  # On update_cmake
     libaccessom2:
       require:
-        - '@git.db8a7352ebb2811693c8a2b698a861ba66189ea2=access-om2' # On fix-pkgconfig
+        - '@git.f2109c1a1e922fc139bfe80f3d16bf7bbf215aa2=access-om2'  # On cmake-export
     oasis3-mct:
       require:
         - '@git.2023.11.09=access-om2'
@@ -38,10 +38,10 @@ spack:
         - '@4.0.2'
     access-fms:
       require:
-        - '@git.c56cd23ed38ee84ae3c4e57fb4cb0d18ecfe1c70' # On mom5-preserve-answers
+        - '@git.mom5-2025.05.000'
     access-generic-tracers:
       require:
-        - '@git.bf2dbee5160929125c73b7d1ef32e6b0063e028b' # On update-cmake
+        - '@git.c5b330a2a74752516c16c92caa3c52879ecd3dea'  # On development
     access-mocsy:
       require:
         - '@git.2017.12.0'
@@ -65,6 +65,6 @@ spack:
         projections:
           access-om2-bgc: '{name}/2024.07.0'
           cice5: '{name}/2023.10.19-{hash:7}'
-          mom5: '{name}/51f67bf4a554d62f7b1ce99caf2f39dc1ef6b7b3-{hash:7}'
-          libaccessom2: '{name}/db8a7352ebb2811693c8a2b698a861ba66189ea2-{hash:7}'
+          mom5: '{name}/fcb3b49d389dcf36a6b0c7c0a9394c81a1170ee4-{hash:7}'
+          libaccessom2: '{name}/f2109c1a1e922fc139bfe80f3d16bf7bbf215aa2-{hash:7}'
           oasis3-mct: '{name}/2023.11.09-{hash:7}'

From d49833136b1cce501b2aefd8cff7f4917bec03d0 Mon Sep 17 00:00:00 2001
From: dougiesquire <dougiesquire@gmail.com>
Date: Wed, 14 May 2025 11:38:01 +1000
Subject: [PATCH 4/7] Use makefile build system for MOM5

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

diff --git a/spack.yaml b/spack.yaml
index eecfbab..c862f4b 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -17,6 +17,7 @@ spack:
     mom5:
       require:
         - '@git.fcb3b49d389dcf36a6b0c7c0a9394c81a1170ee4=legacy-access-om2-bgc'  # On update_cmake
+        - 'build_system=makefile'
     libaccessom2:
       require:
         - '@git.f2109c1a1e922fc139bfe80f3d16bf7bbf215aa2=access-om2'  # On cmake-export

From 648030a6783bd20c8114e53a183d3b9decfbf6ad Mon Sep 17 00:00:00 2001
From: dougiesquire <dougiesquire@gmail.com>
Date: Fri, 23 May 2025 07:49:37 +1000
Subject: [PATCH 5/7] Update versions

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

diff --git a/config/versions.json b/config/versions.json
index 8c614ff..1db5463 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,5 +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.22",
-    "spack-packages": "e7c653bd3b2ef11d719f2f22dd1582ebb3a55d6a"
+    "spack-packages": "ed25bd497a716cc4edaa867cc14e06dbc3777149"
 }
diff --git a/spack.yaml b/spack.yaml
index c862f4b..21c58a5 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -16,11 +16,10 @@ spack:
         - '@git.2023.10.19=access-om2'
     mom5:
       require:
-        - '@git.fcb3b49d389dcf36a6b0c7c0a9394c81a1170ee4=legacy-access-om2-bgc'  # On update_cmake
-        - 'build_system=makefile'
+        - '@git.e0b8d3d2a1d0ea242cf0a4fdaae84bb773c18c10=legacy-access-om2-bgc'  # On update_cmake
     libaccessom2:
       require:
-        - '@git.f2109c1a1e922fc139bfe80f3d16bf7bbf215aa2=access-om2'  # On cmake-export
+        - '@git.2025.05.001=access-om2'
     oasis3-mct:
       require:
         - '@git.2023.11.09=access-om2'
@@ -42,7 +41,7 @@ spack:
         - '@git.mom5-2025.05.000'
     access-generic-tracers:
       require:
-        - '@git.c5b330a2a74752516c16c92caa3c52879ecd3dea'  # On development
+        - '@git.dev-2025.05.001'
     access-mocsy:
       require:
         - '@git.2017.12.0'
@@ -66,6 +65,6 @@ spack:
         projections:
           access-om2-bgc: '{name}/2024.07.0'
           cice5: '{name}/2023.10.19-{hash:7}'
-          mom5: '{name}/fcb3b49d389dcf36a6b0c7c0a9394c81a1170ee4-{hash:7}'
-          libaccessom2: '{name}/f2109c1a1e922fc139bfe80f3d16bf7bbf215aa2-{hash:7}'
+          mom5: '{name}/e0b8d3d2a1d0ea242cf0a4fdaae84bb773c18c10-{hash:7}'
+          libaccessom2: '{name}/2025.05.001-{hash:7}'
           oasis3-mct: '{name}/2023.11.09-{hash:7}'

From aec98deeb56664c8fbb6526c29a86d4f460cf809 Mon Sep 17 00:00:00 2001
From: dougiesquire <dougiesquire@gmail.com>
Date: Fri, 23 May 2025 15:30:44 +1000
Subject: [PATCH 6/7] Update mom5 version

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

diff --git a/spack.yaml b/spack.yaml
index 21c58a5..e721bb9 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -16,7 +16,7 @@ spack:
         - '@git.2023.10.19=access-om2'
     mom5:
       require:
-        - '@git.e0b8d3d2a1d0ea242cf0a4fdaae84bb773c18c10=legacy-access-om2-bgc'  # On update_cmake
+        - '@git.2025.05.000=legacy-access-om2-bgc'
     libaccessom2:
       require:
         - '@git.2025.05.001=access-om2'
@@ -38,13 +38,13 @@ spack:
         - '@4.0.2'
     access-fms:
       require:
-        - '@git.mom5-2025.05.000'
+        - '@git.mom5-2025.05.000=mom5'
     access-generic-tracers:
       require:
-        - '@git.dev-2025.05.001'
+        - '@git.dev-2025.05.001=development'
     access-mocsy:
       require:
-        - '@git.2017.12.0'
+        - '@git.2017.12.0=mom5'
     all:
       # Enforce these versions rather than a preference, as in 'spack.packages.all.compilers/target'
       require:
@@ -65,6 +65,6 @@ spack:
         projections:
           access-om2-bgc: '{name}/2024.07.0'
           cice5: '{name}/2023.10.19-{hash:7}'
-          mom5: '{name}/e0b8d3d2a1d0ea242cf0a4fdaae84bb773c18c10-{hash:7}'
+          mom5: '{name}/2025.05.000-{hash:7}'
           libaccessom2: '{name}/2025.05.001-{hash:7}'
           oasis3-mct: '{name}/2023.11.09-{hash:7}'

From 6506dbee18cd6ee00ea121dace66442cecaf7d87 Mon Sep 17 00:00:00 2001
From: dougiesquire <dougiesquire@gmail.com>
Date: Fri, 23 May 2025 16:56:52 +1000
Subject: [PATCH 7/7] Use makefile build system for MOM5

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

diff --git a/spack.yaml b/spack.yaml
index e721bb9..64f4f87 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -17,6 +17,7 @@ spack:
     mom5:
       require:
         - '@git.2025.05.000=legacy-access-om2-bgc'
+        - 'build_system=makefile'
     libaccessom2:
       require:
         - '@git.2025.05.001=access-om2'