diff --git a/classes/Rocket.m b/classes/Rocket.m index 8db21e9a44e206dd85d1ece04aa3170f215ef79e..c9cc13ed6dd542c39567eb7b35d2fff0844813ad 100644 --- a/classes/Rocket.m +++ b/classes/Rocket.m @@ -166,7 +166,7 @@ classdef Rocket < Component function updateAll(obj) % Note: properties without motor must be updated first - if obj.motor.isHRE + % if obj.motor.isHRE obj.updateAbsolutePositions; obj.updateGeometry; obj.updateMassNoMotor; @@ -177,14 +177,14 @@ classdef Rocket < Component obj.updateInertia; obj.updateCutoff; obj.updateStagesMass; - end - obj.updateAbsolutePositions; - obj.updateGeometry; - obj.updateMassNoMotor; - obj.updateMass; - obj.updateXCgNoMotor; - obj.updateInertiaNoMotor; - obj.updateStagesMass; + % end + % obj.updateAbsolutePositions; + % obj.updateGeometry; + % obj.updateMassNoMotor; + % obj.updateMass; + % obj.updateXCgNoMotor; + % obj.updateInertiaNoMotor; + % obj.updateStagesMass; end end diff --git a/classes/bays/Motor.m b/classes/bays/Motor.m index e4687cc0db4cc687a0462b08452b7af5b07505ae..7655e60afb10dd5f02c49b92b586f23058e478e4 100644 --- a/classes/bays/Motor.m +++ b/classes/bays/Motor.m @@ -109,6 +109,7 @@ classdef Motor < Bay obj.fuselageMass = chosenMotor.mFus; end + if isempty(obj.cutoffTime) || obj.cutoffTime > obj.time(end) obj.cutoffTime = obj.time(end); end