Commit 656d6f96 authored by Aaron Bray's avatar Aaron Bray
Browse files

Trimming complete

parent 5017a54b
......@@ -39,9 +39,9 @@ PROTO_POP
BloodChemistry::BloodChemistry(PulseController& data) : SEBloodChemistrySystem(data.GetLogger()), m_data(data)
{
Clear();
m_ArterialOxygen_mmHg = new RunningAverage();
m_ArterialCarbonDioxide_mmHg = new RunningAverage();
Clear();
}
BloodChemistry::~BloodChemistry()
......
......@@ -64,7 +64,6 @@ PROTO_POP
Cardiovascular::Cardiovascular(PulseController& data) : SECardiovascularSystem(data.GetLogger()), m_data(data)
{
Clear();
m_TuningFile = "";
m_transporter = new SELiquidTransporter(VolumePerTimeUnit::mL_Per_s, VolumeUnit::mL, MassUnit::ug, MassPerVolumeUnit::ug_Per_mL, data.GetLogger());
m_circuitCalculator = new SEFluidCircuitCalculator(FlowComplianceUnit::mL_Per_mmHg, VolumePerTimeUnit::mL_Per_s, FlowInertanceUnit::mmHg_s2_Per_mL, PressureUnit::mmHg, VolumeUnit::mL, FlowResistanceUnit::mmHg_s_Per_mL, data.GetLogger());
......@@ -76,6 +75,7 @@ Cardiovascular::Cardiovascular(PulseController& data) : SECardiovascularSystem(d
m_CardiacCyclePulmonaryArteryPressure_mmHg = new RunningAverage();
m_CardiacCycleCentralVenousPressure_mmHg = new RunningAverage();
m_CardiacCycleSkinFlow_mL_Per_s = new RunningAverage();
Clear();
}
Cardiovascular::~Cardiovascular()
......
......@@ -61,10 +61,10 @@ PROTO_POP
Energy::Energy(PulseController& data) : SEEnergySystem(data.GetLogger()), m_data(data)
{
Clear();
m_circuitCalculator = new SEThermalCircuitCalculator(GetLogger());
m_BloodpH = new RunningAverage();
m_BicarbonateMolarity_mmol_Per_L = new RunningAverage();
m_circuitCalculator = new SEThermalCircuitCalculator(GetLogger());
Clear();
}
Energy::~Energy()
......
......@@ -57,7 +57,6 @@ PROTO_POP// Conditions
Renal::Renal(PulseController& data) : SERenalSystem(data.GetLogger()), m_data(data)
{
Clear();
m_spCleared = new SEScalarMass();
m_urineProductionRate_mL_Per_min_runningAvg = new RunningAverage();
m_urineOsmolarity_mOsm_Per_L_runningAvg = new RunningAverage();
......@@ -67,6 +66,7 @@ Renal::Renal(PulseController& data) : SERenalSystem(data.GetLogger()), m_data(da
m_rightSodiumFlow_mg_Per_s_runningAvg = new RunningAverage();
m_leftRenalArterialPressure_mmHg_runningAvg = new RunningAverage();
m_rightRenalArterialPressure_mmHg_runningAvg = new RunningAverage();
Clear();
}
Renal::~Renal()
......
......@@ -82,7 +82,6 @@ PROTO_POP
Respiratory::Respiratory(PulseController& data) : SERespiratorySystem(data.GetLogger()), m_data(data)
{
Clear();
m_BloodPHRunningAverage = new RunningAverage();
m_ArterialO2RunningAverage_mmHg = new RunningAverage();
m_ArterialCO2RunningAverage_mmHg = new RunningAverage();
......@@ -90,6 +89,7 @@ Respiratory::Respiratory(PulseController& data) : SERespiratorySystem(data.GetLo
m_Calculator = new SEFluidCircuitCalculator(FlowComplianceUnit::L_Per_cmH2O, VolumePerTimeUnit::L_Per_s, FlowInertanceUnit::cmH2O_s2_Per_L, PressureUnit::cmH2O, VolumeUnit::L, FlowResistanceUnit::cmH2O_s_Per_L, GetLogger());
m_GasTransporter = new SEGasTransporter(VolumePerTimeUnit::L_Per_s, VolumeUnit::L, VolumeUnit::L, GetLogger());
m_AerosolTransporter = new SELiquidTransporter(VolumePerTimeUnit::mL_Per_s, VolumeUnit::mL, MassUnit::ug, MassPerVolumeUnit::ug_Per_mL, GetLogger());
Clear();
}
Respiratory::~Respiratory()
......
......@@ -30,6 +30,4 @@ Macro EngineUnitTest=EngineUnitTestDriver FastPlot Baseline=unit_tests/pulse/ Co
Macro EngineUnitTestFull=EngineUnitTestDriver FullPlot Baseline=unit_tests/pulse/ Computed=./test_results/unit_tests/pulse
Macro ScenarioTest=ScenarioTestDriver FastPlot Baseline=scenarios/ Computed=./test_results/scenarios
#patient/BasicStandard.pba = ScenarioTest
#drug/Epinephrine.pba = ScenarioTest
drug/Norepinephrine.pba = ScenarioTest
\ No newline at end of file
patient/BasicStandard.pba = ScenarioTest
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment