new technique

Author: gxyd

.github/workflows/CI.yml

@@ -21,11 +21,25 @@ jobs:
         os: ["macos-latest", "ubuntu-latest"]
         compiler: ["gfortran", "lfortran"]
         mpi: ["openmpi", "mpich"]
-        test_type: ["standalone", "standalone_no_wrappers", "pot3d"]
-        exclude:
-          # Only run standalone_no_wrappers for gfortran
-          - compiler: "lfortran"
-            test_type: "standalone_no_wrappers"
+        test_type: ["standalone", "pot3d"]
+        include:
+          # Add standalone-no-wrappers tests only for GFortran
+          - os: "macos-latest"
+            compiler: "gfortran"
+            mpi: "openmpi"
+            test_type: "standalone-no-wrappers"
+          - os: "macos-latest"
+            compiler: "gfortran"
+            mpi: "mpich"
+            test_type: "standalone-no-wrappers"
+          - os: "ubuntu-latest"
+            compiler: "gfortran"
+            mpi: "openmpi"
+            test_type: "standalone-no-wrappers"
+          - os: "ubuntu-latest"
+            compiler: "gfortran"
+            mpi: "mpich"
+            test_type: "standalone-no-wrappers"
     steps:
       - uses: actions/checkout@v4
 
@@ -35,68 +49,57 @@ jobs:
           micromamba-version: '2.0.4-0'
           environment-file: ci/environment_${{ matrix.compiler }}_${{ matrix.mpi }}.yml
 
-      # Standalone tests without custom MPI wrappers
       - name: Run standalone tests without MPI wrappers
-        if: matrix.test_type == 'standalone_no_wrappers'
+        if: matrix.test_type == 'standalone-no-wrappers'
         shell: bash -e -x -l {0}
         run: |
           cd tests
           ./run_tests.sh --without-wrappers
 
-      # Standalone tests with compiler and optimization variations
-      - name: Run standalone tests with ${{ matrix.compiler }}
+      - name: Run standalone tests with optimization variations
         if: matrix.test_type == 'standalone'
         shell: bash -e -x -l {0}
         run: |
           cd tests
-          
-          # Set compiler-specific flags
           if [[ "${{ matrix.compiler }}" == "gfortran" ]]; then
-            BASE_FLAGS="-cpp"
-            OPT_FLAGS="-O3 -march=native -cpp"
-          else
-            BASE_FLAGS="--cpp"
-            OPT_FLAGS="--fast --cpp"
+            if [[ "${{ matrix.mpi }}" == "openmpi" ]]; then
+              FC="gfortran -cpp -DOPEN_MPI=yes" ./run_tests.sh
+              FC="gfortran -O3 -march=native -cpp -DOPEN_MPI=yes" ./run_tests.sh
+            else
+              FC="gfortran -cpp" ./run_tests.sh
+              FC="gfortran -O3 -march=native -cpp" ./run_tests.sh
+            fi
+          else  # lfortran
+            if [[ "${{ matrix.mpi }}" == "openmpi" ]]; then
+              FC="lfortran --cpp -DOPEN_MPI=yes" ./run_tests.sh
+              FC="lfortran --fast --cpp -DOPEN_MPI=yes" ./run_tests.sh
+            else
+              FC="lfortran --cpp" ./run_tests.sh
+              FC="lfortran --fast --cpp" ./run_tests.sh
+            fi
           fi
-          
-          # Add MPI-specific flags for OpenMPI
-          if [[ "${{ matrix.mpi }}" == "openmpi" ]]; then
-            BASE_FLAGS="$BASE_FLAGS -DOPEN_MPI=yes"
-            OPT_FLAGS="$OPT_FLAGS -DOPEN_MPI=yes"
-          fi
-          
-          # Run tests without optimization
-          FC="${{ matrix.compiler }} $BASE_FLAGS" ./run_tests.sh
-          
-          # Run tests with optimization
-          FC="${{ matrix.compiler }} $OPT_FLAGS" ./run_tests.sh
 
-      # POT3D tests
-      - name: Build and validate POT3D with ${{ matrix.compiler }}
+      - name: Build and validate POT3D
         if: matrix.test_type == 'pot3d'
         shell: bash -e -x -l {0}
         run: |
           cd tests/pot3d
-          
-          # Set compiler-specific build script
           if [[ "${{ matrix.compiler }}" == "gfortran" ]]; then
             BUILD_SCRIPT="./build_and_run_gfortran.sh"
-            BASE_FLAGS="-cpp"
-            OPT_FLAGS="-O3 -march=native -cpp"
-          else
+            if [[ "${{ matrix.mpi }}" == "openmpi" ]]; then
+              FC="gfortran -O3 -march=native -cpp -DOPEN_MPI=yes" $BUILD_SCRIPT
+              FC="gfortran -cpp -DOPEN_MPI=yes" $BUILD_SCRIPT
+            else
+              FC="gfortran -O3 -march=native -cpp" $BUILD_SCRIPT
+              FC="gfortran -cpp" $BUILD_SCRIPT
+            fi
+          else  # lfortran
             BUILD_SCRIPT="./build_and_run_lfortran.sh"
-            BASE_FLAGS="--cpp"
-            OPT_FLAGS="--fast --cpp"
-          fi
-          
-          # Add MPI-specific flags for OpenMPI
-          if [[ "${{ matrix.mpi }}" == "openmpi" ]]; then
-            BASE_FLAGS="$BASE_FLAGS -DOPEN_MPI=yes"
-            OPT_FLAGS="$OPT_FLAGS -DOPEN_MPI=yes"
+            if [[ "${{ matrix.mpi }}" == "openmpi" ]]; then
+              FC="lfortran --fast --cpp -DOPEN_MPI=yes" $BUILD_SCRIPT
+              FC="lfortran --cpp -DOPEN_MPI=yes" $BUILD_SCRIPT
+            else
+              FC="lfortran --fast --cpp" $BUILD_SCRIPT
+              FC="lfortran --cpp" $BUILD_SCRIPT
+            fi
           fi
-          
-          # Build and validate without optimization
-          FC="${{ matrix.compiler }} $BASE_FLAGS" $BUILD_SCRIPT
-          
-          # Build and validate with optimization
-          FC="${{ matrix.compiler }} $OPT_FLAGS" $BUILD_SCRIPT