From d5790cedfbba6c24213bbc45c77dcc7e1dbd47f1 Mon Sep 17 00:00:00 2001
From: giuliaghirardini <giuliaghirardini2001@gmail.com>
Date: Mon, 15 Jul 2024 18:55:27 +0200
Subject: [PATCH] [refactoring-missions][classes] Modified rocket framework if
COTS motor used
---
classes/Rocket.m | 18 +++++++++---------
classes/bays/Motor.m | 1 +
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/classes/Rocket.m b/classes/Rocket.m
index 8db21e9..c9cc13e 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 e4687cc..7655e60 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
--
GitLab