From eb05d760e8b445a2cf6fbb2d8a90615e64962ee3 Mon Sep 17 00:00:00 2001
From: Christopher Bull <5499680+chrisb13@users.noreply.github.com>
Date: Fri, 13 Dec 2024 00:55:25 +0000
Subject: [PATCH 1/6] Update spack.yaml to include wombatlite-sinking from
 generic tracers and Dave Bi mom and cice changes

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

diff --git a/spack.yaml b/spack.yaml
index bc619f08..e9ab22a8 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -13,11 +13,11 @@ spack:
   packages:
     mom5:
       require:
-        - '@git.dev_2024.08.14=access-esm1.6'
+        - '@git.update_DaveBi=access-esm1.6'
         - '+access-gtracers'
     cice4:
       require:
-        - '@git.2024.05.21=access-esm1.5'
+        - '@git.update_DaveBi=access-esm1.5'
     um7:
       require:
         - '@git.dev-access-esm1.6=access-esm1.6'
@@ -44,7 +44,7 @@ spack:
         - '@git.dev_2024.12.0'
     access-generic-tracers:
       require:
-        - '@git.dev_2024.12.0'
+        - '@git.wombatlite-sinking'
     access-mocsy:
       require:
         - '@git.2017.12.0'
@@ -67,9 +67,9 @@ spack:
           - mom5
         projections:
           access-esm1p6: '{name}/dev_2024.12.0'
-          cice4: '{name}/2024.05.21-{hash:7}'
+          cice4: '{name}/update_DaveBi-{hash:7}'
           um7: '{name}/dev-access-esm1.6-{hash:7}'
-          mom5: '{name}/dev_2024.08.14-{hash:7}'
+          mom5: '{name}/update_DaveBi-{hash:7}'
   config:
     install_tree:
       root: $spack/../restricted/ukmo/release

From fe652d43552fc52f4a71ec741263efbe17240f0f Mon Sep 17 00:00:00 2001
From: Christopher Bull <5499680+chrisb13@users.noreply.github.com>
Date: Mon, 16 Dec 2024 15:06:38 +1100
Subject: [PATCH 2/6] Update spack.yaml to use development branch of generic
 tracers, normal mom5 version and Dave Bi's cice code changes (now updated)

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

diff --git a/spack.yaml b/spack.yaml
index e9ab22a8..b10a8e56 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -13,7 +13,7 @@ spack:
   packages:
     mom5:
       require:
-        - '@git.update_DaveBi=access-esm1.6'
+        - '@git.dev_2024.08.14=access-esm1.6'
         - '+access-gtracers'
     cice4:
       require:
@@ -44,7 +44,7 @@ spack:
         - '@git.dev_2024.12.0'
     access-generic-tracers:
       require:
-        - '@git.wombatlite-sinking'
+        - '@git.dev_2024.12.0'
     access-mocsy:
       require:
         - '@git.2017.12.0'
@@ -69,7 +69,7 @@ spack:
           access-esm1p6: '{name}/dev_2024.12.0'
           cice4: '{name}/update_DaveBi-{hash:7}'
           um7: '{name}/dev-access-esm1.6-{hash:7}'
-          mom5: '{name}/update_DaveBi-{hash:7}'
+          mom5: '{name}/dev_2024.08.14-{hash:7}'
   config:
     install_tree:
       root: $spack/../restricted/ukmo/release

From 7b907000a7268fd75895b730463b19fd90ffc3b7 Mon Sep 17 00:00:00 2001
From: Christopher Bull <5499680+chrisb13@users.noreply.github.com>
Date: Tue, 17 Dec 2024 12:50:41 +1100
Subject: [PATCH 3/6] Update spack.yaml to include pearse's latest wombatlite
 changes

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

diff --git a/spack.yaml b/spack.yaml
index b10a8e56..11af18d9 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -44,7 +44,7 @@ spack:
         - '@git.dev_2024.12.0'
     access-generic-tracers:
       require:
-        - '@git.dev_2024.12.0'
+        - '@git.dev_2024.12.2'
     access-mocsy:
       require:
         - '@git.2017.12.0'

From d7c120d90b7e56e66543552a63364eed025f47f6 Mon Sep 17 00:00:00 2001
From: Spencer Wong <spencer.wong@anu.edu.au>
Date: Fri, 17 Jan 2025 10:48:19 +1100
Subject: [PATCH 4/6] Use updated WOMBAT-lite with sinking bug fix

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

diff --git a/spack.yaml b/spack.yaml
index 11af18d9..2ba620ba 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -44,7 +44,7 @@ spack:
         - '@git.dev_2024.12.0'
     access-generic-tracers:
       require:
-        - '@git.dev_2024.12.2'
+        - '@git.dev_2025.01.0'
     access-mocsy:
       require:
         - '@git.2017.12.0'

From 4a47ea9246fa593025cfbea8a823ac428835ef57 Mon Sep 17 00:00:00 2001
From: Spencer Wong <spencer.wong@anu.edu.au>
Date: Tue, 21 Jan 2025 16:25:19 +1100
Subject: [PATCH 5/6] Update WOMBAT-lite sinking with conservation changes

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

diff --git a/spack.yaml b/spack.yaml
index 2ba620ba..39febbdd 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -44,7 +44,7 @@ spack:
         - '@git.dev_2024.12.0'
     access-generic-tracers:
       require:
-        - '@git.dev_2025.01.0'
+        - '@git.dev_2025.01.1'
     access-mocsy:
       require:
         - '@git.2017.12.0'

From 3ccb647aa2627345a412aabfc0cbe2dc5cc58bc5 Mon Sep 17 00:00:00 2001
From: Spencer Wong <spencer.wong@anu.edu.au>
Date: Wed, 22 Jan 2025 09:55:50 +1100
Subject: [PATCH 6/6] Update WOMBAT-lite version

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

diff --git a/spack.yaml b/spack.yaml
index 39febbdd..a6640390 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -44,7 +44,7 @@ spack:
         - '@git.dev_2024.12.0'
     access-generic-tracers:
       require:
-        - '@git.dev_2025.01.1'
+        - '@git.dev_2025.01.2'
     access-mocsy:
       require:
         - '@git.2017.12.0'