From 483995836993761f795e3153391ca6018bab6ab3 Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Mon, 7 Oct 2024 15:42:28 +1100 Subject: [PATCH 01/14] spack.yaml: depend on generic tracers Spack components * Use tag dev_2024.08.14 instead of branch name --- spack.yaml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/spack.yaml b/spack.yaml index 9789b63..067138b 100644 --- a/spack.yaml +++ b/spack.yaml @@ -5,16 +5,15 @@ spack: # add package specs to the `specs` list specs: - # TODO: The CI/CD doesn't support the `=access-om2` syntax yet. - # - access-om2@git.2024.03.0=access-om2 - - access-om2@git.2024.03.0 + - access-om2@git.2024.11.0 packages: cice5: require: - '@git.2023.10.19=access-om2' mom5: require: - - '@git.2023.11.09=access-om2' + # FIXME: This would need to be changed to a stable version before release + - '@git.dev_2024.08.14=access-om2' libaccessom2: require: - '@git.2023.10.26=access-om2' @@ -33,6 +32,18 @@ spack: openmpi: require: - '@4.0.2' + access-fms: + require: + # FIXME: This would need to be changed to a stable version before release + - '@development' + access-generic-tracers: + require: + # FIXME: This would need to be changed to a stable version before release. + - '@development' + access-mocsy: + require: + - '@mom5' + # Specifications that apply to all packages all: require: - '%intel@19.0.5.281' @@ -50,8 +61,8 @@ spack: - libaccessom2 - oasis3-mct projections: - access-om2: '{name}/2024.03.0' + access-om2: '{name}/2024.11.0' cice5: '{name}/2023.10.19-{hash:7}' - mom5: '{name}/2023.11.09-{hash:7}' + mom5: '{name}/dev_2024.08.14-{hash:7}' libaccessom2: '{name}/2023.10.26-{hash:7}' oasis3-mct: '{name}/2023.11.09-{hash:7}' From 5efd9d03b8f8f18f0924dafac85cc4e398366ada Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Wed, 20 Nov 2024 10:53:06 +1100 Subject: [PATCH 02/14] Use the latest spack-packages tag from the main branch --- spack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/spack.yaml b/spack.yaml index 067138b..32fd096 100644 --- a/spack.yaml +++ b/spack.yaml @@ -14,6 +14,7 @@ spack: require: # FIXME: This would need to be changed to a stable version before release - '@git.dev_2024.08.14=access-om2' + - '+access-gtracers' libaccessom2: require: - '@git.2023.10.26=access-om2' From 3967b3a384bdd048a96054c3963aa3b64d983192 Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Tue, 26 Nov 2024 11:16:05 +1100 Subject: [PATCH 03/14] spack.yaml: access-generic-tracers should use tag 2024.11.0 --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 32fd096..190d48e 100644 --- a/spack.yaml +++ b/spack.yaml @@ -40,7 +40,7 @@ spack: access-generic-tracers: require: # FIXME: This would need to be changed to a stable version before release. - - '@development' + - '@git.dev_2024.11.0' access-mocsy: require: - '@mom5' From 843bab7dd61c23d35fdf90215accd1e760d5b0b7 Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Fri, 13 Dec 2024 11:06:34 +1100 Subject: [PATCH 04/14] spack.yaml: update the versions of components --- spack.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spack.yaml b/spack.yaml index 190d48e..bdc439a 100644 --- a/spack.yaml +++ b/spack.yaml @@ -5,7 +5,7 @@ spack: # add package specs to the `specs` list specs: - - access-om2@git.2024.11.0 + - access-om2@git.2024.12.0 packages: cice5: require: @@ -36,14 +36,14 @@ spack: access-fms: require: # FIXME: This would need to be changed to a stable version before release - - '@development' + - '@git.dev_2024.12.0' access-generic-tracers: require: # FIXME: This would need to be changed to a stable version before release. - - '@git.dev_2024.11.0' + - '@git.dev_2024.12.0' access-mocsy: require: - - '@mom5' + - '@git.2017.12.0' # Specifications that apply to all packages all: require: @@ -62,7 +62,7 @@ spack: - libaccessom2 - oasis3-mct projections: - access-om2: '{name}/2024.11.0' + access-om2: '{name}/2024.12.0' cice5: '{name}/2023.10.19-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' libaccessom2: '{name}/2023.10.26-{hash:7}' From 342cc431c510148608673d2e776b2d931e7c5ef4 Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Tue, 17 Dec 2024 12:11:06 +1100 Subject: [PATCH 05/14] Build OM2 with wombatlite-sinking (991e993) * Includes https://github.com/ACCESS-NRI/GFDL-generic-tracers/commit/991e993e8391470711a12bcc66480925cb506d30 --- spack.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index bdc439a..b48e454 100644 --- a/spack.yaml +++ b/spack.yaml @@ -5,7 +5,7 @@ spack: # add package specs to the `specs` list specs: - - access-om2@git.2024.12.0 + - access-om2@git.2024.12.2 packages: cice5: require: @@ -37,10 +37,11 @@ spack: require: # FIXME: This would need to be changed to a stable version before release - '@git.dev_2024.12.0' + # Includes wombatlite-sinking: https://github.com/ACCESS-NRI/GFDL-generic-tracers/commit/991e993e8391470711a12bcc66480925cb506d30 access-generic-tracers: require: # FIXME: This would need to be changed to a stable version before release. - - '@git.dev_2024.12.0' + - '@git.dev_2024.12.2' access-mocsy: require: - '@git.2017.12.0' @@ -62,7 +63,7 @@ spack: - libaccessom2 - oasis3-mct projections: - access-om2: '{name}/2024.12.0' + access-om2: '{name}/2024.12.2' cice5: '{name}/2023.10.19-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' libaccessom2: '{name}/2023.10.26-{hash:7}' From c7ba91fefd30fdc3cb4dc92985417152e6127cef Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Thu, 16 Jan 2025 16:31:19 +1100 Subject: [PATCH 06/14] Build OM2 with wombatlite-sinking (4779c63) * Includes wombatlite-sinking: https://github.com/ACCESS-NRI/GFDL-generic-tracers/commit/4779c63d8b61c191152823404015bdfe963ff92a --- spack.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spack.yaml b/spack.yaml index b48e454..a082b29 100644 --- a/spack.yaml +++ b/spack.yaml @@ -5,7 +5,7 @@ spack: # add package specs to the `specs` list specs: - - access-om2@git.2024.12.2 + - access-om2@git.2025.01.0 packages: cice5: require: @@ -37,11 +37,11 @@ spack: require: # FIXME: This would need to be changed to a stable version before release - '@git.dev_2024.12.0' - # Includes wombatlite-sinking: https://github.com/ACCESS-NRI/GFDL-generic-tracers/commit/991e993e8391470711a12bcc66480925cb506d30 + # Includes wombatlite-sinking: https://github.com/ACCESS-NRI/GFDL-generic-tracers/commit/4779c63d8b61c191152823404015bdfe963ff92a access-generic-tracers: require: # FIXME: This would need to be changed to a stable version before release. - - '@git.dev_2024.12.2' + - '@git.dev_2025.01.0' access-mocsy: require: - '@git.2017.12.0' @@ -63,7 +63,7 @@ spack: - libaccessom2 - oasis3-mct projections: - access-om2: '{name}/2024.12.2' + access-om2: '{name}/2025.01.0' cice5: '{name}/2023.10.19-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' libaccessom2: '{name}/2023.10.26-{hash:7}' From 5b765457c7f39e2f9b7cb8f656b6b77f446cc990 Mon Sep 17 00:00:00 2001 From: Spencer Wong Date: Tue, 21 Jan 2025 16:23:03 +1100 Subject: [PATCH 07/14] Update WOMBAT-lite sinking --- spack.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spack.yaml b/spack.yaml index a082b29..e925b33 100644 --- a/spack.yaml +++ b/spack.yaml @@ -5,7 +5,7 @@ spack: # add package specs to the `specs` list specs: - - access-om2@git.2025.01.0 + - access-om2@git.2025.01.1 packages: cice5: require: @@ -37,11 +37,11 @@ spack: require: # FIXME: This would need to be changed to a stable version before release - '@git.dev_2024.12.0' - # Includes wombatlite-sinking: https://github.com/ACCESS-NRI/GFDL-generic-tracers/commit/4779c63d8b61c191152823404015bdfe963ff92a + # Includes wombatlite-sinking: https://github.com/ACCESS-NRI/GFDL-generic-tracers/commit/2c21bd8e1a8903eac581e4448854779248da3306 access-generic-tracers: require: # FIXME: This would need to be changed to a stable version before release. - - '@git.dev_2025.01.0' + - '@git.dev_2025.01.1' access-mocsy: require: - '@git.2017.12.0' @@ -63,7 +63,7 @@ spack: - libaccessom2 - oasis3-mct projections: - access-om2: '{name}/2025.01.0' + access-om2: '{name}/2025.01.1' cice5: '{name}/2023.10.19-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' libaccessom2: '{name}/2023.10.26-{hash:7}' From fc3f82aa939faea4cd849008d07288fb23d53b5a Mon Sep 17 00:00:00 2001 From: Spencer Wong Date: Wed, 22 Jan 2025 09:53:56 +1100 Subject: [PATCH 08/14] Update WOMBAT-lite version --- spack.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spack.yaml b/spack.yaml index e925b33..cc0d306 100644 --- a/spack.yaml +++ b/spack.yaml @@ -5,7 +5,7 @@ spack: # add package specs to the `specs` list specs: - - access-om2@git.2025.01.1 + - access-om2@git.2025.01.2 packages: cice5: require: @@ -37,11 +37,11 @@ spack: require: # FIXME: This would need to be changed to a stable version before release - '@git.dev_2024.12.0' - # Includes wombatlite-sinking: https://github.com/ACCESS-NRI/GFDL-generic-tracers/commit/2c21bd8e1a8903eac581e4448854779248da3306 + # Includes wombatlite-sinking: https://github.com/ACCESS-NRI/GFDL-generic-tracers/commit/9bf0d6d7c72918eaa96d94e68463bf70f6065985 access-generic-tracers: require: # FIXME: This would need to be changed to a stable version before release. - - '@git.dev_2025.01.1' + - '@git.dev_2025.01.2' access-mocsy: require: - '@git.2017.12.0' @@ -63,7 +63,7 @@ spack: - libaccessom2 - oasis3-mct projections: - access-om2: '{name}/2025.01.1' + access-om2: '{name}/2025.01.2' cice5: '{name}/2023.10.19-{hash:7}' mom5: '{name}/dev_2024.08.14-{hash:7}' libaccessom2: '{name}/2023.10.26-{hash:7}' From f6f0fa5e12bcf29b4cd74dea2bf9c575bf84eb9b Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Thu, 27 Mar 2025 13:59:04 +1100 Subject: [PATCH 09/14] Build access-fms using release branch mom5 --- spack.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index cc0d306..fb5efba 100644 --- a/spack.yaml +++ b/spack.yaml @@ -35,8 +35,7 @@ spack: - '@4.0.2' access-fms: require: - # FIXME: This would need to be changed to a stable version before release - - '@git.dev_2024.12.0' + - '@git.mom5-2025.04.001' # Includes wombatlite-sinking: https://github.com/ACCESS-NRI/GFDL-generic-tracers/commit/9bf0d6d7c72918eaa96d94e68463bf70f6065985 access-generic-tracers: require: From 20701ac6e61417414d367fef94c21793b0bfa0cd Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Fri, 4 Apr 2025 16:28:05 +1100 Subject: [PATCH 10/14] GFDL-generic-tracers development branch is sync'd with main. --- spack.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index fb5efba..8ce2085 100644 --- a/spack.yaml +++ b/spack.yaml @@ -36,11 +36,10 @@ spack: access-fms: require: - '@git.mom5-2025.04.001' - # Includes wombatlite-sinking: https://github.com/ACCESS-NRI/GFDL-generic-tracers/commit/9bf0d6d7c72918eaa96d94e68463bf70f6065985 access-generic-tracers: require: # FIXME: This would need to be changed to a stable version before release. - - '@git.dev_2025.01.2' + - '@git.dev-2025.04.001' access-mocsy: require: - '@git.2017.12.0' From ce6979ff7b2084b5ca902fb9b5e39a9f48dd3fcb Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Wed, 16 Apr 2025 16:20:23 +1000 Subject: [PATCH 11/14] Update to spack-packages dev-2025.04.001 --- config/versions.json | 2 +- spack.yaml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/versions.json b/config/versions.json index 8965f43..a70a0b0 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://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.01.1" + "spack-packages": "dev-2025.04.001" } diff --git a/spack.yaml b/spack.yaml index 8ce2085..d12dfbf 100644 --- a/spack.yaml +++ b/spack.yaml @@ -13,8 +13,7 @@ spack: mom5: require: # FIXME: This would need to be changed to a stable version before release - - '@git.dev_2024.08.14=access-om2' - - '+access-gtracers' + - '@git.ed9eadc28f61818a075d0036ba80efc8863a7fcf=access-om2' libaccessom2: require: - '@git.2023.10.26=access-om2' @@ -63,6 +62,6 @@ spack: projections: access-om2: '{name}/2025.01.2' cice5: '{name}/2023.10.19-{hash:7}' - mom5: '{name}/dev_2024.08.14-{hash:7}' + mom5: '{name}/ed9eadc28f61818a075d0036ba80efc8863a7fcf-{hash:7}' libaccessom2: '{name}/2023.10.26-{hash:7}' oasis3-mct: '{name}/2023.11.09-{hash:7}' From 8e9c4936eb325f5a6ba173e213101a055f8444b4 Mon Sep 17 00:00:00 2001 From: Dougie Squire <42455466+dougiesquire@users.noreply.github.com> Date: Thu, 17 Apr 2025 13:37:49 +1000 Subject: [PATCH 12/14] Update MOM5 --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index d12dfbf..a09c0dc 100644 --- a/spack.yaml +++ b/spack.yaml @@ -13,7 +13,7 @@ spack: mom5: require: # FIXME: This would need to be changed to a stable version before release - - '@git.ed9eadc28f61818a075d0036ba80efc8863a7fcf=access-om2' + - '@git.be7047af8686d7d057b9779a1f06c9559f08c7dd=access-om2' libaccessom2: require: - '@git.2023.10.26=access-om2' @@ -62,6 +62,6 @@ spack: projections: access-om2: '{name}/2025.01.2' cice5: '{name}/2023.10.19-{hash:7}' - mom5: '{name}/ed9eadc28f61818a075d0036ba80efc8863a7fcf-{hash:7}' + mom5: '{name}/be7047af8686d7d057b9779a1f06c9559f08c7dd-{hash:7}' libaccessom2: '{name}/2023.10.26-{hash:7}' oasis3-mct: '{name}/2023.11.09-{hash:7}' From 1be91df37d4443ea14ded6971820bde8a79051c8 Mon Sep 17 00:00:00 2001 From: Dougie Squire <42455466+dougiesquire@users.noreply.github.com> Date: Tue, 22 Apr 2025 09:19:37 +1000 Subject: [PATCH 13/14] Update to spack-packages dev-2025.04.002 --- config/versions.json | 2 +- spack.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/versions.json b/config/versions.json index a70a0b0..177510b 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "dev-2025.04.001" + "spack-packages": "dev-2025.04.002" } diff --git a/spack.yaml b/spack.yaml index a09c0dc..21b1897 100644 --- a/spack.yaml +++ b/spack.yaml @@ -13,7 +13,7 @@ spack: mom5: require: # FIXME: This would need to be changed to a stable version before release - - '@git.be7047af8686d7d057b9779a1f06c9559f08c7dd=access-om2' + - '@git.dev-2025.04.001=access-om2' libaccessom2: require: - '@git.2023.10.26=access-om2' @@ -62,6 +62,6 @@ spack: projections: access-om2: '{name}/2025.01.2' cice5: '{name}/2023.10.19-{hash:7}' - mom5: '{name}/be7047af8686d7d057b9779a1f06c9559f08c7dd-{hash:7}' + mom5: '{name}/dev-2025.04.001-{hash:7}' libaccessom2: '{name}/2023.10.26-{hash:7}' oasis3-mct: '{name}/2023.11.09-{hash:7}' From 85f8b97a7a76433c078bc013d2dde9fb5aa667a0 Mon Sep 17 00:00:00 2001 From: Dougie Squire <42455466+dougiesquire@users.noreply.github.com> Date: Wed, 23 Apr 2025 14:59:46 +1000 Subject: [PATCH 14/14] Update to spack-packages dev-2025.04.004 --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 177510b..ed47a90 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "dev-2025.04.002" + "spack-packages": "dev-2025.04.004" }