Bump w3emc to 2.11.0, fix bug on Blueback to use correct Fortran compiler with [email protected] (#1717)

* Bump w3emc from 2.10.0 to 2.11.0 for ifx support, except for LLVM clang
* Update compiler configs for Blueback and Narwhal: remove deprecated Intel Classic compiler, set INTEL_COMPILER_TYPE environment variable for Cray

Author: climbfuji

configs/common/packages.yaml

@@ -305,9 +305,14 @@ packages:
   # Note - we can remove upp from stack at some point?
   upp:
     require: '@10.0.10'
-  # Need extradeps for grib-utils, enable by default to avoid duplicate packages
+  # Need extradeps for grib-utils, which ties us to w3ecm@:2.11
   w3emc:
-    require: '@2.10.0 precision=4,d,8 +extradeps'
+    require:
+    - '@:2.11.0'
+    - 'precision=4,d,8 +extradeps'
+    # https://github.com/NOAA-EMC/NCEPLIBS-w3emc/issues/246
+    - one_of: ['@2.10.0']
+      when: "%clang"
   w3nco:
     require: '@2.4.1'
   # See macOS site config for wgrib2 version/variant overrides

configs/containers/specs/jedi-ci.yaml

@@ -45,7 +45,7 @@
     py-shapely,
     py-xarray,
     [email protected],
-    w3emc@2.10.0,
+    w3emc,
     nco,
     [email protected],
     [email protected],

configs/sites/tier1/blueback/compilers.yaml

@@ -42,6 +42,8 @@ compilers::
       set:
         CONFIG_SITE: ''
         CRAY_CPU_TARGET: x86-genoa
+        # Force ifort not ifx
+        INTEL_COMPILER_TYPE: 'RECOMMENDED'
     extra_rpaths: []
 - compiler:
     spec: oneapi@=2025.0.4

configs/sites/tier1/narwhal/compilers.yaml

@@ -1,28 +1,4 @@
 compilers::
-- compiler:
-    spec: [email protected]
-    paths:
-      cc: cc
-      cxx: CC
-      f77: ftn
-      fc: ftn
-    flags: {}
-    operating_system: sles15
-    target: x86_64
-    modules:
-    - PrgEnv-intel/8.4.0
-    - intel-classic/2023.2.0
-    - cray-libsci/23.05.1.4
-    - libfabric/1.12.1.2.2.1
-    environment:
-      prepend_path:
-        PATH: '/opt/cray/pe/gcc/10.3.0/snos/bin'
-        CPATH: '/opt/cray/pe/gcc/10.3.0/snos/include'
-        LD_LIBRARY_PATH: '/opt/cray/libfabric/1.12.1.2.2.1/lib64:/opt/cray/pe/libsci/23.05.1.4/INTEL/2022.2/x86_64/lib:/opt/cray/pe/gcc/10.3.0/snos/lib:/opt/cray/pe/gcc/10.3.0/snos/lib64'
-      set:
-        CRAYPE_LINK_TYPE: 'dynamic'
-    extra_rpaths:
-    - /opt/cray/pe/libsci/23.05.1.4/INTEL/2022.2/x86_64/lib
 - compiler:
     spec: [email protected]
     paths:
@@ -47,6 +23,8 @@ compilers::
         CPATH: '/opt/intel/oneapi_2024.2.0.634/compiler/2024.2/opt/compiler/include/intel64'
       set:
         CRAYPE_LINK_TYPE: 'dynamic'
+        # Force ifort not ifx
+        INTEL_COMPILER_TYPE: 'RECOMMENDED'
     extra_rpaths:
     - /opt/cray/pe/libsci/23.05.1.4/INTEL/2022.2/x86_64/lib
 - compiler: