Updates for mapl/esmf in packages.yaml and modules*.yaml (#1176)

* Updates for mapl/esmf in packages.yaml and modules*.yaml --------- Co-authored-by: Cameron Book <[email protected]>
JCSDA · Jul 2, 2024 · 4fcbb82 · 4fcbb82
1 parent 0c2ff3b
commit 4fcbb82
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml
@@ -137,6 +137,8 @@ modules:
           ^[email protected]+debug snapshot=none: 'esmf-8.5.0-debug'
           ^[email protected]~debug snapshot=none: 'esmf-8.6.0'
           ^[email protected]+debug snapshot=none: 'esmf-8.6.0-debug'
+          ^[email protected]~debug snapshot=none: 'esmf-8.6.1'
+          ^[email protected]+debug snapshot=none: 'esmf-8.6.1-debug'
       openmpi:
         environment:
           set:

diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml
@@ -139,6 +139,8 @@ modules:
           ^[email protected]+debug snapshot=none: 'esmf-8.5.0-debug'
           ^[email protected]~debug snapshot=none: 'esmf-8.6.0'
           ^[email protected]+debug snapshot=none: 'esmf-8.6.0-debug'
+          ^[email protected]~debug snapshot=none: 'esmf-8.6.1'
+          ^[email protected]+debug snapshot=none: 'esmf-8.6.1-debug'
       openmpi:
         environment:
           set:

diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
@@ -60,6 +60,8 @@
     # config and update the projections for lmod/tcl.
     # Also, check the acorn and derecho site configs which have esmf modifications.
     esmf:
+      #version: ['8.6.1']
+      #variants: ~xerces ~pnetcdf snapshot=none ~shared +external-parallelio
       version: ['8.5.0']
       variants: ~xerces ~pnetcdf snapshot=none ~shared +external-parallelio
       require:
@@ -143,6 +145,8 @@
       # also: ... extdata2g segfault UFS?
       version: ['2.40.3']
       variants: ~shared ~extdata2g ~pflogger
+      #version: ['2.46.2']
+      #variants: +pflogger
     # If making changes here, also check the Discover site config and the CI workflows
     met:
       version: ['11.1.0']

diff --git a/spack b/spack
+12 −3		var/spack/repos/builtin/packages/esmf/package.py
+116 −19		var/spack/repos/builtin/packages/mapl/package.py