From 6e8e6e495543052a155f3405dbcd1e1d5399d61f Mon Sep 17 00:00:00 2001
From: Edward Yang <yang.e@wehi.edu.au>
Date: Wed, 18 Jun 2025 11:34:42 +1000
Subject: [PATCH 01/49] +mom_symmetric

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

diff --git a/spack.yaml b/spack.yaml
index 4d08f0b7..ad8c87c5 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -16,6 +16,7 @@ spack:
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - +mom_symmetric
     access-cice:
       require:
         - '@CICE6.6.0-3'

From b2fc7da059563b3bd1dc7dc38518cc2d292c6de4 Mon Sep 17 00:00:00 2001
From: Edward Yang <yang.e@wehi.edu.au>
Date: Wed, 18 Jun 2025 14:42:26 +1000
Subject: [PATCH 02/49] remove +mom_symmetric, +asymmetric_mem

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

diff --git a/spack.yaml b/spack.yaml
index ad8c87c5..63dd0d15 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -16,7 +16,6 @@ spack:
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - +mom_symmetric
     access-cice:
       require:
         - '@CICE6.6.0-3'
@@ -27,7 +26,6 @@ spack:
     access-mom6:
       require:
         - '@2025.02.001'
-        - '+asymmetric_mem'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'

From 219e7b618ff31c43f7bff5297497ab209937fffd Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Mon, 30 Jun 2025 16:55:16 +1000
Subject: [PATCH 03/49] Change MOM6 commit reference in spack.yaml to add
 recent GFDL mom-ocean merge and small index bug

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

diff --git a/spack.yaml b/spack.yaml
index 63dd0d15..f4c6ceb4 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -25,7 +25,7 @@ spack:
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
     access-mom6:
       require:
-        - '@2025.02.001'
+        - '@921b3402466fd0a24ab8c409bbef8fb721f483bd'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'

From d7a0e270dc0297051472044bf17e3e960a617ca6 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Mon, 30 Jun 2025 17:11:52 +1000
Subject: [PATCH 04/49] Attempt to fix notation according to
 https://github.com/ACCESS-NRI/model-deployment-template/blob/main/spack.yaml

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

diff --git a/spack.yaml b/spack.yaml
index f4c6ceb4..d6d266c1 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -25,7 +25,7 @@ spack:
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
     access-mom6:
       require:
-        - '@921b3402466fd0a24ab8c409bbef8fb721f483bd'
+        - '@git.921b3402466fd0a24ab8c409bbef8fb721f483bd=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'

From 81fde52d66fbd0d45d5a6ace1a75e2cfef51cc56 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Tue, 1 Jul 2025 10:18:55 +1000
Subject: [PATCH 05/49] Update git version of MOM6 after Dougie rebased it

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

diff --git a/spack.yaml b/spack.yaml
index d6d266c1..463ef708 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -25,7 +25,7 @@ spack:
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
     access-mom6:
       require:
-        - '@git.921b3402466fd0a24ab8c409bbef8fb721f483bd=2025.02.001'
+        - '@git.f20b0e150b0273b128ebd0e63ee3238755aa0986=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'

From 649a2c891fdb44ef74734de5f17c6c2e8265ef76 Mon Sep 17 00:00:00 2001
From: Dougie Squire <42455466+dougiesquire@users.noreply.github.com>
Date: Tue, 1 Jul 2025 15:14:04 +1000
Subject: [PATCH 06/49] Update to %oneapi@2025.1.1

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

diff --git a/spack.yaml b/spack.yaml
index 463ef708..85e665fb 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -81,7 +81,7 @@ spack:
         - '%gcc'
     all:
       require:
-        - '%oneapi@2025.0.4'
+        - '%oneapi@2025.1.1'
         - 'target=x86_64_v4'
   view: true
   concretizer:

From 2262c26a18b18ad4c61f7bab455f179d7af30122 Mon Sep 17 00:00:00 2001
From: Dougie Squire <42455466+dougiesquire@users.noreply.github.com>
Date: Tue, 1 Jul 2025 16:02:11 +1000
Subject: [PATCH 07/49] Use %oneapi@2025.0.4 for FMS only

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

diff --git a/spack.yaml b/spack.yaml
index 85e665fb..a1d93fe4 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -70,6 +70,7 @@ spack:
     fms:
       require:
         - '@git.2025.02=2025.02'
+        - '%oneapi@2025.0.4'
     openmpi:
       require:
         - '@4.1.7'

From b0514fb3e66f7126564a72efc53964d8257b5bc5 Mon Sep 17 00:00:00 2001
From: Dougie Squire <42455466+dougiesquire@users.noreply.github.com>
Date: Tue, 1 Jul 2025 16:25:52 +1000
Subject: [PATCH 08/49] MOM6 with %oneapi@2025.1.1, everything else with
 %oneapi@2025.0.4

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

diff --git a/spack.yaml b/spack.yaml
index a1d93fe4..f5bfea7d 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -29,6 +29,7 @@ spack:
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - '%oneapi@2025.1.1'
     access-ww3:
       require:
         - '@2025.03.0'
@@ -70,7 +71,6 @@ spack:
     fms:
       require:
         - '@git.2025.02=2025.02'
-        - '%oneapi@2025.0.4'
     openmpi:
       require:
         - '@4.1.7'
@@ -82,7 +82,7 @@ spack:
         - '%gcc'
     all:
       require:
-        - '%oneapi@2025.1.1'
+        - '%oneapi@2025.0.4'
         - 'target=x86_64_v4'
   view: true
   concretizer:

From 47500175fd93913cfdb58db7a63e0cc20614ccd1 Mon Sep 17 00:00:00 2001
From: Dougie Squire <42455466+dougiesquire@users.noreply.github.com>
Date: Tue, 1 Jul 2025 16:34:09 +1000
Subject: [PATCH 09/49] Explicitly set compiler for each package

---
 spack.yaml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/spack.yaml b/spack.yaml
index f5bfea7d..12546c91 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -16,6 +16,7 @@ spack:
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - '%oneapi@2025.0.4'
     access-cice:
       require:
         - '@CICE6.6.0-3'
@@ -23,6 +24,7 @@ spack:
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - '%oneapi@2025.0.4'
     access-mom6:
       require:
         - '@git.f20b0e150b0273b128ebd0e63ee3238755aa0986=2025.02.001'
@@ -33,24 +35,32 @@ spack:
     access-ww3:
       require:
         - '@2025.03.0'
+        - '%oneapi@2025.0.4'
     access3-share:
       require:
         - '@2025.03.1'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - '%oneapi@2025.0.4'
     access-generic-tracers:
       require:
         - '@git.dev-2025.05.001=development'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - '%oneapi@2025.1.1'
     access-mocsy:
       require:
         - '@git.2017.12.0=gtracers'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+<<<<<<< HEAD
+=======
+        - '%oneapi@2025.1.1'
+
+>>>>>>> dbac0ee (Explicitly set compiler for each package)
     # Other Dependencies
     esmf:
       require:
@@ -58,31 +68,38 @@ spack:
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - '%oneapi@2025.0.4'
     parallelio:
       require:
         - '@2.6.2'
+        - '%oneapi@2025.0.4'
     netcdf-c:
       require:
         - '@4.9.2'
         - build_system=cmake build_type=RelWithDebInfo
+        - '%oneapi@2025.0.4'
     netcdf-fortran:
       require:
         - '@4.6.1'
+        - '%oneapi@2025.0.4'
     fms:
       require:
         - '@git.2025.02=2025.02'
+        - '%oneapi@2025.0.4'
     openmpi:
       require:
         - '@4.1.7'
+        - '%oneapi@2025.0.4'
     fortranxml:
       require:
         - '@4.1.2'
+        - '%oneapi@2025.0.4'
     gcc-runtime:
       require:
         - '%gcc'
+        - '%oneapi@2025.0.4'
     all:
       require:
-        - '%oneapi@2025.0.4'
         - 'target=x86_64_v4'
   view: true
   concretizer:

From f04ab9f610476ce8a483b44c2de308f689558d8c Mon Sep 17 00:00:00 2001
From: Dougie Squire <42455466+dougiesquire@users.noreply.github.com>
Date: Tue, 1 Jul 2025 19:55:09 +1000
Subject: [PATCH 10/49] This should work too?

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

diff --git a/spack.yaml b/spack.yaml
index 12546c91..2868c7fd 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -16,7 +16,6 @@ spack:
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - '%oneapi@2025.0.4'
     access-cice:
       require:
         - '@CICE6.6.0-3'
@@ -24,7 +23,6 @@ spack:
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - '%oneapi@2025.0.4'
     access-mom6:
       require:
         - '@git.f20b0e150b0273b128ebd0e63ee3238755aa0986=2025.02.001'
@@ -35,14 +33,12 @@ spack:
     access-ww3:
       require:
         - '@2025.03.0'
-        - '%oneapi@2025.0.4'
     access3-share:
       require:
         - '@2025.03.1'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - '%oneapi@2025.0.4'
     access-generic-tracers:
       require:
         - '@git.dev-2025.05.001=development'
@@ -68,38 +64,32 @@ spack:
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - '%oneapi@2025.0.4'
     parallelio:
       require:
         - '@2.6.2'
-        - '%oneapi@2025.0.4'
     netcdf-c:
       require:
         - '@4.9.2'
         - build_system=cmake build_type=RelWithDebInfo
-        - '%oneapi@2025.0.4'
     netcdf-fortran:
       require:
         - '@4.6.1'
-        - '%oneapi@2025.0.4'
     fms:
       require:
         - '@git.2025.02=2025.02'
-        - '%oneapi@2025.0.4'
     openmpi:
       require:
         - '@4.1.7'
-        - '%oneapi@2025.0.4'
     fortranxml:
       require:
         - '@4.1.2'
-        - '%oneapi@2025.0.4'
     gcc-runtime:
       require:
         - '%gcc'
         - '%oneapi@2025.0.4'
     all:
       require:
+        - '%oneapi@2025.0.4'
         - 'target=x86_64_v4'
   view: true
   concretizer:

From 581ac448601f9ae95b1b68dda47fd2a589e9247b Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Wed, 2 Jul 2025 15:20:38 +1000
Subject: [PATCH 11/49] Revert "This should work too?"

This reverts commit 35281225a7737e31abca62f029b183d1b0466801.
---
 spack.yaml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/spack.yaml b/spack.yaml
index 2868c7fd..12546c91 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -16,6 +16,7 @@ spack:
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - '%oneapi@2025.0.4'
     access-cice:
       require:
         - '@CICE6.6.0-3'
@@ -23,6 +24,7 @@ spack:
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - '%oneapi@2025.0.4'
     access-mom6:
       require:
         - '@git.f20b0e150b0273b128ebd0e63ee3238755aa0986=2025.02.001'
@@ -33,12 +35,14 @@ spack:
     access-ww3:
       require:
         - '@2025.03.0'
+        - '%oneapi@2025.0.4'
     access3-share:
       require:
         - '@2025.03.1'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - '%oneapi@2025.0.4'
     access-generic-tracers:
       require:
         - '@git.dev-2025.05.001=development'
@@ -64,32 +68,38 @@ spack:
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - '%oneapi@2025.0.4'
     parallelio:
       require:
         - '@2.6.2'
+        - '%oneapi@2025.0.4'
     netcdf-c:
       require:
         - '@4.9.2'
         - build_system=cmake build_type=RelWithDebInfo
+        - '%oneapi@2025.0.4'
     netcdf-fortran:
       require:
         - '@4.6.1'
+        - '%oneapi@2025.0.4'
     fms:
       require:
         - '@git.2025.02=2025.02'
+        - '%oneapi@2025.0.4'
     openmpi:
       require:
         - '@4.1.7'
+        - '%oneapi@2025.0.4'
     fortranxml:
       require:
         - '@4.1.2'
+        - '%oneapi@2025.0.4'
     gcc-runtime:
       require:
         - '%gcc'
         - '%oneapi@2025.0.4'
     all:
       require:
-        - '%oneapi@2025.0.4'
         - 'target=x86_64_v4'
   view: true
   concretizer:

From 27117502825f41a97cc8575f4696e7432c3850e1 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Wed, 2 Jul 2025 15:21:39 +1000
Subject: [PATCH 12/49] Add MOM6 version with print statements in
 config_src/drivers/nuopc_cap/mom_cap.F90

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

diff --git a/spack.yaml b/spack.yaml
index 12546c91..57f363a1 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - '%oneapi@2025.0.4'
     access-mom6:
       require:
-        - '@git.f20b0e150b0273b128ebd0e63ee3238755aa0986=2025.02.001'
+        - '@git.07b59848401c38e30eda920f8a7f4fb4aa229b82=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'

From 4189742bdb9a4f5cbba867ab2937199a26512e26 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Thu, 3 Jul 2025 09:26:12 +1000
Subject: [PATCH 13/49] Update code trying to set dirs%input_filename in nuopc
 cap to get ice shelf to read it

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

diff --git a/spack.yaml b/spack.yaml
index 57f363a1..259b7cb2 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - '%oneapi@2025.0.4'
     access-mom6:
       require:
-        - '@git.07b59848401c38e30eda920f8a7f4fb4aa229b82=2025.02.001'
+        - '@git.a0f364934d76fbf3972ce6a00c960d33ef3e1981=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'

From 36320e540df219a7b3a3cbaf9f8f07e2ca670968 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Sun, 6 Jul 2025 13:28:07 +1000
Subject: [PATCH 14/49] Update git ref on MOM6 to no print statements

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

diff --git a/spack.yaml b/spack.yaml
index 259b7cb2..2f931a15 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - '%oneapi@2025.0.4'
     access-mom6:
       require:
-        - '@git.a0f364934d76fbf3972ce6a00c960d33ef3e1981=2025.02.001'
+        - '@git.f6ab4fdaa8e2f94dfecbfd546355ec0fb98c2738=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'

From 061cbebe37e4fe6d254bc8f99a7df9a2f9010451 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Sun, 6 Jul 2025 13:30:43 +1000
Subject: [PATCH 15/49] Make a guess on how to make a debug executable
 https://github.com/ACCESS-NRI/ACCESS-OM3/compare/cy-pananopt...om3-mom6-debug-example

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

diff --git a/spack.yaml b/spack.yaml
index 2f931a15..010447e8 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -17,6 +17,7 @@ spack:
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - '%oneapi@2025.0.4'
+        - build_type=Debug
     access-cice:
       require:
         - '@CICE6.6.0-3'
@@ -25,6 +26,7 @@ spack:
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - '%oneapi@2025.0.4'
+        - build_type=Debug
     access-mom6:
       require:
         - '@git.f6ab4fdaa8e2f94dfecbfd546355ec0fb98c2738=2025.02.001'
@@ -32,10 +34,12 @@ spack:
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - '%oneapi@2025.1.1'
+        - build_type=Debug
     access-ww3:
       require:
         - '@2025.03.0'
         - '%oneapi@2025.0.4'
+        - build_type=Debug
     access3-share:
       require:
         - '@2025.03.1'
@@ -43,6 +47,7 @@ spack:
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - '%oneapi@2025.0.4'
+        - build_type=Debug
     access-generic-tracers:
       require:
         - '@git.dev-2025.05.001=development'
@@ -50,6 +55,7 @@ spack:
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - '%oneapi@2025.1.1'
+        - build_type=Debug
     access-mocsy:
       require:
         - '@git.2017.12.0=gtracers'
@@ -59,6 +65,7 @@ spack:
 <<<<<<< HEAD
 =======
         - '%oneapi@2025.1.1'
+        - build_type=Debug
 
 >>>>>>> dbac0ee (Explicitly set compiler for each package)
     # Other Dependencies
@@ -72,6 +79,7 @@ spack:
     parallelio:
       require:
         - '@2.6.2'
+        - build_type=RelWithDebInfo
         - '%oneapi@2025.0.4'
     netcdf-c:
       require:

From a7e794efa8e240cbafa4129f33c613d951eb5ed8 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Sun, 6 Jul 2025 13:37:48 +1000
Subject: [PATCH 16/49] Try again removing debug mode for some components

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

diff --git a/spack.yaml b/spack.yaml
index 010447e8..549e9a2b 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -39,7 +39,6 @@ spack:
       require:
         - '@2025.03.0'
         - '%oneapi@2025.0.4'
-        - build_type=Debug
     access3-share:
       require:
         - '@2025.03.1'
@@ -55,7 +54,6 @@ spack:
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - '%oneapi@2025.1.1'
-        - build_type=Debug
     access-mocsy:
       require:
         - '@git.2017.12.0=gtracers'
@@ -65,7 +63,6 @@ spack:
 <<<<<<< HEAD
 =======
         - '%oneapi@2025.1.1'
-        - build_type=Debug
 
 >>>>>>> dbac0ee (Explicitly set compiler for each package)
     # Other Dependencies

From bf6c9889904d86b5eca82a3303d2f7c117a25a51 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Mon, 7 Jul 2025 11:15:41 +1000
Subject: [PATCH 17/49] Try changes in
 https://github.com/ACCESS-NRI/ACCESS-OM3/pull/97/files ffflags instead of
 build_type=debug

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

diff --git a/spack.yaml b/spack.yaml
index 549e9a2b..7ac5af6e 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -17,7 +17,7 @@ spack:
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - '%oneapi@2025.0.4'
-        - build_type=Debug
+        - fflags="-O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"
     access-cice:
       require:
         - '@CICE6.6.0-3'
@@ -26,7 +26,7 @@ spack:
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - '%oneapi@2025.0.4'
-        - build_type=Debug
+        - fflags="-O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"
     access-mom6:
       require:
         - '@git.f6ab4fdaa8e2f94dfecbfd546355ec0fb98c2738=2025.02.001'
@@ -34,7 +34,7 @@ spack:
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - '%oneapi@2025.1.1'
-        - build_type=Debug
+        - fflags="-O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"
     access-ww3:
       require:
         - '@2025.03.0'
@@ -46,7 +46,7 @@ spack:
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - '%oneapi@2025.0.4'
-        - build_type=Debug
+        - fflags="-O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"
     access-generic-tracers:
       require:
         - '@git.dev-2025.05.001=development'
@@ -76,7 +76,6 @@ spack:
     parallelio:
       require:
         - '@2.6.2'
-        - build_type=RelWithDebInfo
         - '%oneapi@2025.0.4'
     netcdf-c:
       require:

From ebbaee3d5436e82ae51ee082ba576014226796fa Mon Sep 17 00:00:00 2001
From: Dougie Squire <42455466+dougiesquire@users.noreply.github.com>
Date: Tue, 8 Jul 2025 11:50:12 +1000
Subject: [PATCH 18/49] Use %oneapi@2025.2.0 Use spack-packages branch
 use-default-flag-handler Update access-generic-tracers and access-mocsy

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

diff --git a/config/versions.json b/config/versions.json
index 3a6084c2..f863b02c 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/3-0-0.json",
     "spack": "0.22",
-    "spack-packages": "2025.06.000"
+    "spack-packages": "97c26382fab997698a344b9aac364b8a4e7411df"
 }
diff --git a/spack.yaml b/spack.yaml
index 7ac5af6e..7d9d3559 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -13,58 +13,44 @@ spack:
       require:
         - '@2025.03.1'
         - configurations=MOM6-CICE6,MOM6-CICE6-WW3
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - '%oneapi@2025.0.4'
-        - fflags="-O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"
     access-cice:
       require:
         - '@CICE6.6.0-3'
         - io_type=PIO
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - '%oneapi@2025.0.4'
-        - fflags="-O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"
     access-mom6:
       require:
         - '@git.f6ab4fdaa8e2f94dfecbfd546355ec0fb98c2738=2025.02.001'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - '%oneapi@2025.1.1'
-        - fflags="-O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"
     access-ww3:
       require:
         - '@2025.03.0'
-        - '%oneapi@2025.0.4'
     access3-share:
       require:
         - '@2025.03.1'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - '%oneapi@2025.0.4'
-        - fflags="-O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"
     access-generic-tracers:
       require:
-        - '@git.dev-2025.05.001=development'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - '@git.dev-2025.06.002=development'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - '%oneapi@2025.1.1'
     access-mocsy:
       require:
-        - '@git.2017.12.0=gtracers'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - '@git.2025.07.000=gtracers'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-<<<<<<< HEAD
-=======
         - '%oneapi@2025.1.1'
-
->>>>>>> dbac0ee (Explicitly set compiler for each package)
     # Other Dependencies
     esmf:
       require:
@@ -72,38 +58,32 @@ spack:
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - '%oneapi@2025.0.4'
     parallelio:
       require:
         - '@2.6.2'
-        - '%oneapi@2025.0.4'
     netcdf-c:
       require:
         - '@4.9.2'
         - build_system=cmake build_type=RelWithDebInfo
-        - '%oneapi@2025.0.4'
     netcdf-fortran:
       require:
         - '@4.6.1'
-        - '%oneapi@2025.0.4'
     fms:
       require:
         - '@git.2025.02=2025.02'
-        - '%oneapi@2025.0.4'
     openmpi:
       require:
         - '@4.1.7'
-        - '%oneapi@2025.0.4'
     fortranxml:
       require:
         - '@4.1.2'
-        - '%oneapi@2025.0.4'
     gcc-runtime:
       require:
         - '%gcc'
         - '%oneapi@2025.0.4'
     all:
       require:
+        - '%oneapi@2025.2.0'
         - 'target=x86_64_v4'
   view: true
   concretizer:

From 9e8be8635bb0f208d85b9fb91f101d722687a4aa Mon Sep 17 00:00:00 2001
From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com>
Date: Wed, 16 Jul 2025 16:55:53 +1000
Subject: [PATCH 19/49] Update cice to fix error found in debug build

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

diff --git a/spack.yaml b/spack.yaml
index 7d9d3559..3a6bd2c8 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -18,7 +18,7 @@ spack:
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
     access-cice:
       require:
-        - '@CICE6.6.0-3'
+        - '@git.fe521f93dda96d2e7a7fed1d2a05cdab3c08170b'
         - io_type=PIO
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'

From 976fc519f025fadb15fab4f8dffe1793207534a1 Mon Sep 17 00:00:00 2001
From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com>
Date: Thu, 17 Jul 2025 09:20:00 +1000
Subject: [PATCH 20/49] Update spack.yaml

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

diff --git a/spack.yaml b/spack.yaml
index 3a6bd2c8..96b4eb4b 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -18,7 +18,7 @@ spack:
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
     access-cice:
       require:
-        - '@git.fe521f93dda96d2e7a7fed1d2a05cdab3c08170b'
+        - '@git.e2efd7b905a0c042ec0083c53469fd2c688251e4'
         - io_type=PIO
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
@@ -54,7 +54,7 @@ spack:
     # Other Dependencies
     esmf:
       require:
-        - '@git.v8.7.0=8.7.0'
+        - '@git.v8.7.0=8.7.0 /cj6ae3p'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'

From e7d376f0f99dd78a01c2098e34eca2987f525273 Mon Sep 17 00:00:00 2001
From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com>
Date: Thu, 17 Jul 2025 10:38:18 +1000
Subject: [PATCH 21/49] Update spack.yaml

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

diff --git a/spack.yaml b/spack.yaml
index 96b4eb4b..cd3c8aaa 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -18,7 +18,7 @@ spack:
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
     access-cice:
       require:
-        - '@git.e2efd7b905a0c042ec0083c53469fd2c688251e4'
+        - '@git.83d1f71749889a4394aecbf204ebd2b9bdbf1440'
         - io_type=PIO
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'

From 33ca2e2c7a23cb72dcb402b036f91111fd628a9d Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Wed, 27 Aug 2025 15:39:05 +1000
Subject: [PATCH 22/49] Remove debug mode ffflags from
 https://github.com/ACCESS-NRI/ACCESS-OM3/tree/b751c08461cc95eb330b8b504aae0bd1f24a3c7e

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

diff --git a/spack.yaml b/spack.yaml
index cd3c8aaa..0e248ac1 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -13,20 +13,20 @@ spack:
       require:
         - '@2025.03.1'
         - configurations=MOM6-CICE6,MOM6-CICE6-WW3
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
     access-cice:
       require:
         - '@git.83d1f71749889a4394aecbf204ebd2b9bdbf1440'
         - io_type=PIO
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
     access-mom6:
       require:
         - '@git.f6ab4fdaa8e2f94dfecbfd546355ec0fb98c2738=2025.02.001'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
     access-ww3:
@@ -35,19 +35,19 @@ spack:
     access3-share:
       require:
         - '@2025.03.1'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
     access-generic-tracers:
       require:
         - '@git.dev-2025.06.002=development'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
     access-mocsy:
       require:
         - '@git.2025.07.000=gtracers'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - '%oneapi@2025.1.1'

From e2d2c1fbb9a3b8bd7ba470d0a4aac3cc66764179 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Wed, 27 Aug 2025 15:53:05 +1000
Subject: [PATCH 23/49] Point MOM6 to
 https://github.com/mom-ocean/MOM6/tree/667aded12584a68c303cbec8441c0599f705fd09

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

diff --git a/spack.yaml b/spack.yaml
index 0e248ac1..af10c84c 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -25,7 +25,7 @@ spack:
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
     access-mom6:
       require:
-        - '@git.f6ab4fdaa8e2f94dfecbfd546355ec0fb98c2738=2025.02.001'
+        - '@git.667aded12584a68c303cbec8441c0599f705fd09=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'

From 579b4a1dc616a6b491765744003a05f7b12883e9 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Wed, 27 Aug 2025 16:16:39 +1000
Subject: [PATCH 24/49] remove gcc-runtime requiremnt

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

diff --git a/spack.yaml b/spack.yaml
index af10c84c..83a0d3f9 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -80,7 +80,6 @@ spack:
     gcc-runtime:
       require:
         - '%gcc'
-        - '%oneapi@2025.0.4'
     all:
       require:
         - '%oneapi@2025.2.0'

From ccf586232a8d8cb18ebb464b135c2cbb236aaeac Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Fri, 29 Aug 2025 11:56:26 +1000
Subject: [PATCH 25/49] Manually add Ed's flags from PR of panan optimisation
 https://github.com/ACCESS-NRI/ACCESS-OM3/pull/113 Diff is
 https://github.com/ACCESS-NRI/ACCESS-OM3/compare/4899d3f2ac356dce550875f4c07e590822791953...11938bd22ec34da145839a922f3a90b08c1f6bf4

---
 spack.yaml | 49 ++++++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/spack.yaml b/spack.yaml
index 83a0d3f9..ccfdb298 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -13,51 +13,58 @@ spack:
       require:
         - '@2025.03.1'
         - configurations=MOM6-CICE6,MOM6-CICE6-WW3
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
     access-cice:
       require:
         - '@git.83d1f71749889a4394aecbf204ebd2b9bdbf1440'
         - io_type=PIO
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
+        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
     access-mom6:
       require:
         - '@git.667aded12584a68c303cbec8441c0599f705fd09=2025.02.001'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
     access-ww3:
       require:
         - '@2025.03.0'
     access3-share:
       require:
         - '@2025.03.1'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
     access-generic-tracers:
       require:
         - '@git.dev-2025.06.002=development'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
     access-mocsy:
       require:
         - '@git.2025.07.000=gtracers'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
         - '%oneapi@2025.1.1'
     # Other Dependencies
     esmf:
       require:
         - '@git.v8.7.0=8.7.0 /cj6ae3p'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
-        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
     parallelio:
       require:
         - '@2.6.2'

From 6a301adff43889d3c37b02f4776ea437e07efcd4 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Thu, 4 Sep 2025 14:39:57 +1000
Subject: [PATCH 26/49] Try adding ice shelf info to omask calc in nuopc mom
 cap
 https://github.com/mom-ocean/MOM6/commit/1ddced2e1b8f909caed3c9d76b815d6b3cdd1a52

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

diff --git a/spack.yaml b/spack.yaml
index ccfdb298..aeafdd76 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
     access-mom6:
       require:
-        - '@git.667aded12584a68c303cbec8441c0599f705fd09=2025.02.001'
+        - '@git.1ddced2e1b8f909caed3c9d76b815d6b3cdd1a52=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'

From 78c70824fd68081afc77d3c11b27d2ba0c18cda2 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Thu, 4 Sep 2025 14:53:10 +1000
Subject: [PATCH 27/49] Update mom source with no duplicate names (just in
 case)

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

diff --git a/spack.yaml b/spack.yaml
index aeafdd76..635f17f3 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
     access-mom6:
       require:
-        - '@git.1ddced2e1b8f909caed3c9d76b815d6b3cdd1a52=2025.02.001'
+        - '@git.e02e0fed9b6ef300d4a20aead01777c8f0d26a78=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'

From 67f1472ff5e4ff3edceea103d75dd31700b1f0bd Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Thu, 4 Sep 2025 15:11:33 +1000
Subject: [PATCH 28/49] Attempt to fix problems with merge

---
 spack.yaml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/spack.yaml b/spack.yaml
index 5c3dec35..4da5a5ce 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -6,20 +6,20 @@
 # https://github.com/ACCESS-NRI/model-deployment-template/blob/main/spack.yaml
 spack:
   specs:
-    - access-om3@git.2025.08.001
+    - access-om3@git.2025.08.000
   packages:
     # Main Dependencies
     access3:
       require:
-        - '@2025.03.1'
-        - configurations=MOM6-CICE6,MOM6-CICE6-WW3
+        - '@2025.08.000'
+        - configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
     access-cice:
       require:
-        - '@git.83d1f71749889a4394aecbf204ebd2b9bdbf1440'
+        - '@CICE6.6.1-0'
         - io_type=PIO
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
@@ -37,30 +37,29 @@ spack:
         - '@2025.08.000'
     access3-share:
       require:
-        - '@2025.03.1'
+        - '@2025.08.000'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
     access-generic-tracers:
       require:
-        - '@git.dev-2025.06.002=development'
+        - '@2025.08.000'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
     access-mocsy:
       require:
-        - '@git.2025.07.000=gtracers'
+        - '@2025.07.002'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
-        - '%oneapi@2025.1.1'
     # Other Dependencies
     esmf:
       require:
-        - '@git.v8.7.0=8.7.0 /cj6ae3p'
+        - '@8.7.0'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'

From e576d379416dc408f650ca9dd4300758ae2ada26 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Thu, 4 Sep 2025 19:48:56 +1000
Subject: [PATCH 29/49] Update mom ref to
 https://github.com/ACCESS-NRI/MOM6/commit/6ea701f9324109b30ac1309744405cd6ef479929

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

diff --git a/spack.yaml b/spack.yaml
index 4da5a5ce..8fa4f95b 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
     access-mom6:
       require:
-        - '@git.e02e0fed9b6ef300d4a20aead01777c8f0d26a78=2025.02.001'
+        - '@git.6ea701f9324109b30ac1309744405cd6ef479929=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'

From 7893831e5cde4be66eb22cb91dd1e20c6292e4eb Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Thu, 4 Sep 2025 21:22:32 +1000
Subject: [PATCH 30/49] update mom6 source to
 https://github.com/ACCESS-NRI/MOM6/commit/e0bab918dd767e6250364b40b51ccd0bc3438ad2

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

diff --git a/spack.yaml b/spack.yaml
index 8fa4f95b..c9613cbe 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
     access-mom6:
       require:
-        - '@git.6ea701f9324109b30ac1309744405cd6ef479929=2025.02.001'
+        - '@git.e0bab918dd767e6250364b40b51ccd0bc3438ad2=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'

From 6f810e0f06c1e7ba4f7903f44d8001fffc31a545 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Thu, 4 Sep 2025 22:36:55 +1000
Subject: [PATCH 31/49] Update mom6 source to
 https://github.com/mom-ocean/MOM6/commit/d3016f0047c287f19456605a9f860d469cb95f88

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

diff --git a/spack.yaml b/spack.yaml
index c9613cbe..37dc3fe2 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
     access-mom6:
       require:
-        - '@git.e0bab918dd767e6250364b40b51ccd0bc3438ad2=2025.02.001'
+        - '@git.d3016f0047c287f19456605a9f860d469cb95f88=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'

From 47720989171f3dc9f6c3268c1493550bec29808c Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Fri, 5 Sep 2025 07:18:47 +1000
Subject: [PATCH 32/49] Update mom ref to
 https://github.com/mom-ocean/MOM6/commit/455ef1cea7cf3f03f24c508b27c69f19d769930f

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

diff --git a/spack.yaml b/spack.yaml
index 37dc3fe2..e9c0ff7d 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
     access-mom6:
       require:
-        - '@git.d3016f0047c287f19456605a9f860d469cb95f88=2025.02.001'
+        - '@git.455ef1cea7cf3f03f24c508b27c69f19d769930f=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'

From fcf794973925d8fa30c9c6ca808854b23bb3cd22 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Fri, 5 Sep 2025 09:54:00 +1000
Subject: [PATCH 33/49] Update mom ref to
 https://github.com/mom-ocean/MOM6/commit/e4010d06d13e4d9066db31ba9f37c3c72a735b24

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

diff --git a/spack.yaml b/spack.yaml
index e9c0ff7d..0c70cbf9 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
     access-mom6:
       require:
-        - '@git.455ef1cea7cf3f03f24c508b27c69f19d769930f=2025.02.001'
+        - '@git.e4010d06d13e4d9066db31ba9f37c3c72a735b24=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'

From 98030ea5614737f213d387bcff3f2f195112f871 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Fri, 5 Sep 2025 12:20:17 +1000
Subject: [PATCH 34/49] Revert MOM6 ref to before my mask changes to
 https://github.com/mom-ocean/MOM6/commit/667aded12584a68c303cbec8441c0599f705fd09

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

diff --git a/spack.yaml b/spack.yaml
index 0c70cbf9..aa9aa1be 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
     access-mom6:
       require:
-        - '@git.e4010d06d13e4d9066db31ba9f37c3c72a735b24=2025.02.001'
+        - '@git.667aded12584a68c303cbec8441c0599f705fd09=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'

From 1d7895dcd282080a3c7ceaf553def865945e6a3f Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Mon, 8 Sep 2025 12:30:36 +1000
Subject: [PATCH 35/49] Update mom ref to
 https://github.com/mom-ocean/MOM6/commit/bd3640bedf9039dd1eb861344e6f9c1e348ecc56

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

diff --git a/spack.yaml b/spack.yaml
index aa9aa1be..082ad368 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
     access-mom6:
       require:
-        - '@git.667aded12584a68c303cbec8441c0599f705fd09=2025.02.001'
+        - '@git.bd3640bedf9039dd1eb861344e6f9c1e348ecc56=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'

From 41d0a17f67a43ae24a75c5cc5fcd303e83dee77d Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Mon, 15 Sep 2025 17:08:40 +1000
Subject: [PATCH 36/49] Update mom6 ref to
 https://github.com/mom-ocean/MOM6/tree/23ba3e331e347fc9530f47f0bba9cce09d828d76
 of https://github.com/ACCESS-NRI/MOM6/tree/ice-shelf-dev

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

diff --git a/spack.yaml b/spack.yaml
index 082ad368..8b4d0a02 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
     access-mom6:
       require:
-        - '@git.bd3640bedf9039dd1eb861344e6f9c1e348ecc56=2025.02.001'
+        - '@git.23ba3e331e347fc9530f47f0bba9cce09d828d76=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'

From 061546ff230a6a02d0c19c7514a58f524c2db9fd Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Wed, 1 Oct 2025 10:07:35 +1000
Subject: [PATCH 37/49] update mom6 ref to
 https://github.com/ACCESS-NRI/MOM6/commit/b2e31ba8330f97fdefb85f1b896eae9eb124f664

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

diff --git a/spack.yaml b/spack.yaml
index 8b4d0a02..d13ca4d7 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
     access-mom6:
       require:
-        - '@git.23ba3e331e347fc9530f47f0bba9cce09d828d76=2025.02.001'
+        - '@git.b2e31ba8330f97fdefb85f1b896eae9eb124f664=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'

From 2603115723e87414fe9db871d3e1a2f300e19ae1 Mon Sep 17 00:00:00 2001
From: minghangli-uni <24727729+minghangli-uni@users.noreply.github.com>
Date: Thu, 16 Oct 2025 11:53:54 +1100
Subject: [PATCH 38/49] Update mom6ref to
 47ce6976a093140329c6275b71bae91cba762632

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

diff --git a/spack.yaml b/spack.yaml
index d13ca4d7..a04b282d 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
     access-mom6:
       require:
-        - '@git.b2e31ba8330f97fdefb85f1b896eae9eb124f664=2025.02.001'
+        - '@git.47ce6976a093140329c6275b71bae91cba762632=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'

From 90cae842a29b5271be6566c53e501b35a04c64bc Mon Sep 17 00:00:00 2001
From: minghangli-uni <24727729+minghangli-uni@users.noreply.github.com>
Date: Thu, 16 Oct 2025 12:15:05 +1100
Subject: [PATCH 39/49] reuse esmf@3jaaghfgv

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

diff --git a/spack.yaml b/spack.yaml
index a04b282d..a43bba79 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -6,7 +6,7 @@
 # https://github.com/ACCESS-NRI/model-deployment-template/blob/main/spack.yaml
 spack:
   specs:
-    - access-om3@git.2025.08.000
+    - access-om3@git.2025.08.000/3jaaghfgv
   packages:
     # Main Dependencies
     access3:
@@ -57,13 +57,13 @@ spack:
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
     # Other Dependencies
-    esmf:
-      require:
-        - '@8.7.0'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
+    # esmf:
+    #   require:
+    #     - '@8.7.0'
+        # - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        # - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        # - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
+        # - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
     parallelio:
       require:
         - '@2.6.2'

From 57dd42b28cc39dc4852f1001ef9ec7b0950be9bf Mon Sep 17 00:00:00 2001
From: minghangli-uni <24727729+minghangli-uni@users.noreply.github.com>
Date: Fri, 17 Oct 2025 08:09:16 +1100
Subject: [PATCH 40/49] Update compiler flags to be consistent with
 compiler_flag 2 in https://github.com/ACCESS-NRI/ACCESS-OM3/pull/148

---
 spack.yaml | 60 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/spack.yaml b/spack.yaml
index a43bba79..085c6e4a 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -13,57 +13,57 @@ spack:
       require:
         - '@2025.08.000'
         - configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"'
     access-cice:
       require:
         - '@CICE6.6.1-0'
         - io_type=PIO
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
-        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
-        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
-        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"'
+        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"'
     access-mom6:
       require:
         - '@git.47ce6976a093140329c6275b71bae91cba762632=2025.02.001'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"'
     access-ww3:
       require:
         - '@2025.08.000'
     access3-share:
       require:
         - '@2025.08.000'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"'
     access-generic-tracers:
       require:
         - '@2025.08.000'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"'
     access-mocsy:
       require:
         - '@2025.07.002'
-        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"'
     # Other Dependencies
     # esmf:
     #   require:
     #     - '@8.7.0'
-        # - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        # - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        # - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto"'
-        # - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -qopt-prefetch -flto -fuse-ld=lld"'
+        # - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        # - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        # - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        # - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"'
     parallelio:
       require:
         - '@2.6.2'
@@ -78,6 +78,10 @@ spack:
       require:
         - '@2025.03'
         - 'cppflags="-DMAXFIELDMETHODS_=600"'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
+        - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"'
     openmpi:
       require:
         - '@4.1.7'

From 120dede9cf86143acdc3f3c77e873f7dc8015f5d Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Wed, 22 Oct 2025 20:06:46 +1100
Subject: [PATCH 41/49] Update MOM6 ref to
 https://github.com/ACCESS-NRI/MOM6/tree/0c71791cfaf7bed88914a702c143e8df109cac42

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

diff --git a/spack.yaml b/spack.yaml
index 085c6e4a..e154d6d7 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"'
     access-mom6:
       require:
-        - '@git.47ce6976a093140329c6275b71bae91cba762632=2025.02.001'
+        - '@git.0c71791cfaf7bed88914a702c143e8df109cac42=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'

From 9b10d6e5b3e40a134105ccfa1526b3011ff36b96 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Sat, 15 Nov 2025 19:46:22 +1100
Subject: [PATCH 42/49] Update MOM6 ref to Angus 's fixed version
 https://github.com/ACCESS-NRI/MOM6/commit/b5de607e36baa1b5b8e4df0cd57a4aaa22a3b3ae

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

diff --git a/spack.yaml b/spack.yaml
index e154d6d7..5782dd54 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"'
     access-mom6:
       require:
-        - '@git.0c71791cfaf7bed88914a702c143e8df109cac42=2025.02.001'
+        - '@git.b5de607e36baa1b5b8e4df0cd57a4aaa22a3b3ae=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'

From 4e272cbfe61fa59ef4090b41be984fc0707107e0 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Fri, 21 Nov 2025 10:52:59 +1100
Subject: [PATCH 43/49] Update mom6 ref to ice-shelf-dev branch
 https://github.com/ACCESS-NRI/MOM6/commit/95e4274e4da578a3397faf90a3aac2efe0586eb1

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

diff --git a/spack.yaml b/spack.yaml
index 5782dd54..b610cb62 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"'
     access-mom6:
       require:
-        - '@git.b5de607e36baa1b5b8e4df0cd57a4aaa22a3b3ae=2025.02.001'
+        - '@git.95e4274e4da578a3397faf90a3aac2efe0586eb1=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'

From 39350210d2032110261320262278485f65bff5f6 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Mon, 8 Dec 2025 10:33:41 +1100
Subject: [PATCH 44/49] Update esmf version
 https://github.com/ACCESS-NRI/ACCESS-OM3/pull/168/commits/d65fd93a6227724db7ee09d25393ca4262f13e40
 that Angus found to fix segfaults

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

diff --git a/spack.yaml b/spack.yaml
index b610cb62..19db6274 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -64,6 +64,12 @@ spack:
         # - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         # - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         # - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"'
+    esmf:
+      require:
+        - '@git.v8.8.0=8.8.0'
+        - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
+        - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"'
     parallelio:
       require:
         - '@2.6.2'

From b35296ef41125a60887869ca6730ea012e75ad64 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Wed, 10 Dec 2025 12:13:18 +1100
Subject: [PATCH 45/49] Update MOM6 ref to
 https://github.com/ACCESS-NRI/MOM6/commit/f7cb56487c83d7febc3148166477961ad9f5003d
 to allow for prescribing ice shelf melt rate with a file

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

diff --git a/spack.yaml b/spack.yaml
index 19db6274..5cbfa8c3 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"'
     access-mom6:
       require:
-        - '@git.95e4274e4da578a3397faf90a3aac2efe0586eb1=2025.02.001'
+        - '@git.f7cb56487c83d7febc3148166477961ad9f5003d=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'

From 61eafdcfb592ea8a02f3c1ae4ec93a3892ea4c9b Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Fri, 12 Dec 2025 06:54:14 +1100
Subject: [PATCH 46/49] Update spack yaml?

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

diff --git a/spack.yaml b/spack.yaml
index 5cbfa8c3..0ce1ec84 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -6,7 +6,7 @@
 # https://github.com/ACCESS-NRI/model-deployment-template/blob/main/spack.yaml
 spack:
   specs:
-    - access-om3@git.2025.08.000/3jaaghfgv
+    - access-om3@git.2025.08.001
   packages:
     # Main Dependencies
     access3:

From 0455a71069fe1b9ea0411a689879433af9b23944 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Wed, 17 Dec 2025 10:33:54 +1100
Subject: [PATCH 47/49] Update MOM6 ref to
 https://github.com/ACCESS-NRI/MOM6/commit/ee6bf4662b320dc6ebac0a228e071d34afcd101c
 to include bug fix to melt parameterisation code

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

diff --git a/spack.yaml b/spack.yaml
index 0ce1ec84..dab1183b 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"'
     access-mom6:
       require:
-        - '@git.f7cb56487c83d7febc3148166477961ad9f5003d=2025.02.001'
+        - '@git.ee6bf4662b320dc6ebac0a228e071d34afcd101c=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'

From 4cf65a8e3e600bf25de4200c4d7ca8905170a5ad Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Wed, 17 Dec 2025 11:53:42 +1100
Subject: [PATCH 48/49] Update mom ref to
 https://github.com/ACCESS-NRI/MOM6/commit/401ec5b2426f6e2e68affde8153139e6e671412f
 to include Alex Huth's friction velocity bugfix and frazil under ice shelf
 fix
 https://github.com/mom-ocean/MOM6/commit/ef9ad05903f15f6440ce20f91ed320c860e9b3d7

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

diff --git a/spack.yaml b/spack.yaml
index dab1183b..e120f46f 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"'
     access-mom6:
       require:
-        - '@git.ee6bf4662b320dc6ebac0a228e071d34afcd101c=2025.02.001'
+        - '@git.401ec5b2426f6e2e68affde8153139e6e671412f=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'

From f2a17e4cf6ca97893eb193d4896efaa010a01f41 Mon Sep 17 00:00:00 2001
From: Claire Yung <u6066740@anu.edu.au>
Date: Fri, 9 Jan 2026 09:51:40 +1100
Subject: [PATCH 49/49] Update mom6 ref to not use the new frazil formulation
 but still pick up Alex's friction velocity fix
 https://github.com/ACCESS-NRI/MOM6/commit/851c39cb89629793cfb16c3c71d88b5d3ba526c6

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

diff --git a/spack.yaml b/spack.yaml
index e120f46f..5abf3ea7 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
         - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"'
     access-mom6:
       require:
-        - '@git.401ec5b2426f6e2e68affde8153139e6e671412f=2025.02.001'
+        - '@git.851c39cb89629793cfb16c3c71d88b5d3ba526c6=2025.02.001'
         - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'
         - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'