Skip to content

Commit 85ccad5

Browse files
rjrios915RickyAwesomeManncdorn
authored
Added option to specify cardiac period (#127)
Co-authored-by: ricky <[email protected]> Co-authored-by: Nick Dorn <[email protected]>
1 parent a1046bd commit 85ccad5

17 files changed

+668
-323
lines changed

.github/codecov.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/workflows/codechecks.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/workflows/documentation.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/gui.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

.github/workflows/test.yml

Lines changed: 0 additions & 164 deletions
This file was deleted.

.github/workflows/test_visualization.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ build*/
3838

3939
# Node modules (for directed graph visualization)
4040
node_modules/
41+
42+
.github
43+

src/model/Model.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,6 @@ void Model::finalize() {
174174
for (auto &block : blocks) {
175175
block->setup_model_dependent_params();
176176
}
177-
178-
if (cardiac_cycle_period < 0.0) {
179-
cardiac_cycle_period = 1.0;
180-
}
181177
}
182178

183179
int Model::get_num_blocks(bool internal) const {

src/solve/SimulationParameters.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ SimulationParameters load_simulation_params(const nlohmann::json& config) {
169169
sim_config.value("sim_cycle_to_cycle_percent_error", 1.0) / 100;
170170
}
171171
sim_params.sim_external_step_size = 0.0;
172-
173172
} else {
174173
sim_params.sim_num_cycles = 1;
175174
sim_params.sim_num_time_steps = sim_config["number_of_time_pts"];
@@ -187,6 +186,7 @@ SimulationParameters load_simulation_params(const nlohmann::json& config) {
187186
sim_params.output_mean_only = sim_config.value("output_mean_only", false);
188187
sim_params.output_derivative = sim_config.value("output_derivative", false);
189188
sim_params.output_all_cycles = sim_config.value("output_all_cycles", false);
189+
sim_params.sim_cardiac_period = sim_config.value("cardiac_period", -1.0);
190190
DEBUG_MSG("Finished loading simulation parameters");
191191
return sim_params;
192192
}
@@ -396,7 +396,7 @@ void create_external_coupling(
396396
if (std::find(std::begin(possible_types), std::end(possible_types),
397397
connected_type) == std::end(possible_types)) {
398398
throw std::runtime_error(
399-
"Error: The specified connection type for inlet "
399+
"Error: The specified connection type for inlet"
400400
"external_coupling_block is invalid.");
401401
}
402402
connections.push_back({coupling_name, connected_block});

src/solve/SimulationParameters.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
struct SimulationParameters {
2424
// Negative value indicates this has not
2525
// been read from config file yet.
26-
double sim_time_step_size{0.0}; ///< Simulation time step size
27-
double sim_abs_tol{0.0}; ///< Absolute tolerance for simulation
28-
29-
int sim_num_cycles{0}; ///< Number of cardiac cycles to simulate
30-
int sim_pts_per_cycle{0}; ///< Number of time steps per cardiac cycle
26+
double sim_time_step_size{0.0}; ///< Simulation time step size
27+
double sim_abs_tol{0.0}; ///< Absolute tolerance for simulation
28+
double sim_cardiac_period{-1.0}; ///< Cardiac period
29+
int sim_num_cycles{0}; ///< Number of cardiac cycles to simulate
30+
int sim_pts_per_cycle{0}; ///< Number of time steps per cardiac cycle
3131
bool use_cycle_to_cycle_error{
3232
false}; ///< If model does not have RCR boundary conditions, simulate
3333
///< model to convergence (based on cycle-to-cycle error of last

0 commit comments

Comments
 (0)