More systematic compiler flags for CI; separate Conda-style builds

.github/workflows/conda-style-builds.yml

@@ -0,0 +1,84 @@
+name: Conda-compatible builds
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
+
+defaults:
+  run:
+    # Enable Conda environment by using the login shell:
+    shell: bash -leo pipefail {0}
+
+jobs:
+  CI:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-24.04, macos-13, macos-latest, windows-2022]
+    env:
+      FC: gfortran
+      # FFLAGS: "-std=f2008"
+      CMAKE_BUILD_PARALLEL_LEVEL: 8
+      VERBOSE:
+      CTEST_PARALLEL_LEVEL: 8
+      CTEST_OUTPUT_ON_FAILURE: 1
+    runs-on: ${{ matrix.os }}
+    steps:
+      #
+      # Check out repository under $GITHUB_WORKSPACE
+      #
+      - name: Check out code
+        uses: actions/checkout@v4
+      #
+      # Cache Conda packages
+      #
+      - name: Cache Conda packages
+        uses: actions/cache@v4
+        with:
+          path: ~/conda_pkgs_dir
+          key: conda-pkgs-${{ matrix.os }}
+      #
+      # Set up Conda
+      #
+      - name: Set up Conda
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          miniforge-version: latest
+          activate-environment: rte_rrtmgp_test
+          environment-file: environment-noplots.yml
+          python-version: 3.11
+          auto-activate-base: false
+          conda-remove-defaults: true
+          # Use the cache properly:
+          use-only-tar-bz2: false
+      #
+      # Install compiler and dependencies
+      #
+      - name: Install compiler, dependencies
+        run: |
+          conda install -c conda-forge "${FC}" netcdf-fortran ninja -y
+          echo "FC=gfortran" >> "$GITHUB_ENV"
+      #
+      # Adjust toolchain
+      #
+      - name: Adjust Windows toolchain
+        if: matrix.os == 'windows-2022'
+        run: echo "FC=${FC}.exe" >> "$GITHUB_ENV"
+      #
+      # Build libraries, examples, and tests
+      #
+      - name: Build libraries and tests
+        run: |
+          cmake -S . -B build -G "Ninja" \
+              -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+              -DBUILD_TESTING=ON
+          cmake --build build
+      #
+      # Run examples, tests and checks
+      #
+      - name: Run examples, tests and checks
+        working-directory: build
+        run: ctest

.github/workflows/continuous-integration.yml

@@ -17,53 +17,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, macos-13, macos-latest, windows-2022]
-        gfortran-version: [12, 13, 14]
-        gfortran-from: [system, conda]
+        rte-kernels: [default, accel]
         fpmodel: [DP, SP]
-        exclude:
-          - os: ubuntu-24.04
-            gfortran-from: conda
-          - os: macos-13
-            gfortran-from: system
-          - os: macos-13
-            gfortran-version: 14
-            gfortran-from: conda
-          - os: macos-latest
-            gfortran-from: system
-          - os: macos-latest
-            gfortran-version: 14
-            gfortran-from: conda
-          - os: windows-2022
-        include:
-          - os: ubuntu-24.04
-            gfortran-version: 13
-            gfortran-from: conda
-            fpmodel: DP
-          - os: windows-2022
-            gfortran-version: 13
-            gfortran-from: conda
-            fpmodel: DP
-          - os: windows-2022
-            gfortran-version: 13
-            gfortran-from: conda
-            fpmodel: SP
-          - os: windows-2022
-            gfortran-version: 14
-            gfortran-from: conda
-            fpmodel: DP
-          - os: windows-2022
-            gfortran-version: 14
-            gfortran-from: conda
-            fpmodel: SP
+        build-type: [Debug, RelWithDebugInfo]
+        # Add Release config?
+        # Exclude RelWithDebugInfo/accel combinations?
     env:
-      FC: gfortran-${{ matrix.gfortran-version }}
-      FFLAGS: "-m64 -std=f2008 -march=native -fbounds-check -fmodule-private -fimplicit-none -finit-real=nan"
       CMAKE_BUILD_PARALLEL_LEVEL: 8
       VERBOSE:
       CTEST_PARALLEL_LEVEL: 8
       CTEST_OUTPUT_ON_FAILURE: 1
-    runs-on: ${{ matrix.os }}
+      FC: gfortran-14
+    runs-on: ubuntu-24.04 # latest?
     steps:
       #
       # Check out repository under $GITHUB_WORKSPACE
@@ -77,7 +42,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/conda_pkgs_dir
-          key: conda-pkgs-${{ matrix.os }}
+          key: conda-pkgs
       #
       # Set up Conda
       #
@@ -89,35 +54,29 @@ jobs:
           environment-file: environment-noplots.yml
           python-version: 3.11
           auto-activate-base: false
+          conda-remove-defaults: true
           # Use the cache properly:
           use-only-tar-bz2: false
       #
-      # Install compiler
-      #
-      - name: Install compiler
-        if: matrix.gfortran-from == 'conda'
-        run: |
-          conda install -c conda-forge gfortran=${{ matrix.gfortran-version }} -y
-          echo "FC=gfortran" >> "$GITHUB_ENV"
-      #
       # Install dependencies
       #
       - name: Install dependencies
         run: conda install -c conda-forge netcdf-fortran ninja -y
       #
-      # Adjust toolchain
+      # Add debug flags
       #
-      - name: Adjust toolchain
-        if: matrix.os == 'windows-2022'
-        run: echo "FC=${FC}.exe" >> "$GITHUB_ENV"
+      - name: Add debug flags
+        if: matrix.build-type == 'Debug'
+        run: echo  "FFLAGS=-std=f2008 -fbounds-check -fmodule-private -fimplicit-none -finit-real=nan" >> "$GITHUB_ENV"
       #
       # Build libraries, examples, and tests
       #
       - name: Build libraries and tests
         run: |
           cmake -S . -B build -G "Ninja" \
-              -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+              -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} \
               -DRTE_ENABLE_SP="$(test '${{ matrix.fpmodel }}' = SP && echo ON || echo OFF)" \
+              -DKERNEL_MODE=${{ matrix.rte-kernels }} \
               -DBUILD_TESTING=ON
           cmake --build build
       #

.github/workflows/style.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Check out code
         uses: actions/checkout@v4