Update adding macos-13 and windows-2022 in containerized-ci

.github/workflows/containerized-ci.yml

@@ -11,37 +11,40 @@ on:
 
 jobs:
   Containerized-CI:
-    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        fortran-compiler: [ifort, ifx, nvfortran]
+        os: [ubuntu-22.04, macos-13, windows-2022]
+          toolchain:
+          - {compiler: intel-classic, version: 2021.10}
+          - {compiler: intel, version: 2024.1}
+          - {compiler: nvidia-hpc, version: 23.11}
         rte-kernels: [default, accel]
         fpmodel: [DP, SP]
         include:
         # Set flags for Intel Fortran Compiler Classic
-        - fortran-compiler: ifort
+        - fortran-compiler: intel-classic
           fcflags: -m64 -g -traceback -heap-arrays -assume realloc_lhs -extend-source 132 -check bounds,uninit,pointers,stack -stand f08 -diag-disable=10448
         # Set flags for Intel Fortran Compiler
-        - fortran-compiler: ifx
+        - fortran-compiler: intel
           rte-kernels: default
           fcflags: -debug -traceback -O0 -heap-arrays -assume realloc_lhs -extend-source 132 -stand f08
-        - fortran-compiler: ifx
+        - fortran-compiler: intel
           rte-kernels: accel
           fcflags: -debug -traceback -O0 -heap-arrays -assume realloc_lhs -extend-source 132 -stand f08 -fiopenmp -fopenmp-targets=spir64
         # Set flags for NVIDIA Fortran compiler
-        - fortran-compiler: nvfortran
+        - fortran-compiler: nvidia-hpc
           rte-kernels: default
           fcflags: -Mallocatable=03 -Mstandard -Mbounds -Mchkptr -Kieee -Mchkstk
-        - fortran-compiler: nvfortran
+        - fortran-compiler: nvidia-hpc
           rte-kernels: accel
           fcflags: -Mallocatable=03 -Mstandard -Mbounds -Mchkptr -Kieee -Mchkstk -acc
         # Set container images
-        - fortran-compiler: ifort
+        - fortran-compiler: intel-classic
           image: ghcr.io/earth-system-radiation/rte-rrtmgp-ci:oneapi
-        - fortran-compiler: ifx
+        - fortran-compiler: intel
           image: ghcr.io/earth-system-radiation/rte-rrtmgp-ci:oneapi
-        - fortran-compiler: nvfortran
+        - fortran-compiler: nvidia-hpc
           image: ghcr.io/earth-system-radiation/rte-rrtmgp-ci:nvhpc
     container:
       image: ${{ matrix.image }}
@@ -59,8 +62,13 @@ jobs:
       OMP_TARGET_OFFLOAD: DISABLED
       FAILURE_THRESHOLD: 7.e-4
       BUILD_FOLDER: build
-
+    runs-on: ${{ matrix.os }}
     steps:
+    - uses: fortran-lang/setup-fortran@v1
+      id: setup-fortran
+      with:
+        compiler: ${{ matrix.toolchain.compiler }}
+        version: ${{ matrix.toolchain.version }}
     #
     # Check out repository under $GITHUB_WORKSPACE
     #
@@ -84,11 +92,10 @@ jobs:
     #
     - name: Build libraries, examples and tests (expect success)
       id: build-success
-      if: matrix.fortran-compiler != 'ifx' || matrix.rte-kernels != 'accel'
+      if: ${{ env.FC }} != 'intel' || matrix.rte-kernels != 'accel'
       run: |
-        $FC --version
         cmake -S . -B $BUILD_FOLDER \
-            -DCMAKE_Fortran_COMPILER=$FC \
+            -DCMAKE_Fortran_COMPILER=${{ env.FC }} \
             -DCMAKE_Fortran_FLAGS="$FCFLAGS" \
             -DRRTMGP_DATA_VERSION=$RRTMGP_DATA_VERSION \
             -DFP_MODEL=$FP_MODEL \