From 933a7aaa2b5070994d5ee6395c56667be706fddf Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 29 Oct 2026 15:00:19 -0600 Subject: [PATCH 1/2] Add mapl@2.69.1 ^esmf@8.9.1 to unified environment (configs/templates/unified-dev/spack.yaml) --- configs/common/packages.yaml | 1 + configs/templates/unified-dev/spack.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 49042148f9..91d18f7817 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -151,6 +151,7 @@ packages: - +shared - +external-parallelio - any_of: + - '@=8.9.1' - '@=9.0.0b17' - '@=9.0.0b18' - any_of: diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index dc25760ad7..eb5bc6868a 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -28,9 +28,11 @@ spack: - ufs-weather-model-env ^esmf@=9.0.0b17 ^crtm@=3.1.5 # Mapl with specific esmf tags (list all to avoid duplicate packages) + - mapl@2.69.1 ^esmf@=8.9.1 - mapl@2.69.1 ^esmf@=9.0.0b17 # Various esmf tags (list all to avoid duplicate packages) + - esmf@=8.9.1 - esmf@=9.0.0b17 - esmf@=9.0.0b18 From 2cb14b6350d1feff8edf2062c5dbdc7330eee821 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 30 Oct 2026 06:05:51 -0600 Subject: [PATCH 2/2] Update configs/common/modules_*.yaml: esmf@8.9.1 --- configs/common/modules_lmod.yaml | 4 ++++ configs/common/modules_tcl.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml index d93368772a..47a0c59efe 100644 --- a/configs/common/modules_lmod.yaml +++ b/configs/common/modules_lmod.yaml @@ -143,6 +143,10 @@ modules: 'MADIS_ROOT': '{prefix}' mapl: suffixes: + ^esmf@=8.9.1~debug ~openmp: 'esmf-8.9.1-noopenmp' + ^esmf@=8.9.1+debug ~openmp: 'esmf-8.9.1-debug-noopenmp' + ^esmf@=8.9.1~debug +openmp: 'esmf-8.9.1' + ^esmf@=8.9.1+debug +openmp: 'esmf-8.9.1-debug' ^esmf@=9.0.0~debug ~openmp: 'esmf-9.0.0-noopenmp' ^esmf@=9.0.0+debug ~openmp: 'esmf-9.0.0-debug-noopenmp' ^esmf@=9.0.0~debug +openmp: 'esmf-9.0.0' diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml index 0249e04ac1..bd237abdae 100644 --- a/configs/common/modules_tcl.yaml +++ b/configs/common/modules_tcl.yaml @@ -162,6 +162,10 @@ modules: 'MADIS_ROOT': '{prefix}' mapl: suffixes: + ^esmf@=8.9.1~debug ~openmp: 'esmf-8.9.1-noopenmp' + ^esmf@=8.9.1+debug ~openmp: 'esmf-8.9.1-debug-noopenmp' + ^esmf@=8.9.1~debug +openmp: 'esmf-8.9.1' + ^esmf@=8.9.1+debug +openmp: 'esmf-8.9.1-debug' ^esmf@=9.0.0~debug ~openmp: 'esmf-9.0.0-noopenmp' ^esmf@=9.0.0+debug ~openmp: 'esmf-9.0.0-debug-noopenmp' ^esmf@=9.0.0~debug +openmp: 'esmf-9.0.0'