From a3f667a23c60c1fb7e8c820fdeb088223cf2ca26 Mon Sep 17 00:00:00 2001 From: Dougie Squire <42455466+dougiesquire@users.noreply.github.com> Date: Wed, 18 Feb 2026 10:59:07 +1100 Subject: [PATCH 01/10] MOM6 at latest on dev/gfdl+access+isf Also updated compiler flags following https://github.com/ACCESS-NRI/ACCESS-OM3/pull/142 Also update to ESMF 8.8.1 --- spack.yaml | 57 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/spack.yaml b/spack.yaml index ab00b837..11d27d33 100644 --- a/spack.yaml +++ b/spack.yaml @@ -13,50 +13,57 @@ spack: require: - '@2025.08.000' - configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3 - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' access-cice: require: - '@CICE6.6.1-0' - io_type=PIO - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' access-mom6: require: - - '@2025.07.000' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - '@git.fc24c40d7f2050ee4febbf8885a4cb1f185d9ccf=2026.01.000' # On branch dev/gfdl+access+isf + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' access-ww3: require: - '@2025.08.000' access3-share: require: - '@2025.08.000' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' access-generic-tracers: require: - '@2025.08.000' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' access-mocsy: require: - '@2025.07.002' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' + fms: + require: + - '@2025.03' + - 'cppflags="-DMAXFIELDMETHODS_=600"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' # Other Dependencies esmf: require: - - '@8.7.0' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - '@8.8.1' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' parallelio: require: - '@2.6.2' @@ -67,10 +74,6 @@ spack: netcdf-fortran: require: - '@4.6.1' - fms: - require: - - '@2025.03' - - 'cppflags="-DMAXFIELDMETHODS_=600"' openmpi: require: - '@4.1.7' From d479da0a67dc564eb4cd0c0377a494f544d90656 Mon Sep 17 00:00:00 2001 From: Dougie Squire <42455466+dougiesquire@users.noreply.github.com> Date: Wed, 18 Feb 2026 13:47:28 +1100 Subject: [PATCH 02/10] Add new source ALE/Recon1d_PLM_WLS.F90 to MOM6 CMake Specify ESMF hash to prevent rebuilt --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 11d27d33..5968e756 100644 --- a/spack.yaml +++ b/spack.yaml @@ -6,7 +6,7 @@ # https://github.com/ACCESS-NRI/model-deployment-template/blob/main/spack.yaml spack: specs: - - access-om3@git.2025.08.001 + - access-om3@git.2025.08.001 ^/bmqjm4u packages: # Main Dependencies access3: @@ -25,7 +25,7 @@ spack: - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' access-mom6: require: - - '@git.fc24c40d7f2050ee4febbf8885a4cb1f185d9ccf=2026.01.000' # On branch dev/gfdl+access+isf + - '@git.9b5014887a95cfbe9462079d8f938a4d5d73ab11=2026.01.000' # On branch dev/gfdl+access+isf - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' From fb6323700aba606af823e97e5886bb17f2df7dd1 Mon Sep 17 00:00:00 2001 From: Dougie Squire Date: Thu, 19 Feb 2026 08:59:04 +1100 Subject: [PATCH 03/10] Set build_jobs to 1 --- spack.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack.yaml b/spack.yaml index 5968e756..4a00e40c 100644 --- a/spack.yaml +++ b/spack.yaml @@ -87,6 +87,8 @@ spack: require: - '%oneapi@2025.2.0' - 'target=x86_64_v4' + config: + build_jobs: 1 view: true concretizer: unify: true From 7c190d5d7716eed207c20dae9684a1a5a9b024ca Mon Sep 17 00:00:00 2001 From: Dougie Squire Date: Thu, 19 Feb 2026 09:56:40 +1100 Subject: [PATCH 04/10] Use -flto=thin --- spack.yaml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/spack.yaml b/spack.yaml index 4a00e40c..54abee47 100644 --- a/spack.yaml +++ b/spack.yaml @@ -6,16 +6,16 @@ # https://github.com/ACCESS-NRI/model-deployment-template/blob/main/spack.yaml spack: specs: - - access-om3@git.2025.08.001 ^/bmqjm4u + - access-om3@git.2025.08.001 packages: # Main Dependencies access3: require: - '@2025.08.000' - configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3 - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin -fuse-ld=lld"' access-cice: require: - '@CICE6.6.1-0' @@ -26,44 +26,44 @@ spack: access-mom6: require: - '@git.9b5014887a95cfbe9462079d8f938a4d5d73ab11=2026.01.000' # On branch dev/gfdl+access+isf - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin -fuse-ld=lld"' access-ww3: require: - '@2025.08.000' access3-share: require: - '@2025.08.000' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin -fuse-ld=lld"' access-generic-tracers: require: - '@2025.08.000' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin -fuse-ld=lld"' access-mocsy: require: - '@2025.07.002' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin -fuse-ld=lld"' fms: require: - '@2025.03' - 'cppflags="-DMAXFIELDMETHODS_=600"' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin -fuse-ld=lld"' # Other Dependencies esmf: require: - '@8.8.1' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' + - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin -fuse-ld=lld"' parallelio: require: - '@2.6.2' From 8335be033ce116e3122cb11fabbd96b9819cb911 Mon Sep 17 00:00:00 2001 From: Dougie Squire Date: Thu, 19 Feb 2026 11:09:28 +1100 Subject: [PATCH 05/10] Remove -flto flags for esmf --- spack.yaml | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/spack.yaml b/spack.yaml index 54abee47..80b89d42 100644 --- a/spack.yaml +++ b/spack.yaml @@ -13,9 +13,9 @@ spack: require: - '@2025.08.000' - configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3 - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' access-cice: require: - '@CICE6.6.1-0' @@ -26,44 +26,43 @@ spack: access-mom6: require: - '@git.9b5014887a95cfbe9462079d8f938a4d5d73ab11=2026.01.000' # On branch dev/gfdl+access+isf - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' access-ww3: require: - '@2025.08.000' access3-share: require: - '@2025.08.000' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' access-generic-tracers: require: - '@2025.08.000' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' access-mocsy: require: - '@2025.07.002' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' fms: require: - '@2025.03' - 'cppflags="-DMAXFIELDMETHODS_=600"' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' # Other Dependencies esmf: require: - '@8.8.1' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto=thin -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' + - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' parallelio: require: - '@2.6.2' From e5a500e469b667ab96d9e768a70cff9db3a4eb38 Mon Sep 17 00:00:00 2001 From: Dougie Squire Date: Thu, 19 Feb 2026 14:01:23 +1100 Subject: [PATCH 06/10] Add lto flags for cice These were not included in https://github.com/ACCESS-NRI/ACCESS-OM3/pull/142 but are in https://github.com/ACCESS-NRI/ACCESS-OM3/pull/148 --- spack.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spack.yaml b/spack.yaml index 80b89d42..b879c194 100644 --- a/spack.yaml +++ b/spack.yaml @@ -6,7 +6,7 @@ # https://github.com/ACCESS-NRI/model-deployment-template/blob/main/spack.yaml spack: specs: - - access-om3@git.2025.08.001 + - access-om3@git.2025.08.001 ^/3nq5qch packages: # Main Dependencies access3: @@ -20,9 +20,9 @@ spack: require: - '@CICE6.6.1-0' - io_type=PIO - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' + - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' access-mom6: require: - '@git.9b5014887a95cfbe9462079d8f938a4d5d73ab11=2026.01.000' # On branch dev/gfdl+access+isf From 90aa4bae5d65b583397116f366fd9b473cd38a36 Mon Sep 17 00:00:00 2001 From: Dougie Squire Date: Fri, 20 Feb 2026 13:48:16 +1100 Subject: [PATCH 07/10] Revert to ESMF 8.7.0 --- spack.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spack.yaml b/spack.yaml index b879c194..d032a02b 100644 --- a/spack.yaml +++ b/spack.yaml @@ -6,7 +6,7 @@ # https://github.com/ACCESS-NRI/model-deployment-template/blob/main/spack.yaml spack: specs: - - access-om3@git.2025.08.001 ^/3nq5qch + - access-om3@git.2025.08.001 packages: # Main Dependencies access3: @@ -20,9 +20,8 @@ spack: require: - '@CICE6.6.1-0' - io_type=PIO - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' access-mom6: require: - '@git.9b5014887a95cfbe9462079d8f938a4d5d73ab11=2026.01.000' # On branch dev/gfdl+access+isf @@ -59,7 +58,7 @@ spack: # Other Dependencies esmf: require: - - '@8.8.1' + - '@8.7.0' - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3"' From 5c1c8c1f694b18ad7b341cc1429915b6343ebfdf Mon Sep 17 00:00:00 2001 From: Dougie Squire Date: Tue, 12 May 2026 16:30:05 +1000 Subject: [PATCH 08/10] Update access3-share to allow optional rofl in drof --- spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 5585d959..e909ac5d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -15,7 +15,7 @@ spack: # Main Dependencies access3: require: - - '@2026.03.000' + - '@git.d63adae27696f2caae36625a80dcd436e03475cd=2026.03.000' - configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3 - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' @@ -38,7 +38,7 @@ spack: - '@2026.03.000' access3-share: require: - - '@2026.03.000' + - '@git.d63adae27696f2caae36625a80dcd436e03475cd=2026.03.000' - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' From 460b46c147e1cba52713a59360f95aef0ad4a540 Mon Sep 17 00:00:00 2001 From: Dougie Squire Date: Wed, 13 May 2026 11:27:44 +1000 Subject: [PATCH 09/10] Update MOM6 to include Langmuir number fix --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index e909ac5d..e47e9d2b 100644 --- a/spack.yaml +++ b/spack.yaml @@ -29,7 +29,7 @@ spack: - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' access-mom6: require: - - '@git.87cd5978c25ae2ebd761119d3dffd6665d729f08=2026.01.001' # On branch dev/gfdl+access+isf + - '@git.5100ba4e1c1baff83d1b74b59b56e397f7398f38=2026.01.001' # On branch dev/gfdl+access+isf - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' From e51357780eb276ad31bedf0ff5291099049c4eb0 Mon Sep 17 00:00:00 2001 From: Dougie Squire Date: Mon, 15 Jun 2026 12:12:38 +1000 Subject: [PATCH 10/10] Missing files from CMake --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index f2d115ff..04c8f89c 100644 --- a/spack.yaml +++ b/spack.yaml @@ -29,7 +29,7 @@ spack: - 'ldflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto -fuse-ld=lld"' access-mom6: require: - - '@git.2610fdea91252e6742efe79e48dbf78d352df141=2026.05.001' # On branch dev/gfdl+access+isf + - '@git.d8f109ede36ad6d0dc86c9948d2f93878a67b321=2026.05.001' # On branch dev/gfdl+access+isf - +mom6_solo - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"' - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll -O3 -flto"'