From a11279b30bc120be76fbe1512b37319e83b56619 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 01/62] 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 a04cbc5..35e0e2d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -17,11 +17,11 @@ spack: # requiring a `@git.DATE=BRANCH` version. 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' @@ -50,7 +50,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' @@ -73,9 +73,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 5095ab7d9444b84bfd0bfc59aa6fbac26f551729 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 02/62] 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 35e0e2d..33f199e 100644 --- a/spack.yaml +++ b/spack.yaml @@ -17,7 +17,7 @@ spack: # requiring a `@git.DATE=BRANCH` version. mom5: require: - - '@git.update_DaveBi=access-esm1.6' + - '@git.dev_2024.08.14=access-esm1.6' - '+access-gtracers' cice4: require: @@ -50,7 +50,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' @@ -75,7 +75,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 fa3a855ee802a431cf635c73459ca524f2d7b406 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 03/62] 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 33f199e..558bf99 100644 --- a/spack.yaml +++ b/spack.yaml @@ -50,7 +50,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 5781da0cd31fb7dfcceb8d2089585800b0793b8d Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Mon, 23 Dec 2024 08:33:34 +1100 Subject: [PATCH 04/62] point to my branch in UM7 repo --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 558bf99..3b8b4d0 100644 --- a/spack.yaml +++ b/spack.yaml @@ -24,7 +24,7 @@ spack: - '@git.update_DaveBi=access-esm1.5' um7: require: - - '@git.dev-access-esm1.6=access-esm1.6' + - '@git.RevisePastWeek-access-esm1.6=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: From 4dbe6eb2f1f1a4214eeaaf55908cbd6b563d4041 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Mon, 23 Dec 2024 11:28:59 +1100 Subject: [PATCH 05/62] fix typo --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 3b8b4d0..9827941 100644 --- a/spack.yaml +++ b/spack.yaml @@ -24,7 +24,7 @@ spack: - '@git.update_DaveBi=access-esm1.5' um7: require: - - '@git.RevisePastWeek-access-esm1.6=access-esm1.6' + - '@git.RevisePastWeek=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -74,7 +74,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/dev-access-esm1.6-{hash:7}' + um7: '{name}/RevisePastWeek-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From dd85950a3a64fbc71110bdce2a7fd75f54f7dc74 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Mon, 6 Jan 2025 12:27:23 +1100 Subject: [PATCH 06/62] Revised Root Fractons --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 9827941..6c65251 100644 --- a/spack.yaml +++ b/spack.yaml @@ -24,7 +24,7 @@ spack: - '@git.update_DaveBi=access-esm1.5' um7: require: - - '@git.RevisePastWeek=access-esm1.6' + - '@git.RevisedRootFractions=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: From bde6366e559b48f2e0eecdd5476af001748dbf9e Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Mon, 6 Jan 2025 12:33:41 +1100 Subject: [PATCH 07/62] Revised Root Fractons - projections --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 6c65251..1cdcfca 100644 --- a/spack.yaml +++ b/spack.yaml @@ -74,7 +74,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/RevisePastWeek-{hash:7}' + um7: '{name}/RevisedRootFractions-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From d9eec7a9a3e6f31952b281cc0446c9a8ad289fc0 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Mon, 6 Jan 2025 16:01:18 +1100 Subject: [PATCH 08/62] trigger --- spack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/spack.yaml b/spack.yaml index 1cdcfca..657b210 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,6 +22,7 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' + # Root fractions revised by rml um7: require: - '@git.RevisedRootFractions=access-esm1.6' From 0380de3b30fd52671803f7b9921c210941416377 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 8 Jan 2025 11:07:35 +1100 Subject: [PATCH 09/62] merged pre- Xmas mods (plus some other fixes) to dev-access-esm1.6 (main) branch --- spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index 657b210..1565743 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,10 +22,10 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # Root fractions revised by rml + # 2da3053c674c44cc683bcc4837846d7b44a4cd30 um7: require: - - '@git.RevisedRootFractions=access-esm1.6' + - '@git.dev-access-esm1.6=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -75,7 +75,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/RevisedRootFractions-{hash:7}' + um7: '{name}/dev-access-esm1.6-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From ab23a32d9bf4f821ac295be97ef87f6fba84376e Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 8 Jan 2025 12:31:11 +1100 Subject: [PATCH 10/62] runtime bug --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 1565743..a09a2d8 100644 --- a/spack.yaml +++ b/spack.yaml @@ -25,7 +25,7 @@ spack: # 2da3053c674c44cc683bcc4837846d7b44a4cd30 um7: require: - - '@git.dev-access-esm1.6=access-esm1.6' + - '@git.snminBug=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -75,7 +75,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/dev-access-esm1.6-{hash:7}' + um7: '{name}/snminBug-access-esm1.6-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 9361163e989f0f8195460476d0a044db5820c43b Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 8 Jan 2025 12:55:25 +1100 Subject: [PATCH 11/62] syntax --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index a09a2d8..8024e06 100644 --- a/spack.yaml +++ b/spack.yaml @@ -75,7 +75,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/snminBug-access-esm1.6-{hash:7}' + um7: '{name}/snminBug-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 9a143649e3ca50cc73c3517f967bb2255aaca415 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 8 Jan 2025 14:25:31 +1100 Subject: [PATCH 12/62] test dec init = 0 --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 8024e06..a7c6bd8 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,7 +22,7 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # 2da3053c674c44cc683bcc4837846d7b44a4cd30 + # be2f3cb um7: require: - '@git.snminBug=access-esm1.6' From 7e1b74afd9d835ce30f27e917a87c90b75ed0bf6 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 8 Jan 2025 14:38:00 +1100 Subject: [PATCH 13/62] test finite init of snmin --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index a7c6bd8..97c7822 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,7 +22,7 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # be2f3cb + # cc732bb um7: require: - '@git.snminBug=access-esm1.6' From fa2352f0c7c35ab109982cf5cb4508b5ff7d9893 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 8 Jan 2025 14:59:38 +1100 Subject: [PATCH 14/62] revert to std build from dev-access-esm1.6 --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 97c7822..d990e94 100644 --- a/spack.yaml +++ b/spack.yaml @@ -25,7 +25,7 @@ spack: # cc732bb um7: require: - - '@git.snminBug=access-esm1.6' + - '@git.dev-access-esm1.6=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -75,7 +75,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/snminBug-{hash:7}' + um7: '{name}/dev-access-esm1.6-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 37fe16121efdb8388745af26cb222c2ed73e4acb Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 8 Jan 2025 15:44:34 +1100 Subject: [PATCH 15/62] snmin = 1 --- spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index d990e94..f35468b 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,10 +22,10 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # cc732bb + # um7: require: - - '@git.dev-access-esm1.6=access-esm1.6' + - '@git.snminBug=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -75,7 +75,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/dev-access-esm1.6-{hash:7}' + um7: '{name}/snminBug-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 07be427085f837e54841d12c1636eb77d3563991 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 8 Jan 2025 18:00:03 +1100 Subject: [PATCH 16/62] set default snmin = 1.0 same as main branch --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index f35468b..5329196 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,7 +22,7 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # + # snmin=1.0 um7: require: - '@git.snminBug=access-esm1.6' From 857f419207186dbe20cb0d0df1079f5410d10d40 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 8 Jan 2025 20:31:13 +1100 Subject: [PATCH 17/62] This is for comparison between branches snminBug and dev-access-esm1.6. here snmin = 0.1 --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 5329196..17fa873 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,7 +22,7 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # snmin=1.0 + # snmin=0.1 um7: require: - '@git.snminBug=access-esm1.6' From d0dc7fcc7d4cad56f5fd2b5fbe7233965c5d824a Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 8 Jan 2025 20:53:23 +1100 Subject: [PATCH 18/62] This is for comparison between branches snminBug and dev-access-esm1.6. here snmin = 1.0 --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 17fa873..36477ec 100644 --- a/spack.yaml +++ b/spack.yaml @@ -25,7 +25,7 @@ spack: # snmin=0.1 um7: require: - - '@git.snminBug=access-esm1.6' + - '@git.dev-access-esm1.6=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -75,7 +75,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/snminBug-{hash:7}' + um7: '{name}/dev-access-esm1.6-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 8baca2afaa242efb85817f58506fef4cee066f32 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Sat, 11 Jan 2025 11:55:00 +1100 Subject: [PATCH 19/62] USE snmin directly from runtime_opts mod --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 36477ec..68a2e6d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,7 +22,7 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # snmin=0.1 + # USE snmin directly from runtime_opts mod um7: require: - '@git.dev-access-esm1.6=access-esm1.6' From e286281f0bb39e2978db0ce23bcb7d3e823894ea Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Sat, 11 Jan 2025 12:02:09 +1100 Subject: [PATCH 20/62] snmin = 1.0 --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 68a2e6d..21b671e 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,7 +22,7 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # USE snmin directly from runtime_opts mod + # USE snmin directly from runtime_opts mod && snmin = 1.0 um7: require: - '@git.dev-access-esm1.6=access-esm1.6' From b1e1ad949a815a388b8c6251078b46260cd07fa0 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Sat, 11 Jan 2025 12:20:10 +1100 Subject: [PATCH 21/62] init dec snmin = 0.11 --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 21b671e..826d429 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,7 +22,7 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # USE snmin directly from runtime_opts mod && snmin = 1.0 + # USE snmin directly from runtime_opts mod && snmin = 0.1 um7: require: - '@git.dev-access-esm1.6=access-esm1.6' From 13d76590eea5a24a1dd27d587a8dadb4e19d46f1 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Sat, 11 Jan 2025 12:39:35 +1100 Subject: [PATCH 22/62] build from snminBug --- spack.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 826d429..733183d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -25,7 +25,8 @@ spack: # USE snmin directly from runtime_opts mod && snmin = 0.1 um7: require: - - '@git.dev-access-esm1.6=access-esm1.6' + - '@git.snminBug=access-esm1.6' + # - '@git.dev-access-esm1.6=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: From 3bc87deb8cd65150a85530e15777e0cd2c225643 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Sat, 11 Jan 2025 12:43:51 +1100 Subject: [PATCH 23/62] trivial --- spack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/spack.yaml b/spack.yaml index 733183d..a68fdb3 100644 --- a/spack.yaml +++ b/spack.yaml @@ -76,6 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' + um7: '{name}/snminBug-{hash:7}' um7: '{name}/dev-access-esm1.6-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: From e603ee99b7e9f8a9166255628db57bb1bae73e84 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Sat, 11 Jan 2025 12:49:19 +1100 Subject: [PATCH 24/62] trivial --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index a68fdb3..1488090 100644 --- a/spack.yaml +++ b/spack.yaml @@ -77,7 +77,7 @@ spack: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' um7: '{name}/snminBug-{hash:7}' - um7: '{name}/dev-access-esm1.6-{hash:7}' + #um7: '{name}/dev-access-esm1.6-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 4a78afe753c9ddcabb67da42b63c8179053bc6c8 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Sat, 11 Jan 2025 13:44:20 +1100 Subject: [PATCH 25/62] 5f4df5d93f1d3f702a4cfe69290cf6a87996c1 --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 1488090..d8367b0 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,7 +22,7 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # USE snmin directly from runtime_opts mod && snmin = 0.1 + # USE snmin directly from runtime_opts mod && snmin = 1.0 5f4df5d93f1d3f702a4cfe69290cf6a87996cc61 um7: require: - '@git.snminBug=access-esm1.6' From f692a96555b517e3263ec15d62b0e73edf079a7d Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Sat, 11 Jan 2025 14:31:53 +1100 Subject: [PATCH 26/62] build UM7@4ed8b49cf4f3cd018bb72eceafeac5f3fcfa2e0d --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index d8367b0..af94302 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,7 +22,7 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # USE snmin directly from runtime_opts mod && snmin = 1.0 5f4df5d93f1d3f702a4cfe69290cf6a87996cc61 + # USE snmin directly from runtime_opts mod && snmin = 1.0 4ed8b49cf4f3cd018bb72eceafeac5f3fcfa2e0d um7: require: - '@git.snminBug=access-esm1.6' From 7575772dd987fbc433408cea97350b2453c5e25a Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 15 Jan 2025 14:54:18 +1100 Subject: [PATCH 27/62] spack.yaml: Updated um7 to dev-access-esm1.6 --- spack.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spack.yaml b/spack.yaml index af94302..e333ba5 100644 --- a/spack.yaml +++ b/spack.yaml @@ -25,8 +25,7 @@ spack: # USE snmin directly from runtime_opts mod && snmin = 1.0 4ed8b49cf4f3cd018bb72eceafeac5f3fcfa2e0d um7: require: - - '@git.snminBug=access-esm1.6' - # - '@git.dev-access-esm1.6=access-esm1.6' + - '@git.dev-access-esm1.6=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,8 +75,8 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/snminBug-{hash:7}' - #um7: '{name}/dev-access-esm1.6-{hash:7}' + #um7: '{name}/snminBug-{hash:7}' + um7: '{name}/dev-access-esm1.6-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From f4b555c31b4866d4ddd57c3113f965b7586011e3 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Fri, 24 Jan 2025 08:13:26 +1100 Subject: [PATCH 28/62] build from um7:add-user-switches_draft2 branch --- spack.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index e333ba5..bb9ce4a 100644 --- a/spack.yaml +++ b/spack.yaml @@ -25,7 +25,7 @@ spack: # USE snmin directly from runtime_opts mod && snmin = 1.0 4ed8b49cf4f3cd018bb72eceafeac5f3fcfa2e0d um7: require: - - '@git.dev-access-esm1.6=access-esm1.6' + - '@git.add-user-switches_draft2=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -75,8 +75,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - #um7: '{name}/snminBug-{hash:7}' - um7: '{name}/dev-access-esm1.6-{hash:7}' + um7: '{name}/add-user-switches_draft2-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 37ac24dbf29782cdfde8d3d02e7709cf7cc3a3e2 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Fri, 31 Jan 2025 11:28:35 +1100 Subject: [PATCH 29/62] re-deploy --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index bb9ce4a..4b7e7d0 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,7 +22,7 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # USE snmin directly from runtime_opts mod && snmin = 1.0 4ed8b49cf4f3cd018bb72eceafeac5f3fcfa2e0d + # 1cd51aa - read params from nml files um7: require: - '@git.add-user-switches_draft2=access-esm1.6' From 085979175a6b2fddb0ee61d7f9a17e140b715fa2 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Sat, 1 Feb 2025 14:51:02 +1100 Subject: [PATCH 30/62] 22-land-parameters-in-code --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 4b7e7d0..8833914 100644 --- a/spack.yaml +++ b/spack.yaml @@ -25,7 +25,7 @@ spack: # 1cd51aa - read params from nml files um7: require: - - '@git.add-user-switches_draft2=access-esm1.6' + - '@git.22-land-parameters-in-code=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -75,7 +75,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/add-user-switches_draft2-{hash:7}' + um7: '{name}/22-land-parameters-in-code-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From af635fcfc12601aa30478c81ada116d0b378820f Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Sun, 2 Feb 2025 13:14:11 +1100 Subject: [PATCH 31/62] redux --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 8833914..0640f62 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,7 +22,7 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # 1cd51aa - read params from nml files + # 1cd51aa - read params from nml files redux um7: require: - '@git.22-land-parameters-in-code=access-esm1.6' From 4cb0a3899709cd5d939cbcb49d45d6cd2f1390cb Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Sun, 2 Feb 2025 14:15:47 +1100 Subject: [PATCH 32/62] dev-access-esm1.6 --- spack.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 0640f62..ad21e92 100644 --- a/spack.yaml +++ b/spack.yaml @@ -25,7 +25,8 @@ spack: # 1cd51aa - read params from nml files redux um7: require: - - '@git.22-land-parameters-in-code=access-esm1.6' + - '@git.dev-access-esm1.6=access-esm1.6' + #- '@git.22-land-parameters-in-code=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -75,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/22-land-parameters-in-code-{hash:7}' + um7: '{name}/dev-access-esm1.6-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From d614d4974ff9eea34f50de2b50e8ec8eb28f5345 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Sun, 2 Feb 2025 20:00:19 +1100 Subject: [PATCH 33/62] test same UM7 brabch here and in CMIP6 version --- spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index ad21e92..3c8c569 100644 --- a/spack.yaml +++ b/spack.yaml @@ -25,8 +25,8 @@ spack: # 1cd51aa - read params from nml files redux um7: require: - - '@git.dev-access-esm1.6=access-esm1.6' - #- '@git.22-land-parameters-in-code=access-esm1.6' + #- '@git.dev-access-esm1.6=access-esm1.6' + - '@git.22-land-parameters-in-code=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/dev-access-esm1.6-{hash:7}' + um7: '{name}/22-land-parameters-in-code-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From c77ebb6de90f7223f753b82265d8df6d44b2da74 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Sun, 2 Feb 2025 20:58:01 +1100 Subject: [PATCH 34/62] bug fix --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 3c8c569..845163d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,7 +22,7 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # 1cd51aa - read params from nml files redux + # read params from nml files fix bug um7: require: #- '@git.dev-access-esm1.6=access-esm1.6' From f3b6dd8e275d3d587707b1404306f35ae5a0827d Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Mon, 3 Feb 2025 07:40:02 +1100 Subject: [PATCH 35/62] revision testing go nack to pre-Xmas fixes re-introduced to main:#56 --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 845163d..f15e6fb 100644 --- a/spack.yaml +++ b/spack.yaml @@ -26,7 +26,7 @@ spack: um7: require: #- '@git.dev-access-esm1.6=access-esm1.6' - - '@git.22-land-parameters-in-code=access-esm1.6' + - '@git.test_2da305=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/22-land-parameters-in-code-{hash:7}' + um7: '{name}/test_2da305-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 352a6215bf59aedcbece6be5d5796d1588c8a42f Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Mon, 3 Feb 2025 07:56:41 +1100 Subject: [PATCH 36/62] ibug fix in src hopefully fixes wobbly executable --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index f15e6fb..845163d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -26,7 +26,7 @@ spack: um7: require: #- '@git.dev-access-esm1.6=access-esm1.6' - - '@git.test_2da305=access-esm1.6' + - '@git.22-land-parameters-in-code=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/test_2da305-{hash:7}' + um7: '{name}/22-land-parameters-in-code-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From d654d38322faf1d64d87b2a98f55c77495ffe3e5 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 5 Feb 2025 17:16:14 +1100 Subject: [PATCH 37/62] 9ad2fc0..ecc3524 diagnostic write to verify that it has read the L_rev_cor switch --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 845163d..39a203b 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,8 +22,8 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # read params from nml files fix bug - um7: + # read params from nml files fix bug # 9ad2fc0..ecc3524 + um7: require: #- '@git.dev-access-esm1.6=access-esm1.6' - '@git.22-land-parameters-in-code=access-esm1.6' From 9e449423658dc00629fab1030c0a89a369d00e91 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Thu, 6 Feb 2025 07:58:05 +1100 Subject: [PATCH 38/62] diag writ to external file --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 39a203b..3071ab4 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,7 +22,7 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # read params from nml files fix bug # 9ad2fc0..ecc3524 + # read params from nml files fix bug # 5da9977 um7: require: #- '@git.dev-access-esm1.6=access-esm1.6' From 245a4b8410bd7a2f13eb12c2457600781b5b86ae Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Mon, 10 Feb 2025 17:34:52 +1100 Subject: [PATCH 39/62] build by commit SHA --- spack.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 3071ab4..7357425 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,11 +22,12 @@ spack: cice4: require: - '@git.update_DaveBi=access-esm1.5' - # read params from nml files fix bug # 5da9977 + + # branch = 22-land-parameters-in-code um7: require: #- '@git.dev-access-esm1.6=access-esm1.6' - - '@git.22-land-parameters-in-code=access-esm1.6' + - '@git.5da9977a0221a29f493454758f3617ad59d8c2d7=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: From cad922f5ce3146814031137ec6da0acaf1ff821a Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Mon, 10 Feb 2025 17:39:15 +1100 Subject: [PATCH 40/62] build from SHA reference --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 7357425..a4413a0 100644 --- a/spack.yaml +++ b/spack.yaml @@ -27,7 +27,7 @@ spack: um7: require: #- '@git.dev-access-esm1.6=access-esm1.6' - - '@git.5da9977a0221a29f493454758f3617ad59d8c2d7=access-esm1.6' + - '@git.5da9977a0221a29f493454758f3617ad59d8c2d7-debug=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -77,7 +77,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/22-land-parameters-in-code-{hash:7}' + um7: '{name}/5da9977a0221a29f493454758f3617ad59d8c2d7-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From d1684f38cfe3777df3d24c01e1c41e95772aacf6 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Mon, 10 Feb 2025 17:43:14 +1100 Subject: [PATCH 41/62] typo --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index a4413a0..647a8e8 100644 --- a/spack.yaml +++ b/spack.yaml @@ -77,7 +77,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/5da9977a0221a29f493454758f3617ad59d8c2d7-{hash:7}' + um7: '{name}/5da9977a0221a29f493454758f3617ad59d8c2d7-debug-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From f65cb1fcf3e1c651861cfab27639f2ea9ca17405 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 11 Feb 2025 09:18:30 +1100 Subject: [PATCH 42/62] Removed '-debug' from um7 version --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 647a8e8..af93a3b 100644 --- a/spack.yaml +++ b/spack.yaml @@ -27,7 +27,7 @@ spack: um7: require: #- '@git.dev-access-esm1.6=access-esm1.6' - - '@git.5da9977a0221a29f493454758f3617ad59d8c2d7-debug=access-esm1.6' + - '@git.5da9977a0221a29f493454758f3617ad59d8c2d7=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -77,7 +77,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/5da9977a0221a29f493454758f3617ad59d8c2d7-debug-{hash:7}' + um7: '{name}/5da9977a0221a29f493454758f3617ad59d8c2d7-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 24f692f5f9d349dd6e1b59eb3eb0eada9a85b291 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Tue, 11 Feb 2025 14:19:55 +1100 Subject: [PATCH 43/62] deploy --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index af93a3b..17b24b2 100644 --- a/spack.yaml +++ b/spack.yaml @@ -27,7 +27,7 @@ spack: um7: require: #- '@git.dev-access-esm1.6=access-esm1.6' - - '@git.5da9977a0221a29f493454758f3617ad59d8c2d7=access-esm1.6' + - '@git.75f8304f559f8bd7ee9a5c02ac7fb87a96bc3e5e=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -77,7 +77,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/5da9977a0221a29f493454758f3617ad59d8c2d7-{hash:7}' + um7: '{name}/75f8304f559f8bd7ee9a5c02ac7fb87a96bc3e5e-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 04b11e9f49572cbca651a18d06663e5bb94ba5bb Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Tue, 11 Feb 2025 21:15:49 +1100 Subject: [PATCH 44/62] deploy --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 17b24b2..950eb3d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -27,7 +27,7 @@ spack: um7: require: #- '@git.dev-access-esm1.6=access-esm1.6' - - '@git.75f8304f559f8bd7ee9a5c02ac7fb87a96bc3e5e=access-esm1.6' + - '@git.ef7bce300a148e52b52cc16e5eece8299b1cc0dc=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -77,7 +77,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/75f8304f559f8bd7ee9a5c02ac7fb87a96bc3e5e-{hash:7}' + um7: '{name}/ef7bce300a148e52b52cc16e5eece8299b1cc0dc-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 6f068777a0772c545a50751b599182bf9eaf4956 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 12 Feb 2025 09:41:01 +1100 Subject: [PATCH 45/62] fec66db8f63d9a784ec435703a63983d6d2119ee --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 950eb3d..300de54 100644 --- a/spack.yaml +++ b/spack.yaml @@ -27,7 +27,7 @@ spack: um7: require: #- '@git.dev-access-esm1.6=access-esm1.6' - - '@git.ef7bce300a148e52b52cc16e5eece8299b1cc0dc=access-esm1.6' + - '@git.fec66db8f63d9a784ec435703a63983d6d2119ee=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -77,7 +77,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/ef7bce300a148e52b52cc16e5eece8299b1cc0dc-{hash:7}' + um7: '{name}/-fec66db8f63d9a784ec435703a63983d6d2119ee{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 03f03ed7909c1ead0f03609d7af4edc659fc7ef6 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 12 Feb 2025 10:07:30 +1100 Subject: [PATCH 46/62] fec66db8f63d9a784ec435703a63983d6d2119ee - dos --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 300de54..dfcfefa 100644 --- a/spack.yaml +++ b/spack.yaml @@ -77,7 +77,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/-fec66db8f63d9a784ec435703a63983d6d2119ee{hash:7}' + um7: '{name}/fec66db8f63d9a784ec435703a63983d6d2119ee-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From cc5f27aacbea18ebfd41357b7b33c2b4171a433e Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 12 Feb 2025 14:03:06 +1100 Subject: [PATCH 47/62] 4fa79c73652f19f7e89ceba0890571187b86f989 --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index dfcfefa..c256e0e 100644 --- a/spack.yaml +++ b/spack.yaml @@ -27,7 +27,7 @@ spack: um7: require: #- '@git.dev-access-esm1.6=access-esm1.6' - - '@git.fec66db8f63d9a784ec435703a63983d6d2119ee=access-esm1.6' + - '@git.4fa79c73652f19f7e89ceba0890571187b86f989=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -77,7 +77,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/fec66db8f63d9a784ec435703a63983d6d2119ee-{hash:7}' + um7: '{name}/4fa79c73652f19f7e89ceba0890571187b86f989-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 087b6f20ab987ea990044b4595e1183188647beb Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Wed, 12 Feb 2025 17:22:50 +1100 Subject: [PATCH 48/62] point to UM7:main --- spack.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index c256e0e..ebb5528 100644 --- a/spack.yaml +++ b/spack.yaml @@ -26,8 +26,7 @@ spack: # branch = 22-land-parameters-in-code um7: require: - #- '@git.dev-access-esm1.6=access-esm1.6' - - '@git.4fa79c73652f19f7e89ceba0890571187b86f989=access-esm1.6' + - '@git.dev-access-esm1.6=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -77,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/4fa79c73652f19f7e89ceba0890571187b86f989-{hash:7}' + um7: '{name}/dev-access-esm1.6-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 8f70ab1d659d13f71b6440babc63f3b0bdeefaa0 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Fri, 14 Feb 2025 09:38:35 +1100 Subject: [PATCH 49/62] use SHA --- spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index ebb5528..490156a 100644 --- a/spack.yaml +++ b/spack.yaml @@ -23,10 +23,10 @@ spack: require: - '@git.update_DaveBi=access-esm1.5' - # branch = 22-land-parameters-in-code + #branch = dev-access-esm1.6 um7: require: - - '@git.dev-access-esm1.6=access-esm1.6' + - '@git.8b6bac6be230aa505229bb01e17e641e5aa90230=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/dev-access-esm1.6-{hash:7}' + um7: '{name}/8b6bac6be230aa505229bb01e17e641e5aa90230-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From aab93d5569f4ddd4bd4ff70fa1c034705c4e7c50 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Tue, 18 Feb 2025 09:34:30 +1100 Subject: [PATCH 50/62] fix geat capacity initialization bug --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 490156a..36c8654 100644 --- a/spack.yaml +++ b/spack.yaml @@ -26,7 +26,7 @@ spack: #branch = dev-access-esm1.6 um7: require: - - '@git.8b6bac6be230aa505229bb01e17e641e5aa90230=access-esm1.6' + - '@git.dee363e6329af3d2680b3269c329183fc1ddeaad=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: From f987b9e898560ac9aab10027d75c4ef8847aaee8 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Tue, 18 Feb 2025 09:36:28 +1100 Subject: [PATCH 51/62] fix geat capacity initialization bug --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 36c8654..65753ac 100644 --- a/spack.yaml +++ b/spack.yaml @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/8b6bac6be230aa505229bb01e17e641e5aa90230-{hash:7}' + um7: '{name}/dee363e6329af3d2680b3269c329183fc1ddeaad-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From d2622bd48423d2fcb6f42a78892f2d9181fa01fc Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Tue, 18 Feb 2025 14:40:30 +1100 Subject: [PATCH 52/62] fix sign of trad correction term --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 65753ac..80c93c0 100644 --- a/spack.yaml +++ b/spack.yaml @@ -26,7 +26,7 @@ spack: #branch = dev-access-esm1.6 um7: require: - - '@git.dee363e6329af3d2680b3269c329183fc1ddeaad=access-esm1.6' + - '@git.8994b601c003ebaaaf344797daf33246255c2c9d=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/dee363e6329af3d2680b3269c329183fc1ddeaad-{hash:7}' + um7: '{name}/8994b601c003ebaaaf344797daf33246255c2c9d-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 6ae463fd649efe82e30346041f24e0bc938b1aee Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Tue, 18 Feb 2025 17:00:36 +1100 Subject: [PATCH 53/62] trivial --- spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index 80c93c0..f86c3ff 100644 --- a/spack.yaml +++ b/spack.yaml @@ -23,10 +23,10 @@ spack: require: - '@git.update_DaveBi=access-esm1.5' - #branch = dev-access-esm1.6 + #branch = move-snow_aging corresponding to #539 in CABLE:main um7: require: - - '@git.8994b601c003ebaaaf344797daf33246255c2c9d=access-esm1.6' + - '@git.1ce8b3bc4c5b516ee88f62f50f947d28b12e6aaf=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/8994b601c003ebaaaf344797daf33246255c2c9d-{hash:7}' + um7: '{name}/1ce8b3bc4c5b516ee88f62f50f947d28b12e6aaf-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From eb5c1546d3401e58e82639d10d842035f8b493d0 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Thu, 20 Feb 2025 15:02:56 +1100 Subject: [PATCH 54/62] test PR#70 --- spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index f86c3ff..0fc074f 100644 --- a/spack.yaml +++ b/spack.yaml @@ -23,10 +23,10 @@ spack: require: - '@git.update_DaveBi=access-esm1.5' - #branch = move-snow_aging corresponding to #539 in CABLE:main + #branch = 69 um7: require: - - '@git.1ce8b3bc4c5b516ee88f62f50f947d28b12e6aaf=access-esm1.6' + - '@git.c2a360fb295e48187872474378b49715159be64a=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/1ce8b3bc4c5b516ee88f62f50f947d28b12e6aaf-{hash:7}' + um7: '{name}/c2a360fb295e48187872474378b49715159be64a-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 6ea9c51b475dec26ccfdc3712d16a2b8fe30375b Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Thu, 20 Feb 2025 17:10:05 +1100 Subject: [PATCH 55/62] sand/clay/silt/hcap iss #61 --- spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index 0fc074f..cf7b899 100644 --- a/spack.yaml +++ b/spack.yaml @@ -23,10 +23,10 @@ spack: require: - '@git.update_DaveBi=access-esm1.5' - #branch = 69 + #branch = iss 61 sand/clay/silt/hcap um7: require: - - '@git.c2a360fb295e48187872474378b49715159be64a=access-esm1.6' + - '@git.d6970d7bd72c4edff13f9a7adc6dfb73d5485c99=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/c2a360fb295e48187872474378b49715159be64a-{hash:7}' + um7: '{name}/d6970d7bd72c4edff13f9a7adc6dfb73d5485c99-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From a892b1ba9ae1e5dd5eb251b1d284c4c4baef9d96 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Thu, 20 Feb 2025 20:25:22 +1100 Subject: [PATCH 56/62] 69-sublimation-fix --- spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index cf7b899..3836b6c 100644 --- a/spack.yaml +++ b/spack.yaml @@ -23,10 +23,10 @@ spack: require: - '@git.update_DaveBi=access-esm1.5' - #branch = iss 61 sand/clay/silt/hcap + #branch = 69-sublimation-fix um7: require: - - '@git.d6970d7bd72c4edff13f9a7adc6dfb73d5485c99=access-esm1.6' + - '@git.61c1ff1c86e1e27da8a9f1bed3f31a1051cbba78=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/d6970d7bd72c4edff13f9a7adc6dfb73d5485c99-{hash:7}' + um7: '{name}/61c1ff1c86e1e27da8a9f1bed3f31a1051cbba78-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From b6eee47fc34c1864b147040f8f1baec5ad194630 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Sat, 22 Feb 2025 08:06:23 +1100 Subject: [PATCH 57/62] revert hcon_ICE --- spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index 3836b6c..1a45532 100644 --- a/spack.yaml +++ b/spack.yaml @@ -23,10 +23,10 @@ spack: require: - '@git.update_DaveBi=access-esm1.5' - #branch = 69-sublimation-fix + #branch = 61-sand-clay-silt um7: require: - - '@git.61c1ff1c86e1e27da8a9f1bed3f31a1051cbba78=access-esm1.6' + - '@git.56101cb6f17bf1bbbe4e2a386a2799624fa1f94b=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/61c1ff1c86e1e27da8a9f1bed3f31a1051cbba78-{hash:7}' + um7: '{name}/56101cb6f17bf1bbbe4e2a386a2799624fa1f94b-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From f2ff3bb2b872abf01b9b2b691d409cd4fa5bfeeb Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Mon, 24 Feb 2025 10:25:59 +1100 Subject: [PATCH 58/62] wood thinnin --- spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index 1a45532..3a3f799 100644 --- a/spack.yaml +++ b/spack.yaml @@ -23,10 +23,10 @@ spack: require: - '@git.update_DaveBi=access-esm1.5' - #branch = 61-sand-clay-silt + #branch = wood thinning um7: require: - - '@git.56101cb6f17bf1bbbe4e2a386a2799624fa1f94b=access-esm1.6' + - '@git.89599ed20719485d4fd0ac0454e25605fd923d6f=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/56101cb6f17bf1bbbe4e2a386a2799624fa1f94b-{hash:7}' + um7: '{name}/89599ed20719485d4fd0ac0454e25605fd923d6f-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 1fef0d095205757516fd0fc33bb2022fbb0e9397 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Mon, 24 Feb 2025 11:33:38 +1100 Subject: [PATCH 59/62] wood thinning --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 3a3f799..732df89 100644 --- a/spack.yaml +++ b/spack.yaml @@ -26,7 +26,7 @@ spack: #branch = wood thinning um7: require: - - '@git.89599ed20719485d4fd0ac0454e25605fd923d6f=access-esm1.6' + - '@git.9ea058be6f4489412b12560018157bc63689bbe5=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/89599ed20719485d4fd0ac0454e25605fd923d6f-{hash:7}' + um7: '{name}/9ea058be6f4489412b12560018157bc63689bbe5-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From 66c896a9f1a05a05b77bb07a1bf78f8db50818b4 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Mon, 24 Feb 2025 17:45:26 +1100 Subject: [PATCH 60/62] base-70b173e --- spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index 732df89..769d409 100644 --- a/spack.yaml +++ b/spack.yaml @@ -23,10 +23,10 @@ spack: require: - '@git.update_DaveBi=access-esm1.5' - #branch = wood thinning + #branch = dev-access-esm16 um7: require: - - '@git.9ea058be6f4489412b12560018157bc63689bbe5=access-esm1.6' + - '@git.70b173e38c1c6f523e7cb7c61f3767f3c7d01671=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/9ea058be6f4489412b12560018157bc63689bbe5-{hash:7}' + um7: '{name}/70b173e38c1c6f523e7cb7c61f3767f3c7d01671-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From efa9f2d924129fb7ad129d150f84a1cfb6e1f060 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Thu, 27 Feb 2025 12:31:17 +1100 Subject: [PATCH 61/62] revised_canopy_epot --- spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index 769d409..eedaa13 100644 --- a/spack.yaml +++ b/spack.yaml @@ -23,10 +23,10 @@ spack: require: - '@git.update_DaveBi=access-esm1.5' - #branch = dev-access-esm16 + #branch = revised_canopy_epot um7: require: - - '@git.70b173e38c1c6f523e7cb7c61f3767f3c7d01671=access-esm1.6' + - '@git.1839be85a065f8af2588c99d2dbcd7425a94063b=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -76,7 +76,7 @@ spack: projections: access-esm1p6: '{name}/dev_2024.12.0' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/70b173e38c1c6f523e7cb7c61f3767f3c7d01671-{hash:7}' + um7: '{name}/1839be85a065f8af2588c99d2dbcd7425a94063b-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: From bdbd4dc174287f02ff298cdc26d79d55f46a2f32 Mon Sep 17 00:00:00 2001 From: "Srbinovsky, Jhan (O&A, Aspendale)" Date: Mon, 3 Mar 2025 18:12:07 +1100 Subject: [PATCH 62/62] re-build#52 --- spack.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spack.yaml b/spack.yaml index eedaa13..b20e57d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -9,7 +9,7 @@ # - CICE4 from ESM1.5 and change to CICE5 once CICE5 SPR has been updated. spack: specs: - - access-esm1p6@git.dev_2024.12.0 + - access-esm1p6@git.2024.12.1 packages: # Direct ACCESS-NRI dependencies # Note: some packages have branch-specific logic and hence can't use @@ -26,7 +26,7 @@ spack: #branch = revised_canopy_epot um7: require: - - '@git.1839be85a065f8af2588c99d2dbcd7425a94063b=access-esm1.6' + - '@git.da845aa74926626499d203d7b3e6cf2e3e240a57=access-esm1.6' # Lower-level ACCESS-NRI dependencies gcom4: require: @@ -74,9 +74,9 @@ spack: - um7 - mom5 projections: - access-esm1p6: '{name}/dev_2024.12.0' + access-esm1p6: '{name}/2024.12.1' cice4: '{name}/update_DaveBi-{hash:7}' - um7: '{name}/1839be85a065f8af2588c99d2dbcd7425a94063b-{hash:7}' + um7: '{name}/da845aa74926626499d203d7b3e6cf2e3e240a57-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' config: install_tree: