Update to crtm 3.1.5, GEOS templates, geos-gcm-env

configs/templates/geos-dev-flang/spack.yaml

@@ -0,0 +1,43 @@
+# Template for GEOS development with the LLVM Flang compiler.
+#
+# GEOS 11.10.0 requires FMS 2024.03, which is not supported by Flang.
+spack:
+  concretizer:
+    unify: when_possible
+
+  view: false
+  include: []
+
+  specs:
+  # Two builds: release (esmf ~debug) and debug (esmf +debug).
+  # The macOS site configuration requires +debug, so these resolve to one build.
+  - geos-gcm-env@12.1.0 ~debug +cdo +fms
+  - geos-gcm-env@12.1.0 +debug +cdo +fms
+
+  - fms@=2026.01.01 ~gfs_phys constants=GEOS
+
+  packages:
+    # Turn on python variant for esmf
+    esmf:
+      require:
+      - +python
+      - '@=9.0.0b18'
+
+    # PnetCDF is unneeded for GEOS and does not build with Flang on macOS.
+    parallelio:
+      require::
+      - '@2.6.2'
+      - ~pnetcdf
+
+    # Homebrew LLVM Flang on Apple Silicon does not support REAL(16).
+    fms:
+      require::
+      - ~quad_precision
+
+    # Use the same CDO variants (fftw3 and GRIB2 via eccodes) as geos-dev,
+    # so the stacks are consistent and do not change when other
+    # environments (e.g. ai-env) are present.
+    cdo:
+      require:
+      - +fftw3
+      - grib2=eccodes

configs/templates/geos-dev-nag/spack.yaml

@@ -13,8 +13,10 @@ spack:
   # (see geos_gcm_env/package.py). On platforms where only +debug is supported
   # (e.g., macOS), the site packages.yaml requires geos-gcm-env +debug, which
   # causes both specs to resolve to +debug (only one unique build).
-  - geos-gcm-env ~debug
-  - geos-gcm-env +debug
+  #
+  # Also, NAG cannot build FMS yet (due to use of cray pointers)
+  - geos-gcm-env ~debug ~fms ~cdo
+  - geos-gcm-env +debug ~fms ~cdo
 
 
   packages:

configs/templates/geos-dev/spack.yaml

@@ -13,15 +13,26 @@ spack:
   # (see geos_gcm_env/package.py). On platforms where only +debug is supported
   # (e.g., macOS), the site packages.yaml requires geos-gcm-env +debug, which
   # causes both specs to resolve to +debug (only one unique build).
-  - geos-gcm-env ~debug
-  - geos-gcm-env +debug
+  - geos-gcm-env@11.10.0 ~debug +cdo +fms
+  - geos-gcm-env@11.10.0 +debug +cdo +fms
+  - geos-gcm-env@12.1.0 ~debug +cdo +fms
+  - geos-gcm-env@12.1.0 +debug +cdo +fms
 
   # Various fms builds
   - fms@=2024.03 ~gfs_phys constants=GEOS
+  - fms@=2026.01.01 ~gfs_phys constants=GEOS
 
   packages:
     # Turn on python variant for esmf
     esmf:
       require:
       - +python
       - '@=9.0.0b18'
+    # Use one CDO build (with fftw3 and GRIB2 via eccodes) for all
+    # GEOS-GCM-ENV versions. Without this, the solver may pick different
+    # variants per geos-gcm-env version when other environments (e.g. ai-env)
+    # are present.
+    cdo:
+      require:
+      - +fftw3
+      - grib2=eccodes

configs/templates/nco/spack.yaml

@@ -19,7 +19,7 @@ spack:
   - cdo
   - cfitsio
   - cmake
-  - crtm@=3.1.2
+  - crtm@=3.1.5
   - curl
   - ecflow
   - eckit
@@ -81,7 +81,7 @@ spack:
   - sp
   - subversion
   - udunits
-  - upp ^crtm@=2.4.0.1
+  - upp
   - w3emc
   - w3nco
   - wgrib2