diff --git a/.github/workflows/test_macos.yml b/.github/workflows/test_macos.yml deleted file mode 100644 index 459cc1d12..000000000 --- a/.github/workflows/test_macos.yml +++ /dev/null @@ -1,28 +0,0 @@ -# This workflow builds and tests svZeroDSolver. It is built and tested on -# different versions of ubuntu and macOS. -name: Test Macos_latest -on: [push] -jobs: - test: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-latest] - fail-fast: false - steps: - - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v3 - with: - auto-update-conda: true - - name: Build using CMake - run: | - mkdir Release - cd Release - cmake -DCMAKE_BUILD_TYPE=DEBUG -DENABLE_DISTRIBUTION=ON .. - make -j2 - - name: Test build - run: | - pwd - cd tests/cases - ../../Release/svzerodsolver pulsatileFlow_R_RCR_mean.json results.csv - rm results.csv diff --git a/src/model/Model.cpp b/src/model/Model.cpp index 7fabee1be..7995fa847 100644 --- a/src/model/Model.cpp +++ b/src/model/Model.cpp @@ -32,7 +32,7 @@ template BlockFactoryFunc block_factory() { - return [](int count, Model *model) -> std::shared_ptr{ + return [](int count, Model *model) -> std::shared_ptr { return std::make_shared(count, model); }; } diff --git a/src/model/Parameter.cpp b/src/model/Parameter.cpp index 86bbd98e7..ab9efe19c 100644 --- a/src/model/Parameter.cpp +++ b/src/model/Parameter.cpp @@ -82,7 +82,8 @@ void Parameter::update(const std::string update_string) { symbol_table.clear(); if (!symbol_table.create_variable("t")) { - throw std::runtime_error("Error failed to create time_value in symbol_table."); + throw std::runtime_error( + "Error failed to create time_value in symbol_table."); return; } @@ -110,7 +111,8 @@ void Parameter::update(const std::string update_string) { exprtk::parser_error::to_str(error.mode).c_str(), error.diagnostic.c_str(), expression_string.c_str()); } - throw std::runtime_error("Error when compiling the function provided in 'fn'."); + throw std::runtime_error( + "Error when compiling the function provided in 'fn'."); return; } } diff --git a/tests/cases/dirgraph-results/timeDep_Flow_directed_graph.dot b/tests/cases/dirgraph-results/timeDep_Flow_directed_graph.dot new file mode 100644 index 000000000..93378161d --- /dev/null +++ b/tests/cases/dirgraph-results/timeDep_Flow_directed_graph.dot @@ -0,0 +1,7 @@ +strict digraph { +BC0_inlet; +V0; +BC0_outlet; +BC0_inlet -> V0; +V0 -> BC0_outlet; +} diff --git a/tests/cases/dirgraph-results/timeDep_Pressure_directed_graph.dot b/tests/cases/dirgraph-results/timeDep_Pressure_directed_graph.dot new file mode 100644 index 000000000..93378161d --- /dev/null +++ b/tests/cases/dirgraph-results/timeDep_Pressure_directed_graph.dot @@ -0,0 +1,7 @@ +strict digraph { +BC0_inlet; +V0; +BC0_outlet; +BC0_inlet -> V0; +V0 -> BC0_outlet; +}