From 5fdff9781747c354da35ba4baaeee44536b65a73 Mon Sep 17 00:00:00 2001 From: anton-seaice Date: Thu, 20 Nov 2025 11:45:00 +1100 Subject: [PATCH 01/16] messing around with cmake in cice5 --- config/versions.json | 2 +- spack.yaml | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config/versions.json b/config/versions.json index 46074bf..0e162cd 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.09.004" + "spack-packages": "bf617a8049ac2837271e0d20d223a16f8523665a" } diff --git a/spack.yaml b/spack.yaml index 1a55bb2..f891540 100644 --- a/spack.yaml +++ b/spack.yaml @@ -5,11 +5,14 @@ spack: # add package specs to the `specs` list specs: - - access-om2@git.2025.09.000=latest + - access-om2@git.2025.09.000=latest ^cice5 nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1 + - access-om2@git.2025.09.000=latest ^cice5 nxglob=1440 nyglob=1080 blckx=30 blcky=27 mxblcks=4 + - access-om2@git.2025.09.000=latest ^cice5 nxglob=3600 nyglob=2700 blckx=18 blcky=15 mxblcks=22 + packages: cice5: require: - - '@git.2025.03.001=access-om2' + - '@git.0612f2297edbc12f268d0ca3f4cb7e412310f65a=stable model=access-om2' mom5: require: - '@git.2025.08.000=access-om2' @@ -47,4 +50,4 @@ spack: - 'target=x86_64' view: true concretizer: - unify: true + unify: when_possible From 03d8a3acb71256608c848a452a7e51e1ea169d60 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Thu, 20 Nov 2025 12:10:23 +1100 Subject: [PATCH 02/16] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index f891540..9f4345f 100644 --- a/spack.yaml +++ b/spack.yaml @@ -12,7 +12,7 @@ spack: packages: cice5: require: - - '@git.0612f2297edbc12f268d0ca3f4cb7e412310f65a=stable model=access-om2' + - '@git.782a247de1fdafe5eb1289099226675c2b2d6c33=stable model=access-om2' mom5: require: - '@git.2025.08.000=access-om2' From ede63f0249abaf9583e51fbe54cd09f26371b52b Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Thu, 20 Nov 2025 12:39:35 +1100 Subject: [PATCH 03/16] Update spack.yaml --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 9f4345f..2eddd99 100644 --- a/spack.yaml +++ b/spack.yaml @@ -6,8 +6,8 @@ spack: # add package specs to the `specs` list specs: - access-om2@git.2025.09.000=latest ^cice5 nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1 - - access-om2@git.2025.09.000=latest ^cice5 nxglob=1440 nyglob=1080 blckx=30 blcky=27 mxblcks=4 - - access-om2@git.2025.09.000=latest ^cice5 nxglob=3600 nyglob=2700 blckx=18 blcky=15 mxblcks=22 + # - access-om2@git.2025.09.000=latest ^cice5 nxglob=1440 nyglob=1080 blckx=30 blcky=27 mxblcks=4 + # - access-om2@git.2025.09.000=latest ^cice5 nxglob=3600 nyglob=2700 blckx=18 blcky=15 mxblcks=22 packages: cice5: From bcb94bfdbf1a93bb47058b2a05fd974141b93ee4 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Thu, 20 Nov 2025 13:52:18 +1100 Subject: [PATCH 04/16] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 2eddd99..41e162d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -12,7 +12,7 @@ spack: packages: cice5: require: - - '@git.782a247de1fdafe5eb1289099226675c2b2d6c33=stable model=access-om2' + - '@git.b070e42978de8b9e443db1f064bee6bf47b2a9c8=stable model=access-om2' mom5: require: - '@git.2025.08.000=access-om2' From 449be27bfdc60f7b745093c90128c6ae2f05985b Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Thu, 20 Nov 2025 14:07:04 +1100 Subject: [PATCH 05/16] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 41e162d..654f08c 100644 --- a/spack.yaml +++ b/spack.yaml @@ -12,7 +12,7 @@ spack: packages: cice5: require: - - '@git.b070e42978de8b9e443db1f064bee6bf47b2a9c8=stable model=access-om2' + - '@git.46ef92b232632663855abb4088ffbd76378c27b5=stable model=access-om2' mom5: require: - '@git.2025.08.000=access-om2' From 8163483595de02bf6a012a9a249012305f91fc5d Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Thu, 20 Nov 2025 14:17:29 +1100 Subject: [PATCH 06/16] Update spack.yaml --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 654f08c..499e738 100644 --- a/spack.yaml +++ b/spack.yaml @@ -6,8 +6,8 @@ spack: # add package specs to the `specs` list specs: - access-om2@git.2025.09.000=latest ^cice5 nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1 - # - access-om2@git.2025.09.000=latest ^cice5 nxglob=1440 nyglob=1080 blckx=30 blcky=27 mxblcks=4 - # - access-om2@git.2025.09.000=latest ^cice5 nxglob=3600 nyglob=2700 blckx=18 blcky=15 mxblcks=22 + - access-om2@git.2025.09.000=latest ^cice5 nxglob=1440 nyglob=1080 blckx=30 blcky=27 mxblcks=4 + - access-om2@git.2025.09.000=latest ^cice5 nxglob=3600 nyglob=2700 blckx=18 blcky=15 mxblcks=22 packages: cice5: From b33d0dcbed4a10964dd32195273ec69ab3089e99 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Fri, 21 Nov 2025 14:11:05 +1100 Subject: [PATCH 07/16] Possible module projections --- spack.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/spack.yaml b/spack.yaml index 499e738..159525d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -5,10 +5,9 @@ spack: # add package specs to the `specs` list specs: - - access-om2@git.2025.09.000=latest ^cice5 nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1 - - access-om2@git.2025.09.000=latest ^cice5 nxglob=1440 nyglob=1080 blckx=30 blcky=27 mxblcks=4 - - access-om2@git.2025.09.000=latest ^cice5 nxglob=3600 nyglob=2700 blckx=18 blcky=15 mxblcks=22 - + - access-om2@git.2025.12.000 ^cice5 nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1 + - access-om2 ^cice5 nxglob=1440 nyglob=1080 blckx=30 blcky=27 mxblcks=4 + - access-om2 ^cice5 nxglob=3600 nyglob=2700 blckx=18 blcky=15 mxblcks=22 packages: cice5: require: @@ -48,6 +47,11 @@ spack: require: - '%intel@19.0.5.281' - 'target=x86_64' - view: true + view: false concretizer: unify: when_possible + modules: + default: + tcl: + projections: + ^cice5: '{name}/{version}-{^cice5.variants.nxglob.value}x{^cice5.variants.nyglob.value}' From 21457861b0590782b68d21f5d089400ecdb38300 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Fri, 21 Nov 2025 14:21:12 +1100 Subject: [PATCH 08/16] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 159525d..bbc162d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -54,4 +54,4 @@ spack: default: tcl: projections: - ^cice5: '{name}/{version}-{^cice5.variants.nxglob.value}x{^cice5.variants.nyglob.value}' + access-om2: '{name}/{version}-{^cice5.variants.nxglob.value}x{^cice5.variants.nyglob.value}' From 5c7f7394b9592057d9d7e05bf4279e28938e4cfa Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Fri, 21 Nov 2025 14:21:48 +1100 Subject: [PATCH 09/16] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index bbc162d..11aaf09 100644 --- a/spack.yaml +++ b/spack.yaml @@ -54,4 +54,4 @@ spack: default: tcl: projections: - access-om2: '{name}/{version}-{^cice5.variants.nxglob.value}x{^cice5.variants.nyglob.value}' + access-om2: '{name}/2025.12.000-{^cice5.variants.nxglob.value}x{^cice5.variants.nyglob.value}' From 59ebc211ee3ae38688ef41a2610b5088d5dc37cb Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Fri, 21 Nov 2025 14:37:09 +1100 Subject: [PATCH 10/16] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 11aaf09..17dd442 100644 --- a/spack.yaml +++ b/spack.yaml @@ -54,4 +54,4 @@ spack: default: tcl: projections: - access-om2: '{name}/2025.12.000-{^cice5.variants.nxglob.value}x{^cice5.variants.nyglob.value}' + access-om2: '{name}/2025.12.000-{^cice5.variants.nxglob.value}x{^cice5.variants.nyglob.value}-{hash[:7]}' From 0997ee6eaa8dee7ca2e627ed51dbf2822437a7b0 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Fri, 21 Nov 2025 14:41:21 +1100 Subject: [PATCH 11/16] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 17dd442..4604e93 100644 --- a/spack.yaml +++ b/spack.yaml @@ -54,4 +54,4 @@ spack: default: tcl: projections: - access-om2: '{name}/2025.12.000-{^cice5.variants.nxglob.value}x{^cice5.variants.nyglob.value}-{hash[:7]}' + ^cice5: '{name}/2025.12.000-{^cice5.variants.nxglob.value}x{^cice5.variants.nyglob.value}' From 969e762224038c1790d859db2392d0df63f114bf Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Mon, 24 Nov 2025 16:37:51 +1100 Subject: [PATCH 12/16] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 4604e93..11aaf09 100644 --- a/spack.yaml +++ b/spack.yaml @@ -54,4 +54,4 @@ spack: default: tcl: projections: - ^cice5: '{name}/2025.12.000-{^cice5.variants.nxglob.value}x{^cice5.variants.nyglob.value}' + access-om2: '{name}/2025.12.000-{^cice5.variants.nxglob.value}x{^cice5.variants.nyglob.value}' From 5132b9f4f141cad40d8de21bb5c162099fc6c909 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Thu, 27 Nov 2025 13:30:18 +1100 Subject: [PATCH 13/16] 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 0e162cd..1f5496c 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": "bf617a8049ac2837271e0d20d223a16f8523665a" + "spack-packages": "2817e9e41a6142cb617b216e53c7f3fef5a8da52" } From 066be630d3e1f74f587bc9868e2a25652f338a3b Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:43:07 +1100 Subject: [PATCH 14/16] latest master --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 11aaf09..2e077ed 100644 --- a/spack.yaml +++ b/spack.yaml @@ -11,7 +11,7 @@ spack: packages: cice5: require: - - '@git.46ef92b232632663855abb4088ffbd76378c27b5=stable model=access-om2' + - '@git.38b7fc85382ec1015fb7304bb3c9e2ba6e2e9a0f=stable model=access-om2' mom5: require: - '@git.2025.08.000=access-om2' @@ -29,7 +29,7 @@ spack: - '@4.6.1' parallelio: require: - - '@2.6.2' + - '@git.06e79373ae7f344833ba70a5958b53cd7a46adef=2.6.2' openmpi: require: - '@4.1.5' From a9c0c19d0fea914ae355d860a7e47284d689bf1a Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:50:43 +1100 Subject: [PATCH 15/16] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 2e077ed..23434e2 100644 --- a/spack.yaml +++ b/spack.yaml @@ -11,7 +11,7 @@ spack: packages: cice5: require: - - '@git.38b7fc85382ec1015fb7304bb3c9e2ba6e2e9a0f=stable model=access-om2' + - '@git.4048ff2b836a04a6ea00fcbffd17335829393e5b=stable model=access-om2' mom5: require: - '@git.2025.08.000=access-om2' From 0af47890caf9bc921190dcefd637bb7fec450c90 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Wed, 3 Dec 2025 15:07:49 +1100 Subject: [PATCH 16/16] Update spack.yaml --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 23434e2..6877373 100644 --- a/spack.yaml +++ b/spack.yaml @@ -11,7 +11,7 @@ spack: packages: cice5: require: - - '@git.4048ff2b836a04a6ea00fcbffd17335829393e5b=stable model=access-om2' + - '@git.4048ff2b836a04a6ea00fcbffd17335829393e5b=stable model=access-om2 io_type=PIO' mom5: require: - '@git.2025.08.000=access-om2'