Merge branch 'release/1.9.0' of https://github.com/JCSDA/spack-stack …

…into feature/ami_tier2_update_1.9

configs/sites/tier1/hera/compilers.yaml

@@ -17,15 +17,32 @@ compilers:
         CPATH: '/apps/gnu/gcc-9.2.0/include'
     extra_rpaths: []
 - compiler:
-    spec: gcc@9.2.0
+    spec: gcc@13.2.0
     paths:
-      cc: /apps/gnu/gcc-9.2.0/bin/gcc
-      cxx: /apps/gnu/gcc-9.2.0/bin/g++
-      f77: /apps/gnu/gcc-9.2.0/bin/gfortran
-      fc:  /apps/gnu/gcc-9.2.0/bin/gfortran
+      cc: /apps/gnu/gcc-13.2.0/bin/gcc
+      cxx: /apps/gnu/gcc-13.2.0/bin/g++
+      f77: /apps/gnu/gcc-13.2.0/bin/gfortran
+      fc:  /apps/gnu/gcc-13.2.0/bin/gfortran
     flags: {}
     operating_system: rocky8
     modules:
-    - gnu/9.2.0
+    - gnu/13.2.0
     environment: {}
     extra_rpaths: []
+- compiler:
+    spec: [email protected]
+    paths:
+      cc: /apps/oneapi/compiler/2024.2/bin/icx
+      cxx: /apps/oneapi/compiler/2024.2/bin/icpx
+      f77: /apps/oneapi/compiler/2024.2/bin/ifort
+      fc: /apps/oneapi/compiler/2024.2/bin/ifort
+    flags: {}
+    operating_system: rocky8
+    modules:
+    - intel/2024.2.1
+    environment:
+      prepend_path:
+        PATH: '/apps/gnu/gcc-13.2.0/bin'
+        LD_LIBRARY_PATH: '/apps/gnu/gcc-13.2.0/lib64'
+        CPATH: '/apps/gnu/gcc-13.2.0/include'
+    extra_rpaths: []

configs/sites/tier1/hera/mirrors.yaml

@@ -1,15 +1,15 @@
 mirrors:
   local-source:
     fetch:
-      url: file:///scratch1/NCEPDEV/nems/role.epic/spack-stack/source-cache
+      url: file:///scratch4/NCEPDEV/stmp/role.epic/spack-stack/mirror
       access_pair:
       - null
       - null
       access_token: null
       profile: null
       endpoint_url: null
     push:
-      url: file:///scratch1/NCEPDEV/nems/role.epic/spack-stack/source-cache
+      url: file:///scratch4/NCEPDEV/stmp/role.epic/spack-stack/mirror
       access_pair:
       - null
       - null

configs/sites/tier1/hera/packages_gcc.yaml

@@ -1,6 +1,6 @@
 packages:
   all:
-    compiler:: [gcc@9.2.0]
+    compiler:: [gcc@13.2.0]
     providers:
       mpi:: [[email protected]]
   mpi:
@@ -9,5 +9,5 @@ packages:
     externals:
     - spec: [email protected]~atomics~cuda~cxx~cxx_exceptions~gpfs~internal-hwloc~internal-libevent~internal-pmix~java+legacylaunchers~lustre~memchecker~openshmem~orterunprefix+pmi+romio+rsh~singularity+static+vt+wrapper-rpath fabrics=ucx schedulers=slurm
       modules:
-      - gnu/9.2.0
-      - openmpi/4.1.6_gnu9.2.0
+      - gnu/13.2.0
+      - openmpi/4.1.6

configs/sites/tier1/hera/packages_oneapi.yaml

@@ -0,0 +1,43 @@
+packages:
+  all:
+    compiler:: [[email protected]]
+    providers:
+      mpi:: [[email protected]]
+      # Remove the next three lines to switch to intel-oneapi-mkl
+      blas:: [openblas]
+      fftw-api:: [fftw]
+      lapack:: [openblas]
+  mpi:
+    buildable: False
+  intel-oneapi-mpi:
+    buildable: False
+    externals:
+    - spec: [email protected]%[email protected]
+      modules:
+      - intel/2024.2.1
+      - impi/2024.2.1
+      prefix: /apps/oneapi
+  intel-oneapi-mkl:
+    # Remove buildable: False and uncomment externals section below to use intel-oneapi-mkl
+    buildable: False
+    #externals:
+    #- spec: [email protected]%[email protected]
+    #  prefix: /apps/oneapi
+  # DH* Remove this section to switch to intel-oneapi-mkl
+  ectrans:
+    require::
+    - '@1.2.0 ~mkl +fftw'
+  gsibec:
+    require::
+    - '@1.2.1 ~mkl'
+  py-numpy:
+    require::
+    - '@1.26'
+    - '^openblas'
+  # *DH
+  zlib-ng:
+    require:
+      - '~shared'
+  cdo:
+    require:
+      - '@2.3.0'

configs/sites/tier1/orion/packages.yaml

@@ -103,10 +103,6 @@ packages:
     externals:
     - spec: [email protected]
       prefix: /usr
-  qt:
-    externals:
-    - spec: [email protected]
-      prefix:  /apps/spack-managed/gcc-11.3.1/qt-5.15.8-d47tsna6f5dylcpblkfgw4gpn2cucihd
   sed:
     externals:
     - spec: [email protected]