Merge branch 'develop' of https://github.com/jcsda/spack-stack into feature/scalasca_scorep

Author: climbfuji

.github/workflows/ubuntu-ci-x86_64-gnu.yaml

@@ -102,7 +102,7 @@ jobs:
             spack config add config:install_tree:padded_length:200
 
             # Set compiler and MPI specs
-            spack config add "packages:mpi:require:['openmpi@5.0.8']"
+            spack config add "packages:mpi:require:['openmpi@5.0.10']"
 
             # Add additional variants for MET packages, different from config/common/packages.yaml
             spack config add "packages:met:variants:+python +grib2 +graphics +lidar2nc +modis"
@@ -225,7 +225,7 @@ jobs:
 
           module use ${ENVDIR}/modules/Core
           module load stack-gcc/11.4.0
-          module load stack-openmpi/5.0.8
+          module load stack-openmpi/5.0.10
           module available
 
           module load jedi-ufs-env

.gitignore

@@ -5,3 +5,5 @@ cache
 .vscode
 doc/build
 deploy_logs/
+logs/
+log.*

configs/common/modules_lmod.yaml

@@ -277,6 +277,11 @@ modules:
         environment:
           set:
             'UDUNITS2_XML_PATH': '{prefix}/share/udunits/udunits2.xml'
+      python:
+        environment:
+          set:
+            'Python_ROOT_DIR': '{prefix}'
+            'Python3_ROOT_DIR': '{prefix}'
 
       hierarchy:
       - mpi

configs/common/modules_tcl.yaml

@@ -296,3 +296,8 @@ modules:
         environment:
           set:
             'UDUNITS2_XML_PATH': '{prefix}/share/udunits/udunits2.xml'
+      python:
+        environment:
+          set:
+            'Python_ROOT_DIR': '{prefix}'
+            'Python3_ROOT_DIR': '{prefix}'

configs/common/packages.yaml

@@ -164,12 +164,14 @@ packages:
       - '@2.6.4'
     fms:
       require:
-      - '@2025.03'
       - precision=32,64
       - +quad_precision
       - +openmp
       - +pic
       - build_type=Release
+      - any_of:
+        - '@=2025.03'
+        - '@=2024.03'
       - any_of:
         - +gfs_phys constants=GFS
         - ~gfs_phys constants=GEOS

configs/common/packages_nag.yaml

@@ -0,0 +1,31 @@
+packages:
+  # Compiler preferences
+  c:
+    prefer::
+    - apple-clang
+  cxx:
+    prefer::
+    - apple-clang
+  fortran:
+    prefer::
+    - nag
+  all:
+    providers:
+      fortran: [nag, gcc, llvm, intel-oneapi-compilers]
+  # Virtual provider settings
+  blas:
+    require:
+    - openblas
+  fftw-api:
+    require:
+    - fftw
+  lapack:
+    require:
+    - openblas
+  # Individual package settings
+  ectrans:
+    require:
+    - +fftw
+  oops:
+    require:
+    - '~mkl'

configs/sites/tier1/blueback/packages_oneapi-2026.0.0.yaml

@@ -13,7 +13,7 @@ packages:
     buildable: false
     externals:
     - spec: intel-oneapi-compilers@2026.0.0 +fix_rt_linkage
-      prefix: /p/app/intel/oneapi-combined
+      prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2026.0.0
       modules:
       - PrgEnv-intel/8.6.0
       - intel-oneapi/2026.0.0

configs/sites/tier2/dutchman/config.yaml

@@ -0,0 +1,2 @@
+config:
+  build_jobs: 4

configs/sites/tier2/dutchman/mirrors.yaml

@@ -0,0 +1,3 @@
+mirrors:
+  local-source: file:///home/dom/prod/spack-source-cache
+  local-binary: file:///home/dom/prod/spack-build-cache

configs/sites/tier2/dutchman/modules.yaml

@@ -0,0 +1,18 @@
+modules:
+  default:
+    enable::
+    - tcl
+    tcl:
+      include:
+      # Compiler modules
+      - apple-clang
+      - gcc
+      - intel-oneapi-compilers
+      - llvm
+      # MPI modules
+      - cray-mpich
+      - intel-mpi
+      - intel-oneapi-mpi
+      - mpich
+      - mpt
+      - openmpi