Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
1b49978
Added Reg CRL, Vessel, and Chambers
RickyAwesomeMan Jul 25, 2024
52ee76a
added CRL test cases
RickyAwesomeMan Jul 25, 2024
b782a5f
added a test case for CRL blood vessel block
rjrios915 Jul 26, 2024
65c0c80
Added option to specify cardiac period
rjrios915 Aug 27, 2024
7b13f3f
updated code
rjrios915 Aug 30, 2024
02bb791
Fixes clang error on cardiac period #126
rjrios915 Sep 26, 2024
71b638c
Fixes second clang error #126
rjrios915 Sep 26, 2024
77a2d07
Colon switched for semi-colon #126
rjrios915 Sep 26, 2024
2098a15
Merge branch 'SimVascular:master' into RegChamber
rjrios915 Sep 26, 2024
7b4e2fa
Removed cardiac period
rjrios915 Sep 26, 2024
812c01f
Merge branch 'RegChamber' of https://github.com/rjrios915/svZeroDSolv…
rjrios915 Sep 26, 2024
f7aabf6
merging RegChamber
rjrios915 Sep 26, 2024
8709431
Merge branch 'SimVascular:master' into period
rjrios915 Oct 1, 2024
7455579
Merge branch 'SimVascular:master' into master
rjrios915 Oct 15, 2024
e2bf417
Merge branch 'SimVascular:master' into period
rjrios915 Oct 15, 2024
fe5a83a
(IN PROGRESS) working on code consistency
rjrios915 Oct 22, 2024
f1b1691
Updated Cardiac Period Implementation
rjrios915 Oct 22, 2024
0e0e831
Clang Update
rjrios915 Oct 22, 2024
ad5b74a
Clang Update
rjrios915 Oct 22, 2024
6778e7b
Clang Update
rjrios915 Oct 22, 2024
8c1fa18
Clang Update
rjrios915 Oct 22, 2024
d33854e
Merge branch 'SimVascular:master' into master
rjrios915 Mar 7, 2025
9eed24f
Tests added
rjrios915 Mar 7, 2025
f2b4e8a
Added test cases and documentation
rjrios915 Mar 11, 2025
0467002
Artifact Error
rjrios915 Mar 11, 2025
a24fbb5
Artifact Fix?
rjrios915 Mar 11, 2025
4a0bdb1
Adds test
rjrios915 Mar 11, 2025
4aacac1
fixing test cases
rjrios915 Mar 11, 2025
c3a160c
Clang fix
rjrios915 Mar 11, 2025
6a8c252
Clang fix
rjrios915 Mar 11, 2025
dd1d132
Merge pull request #1 from SimVascular/master
rjrios915 Mar 13, 2025
e387654
updated testing
rjrios915 Mar 13, 2025
066f777
codechecks
rjrios915 Mar 14, 2025
69be278
codechecks
rjrios915 Mar 14, 2025
d6a866e
Merge branch 'master' into period
rjrios915 Apr 1, 2025
3a8093f
CMake Updates
rjrios915 Apr 3, 2025
c4de55b
CodeCheck
rjrios915 Apr 3, 2025
cb0e485
Testing Fixes
rjrios915 Apr 3, 2025
de92134
Model definition clean up
rjrios915 Apr 8, 2025
60a9e75
Merge branch 'master' into period
ncdorn Jun 10, 2025
d7eefac
Cleaned up period branch
rjrios915 Jun 24, 2025
2b58e1f
More Cleanup
rjrios915 Jun 24, 2025
7070a51
clang
rjrios915 Jun 24, 2025
7cab59a
Merge branch 'master' into period
ncdorn Jul 24, 2025
225d8ed
Removed .github
rjrios915 Aug 19, 2025
404bfcb
Removed .github
rjrios915 Aug 19, 2025
e545d85
Update .gitignore
rjrios915 Aug 25, 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
11 changes: 0 additions & 11 deletions .github/codecov.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .github/workflows/codechecks.yml

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/documentation.yml

This file was deleted.

49 changes: 0 additions & 49 deletions .github/workflows/gui.yml

This file was deleted.

164 changes: 0 additions & 164 deletions .github/workflows/test.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/test_visualization.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,6 @@ build*/

# Node modules (for directed graph visualization)
node_modules/

.github

4 changes: 0 additions & 4 deletions src/model/Model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,6 @@ void Model::finalize() {
for (auto &block : blocks) {
block->setup_model_dependent_params();
}

if (cardiac_cycle_period < 0.0) {
cardiac_cycle_period = 1.0;
}
}

int Model::get_num_blocks(bool internal) const {
Expand Down
4 changes: 2 additions & 2 deletions src/solve/SimulationParameters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ SimulationParameters load_simulation_params(const nlohmann::json& config) {
sim_config.value("sim_cycle_to_cycle_percent_error", 1.0) / 100;
}
sim_params.sim_external_step_size = 0.0;

} else {
sim_params.sim_num_cycles = 1;
sim_params.sim_num_time_steps = sim_config["number_of_time_pts"];
Expand All @@ -187,6 +186,7 @@ SimulationParameters load_simulation_params(const nlohmann::json& config) {
sim_params.output_mean_only = sim_config.value("output_mean_only", false);
sim_params.output_derivative = sim_config.value("output_derivative", false);
sim_params.output_all_cycles = sim_config.value("output_all_cycles", false);
sim_params.sim_cardiac_period = sim_config.value("cardiac_period", -1.0);
DEBUG_MSG("Finished loading simulation parameters");
return sim_params;
}
Expand Down Expand Up @@ -396,7 +396,7 @@ void create_external_coupling(
if (std::find(std::begin(possible_types), std::end(possible_types),
connected_type) == std::end(possible_types)) {
throw std::runtime_error(
"Error: The specified connection type for inlet "
"Error: The specified connection type for inlet"
"external_coupling_block is invalid.");
}
connections.push_back({coupling_name, connected_block});
Expand Down
10 changes: 5 additions & 5 deletions src/solve/SimulationParameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
struct SimulationParameters {
// Negative value indicates this has not
// been read from config file yet.
double sim_time_step_size{0.0}; ///< Simulation time step size
double sim_abs_tol{0.0}; ///< Absolute tolerance for simulation

int sim_num_cycles{0}; ///< Number of cardiac cycles to simulate
int sim_pts_per_cycle{0}; ///< Number of time steps per cardiac cycle
double sim_time_step_size{0.0}; ///< Simulation time step size
double sim_abs_tol{0.0}; ///< Absolute tolerance for simulation
double sim_cardiac_period{-1.0}; ///< Cardiac period
int sim_num_cycles{0}; ///< Number of cardiac cycles to simulate
int sim_pts_per_cycle{0}; ///< Number of time steps per cardiac cycle
bool use_cycle_to_cycle_error{
false}; ///< If model does not have RCR boundary conditions, simulate
///< model to convergence (based on cycle-to-cycle error of last
Expand Down
Loading