Merge branch 'main' into create-PR-and-sync

Author: iulusoy

action.yml

@@ -62,6 +62,11 @@ runs:
         compiler=${COMPILER:-gcc}
         platform=$(uname -s | tr '[:upper:]' '[:lower:]')
 
+        if [[ "$RUNNER_OS" == "macOS" ]] && [[ "$compiler" == "intel" ]]; then
+          echo "Compiler 'intel' not supported on macOS, falling back to 'intel-classic'"
+          compiler="intel-classic"
+        fi
+
         case $compiler in
           gcc)
             version=${VERSION:-13}
@@ -72,7 +77,7 @@ runs:
             install_intel $platform true ${{ inputs.install_mkl }}
             ;;
           intel)
-            version=${VERSION:-2023.2.0}
+            version=${VERSION:-2024.0}
             install_intel $platform false ${{ inputs.install_mkl }}
             ;;
           nvidia-hpc)

setup-fortran.sh

@@ -397,7 +397,7 @@ install_intel_apt()
   fi
 
   source /opt/intel/oneapi/setvars.sh
-
+  # these exports have been removed in later versions of the action?
   if $classic; then
     export FC="ifort"
     export CC="icc"
@@ -512,7 +512,8 @@ install_intel_dmg()
   rm m_HPCKit.dmg
 
   source /opt/intel/oneapi/setvars.sh
-
+ 
+  # these exports have been removed in later versions of the action?
   export FC="ifort"
   export CC="icc"
   export CXX="icpc"