Configuration updates for discover-scu17

README.md

@@ -1,9 +1,8 @@
 <img src="https://user-images.githubusercontent.com/8006981/234488735-45b2c5fa-1de6-47ad-ae3b-4a6829ae49b9.png" width="425">
 
 Spack-stack is a framework for installing software libraries to support
-NOAA's Unified Forecast System (UFS) applications and the
-Joint Effort for Data assimilation Integration (JEDI) coupled to
-several Earth system prediction models (MPAS, NEPTUNE, UM, FV3, GEOS, UFS).
+a wide range of numerical weather prediction and data assimilation systems
+developed by the spack-stack project partners: UFS, MPAS, NEPTUNE, FV3, GEOS, JEDI, ...
 
 Spack-stack supports installations on a range of R&D and operational platforms.
 It provides a set of installation templates (package lists), default package settings,
@@ -29,6 +28,7 @@ Spack-stack is a collaborative effort between:
 * [UCAR Joint Center for Satellite Data Assimilation (JCSDA)](https://www.jcsda.org)
 * [Earth Prediction Innovation Center (EPIC)](https://epic.noaa.gov)
 * [U.S. Naval Research Laboratory (NRL)](https://https://www.nrl.navy.mil)
+* [NASA Global Modeling and Assimilation Office (GMAO)](https://gmao.gsfc.nasa.gov)
 
 For more information about the organization of the spack-stack
 project, see the [Project Charter](project_charter.md).

configs/sites/tier1/discover-scu17/packages_oneapi.yaml

@@ -1,21 +1,59 @@
 packages:
   all:
-    compiler:: [oneapi@2024.2.0,gcc@11.4.0]
     providers:
       mpi:: [intel-oneapi-mpi@2021.13]
   mpi:
     buildable: False
+  intel-oneapi-compilers:
+    buildable: False
+    externals:
+    - spec: intel-oneapi-compilers@2024.2.0
+      prefix: /usr/local/intel/oneapi/2024
+      modules:
+      - comp/intel/2024.2.0
+      extra_attributes:
+        compilers:
+          c: /usr/local/intel/oneapi/2024/compiler/2024.2/bin/icx
+          cxx: /usr/local/intel/oneapi/2024/compiler/2024.2/bin/icpx
+          fortran: /usr/local/intel/oneapi/2024/compiler/2024.2/bin/ifort
+          f77: /usr/local/intel/oneapi/2024/compiler/2024.2/bin/ifort
+        environment:
+          set:
+            # Force ifort not ifx
+            INTEL_COMPILER_TYPE: 'RECOMMENDED'
+          prepend_path:
+            PATH: /usr/local/other/gcc/12.3.0/bin
+            CPATH: /usr/local/other/gcc/12.3.0/include
+            LD_LIBRARY_PATH: '/usr/local/intel/oneapi/2024/compiler/2024.2/lib/:/usr/local/other/gcc/12.3.0/lib64'
+        extra_rpaths:
+        - /usr/local/other/gcc/12.3.0/lib64
   intel-oneapi-mpi:
     externals:
     - spec: intel-oneapi-mpi@2021.13%oneapi@2024.2.0
       prefix: /usr/local/intel/oneapi/2024
       modules:
       - mpi/impi/2021.13
   intel-oneapi-mkl:
+    buildable: false
     externals:
-    - spec: intel-oneapi-mkl@2024.2.0
+    - spec: intel-oneapi-mkl@2024.2.0%oneapi@2024.2.0
       prefix: /usr/local/intel/oneapi/2024
   intel-oneapi-runtime:
+    buildable: false
     externals:
     - spec: intel-oneapi-runtime@2024.2.0%oneapi@2024.2.0
       prefix: /usr/local/intel/oneapi/2024
+  gcc:
+    externals:
+    - spec: gcc@12.3.0 languages:='c,c++,fortran'
+      prefix: /usr/local/other/gcc/12.3.0
+      modules:
+      - comp/gcc/12.3.0
+      extra_attributes:
+        compilers:
+          c: /usr/local/other/gcc/12.3.0/bin/gcc
+          cxx: /usr/local/other/gcc/12.3.0/bin/g++
+          fortran: /usr/local/other/gcc/12.3.0/bin/gfortran
+        flags: {}
+        environment: {}
+        extra_rpaths: []