diff --git a/classes/Rocket.m b/classes/Rocket.m index 3d08ba3eecdc66a7644230c51651cfc0915b4284..b67d0b88a792df56416233a2b46313e39b397b20 100644 --- a/classes/Rocket.m +++ b/classes/Rocket.m @@ -339,6 +339,7 @@ classdef Rocket < Component xCgRocket == xCgTest; strcmp(obj.coefficients.geometry.ogiveType, obj.payload.noseType); geometryRocket == geometryTest; + strcmp(obj.coefficients.geometry.boatType, obj.rear.boatType) ]; end end diff --git a/classes/bays/Motor.m b/classes/bays/Motor.m index 5bf438c832a61c1e9c2759115ba36cad075e53b7..27b4c0195c0693597b069f1082f7daf88a40772c 100644 --- a/classes/bays/Motor.m +++ b/classes/bays/Motor.m @@ -33,9 +33,10 @@ classdef Motor < Bay properties(Dependent) mass % [kg] Total Motor mass fuselageXCg double % [m] xcg of the engine fuselage only from tank tip + flagHRE logical % [-] Flag relateed to the type of motor: true if HRE end - properties(Access = protected) + properties(Access = protected) configName = 'rocketConfig.m' variableName = 'motor' mission Mission = Mission() @@ -64,6 +65,10 @@ classdef Motor < Bay fuselageXCg = (obj.length - ... obj.tankLength)/2 + obj.tankLength; end + + function flagHRE = get.flagHRE(obj) + flagHRE = contains(obj.name, 'HRE'); + end end methods (Access = protected)