Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7202ecf
upload artifact v4
menon-karthik Mar 11, 2025
e1bfa4a
(auto) Paper PDF Draft
menon-karthik Mar 11, 2025
da9c6fd
clang format and artifact v4 in docs
menon-karthik Mar 11, 2025
f675068
clang
menon-karthik Mar 11, 2025
325a265
(auto) Paper PDF Draft
menon-karthik Mar 11, 2025
e8dbbe0
upgrade libstdc++
menon-karthik Mar 11, 2025
38c5ed7
fix upgrade libstdc++
menon-karthik Mar 11, 2025
35d049d
test libstdc++
menon-karthik Mar 11, 2025
d61a69a
test libstdc++ 2
menon-karthik Mar 11, 2025
d0e755e
test libstdc++ 3
menon-karthik Mar 11, 2025
ddc7bd1
test libstdc++
menon-karthik Mar 11, 2025
fe1710d
try conda forge libstdc++
menon-karthik Mar 11, 2025
e0b661f
try conda forge libstdc++ 2
menon-karthik Mar 11, 2025
78d095b
check libstdc++
menon-karthik Mar 11, 2025
f65fbdf
check libstdc++
menon-karthik Mar 11, 2025
375e9be
check libstdc++
menon-karthik Mar 11, 2025
55bf744
check conda-forge libstdc++=13
menon-karthik Mar 11, 2025
8a8ce01
cleaned up test.yml
menon-karthik Mar 11, 2025
1f244e0
version numbers for deps
menon-karthik Mar 11, 2025
77e62ea
fix test workflow
menon-karthik Mar 11, 2025
6a1920f
bug in workflow file
menon-karthik Mar 11, 2025
5759b65
updated versions
menon-karthik Mar 11, 2025
51fe892
fixed env error
menon-karthik Mar 11, 2025
7b79575
newest version from paper branch
menon-karthik Mar 11, 2025
b542fbf
clang format version 20
menon-karthik Mar 11, 2025
a4be24b
clang format version 20
menon-karthik Mar 11, 2025
d501236
clang format version 20
menon-karthik Mar 11, 2025
833f035
clang format version 20
menon-karthik Mar 11, 2025
f01ea33
clang format version 20
menon-karthik Mar 11, 2025
8867d6e
clang format version 19
menon-karthik Mar 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/codechecks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ jobs:
- uses: actions/checkout@v3
- name: Install dependencies
run: |
sudo apt install clang-format
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-get install clang-format-19
- name: Run clang-format
run: |
mkdir Release
cd Release
cmake ..
make codecheck
make codecheck
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
doxyfile-path: 'docs/Doxyfile'
enable-latex: true
- name: Save documentation
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: documentation
path: ./docs/build/html
Expand Down
20 changes: 16 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04, ubuntu-latest, macos-13, macos-latest]
version: [13] # GCC version
fail-fast: false
env:
GCC_V: ${{ matrix.version }}
steps:
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
Expand All @@ -17,12 +20,21 @@ jobs:
- name: Install ubuntu dependencies
if: startsWith(matrix.os, 'ubuntu')
run: sudo apt update && sudo apt install build-essential cmake lcov
- name: Install svZeroDSolver
- name: Create conda environment
run: |
#export PATH="/usr/share/miniconda/bin:$PATH"
#alias conda="$CONDA/bin/conda"
conda create -n zerod python=3.11.4
conda run -n zerod pip install -e ".[dev]"
- name: Install dependencies to get correct version numbers (Ubuntu)
if: startsWith(matrix.os, 'ubuntu')
run: conda install -n zerod -c conda-forge libstdcxx-ng=${GCC_V} gcc=${GCC_V}
- name: Install dependencies to get correct version numbers (MacOS)
if: startsWith(matrix.os, 'macos')
run: |
brew install gcc@${GCC_V}
ln -s /usr/local/bin/gcc-${GCC_V} /usr/local/bin/gcc
- name: Install svZeroDSolver
run: conda run -n zerod pip install -e ".[dev]"
- name: Install Networkx
run: |
conda run -n zerod pip install networkx
Expand Down Expand Up @@ -59,7 +71,7 @@ jobs:
make coverage
- name: Save coverage report
if: startsWith(matrix.os, 'ubuntu-22.04')
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage_report
path: Release/coverage
Expand All @@ -74,7 +86,7 @@ jobs:
cpack
cp distribution/svZeroDSolver_* ..
- name: Upload installer
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }} installer
path: svZeroDSolver_*
Expand Down
4 changes: 2 additions & 2 deletions src/solve/SimulationParameters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,8 @@ void create_external_coupling(
(connected_type == "BloodVessel")) {
connections.push_back({connected_block, coupling_name});
} // connected_type == "ClosedLoopRCR"
} // coupling_loc
} // for (size_t i = 0; i < coupling_configs.length(); i++)
} // coupling_loc
} // for (size_t i = 0; i < coupling_configs.length(); i++)
}

void create_junctions(
Expand Down
Loading