From 37f0e511a4404e20daf450b53252fc89084197b5 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 20 Nov 2025 17:20:21 -0600 Subject: [PATCH 1/3] Update .gitmodules and submodule pointer for spack for code review and testing --- .gitmodules | 6 ++++-- spack | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a69f3e4f1..a549e36c6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = spack-stack-dev + #url = https://github.com/jcsda/spack + #branch = spack-stack-dev + url = https://github.com/climbfuji/spack + branch = feature/esmf891 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index cce215c90..00ce89bac 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit cce215c90bc4502dc390df0f905517e75cd56732 +Subproject commit 00ce89bacfde8de880b2cc57f7aaba896f4bd9b0 From f36cd2381973d17d814dbf43314bf667f8cdb421 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 20 Nov 2025 17:20:34 -0600 Subject: [PATCH 2/3] Replace esmf@8.9.0 with esmf@8.9.1 --- configs/common/modules_lmod.yaml | 2 ++ configs/common/modules_tcl.yaml | 2 ++ configs/common/packages.yaml | 2 +- configs/templates/neptune-dev/spack.yaml | 6 +++--- configs/templates/skylab-dev/spack.yaml | 8 ++++---- configs/templates/unified-dev/spack.yaml | 8 ++++---- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml index a383e2061..34e1a0288 100644 --- a/configs/common/modules_lmod.yaml +++ b/configs/common/modules_lmod.yaml @@ -136,6 +136,8 @@ modules: ^esmf@8.8.0+debug snapshot=none: 'esmf-8.8.0-debug' ^esmf@8.9.0~debug snapshot=none: 'esmf-8.9.0' ^esmf@8.9.0+debug snapshot=none: 'esmf-8.9.0-debug' + ^esmf@8.9.1~debug snapshot=none: 'esmf-8.9.1' + ^esmf@8.9.1+debug snapshot=none: 'esmf-8.9.1-debug' openmpi: environment: set: diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml index 6acb2c585..31db62255 100644 --- a/configs/common/modules_tcl.yaml +++ b/configs/common/modules_tcl.yaml @@ -134,6 +134,8 @@ modules: ^esmf@8.8.0+debug snapshot=none: 'esmf-8.8.0-debug' ^esmf@8.9.0~debug snapshot=none: 'esmf-8.9.0' ^esmf@8.9.0+debug snapshot=none: 'esmf-8.9.0-debug' + ^esmf@8.9.1~debug snapshot=none: 'esmf-8.9.1' + ^esmf@8.9.1+debug snapshot=none: 'esmf-8.9.1-debug' openmpi: environment: set: diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 0296adb32..1217d44a5 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -70,7 +70,7 @@ packages: esmf: require: - '~xerces ~pnetcdf +shared +external-parallelio' - - any_of: ['@=8.6.1 snapshot=none', '@=8.8.0 snapshot=none', '@=8.9.0 snapshot=none'] + - any_of: ['@=8.6.1 snapshot=none', '@=8.8.0 snapshot=none', '@=8.9.1 snapshot=none'] - any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"'] when: "%intel" message: "Extra ESMF compile options for Intel" diff --git a/configs/templates/neptune-dev/spack.yaml b/configs/templates/neptune-dev/spack.yaml index 6bcadbf54..0edc913ee 100644 --- a/configs/templates/neptune-dev/spack.yaml +++ b/configs/templates/neptune-dev/spack.yaml @@ -8,9 +8,9 @@ spack: definitions: - compilers: ['%aocc', '%apple-clang', '%gcc', '%intel', '%oneapi'] - packages: - - neptune-env ~debug +espc ^esmf@=8.9.0 snapshot=none - - neptune-env +debug +espc ^esmf@=8.9.0 snapshot=none - - neptune-python-env ^neptune-env ~debug +espc ^esmf@=8.9.0 snapshot=none + - neptune-env ~debug +espc ^esmf@=8.9.1 snapshot=none + - neptune-env +debug +espc ^esmf@=8.9.1 snapshot=none + - neptune-python-env ^neptune-env ~debug +espc ^esmf@=8.9.1 snapshot=none specs: - matrix: diff --git a/configs/templates/skylab-dev/spack.yaml b/configs/templates/skylab-dev/spack.yaml index 560c2900a..c1794c128 100644 --- a/configs/templates/skylab-dev/spack.yaml +++ b/configs/templates/skylab-dev/spack.yaml @@ -14,12 +14,12 @@ spack: - jedi-fv3-env - jedi-geos-env ^esmf@=8.6.1 - jedi-mpas-env - - jedi-neptune-env ^esmf@=8.9.0 + - jedi-neptune-env ^esmf@=8.9.1 - jedi-tools-env - jedi-ufs-env ^esmf@=8.8.0 - jedi-um-env - - neptune-env ^esmf@=8.9.0 - - neptune-python-env ^esmf@=8.9.0 + - neptune-env ^esmf@=8.9.1 + - neptune-python-env ^esmf@=8.9.1 - soca-env # Various crtm tags (list all to avoid duplicate packages) @@ -34,7 +34,7 @@ spack: # Various esmf tags (list all to avoid duplicate packages) - esmf@=8.6.1 - esmf@=8.8.0 - - esmf@=8.9.0 + - esmf@=8.9.1 specs: - matrix: diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index b91581ae1..83d0dd9b7 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -17,12 +17,12 @@ spack: - jedi-fv3-env - jedi-geos-env ^esmf@=8.6.1 - jedi-mpas-env - - jedi-neptune-env ^esmf@=8.9.0 + - jedi-neptune-env ^esmf@=8.9.1 - jedi-tools-env - jedi-ufs-env ^esmf@=8.8.0 - jedi-um-env - - neptune-env ^esmf@=8.9.0 - - neptune-python-env ^esmf@=8.9.0 + - neptune-env ^esmf@=8.9.1 + - neptune-python-env ^esmf@=8.9.1 - soca-env - ufs-srw-app-env ^esmf@=8.8.0 ^crtm@=3.1.2 - ufs-weather-model-env ^esmf@=8.8.0 ^crtm@=3.1.2 @@ -39,7 +39,7 @@ spack: # Various esmf tags (list all to avoid duplicate packages) - esmf@=8.6.1 - esmf@=8.8.0 - - esmf@=8.9.0 + - esmf@=8.9.1 # MADIS for WCOSS2 decoders. - madis@4.5 From d72039859d2d9de81c5946e547fa66ee30a8bb61 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 20 Nov 2025 22:06:11 -0600 Subject: [PATCH 3/3] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 6 ++---- spack | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index a549e36c6..a69f3e4f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "spack"] path = spack - #url = https://github.com/jcsda/spack - #branch = spack-stack-dev - url = https://github.com/climbfuji/spack - branch = feature/esmf891 + url = https://github.com/jcsda/spack + branch = spack-stack-dev [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index 00ce89bac..206ea024b 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 00ce89bacfde8de880b2cc57f7aaba896f4bd9b0 +Subproject commit 206ea024bc6d4e80f33ec28f1d6b0f60f4561321