From c11d229188358b358f07796445fe842b5552159a Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 1 Jul 2025 13:57:29 +1000 Subject: [PATCH 01/41] Add initial spack.yaml based on ACCESS-NRI/ACCESS-rAM3@8206dadb8c2fda784643b884cadc2d25f2ee4704 --- config/versions.json | 4 +-- spack.yaml | 59 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 48 insertions(+), 15 deletions(-) diff --git a/config/versions.json b/config/versions.json index a6f4b3a..e6c4ced 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", + "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "SOME_SPECIFIC_TAG" + "spack-packages": "9e984d69c91580748fc05b5af46dd5a9566f565a" } diff --git a/spack.yaml b/spack.yaml index 36bdbd5..09a9e20 100644 --- a/spack.yaml +++ b/spack.yaml @@ -4,23 +4,56 @@ # configuration settings. spack: specs: - # TODO: Replace the MODEL and VERSION. - # The root SBD for the model and overall version of the deployment: - # - MODEL@git.VERSION + - access-am3@git.2025.06.000 packages: - # TODO: Specify versions and variants of dependencies where required - # Specification of dependency versions and variants goes here. - # CI/CD requires that the first element of the require is only a version: - # openmpi: - # require: - # - '@4.0.2' + # Direct dependencies + um: + require: + - '@13.1' + - model="vn13p1-am" + # This JULES source code is at ref 2333ceb817ac3e93ed22936e0ed9cee92104a99c + - jules_sources="/scratch/tm70/am3/JULES" + # This UM source code at ref 94551c44b87799d9e6deeb9841665df80573ff16 + - um_sources="/scratch/tm70/am3/UM" + + # Indirect dependencies + eccodes: + require: + - '@2.34.0' + + netcdf-c: + require: + - '@4.9.2' + + netcdf-fortran: + require: + - '@4.5.2' + + fcm: + require: + - '@2021.05.0' + # TODO: Generalize this Gadi-specific variant for spack.yaml + - 'site=nci-gadi' + + gcom: + require: + - '@7.8' + + openmpi: + require: + - '@4.1.5' # Specifications that apply to all packages all: - # TODO: Specify compiler/targets for all packages - # require: - # - '%intel@19.0.5.281' - # - 'target=x86_64' + require: + - '%intel@19.0.3.199' + - target=x86_64_v4 view: true concretizer: unify: true + config: + install_tree: + root: $spack/../restricted/ukmo/release + source_cache: $spack/../restricted/ukmo/source_cache + build_stage: + - $TMPDIR/restricted/spack-stage From 74fd4fe2956fd2d0441adbdefa55648754ef9b8c Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 1 Jul 2025 14:12:18 +1000 Subject: [PATCH 02/41] Update compiler to intel 2021.10.0 --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 09a9e20..e0ccd31 100644 --- a/spack.yaml +++ b/spack.yaml @@ -46,7 +46,7 @@ spack: # Specifications that apply to all packages all: require: - - '%intel@19.0.3.199' + - '%intel@2021.10.0' - target=x86_64_v4 view: true concretizer: From 78a6fbc43aceb958e592c5584da5b235fe2b1781 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Thu, 3 Jul 2025 22:14:35 +1000 Subject: [PATCH 03/41] Update versions.json Testing adjusting the run environment at the package level. --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index e6c4ced..d2bd2a9 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "9e984d69c91580748fc05b5af46dd5a9566f565a" + "spack-packages": "afb4beba0c572cb62cf96f72cfb9bebffb06dfd6" } From 2de222acb5d3f42a04a495b0fbfeb235e876fc06 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Thu, 3 Jul 2025 22:59:47 +1000 Subject: [PATCH 04/41] Update versions.json Syntax error, trying again. --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index d2bd2a9..d15ea4f 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "afb4beba0c572cb62cf96f72cfb9bebffb06dfd6" + "spack-packages": "662961782d04a234a5fa8be32ef4ea34c9522b37" } From bf542ef63b714fb3a48db3dc097de675b94dcdbb Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Thu, 10 Jul 2025 13:38:36 +1000 Subject: [PATCH 05/41] Update versions.json Attempt at using resources. --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index d15ea4f..c38fde5 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "662961782d04a234a5fa8be32ef4ea34c9522b37" + "spack-packages": "a4ca722cb028cd3e131f5ae1fb060ae6ebb580ed" } From 7062f758a9d782a70d195b66a1f93d40c017d49c Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Thu, 10 Jul 2025 13:48:05 +1000 Subject: [PATCH 06/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index c38fde5..186f97d 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "a4ca722cb028cd3e131f5ae1fb060ae6ebb580ed" + "spack-packages": "a8ecc53c790d14a9448d609d42db65e94c5605af" } From 465da524ae941d464ce6c696c3e8d7b1567ac92d Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Thu, 10 Jul 2025 14:36:23 +1000 Subject: [PATCH 07/41] Update spack.yaml Removing source variants from spack.yaml to see if it still works. --- spack.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spack.yaml b/spack.yaml index e0ccd31..e7fd271 100644 --- a/spack.yaml +++ b/spack.yaml @@ -11,10 +11,6 @@ spack: require: - '@13.1' - model="vn13p1-am" - # This JULES source code is at ref 2333ceb817ac3e93ed22936e0ed9cee92104a99c - - jules_sources="/scratch/tm70/am3/JULES" - # This UM source code at ref 94551c44b87799d9e6deeb9841665df80573ff16 - - um_sources="/scratch/tm70/am3/UM" # Indirect dependencies eccodes: From 7eb9788034b10489a7db0b6e1336e37a5172cf51 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Thu, 10 Jul 2025 15:15:30 +1000 Subject: [PATCH 08/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 186f97d..8bc7f0f 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "a8ecc53c790d14a9448d609d42db65e94c5605af" + "spack-packages": "b59311a75bdbaa0e6a4793ee7402a7164715d5e7" } From e821f1862ee99a4fecc4f12278e16259beb8f8fe Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Tue, 15 Jul 2025 12:07:18 +1000 Subject: [PATCH 09/41] Update versions.json Better resource logic in spack-packages. --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 8bc7f0f..e681d06 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "b59311a75bdbaa0e6a4793ee7402a7164715d5e7" + "spack-packages": "eb9d8d833d5681670bc20dfc703f96d5f88427d9" } From 4997f4a5b31f5275853aa2475efcb3d13f70d4cd Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Tue, 15 Jul 2025 22:51:04 +1000 Subject: [PATCH 10/41] Test of source only --- config/versions.json | 2 +- spack.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index e681d06..0f24ab5 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "eb9d8d833d5681670bc20dfc703f96d5f88427d9" + "spack-packages": "84823bdb2bf787cec76572209694277b6fdd81da" } diff --git a/spack.yaml b/spack.yaml index e7fd271..4a2fd8c 100644 --- a/spack.yaml +++ b/spack.yaml @@ -11,6 +11,7 @@ spack: require: - '@13.1' - model="vn13p1-am" + - +am3 # Indirect dependencies eccodes: From c4caabb56f9b06c8d2d449b9419fdac9950d985c Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Tue, 15 Jul 2025 22:57:56 +1000 Subject: [PATCH 11/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 0f24ab5..80e2141 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "84823bdb2bf787cec76572209694277b6fdd81da" + "spack-packages": "4d9bda4995a6f9da643f27cbe64ec97d00083014" } From ca5030a47bd09db2000ded41b4190d5b4f121977 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Tue, 15 Jul 2025 22:59:44 +1000 Subject: [PATCH 12/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 80e2141..0f83c44 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "4d9bda4995a6f9da643f27cbe64ec97d00083014" + "spack-packages": "5d65f74d15b03b18e97cf128a1a6bd47dbb283fb" } From e79168347ef0a460d464f65997b7685c93bd0157 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Tue, 15 Jul 2025 23:11:41 +1000 Subject: [PATCH 13/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 0f83c44..ab4e04f 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "5d65f74d15b03b18e97cf128a1a6bd47dbb283fb" + "spack-packages": "770a8d93194ee21c66b8a9383f0b82d6f678e312" } From 057818940be24fdc7e45e2c65d557a065c4ab7f0 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Tue, 15 Jul 2025 23:24:41 +1000 Subject: [PATCH 14/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index ab4e04f..5b9c203 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "770a8d93194ee21c66b8a9383f0b82d6f678e312" + "spack-packages": "21eba8071626588722d7c68a5f62a225fc0d8a3d" } From 59401687a541347bf2bb97138176cf15e5562a2f Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Tue, 15 Jul 2025 23:28:18 +1000 Subject: [PATCH 15/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 5b9c203..d790232 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "21eba8071626588722d7c68a5f62a225fc0d8a3d" + "spack-packages": "70956da164f8e6d9abe9dabf358026826692c07c" } From 17bf70d81170e14f61abc313f7e8c5d06a146490 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Tue, 15 Jul 2025 23:41:29 +1000 Subject: [PATCH 16/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index d790232..3b7cc07 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "70956da164f8e6d9abe9dabf358026826692c07c" + "spack-packages": "f9355b26abbe3b3f4cd41be75b11e9d5aea0ff08" } From 8da7b0c78e90d39156880900d3cd8dd057fe4718 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Tue, 15 Jul 2025 23:55:25 +1000 Subject: [PATCH 17/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 3b7cc07..3d015c0 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "f9355b26abbe3b3f4cd41be75b11e9d5aea0ff08" + "spack-packages": "13d538e9c24acf44c26916f2986cc42ae0d000ed" } From 97c8ce539825a321f87c5616017c863ee6450a7d Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Wed, 16 Jul 2025 00:20:04 +1000 Subject: [PATCH 18/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 3d015c0..c29e65f 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "13d538e9c24acf44c26916f2986cc42ae0d000ed" + "spack-packages": "35cb96818f8f1b2a1189cf999ffe1b802ce1eb99" } From 9e8a96da0383d877c2f55e952c56416829ea31be Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Wed, 16 Jul 2025 00:30:15 +1000 Subject: [PATCH 19/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index c29e65f..1d28469 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "35cb96818f8f1b2a1189cf999ffe1b802ce1eb99" + "spack-packages": "d87a4b4faaca0528fad8d297d6cf0e6ae55faf3c" } From 24b1f4b53dfeb74601f237a38e83db5ad3249236 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Wed, 16 Jul 2025 09:58:53 +1000 Subject: [PATCH 20/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 1d28469..eec358e 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "d87a4b4faaca0528fad8d297d6cf0e6ae55faf3c" + "spack-packages": "a41b396ef816f9bc28a8bca6ddc5fdbf85b2a781" } From fffa4edf083d987f31830fb3cbfbcb050cce7c5a Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Thu, 17 Jul 2025 09:52:32 +1000 Subject: [PATCH 21/41] Updated versions and spack yaml for new resource approach --- config/versions.json | 2 +- spack.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/config/versions.json b/config/versions.json index eec358e..5272c77 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "a41b396ef816f9bc28a8bca6ddc5fdbf85b2a781" + "spack-packages": "ddddcce32143452bfd9b43181667657a7b0dcb25" } diff --git a/spack.yaml b/spack.yaml index 4a2fd8c..e7fd271 100644 --- a/spack.yaml +++ b/spack.yaml @@ -11,7 +11,6 @@ spack: require: - '@13.1' - model="vn13p1-am" - - +am3 # Indirect dependencies eccodes: From 9b0101dc7ff9b090588a66d669c75f3748748fe3 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Thu, 17 Jul 2025 09:59:32 +1000 Subject: [PATCH 22/41] New hash --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 5272c77..df231b3 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "ddddcce32143452bfd9b43181667657a7b0dcb25" + "spack-packages": "8fa3968f7d2db75217abeea06f34385708c05366" } From 0dbf71eb980da0bc9d6710395c452f617a444485 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Thu, 17 Jul 2025 10:31:32 +1000 Subject: [PATCH 23/41] New spackages version --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index df231b3..6b145e2 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "8fa3968f7d2db75217abeea06f34385708c05366" + "spack-packages": "7928783f01b59d424c9057612c731d363144a5cf" } From f8cd1fff84cc37fadada7ff18bcd8697c8d65f72 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Wed, 23 Jul 2025 10:11:13 +1000 Subject: [PATCH 24/41] Updated with dynamic variants --- config/versions.json | 2 +- spack.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 6b145e2..222f490 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "7928783f01b59d424c9057612c731d363144a5cf" + "spack-packages": "4071d6b18c68868fcdb3b4a2b2d9a575826d0057" } diff --git a/spack.yaml b/spack.yaml index e7fd271..c816681 100644 --- a/spack.yaml +++ b/spack.yaml @@ -11,6 +11,8 @@ spack: require: - '@13.1' - model="vn13p1-am" + - jules_sources="AM3-dev" + - um_sources="AM3-dev" # Indirect dependencies eccodes: From 898703be2d5075e747fa30a6eac408e24fbb4bdd Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Thu, 17 Jul 2025 13:31:15 +1000 Subject: [PATCH 25/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 222f490..35c9728 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "4071d6b18c68868fcdb3b4a2b2d9a575826d0057" + "spack-packages": "d62126706443ccdbfd63b5231bcaffde8c500002" } From 4528bc3d0872422a2577f031be183c4eefdafd5d Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Wed, 23 Jul 2025 10:35:24 +1000 Subject: [PATCH 26/41] New resource path --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 35c9728..73e2e56 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "d62126706443ccdbfd63b5231bcaffde8c500002" + "spack-packages": "ca6e9bc8766f837fa59ca7ca89bfac2fbf59ab5e" } From 1b5fa19d4d58bf71564649d8fd5280963e6afa7b Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Wed, 23 Jul 2025 10:59:02 +1000 Subject: [PATCH 27/41] New resource path --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 73e2e56..5f650f6 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "ca6e9bc8766f837fa59ca7ca89bfac2fbf59ab5e" + "spack-packages": "4b4d48d8e59f73751cbc885a33c54dc61eaf87df" } From df3804d8b983a8b519c8e1995b52c3943a99755c Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Wed, 23 Jul 2025 13:49:34 +1000 Subject: [PATCH 28/41] Attempt with native patch method --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 5f650f6..9523177 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "4b4d48d8e59f73751cbc885a33c54dc61eaf87df" + "spack-packages": "9f3a89df88ed2bf2790a8bfe4327c49cdb996e0d" } From 3c20f166bb9fe55e33ef611348dc6237517a54e5 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Wed, 23 Jul 2025 13:55:00 +1000 Subject: [PATCH 29/41] Attempt with native patch method --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 9523177..87ccd6e 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "9f3a89df88ed2bf2790a8bfe4327c49cdb996e0d" + "spack-packages": "ec7ca3f85dbc383d6c149a34ba472c0019f6cc5a" } From 4b5a062701b8517946585f9207958435e0352690 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Wed, 23 Jul 2025 14:04:00 +1000 Subject: [PATCH 30/41] Attempt with native patch method --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 87ccd6e..800e0e6 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "ec7ca3f85dbc383d6c149a34ba472c0019f6cc5a" + "spack-packages": "99d4fb327a858c6bebeae5a1b9bf1809a210518a" } From 3b030276d3cf0e448ad7484606ff20696ad4209a Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Wed, 23 Jul 2025 16:01:35 +1000 Subject: [PATCH 31/41] Working dynamic resource implementation --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 800e0e6..c08ef17 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "99d4fb327a858c6bebeae5a1b9bf1809a210518a" + "spack-packages": "776be25cceb4310caf1d05319ef9f8321d989669" } From 284f9aad361ae338ca35b6558805162f6d31cc3d Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Wed, 23 Jul 2025 16:07:11 +1000 Subject: [PATCH 32/41] Blank string --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index c08ef17..601ebe1 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "776be25cceb4310caf1d05319ef9f8321d989669" + "spack-packages": "92984ac85c69277d0ad2b204b5d774b852e985d0" } From 1e44c0011522d9259d39fb5ba9bcdb22617dbb0d Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Mon, 28 Jul 2025 12:59:43 +1000 Subject: [PATCH 33/41] Updated packages version --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 601ebe1..a9e2d52 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "92984ac85c69277d0ad2b204b5d774b852e985d0" + "spack-packages": "83d3c692a1f9f4b9023addc7727d3adaa44a59e7" } From 7e33b0078a11f581e5f88670ed5fa09a2d39ce26 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Mon, 28 Jul 2025 13:45:08 +1000 Subject: [PATCH 34/41] Updated openmpi version, included openmpi in environment. --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index c816681..a55a66a 100644 --- a/spack.yaml +++ b/spack.yaml @@ -39,7 +39,7 @@ spack: openmpi: require: - - '@4.1.5' + - '@4.1.7' # Specifications that apply to all packages all: From e8c81cd2653443c8bd58d72615a339cfba9852a2 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Tue, 29 Jul 2025 09:55:07 +1000 Subject: [PATCH 35/41] New hash --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index a9e2d52..76cd9dd 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "83d3c692a1f9f4b9023addc7727d3adaa44a59e7" + "spack-packages": "92ff4c5c98ded8beb93af7edfd288d52da546446" } From b265994d3c37d6a707f1069e34b49ce7228fccd7 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Tue, 29 Jul 2025 10:09:17 +1000 Subject: [PATCH 36/41] New hash --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 76cd9dd..d2ff32c 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "92ff4c5c98ded8beb93af7edfd288d52da546446" + "spack-packages": "76dbf19af106a2344a26ddcf3c2eb38265912f4b" } From b7ca0409b2f78ed20ed2d9f5b8538aaf86a04a00 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Thu, 7 Aug 2025 11:52:37 +1000 Subject: [PATCH 37/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index d2ff32c..f11ab74 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "76dbf19af106a2344a26ddcf3c2eb38265912f4b" + "spack-packages": "a7c138541c4d3f6705fbc836df0150c80b91cd14" } From 033a02784c1b76602909701dcb9155242f6b7a2c Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Fri, 8 Aug 2025 11:16:10 +1000 Subject: [PATCH 38/41] Update versions.json --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index f11ab74..a94775e 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "a7c138541c4d3f6705fbc836df0150c80b91cd14" + "spack-packages": "4f6552df767349c18fac6d588e890116fac1daff" } From cf89487272b7d6f1a948c141e131ace92f620098 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Tue, 12 Aug 2025 10:17:06 +1000 Subject: [PATCH 39/41] Update spack.yaml Tagged JULES and UM sources. --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index a55a66a..03d314d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -11,8 +11,8 @@ spack: require: - '@13.1' - model="vn13p1-am" - - jules_sources="AM3-dev" - - um_sources="AM3-dev" + - jules_sources="2025.08.0" + - um_sources="2025.08.0" # Indirect dependencies eccodes: From 662066bc2a3470b1ae5f07ab363dc4bc02f68251 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 14 Aug 2025 13:10:28 +1000 Subject: [PATCH 40/41] Update gcom version to old origin/initial-deploy version (issue with rebase) --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 03d314d..f5151d0 100644 --- a/spack.yaml +++ b/spack.yaml @@ -35,7 +35,7 @@ spack: gcom: require: - - '@7.8' + - '@7.9' openmpi: require: From c00197e1ca569a6ada28168b1f0499bb01aed62c Mon Sep 17 00:00:00 2001 From: Martin Dix Date: Fri, 19 Sep 2025 10:07:06 +1000 Subject: [PATCH 41/41] Use rough-npft-fix --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index f5151d0..b420d5b 100644 --- a/spack.yaml +++ b/spack.yaml @@ -11,7 +11,7 @@ spack: require: - '@13.1' - model="vn13p1-am" - - jules_sources="2025.08.0" + - jules_sources="f5531ad0535cfed09ab83400da2e19ac4cee05e3" - um_sources="2025.08.0" # Indirect dependencies