From eb4bc934c80586ac2713e7b8bbc920c52ba905ea Mon Sep 17 00:00:00 2001
From: Mauco03 <marco.gaibotti@skywarder.eu>
Date: Sat, 28 Dec 2024 16:04:16 +0100
Subject: [PATCH] [chad-updates] Updated Motor and aerodynamic coefficients
---
classes/bays/Motor.m | 7 +------
missions/2025_Orion_Portugal_October/config/rocketConfig.m | 2 +-
.../2025_Orion_Portugal_October/data/aeroCoefficients.mat | 4 ++--
.../data/aeroCoefficientsHighAOA.mat | 4 ++--
missions/2025_Orion_Portugal_October/data/motors.mat | 4 ++--
5 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/classes/bays/Motor.m b/classes/bays/Motor.m
index 5faddb5..989c938 100644
--- a/classes/bays/Motor.m
+++ b/classes/bays/Motor.m
@@ -16,7 +16,6 @@ classdef Motor < Bay
inertia % [kg*m^2] Total Motor inertia (Body reference)
cutoffTime double % [s] Shutdown time
tankLength double % [m] Tank length
- tankPressure double % [m] Tank length
ignitionTransient double % [s] Ignition transient duration
cutoffTransient double % [s] Cutoff transient duration
time double % [s] Engine time vector
@@ -26,7 +25,6 @@ classdef Motor < Bay
propellantMass double % [Kg] Propellant Mass (in time)
structureMass double % [kg] Engine Structural Mass
fuselageMass double % [kg] Fuselage of the engine only
- chamberTemperature double % [K] Temperature inside combustion chamber
chamberPressure double % [Pa] Pressure inside combustion chamber
xCg % [m] Engine xcg from tank tip
pe double % [Pa] Eflux pressure
@@ -120,10 +118,7 @@ classdef Motor < Bay
obj.pe = chosenMotor.Pe(iUniqueTime);
obj.ae = chosenMotor.Ae;
obj.fuselageMass = chosenMotor.mFus;
- %% TODO: aggiungere a motors.mat (si possono cambiare i nomi dei campi di chosenMotor)
- % obj.tankPressure = chosenMotor.tankPressure;
- % obj.chamberTemperature = chosenMotor.ccTemperature;
- % obj.chamberPressure = chosenMotor.ccPressure;
+ obj.chamberPressure = chosenMotor.Pc;
else
obj.length = chosenMotor.L/1000; % lengths are saved in mm for solid motors
obj.xCg = obj.length/2 * ones(1, size(obj.time, 2));
diff --git a/missions/2025_Orion_Portugal_October/config/rocketConfig.m b/missions/2025_Orion_Portugal_October/config/rocketConfig.m
index bc5927c..631cc20 100644
--- a/missions/2025_Orion_Portugal_October/config/rocketConfig.m
+++ b/missions/2025_Orion_Portugal_October/config/rocketConfig.m
@@ -69,7 +69,7 @@ airbrakes.servoTau = 0.0374588;
%% MOTOR
motor = Motor();
-motor.name = 'HRE_ARM_OPT_2_Venturi';
+motor.name = 'HRE_ARM_OPT_3_No_Chocked';
motor.cutoffTime = []; % [s] OVERRIDE Cutoff time
motor.ignitionTransient = 0.3; % [s] Ignition transient
diff --git a/missions/2025_Orion_Portugal_October/data/aeroCoefficients.mat b/missions/2025_Orion_Portugal_October/data/aeroCoefficients.mat
index c2a9a1d..38e3cad 100644
--- a/missions/2025_Orion_Portugal_October/data/aeroCoefficients.mat
+++ b/missions/2025_Orion_Portugal_October/data/aeroCoefficients.mat
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1389493ef82b7cc4df2e992487f04b33a4bad79727e2e51a0eebf8b716041c21
-size 243915950
+oid sha256:2334c819e3d9d1979e4b405971fd7d8ebbf16f29e8b6ac7fd88042a71adb925a
+size 288256257
diff --git a/missions/2025_Orion_Portugal_October/data/aeroCoefficientsHighAOA.mat b/missions/2025_Orion_Portugal_October/data/aeroCoefficientsHighAOA.mat
index d3f5e2f..0e19b88 100644
--- a/missions/2025_Orion_Portugal_October/data/aeroCoefficientsHighAOA.mat
+++ b/missions/2025_Orion_Portugal_October/data/aeroCoefficientsHighAOA.mat
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:39a4eafbb316befdc6c73a776e76e632e8d215f0426a8dd7adb4025c546058f2
-size 34657630
+oid sha256:39c4c9f66b48648cd44891a9b6357eac741428283a2829d1eab4fdb655c520e0
+size 40434681
diff --git a/missions/2025_Orion_Portugal_October/data/motors.mat b/missions/2025_Orion_Portugal_October/data/motors.mat
index 3dba2f0..1fd2756 100644
--- a/missions/2025_Orion_Portugal_October/data/motors.mat
+++ b/missions/2025_Orion_Portugal_October/data/motors.mat
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bf8dc580108868fa3e2f611fc57053f783e5fc2926fbf706df2774a9d3fd55a7
-size 354191
+oid sha256:6b78bb8da4e4e9f844c7aeea00ebf6ea5d730cdb9575f955ed15b4790218394d
+size 368015
--
GitLab