From b543777fa2919ac1be09ab8955f010bfa56de979 Mon Sep 17 00:00:00 2001 From: Gerhard Theurich Date: Mon, 14 Sep 2026 12:08:35 -0700 Subject: [PATCH 1/5] Update repos/builtin submodule to version that supports esmf@9.0.0b18. --- .gitmodules | 6 ++++-- repos/builtin | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2f6cb0566..91dac998a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,5 +4,7 @@ branch = spack-stack-dev [submodule "repos/builtin"] path = repos/builtin - url = https://github.com/jcsda/spack-packages - branch = spack-stack-dev +# url = https://github.com/jcsda/spack-packages +# branch = spack-stack-dev + url = https://github.com/theurich/spack-packages + branch = feature/esmf900b18 diff --git a/repos/builtin b/repos/builtin index 43d43159c..75cbab3c3 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 43d43159cdd25ac245ed22a53b87204dc25057ef +Subproject commit 75cbab3c34d4ab3cf8cfe13cb7fa63887c6c9059 From f203ac9dfd88a2f569626c5ad3855124a822328c Mon Sep 17 00:00:00 2001 From: Gerhard Theurich Date: Mon, 14 Sep 2026 12:14:04 -0700 Subject: [PATCH 2/5] Bump environments to use esmf@9.0.0b18. --- configs/common/packages.yaml | 2 +- configs/templates/geos-dev-nag/spack.yaml | 2 +- configs/templates/geos-dev/spack.yaml | 2 +- configs/templates/neptune-dev-llvm/spack.yaml | 8 ++++---- configs/templates/neptune-dev-nvhpc/spack.yaml | 8 ++++---- configs/templates/neptune-dev/spack.yaml | 12 ++++++------ configs/templates/neptune-ops/spack.yaml | 2 +- configs/templates/skylab-dev/spack.yaml | 8 ++++---- configs/templates/unified-dev/spack.yaml | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 68d8add85..4b20b5ee9 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -144,7 +144,7 @@ packages: - '@=8.6.1 snapshot=none' - '@=8.8.0 snapshot=none' - '@=8.9.1 snapshot=none' - - '@=9.0.0b11 snapshot=b11' + - '@=9.0.0b18 snapshot=b18' - any_of: - 'fflags="-fp-model precise" cxxflags="-fp-model precise"' when: '%intel' diff --git a/configs/templates/geos-dev-nag/spack.yaml b/configs/templates/geos-dev-nag/spack.yaml index 5137c6ac5..3729d7c6c 100644 --- a/configs/templates/geos-dev-nag/spack.yaml +++ b/configs/templates/geos-dev-nag/spack.yaml @@ -22,4 +22,4 @@ spack: esmf: require: - +python - - '@=9.0.0b11' + - '@=9.0.0b18' diff --git a/configs/templates/geos-dev/spack.yaml b/configs/templates/geos-dev/spack.yaml index c313a64cc..d0d6fbfb4 100644 --- a/configs/templates/geos-dev/spack.yaml +++ b/configs/templates/geos-dev/spack.yaml @@ -24,4 +24,4 @@ spack: esmf: require: - +python - - '@=9.0.0b11' + - '@=9.0.0b18' diff --git a/configs/templates/neptune-dev-llvm/spack.yaml b/configs/templates/neptune-dev-llvm/spack.yaml index b15d7d189..9ca088afe 100644 --- a/configs/templates/neptune-dev-llvm/spack.yaml +++ b/configs/templates/neptune-dev-llvm/spack.yaml @@ -9,10 +9,10 @@ spack: specs: #- dev-utils-env - - neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b11 - - neptune-env +debug +openmp +espc +ncview ^esmf@=9.0.0b11 - - neptune-env ~debug ~openmp +espc +ncview ^esmf@=9.0.0b11 - - neptune-env +debug ~openmp +espc +ncview ^esmf@=9.0.0b11 + - neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b18 + - neptune-env +debug +openmp +espc +ncview ^esmf@=9.0.0b18 + - neptune-env ~debug ~openmp +espc +ncview ^esmf@=9.0.0b18 + - neptune-env +debug ~openmp +espc +ncview ^esmf@=9.0.0b18 - py-numpy - crtm@3.1.3 diff --git a/configs/templates/neptune-dev-nvhpc/spack.yaml b/configs/templates/neptune-dev-nvhpc/spack.yaml index 0b97f8c40..988239c61 100644 --- a/configs/templates/neptune-dev-nvhpc/spack.yaml +++ b/configs/templates/neptune-dev-nvhpc/spack.yaml @@ -9,10 +9,10 @@ spack: specs: #- dev-utils-env - - neptune-env ~debug +openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b11 - - neptune-env +debug +openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b11 - - neptune-env ~debug ~openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b11 - - neptune-env +debug ~openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b11 + - neptune-env ~debug +openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b18 + - neptune-env +debug +openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b18 + - neptune-env ~debug ~openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b18 + - neptune-env +debug ~openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b18 #- py-numpy #- crtm@3.1.3 diff --git a/configs/templates/neptune-dev/spack.yaml b/configs/templates/neptune-dev/spack.yaml index 8d4271638..25439a951 100644 --- a/configs/templates/neptune-dev/spack.yaml +++ b/configs/templates/neptune-dev/spack.yaml @@ -22,12 +22,12 @@ spack: specs: - dev-utils-env - - neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b11 - - neptune-env +debug +openmp +espc +ncview ^esmf@=9.0.0b11 - - neptune-env ~debug ~openmp +espc +ncview ^esmf@=9.0.0b11 - - neptune-env +debug ~openmp +espc +ncview ^esmf@=9.0.0b11 - - neptune-python-env +gittools +lis-ncoda-utils ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b11 - - jedi-neptune-env +adp +sdp +jedi ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b11 + - neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b18 + - neptune-env +debug +openmp +espc +ncview ^esmf@=9.0.0b18 + - neptune-env ~debug ~openmp +espc +ncview ^esmf@=9.0.0b18 + - neptune-env +debug ~openmp +espc +ncview ^esmf@=9.0.0b18 + - neptune-python-env +gittools +lis-ncoda-utils ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b18 + - jedi-neptune-env +adp +sdp +jedi ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b18 - crtm@3.1.3 packages: diff --git a/configs/templates/neptune-ops/spack.yaml b/configs/templates/neptune-ops/spack.yaml index 173940930..16c47ed44 100644 --- a/configs/templates/neptune-ops/spack.yaml +++ b/configs/templates/neptune-ops/spack.yaml @@ -8,7 +8,7 @@ spack: include: [] specs: - - neptune-env ~debug +openmp +espc ~ncview ^esmf@=9.0.0b11 + - neptune-env ~debug +openmp +espc ~ncview ^esmf@=9.0.0b18 packages: # Turn off python variant for esmf diff --git a/configs/templates/skylab-dev/spack.yaml b/configs/templates/skylab-dev/spack.yaml index 41f703336..36f1bc989 100644 --- a/configs/templates/skylab-dev/spack.yaml +++ b/configs/templates/skylab-dev/spack.yaml @@ -14,11 +14,11 @@ spack: - jedi-fv3-env - jedi-geos-env ^esmf@=8.9.1 - jedi-mpas-env - - jedi-neptune-env ^esmf@=9.0.0b11 + - jedi-neptune-env ^esmf@=9.0.0b18 - jedi-tools-env - jedi-ufs-env ^esmf@=8.8.0 - - neptune-env ^esmf@=9.0.0b11 - - neptune-python-env ^esmf@=9.0.0b11 + - neptune-env ^esmf@=9.0.0b18 + - neptune-python-env ^esmf@=9.0.0b18 - soca-env # Various crtm tags (list all to avoid duplicate packages) @@ -32,7 +32,7 @@ spack: # Various esmf tags (list all to avoid duplicate packages) - esmf@=8.8.0 - esmf@=8.9.1 - - esmf@=9.0.0b11 + - esmf@=9.0.0b18 packages: # Turn on python variant for esmf diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index ad6d87421..b59aa498b 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -10,19 +10,19 @@ spack: specs: - dev-utils-env - ewok-env - - geos-gcm-env ^esmf@=9.0.0b11 + - geos-gcm-env ^esmf@=9.0.0b18 - global-workflow-env ^esmf@=8.8.0 ^crtm@=3.1.3 # Is GMAO ready to move to crtm@3.1.3? - gmao-swell-env ^crtm@=v2.4.1-jedi.2 - gsi-env ^crtm@=3.1.3 - jedi-fv3-env - - jedi-geos-env ^esmf@=9.0.0b11 + - jedi-geos-env ^esmf@=9.0.0b18 - jedi-mpas-env - - jedi-neptune-env ^esmf@=9.0.0b11 + - jedi-neptune-env ^esmf@=9.0.0b18 - jedi-ufs-env ^esmf@=8.8.0 - - neptune-env ^esmf@=9.0.0b11 - - neptune-python-env ^esmf@=9.0.0b11 + - neptune-env ^esmf@=9.0.0b18 + - neptune-python-env ^esmf@=9.0.0b18 - soca-env - ufs-srw-app-env ^esmf@=8.8.0 ^crtm@=3.1.3 - ufs-weather-model-env ^esmf@=8.8.0 ^crtm@=3.1.3 @@ -36,7 +36,7 @@ spack: # Various esmf tags (list all to avoid duplicate packages) - esmf@=8.8.0 - - esmf@=9.0.0b11 + - esmf@=9.0.0b18 # Various fms builds - fms +gfs_phys constants=GFS From e974344b7740870490ec562d64f40672dec7bd70 Mon Sep 17 00:00:00 2001 From: Gerhard Theurich Date: Mon, 14 Sep 2026 14:24:07 -0700 Subject: [PATCH 3/5] Update the repos/builtin submodule to include additional ESMF_COMPILER options under the esmf package. --- repos/builtin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/builtin b/repos/builtin index 75cbab3c3..13acf877e 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 75cbab3c34d4ab3cf8cfe13cb7fa63887c6c9059 +Subproject commit 13acf877ec109c5735febeacd0f32126660d69ff From 6d5e71b8efcdfaa6a5e2e288f1d08c3e95312171 Mon Sep 17 00:00:00 2001 From: Gerhard Theurich Date: Mon, 14 Sep 2026 14:44:34 -0700 Subject: [PATCH 4/5] Update repos/builtin submodule one more time. --- repos/builtin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/builtin b/repos/builtin index 13acf877e..1c04b419b 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 13acf877ec109c5735febeacd0f32126660d69ff +Subproject commit 1c04b419b9ec57ea0d1ead9e29202fcc58c09cd2 From 70b8d4aeb14db26e0807c0e381467c62f17b4052 Mon Sep 17 00:00:00 2001 From: Gerhard Theurich Date: Tue, 15 Sep 2026 12:04:09 -0700 Subject: [PATCH 5/5] Point back to spack-stack-dev branch. --- .gitmodules | 6 ++---- repos/builtin | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 91dac998a..2f6cb0566 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,5 @@ branch = spack-stack-dev [submodule "repos/builtin"] path = repos/builtin -# url = https://github.com/jcsda/spack-packages -# branch = spack-stack-dev - url = https://github.com/theurich/spack-packages - branch = feature/esmf900b18 + url = https://github.com/jcsda/spack-packages + branch = spack-stack-dev diff --git a/repos/builtin b/repos/builtin index 1c04b419b..65596eb2d 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 1c04b419b9ec57ea0d1ead9e29202fcc58c09cd2 +Subproject commit 65596eb2dae21766195ea99ec59a3439fe4d6925