Merge pull request #168 from behdadebsh/unstrained-rad-exp

Frequency domain output file
LungNoodle · Nov 29, 2024 · 500ff7c · 500ff7c
2 parents d27a7c0 + faa7a43
commit 500ff7c
Show file tree

Hide file tree

Showing 2 changed files with 1,262 additions and 181 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -19,9 +19,9 @@ jobs:
       matrix:
         config:
         - {
-            name: "Windows 2019 MSVC",
+            name: "Windows 2022 MSVC",
             build_type: "Release",
-            os: windows-2019,
+            os: windows-2022,
           }
         - {
             name: "Ubuntu 20.04",
@@ -35,9 +35,16 @@ jobs:
             os: ubuntu-20.04,
           }
         - {
-            name: "macOS Big Sur 11",
+            name: "macOS Ventura",
             build_type: "Release",
-            os: macos-11,
+            os: macos-13,
+            gfortran: gfortran-13,
+          }
+        - {
+            name: "macOS Sonoma",
+            build_type: "Release",
+            os: macos-14,
+            gfortran: gfortran-14,
           }
     steps:
 # Useful for debugging dll load issues.
@@ -115,7 +122,7 @@ jobs:
 #      run: scripts/cache_exclude_windows.ps1
 
     - name: Checkout lungsim
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: lungsim
 
@@ -143,6 +150,11 @@ jobs:
       shell: bash
       run: sudo apt-get install libsuperlu-dev
 
+    - name: Install SWIG
+      if: runner.os == 'macOS'
+      shell: bash
+      run: brew install swig
+
     - name: Create virtual environment
       shell: cmake -P {0}
       id: create-venv
@@ -185,6 +197,7 @@ jobs:
       if: runner.os == 'Windows'
       run: |
         cmake -S lungsim -B build-lungsim -D CMAKE_Fortran_COMPILER="%INTEL_COMPILER_BIN_PATH:\=/%/ifort.exe" -D AETHER_ENABLE_TESTS=FALSE -D Python_EXECUTABLE=${{ steps.create-venv.outputs.python_exe }}
+
     - name: Generate build instructions - Linux
       shell: bash
       if: runner.os == 'Linux'
@@ -196,17 +209,19 @@ jobs:
           -D AETHER_ENABLE_TESTS=FALSE \
           -D CMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
           -D Python_EXECUTABLE=${{ steps.create-venv.outputs.python_exe }}
+
     - name: Generate build instructions - macOS
       shell: bash
       if: runner.os == 'macOS'
       run: |
         cmake \
           -S lungsim \
           -B build-lungsim \
-          -D CMAKE_Fortran_COMPILER=gfortran-10 \
+          -D CMAKE_Fortran_COMPILER=${{ matrix.config.gfortran }} \
           -D AETHER_ENABLE_TESTS=FALSE \
           -D CMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
           -D Python_EXECUTABLE=${{ steps.create-venv.outputs.python_exe }}
+
     - name: Build lungsim
       shell: cmake -P {0}
       run: |
@@ -227,6 +242,7 @@ jobs:
           message("::error::${error_message}")
           message(FATAL_ERROR "Build failed.")
         endif()
+
     - name: Test lungsim
       shell: bash
       run: |