Remove additional esmf/mapl builds from skylab-dev and unified-dev te…

…mplates, only build [email protected] with [email protected] (#954)

configs/common/packages.yaml

@@ -60,7 +60,7 @@
     # config and update the projections for lmod/tcl.
     # Also, check the acorn and derecho site configs which have esmf modifications.
     esmf:
-      version: ['8.5.0']
+      version: ['8.6.0']
       variants: ~xerces ~pnetcdf snapshot=none ~shared +external-parallelio
       require:
         - any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"']

configs/templates/skylab-dev/spack.yaml

@@ -12,7 +12,7 @@ spack:
       - jedi-fv3-env
       - jedi-mpas-env
       - jedi-neptune-env
-      - jedi-ufs-env ^[email protected] ^[email protected]
+      - jedi-ufs-env
       - jedi-um-env
       - soca-env
 
@@ -24,10 +24,6 @@ spack:
       - [email protected]
       - [email protected]
 
-      # Various esmf/mapl tags (list all to avoid duplicate packages)
-      - [email protected] ^[email protected]
-      - [email protected] ^[email protected]
-
   specs:
     - matrix:
       - [$packages]

configs/templates/unified-dev/spack.yaml

@@ -16,13 +16,13 @@ spack:
       - jedi-mpas-env
       - jedi-neptune-env
       - jedi-tools-env
-      - jedi-ufs-env ^[email protected] ^[email protected]
+      - jedi-ufs-env
       - jedi-um-env
       #- nceplibs-env
       - soca-env
-      - ufs-srw-app-env ^[email protected] ^[email protected]
+      - ufs-srw-app-env
       #- ufs-utils-env
-      - ufs-weather-model-env ^[email protected] ^[email protected]
+      - ufs-weather-model-env
       #- upp-env
       #- ww3-env
 
@@ -34,10 +34,6 @@ spack:
       - [email protected]
       - [email protected]
 
-      # Various esmf/mapl tags (list all to avoid duplicate packages)
-      - [email protected] ^[email protected]
-      - [email protected] ^[email protected]
-
       # MADIS for WCOSS2 decoders.
       - [email protected]
 

doc/source/MaintainersSection.rst

@@ -366,7 +366,7 @@ ecflow
    module load comp/gcc/10.1.0
 
 openmpi
-   Installing ``openmpi`` requires adapting the installation to the network hardware and ``slurm`` scheduler. It is easier to build and test ``openmpi`` manually and use it as an external package, instead of building it as part of spack-stack. These instructions were used to build the ``[email protected]`` MPI library with ``[email protected]`` as referenced in the Discover site config. After the installation, create modulefile `openmpi/4.1.3-gcc-10.1.0` using the template ``doc/modulefile_templates/openmpi``. Note the site-specific module settings at the end of the template, this will likely be different for other HPCs.
+   Installing ``openmpi`` requires adapting the installation to the network hardware and ``slurm`` scheduler. It is easier to build and test ``openmpi`` manually and use it as an external package, instead of building it as part of spack-stack. These instructions were used to build the ``[email protected]`` MPI library with ``[email protected]`` as referenced in the Discover site config. After the installation, create modulefile `openmpi/4.1.3-gcc-10.1.0` using the template ``doc/modulefile_templates/openmpi``. Note the site-specific module settings at the end of the template, this will likely be different for other HPCs. The instructions below have also been tested with ``[email protected]`` (update instructions accordingly) and the module is available on Discover for future use.
 
 .. code-block:: console