Merge branch 'main' into main-PR1187

Author: grantfirl

.github/workflows/bld_scm_images.yaml

@@ -5,7 +5,7 @@ on:
   push:
     branches:
       # Only build containers when pushing to main
-      - "main"
+      - main
 
 jobs:
   docker:

.github/workflows/run_scm_rts.yml

@@ -2,12 +2,16 @@ name: Build/run the CCPP-SCM, compare to existing baselines (GitHub artifact)
 
 on:
   push:
+    branches:
+      # Only build and run when pushing to main
+      - main
   pull_request:
   workflow_dispatch:
 
 jobs:
   run_scm_rts:
     runs-on: ubuntu-24.04
+    if: github.repository == 'NCAR/ccpp-scm'
     strategy:
       fail-fast: false
       matrix:
@@ -176,4 +180,4 @@ jobs:
       uses: actions/upload-artifact@v7
       with:
         name: rt-baselines-${{matrix.build-type}}-${{matrix.fortran-compiler}}-${{matrix.run_lists}}-${{ env.artifact_origin }}
-        path: /__w/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}}-${{matrix.fortran-compiler}}-${{matrix.run_lists}}
+        path: /__w/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}}-${{matrix.fortran-compiler}}-${{matrix.run_lists}}

scm/src/suite_info.py

@@ -98,7 +98,7 @@ def main():
         import rt_test_cases
 
         # choose correct compiler
-        if 'gfortran' in args.fc.lower():
+        if 'gnu' in args.fc.lower():
             rttc = rt_test_cases.gnu_test_cases
         elif 'intel' in args.fc.lower():
             rttc = rt_test_cases.intel_test_cases