diff --git a/missions/2025_Orion_Portugal_October/config/rocketConfig.m b/missions/2025_Orion_Portugal_October/config/rocketConfig.m index 38266aa60cfd91a43f96c51f14eb7f2a2dfdcfeb..cd9070852ed727da4f06be46800b504ea98ec72e 100644 --- a/missions/2025_Orion_Portugal_October/config/rocketConfig.m +++ b/missions/2025_Orion_Portugal_October/config/rocketConfig.m @@ -9,15 +9,15 @@ rocket.inertiaNoMotor = []; % [kg*m^ rocket.xCgNoMotor = []; % [m] OVERRIDE xCg without motor rocket.lengthCenterNoMot = []; % [m] OVERRIDE Center length - no nose, no motor -%% PLD - Includes Parafoil + Nose +%% PRF - Includes Parafoil + Nose parafoil = Parafoil(); -parafoil.length = 619.5 * 1e-3; % [m] Total bay length +parafoil.length = 646.2 * 1e-3; % [m] Total bay length parafoil.mass = 5.2; % [kg] Total bay mass parafoil.inertia = 1e-9*[12531966; 109986813; 109930516]; % [kg*m^2] Total bay inertia (Body reference) parafoil.xCg = 453.55 * 1e-3; % [m] Cg relative to bay upper side -parafoil.noseLength = 0.32; % [m] Nosecone length +parafoil.noseLength = 0.327; % [m] Nosecone length parafoil.noseType = 'MHAACK'; % [-] Nosecone shape parafoil.nosePower = 3/4; % [-] Nosecone power type parameter parafoil.nosePMod = 1.250152e+00; % [-] P coefficient for modified nosecone shapes @@ -26,7 +26,7 @@ parafoil.noseCMod = 1.799127e-01; % [-] C %% RCS recovery = Recovery(); -recovery.length = 829.15 * 1e-3; % [m] Total bay length +recovery.length = 826 * 1e-3; % [m] Total bay length recovery.mass = 4.42; % [kg] Total bay mass recovery.inertia = 1e-9*[13831051; 269596803; 269645059]; % [kg*m^2] Total bay inertia (Body reference) recovery.xCg = 459 * 1e-3; % [m] Cg relative to bay upper side @@ -44,7 +44,7 @@ airbrakes = Airbrakes(); airbrakes.identification = false; % Control parameter for airbrakes - GNC -airbrakes.length = 64.8 * 1e-3; % [m] Total bay length +airbrakes.length = 54.8 * 1e-3; % [m] Total bay length airbrakes.mass = 0.96; % [kg] Total bay mass airbrakes.inertia = 1e-9*[3086650; 1931082; 1889047]; % [kg*m^2] Total bay inertia (Body reference) airbrakes.xCg = 35.2 * 1e-3; % [m] Cg relative to bay upper side @@ -69,7 +69,7 @@ airbrakes.servoTau = 0.0374588; %% MOTOR motor = Motor(); -motor.name = 'HRE_ARM_Preliminary'; +motor.name = 'HRE_ARM_OPT_2_Venturi'; motor.cutoffTime = []; % [s] OVERRIDE Cutoff time motor.ignitionTransient = 0.3; % [s] Ignition transient @@ -78,23 +78,24 @@ motor.cutoffTransient = 0.3; % [s] Cut-o %% REAR - Includes Fincan + Boat rear = Rear(); -rear.position = 1.2247; % [m] offset from +rear.position = 1.2468; % [m] offset from rear.length = 547 * 1e-3; % [m] Total bay length -rear.mass = 1.623; % [kg] Total bay mass +rear.mass = 1.71; % [kg] Total bay mass rear.inertia = 1e-9*[13074201; 44271226; 44270124]; % [kg*m^2] Total bay inertia (Body reference) rear.xCg = 253.77 * 1e-3; % [m] Cg relative to bay upper side rear.boatType = 'OGIVE'; % [-] Boat type -rear.boatLength = 0.114; % [m] Boat length -rear.boatFinalDiameter = 0.125; % [m] Boat end diameter +rear.boatLength = 0.240; % [m] Boat length +rear.boatFinalDiameter = 0.076; % [m] Boat end diameter rear.finsRootChord = 0.3; % [m] attached chord length -rear.finsFreeChord = 0.12; % [m] free chord length +rear.finsFreeChord = 0.17; % [m] free chord length rear.finsHeight = 0.13; % [m] fin height -rear.finsDeltaXFreeChord = 0.13; % [m] start of Chord 2 measured from start of Chord 1 +% rear.finsDeltaXRootChord = 0.205; +rear.finsDeltaXFreeChord = 0.12; % [m] start of Chord 2 measured from start of Chord 1 rear.nPanel = 3; % [m] number of fins rear.finsLeadingEdgeRadius = [0 0]; % [deg] Leading edge radius at each span station -rear.finsAxialDistance = -0.044; % [m] distance between end of root chord and end of center body +rear.finsAxialDistance = -0.205; % [m] distance between end of root chord and end of center body rear.finsSemiThickness = 0.00175; % [m] fin semi-thickness rear.finsMaxThicknessPosition = 0.00175; % [m] Fraction of chord from leading edge to max thickness diff --git a/missions/2025_Orion_Portugal_October/data/aeroCoefficients.mat b/missions/2025_Orion_Portugal_October/data/aeroCoefficients.mat index f9d0a26e5a338ce1fc35e5f361815fa84b9f5e4f..49d5677fd035c1a99902ec1d6082705bc4740508 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:8c94d56e791b9d0847dbe06b70f1303c3fe4741382709c52d974ba1bb0c1961a -size 66530066 +oid sha256:341e566c75565e17f268f2d5c931b2ab12d969da8ac029025e5389bdb3cb6fbe +size 243915328 diff --git a/missions/2025_Orion_Portugal_October/data/aeroCoefficientsHighAOA.mat b/missions/2025_Orion_Portugal_October/data/aeroCoefficientsHighAOA.mat index f59ecbc6b8bac6442e15ffc3fcc801f521853d88..3b0b3849d869ba0385fc96d4742c30ca56eda706 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:a7cb40b6d6b84c442063b17af371bf35332333be7e359d6d293c146c25feddfc -size 11552007 +oid sha256:63ff71a54b0619b9e8a6f31b07b3cbb4cade8437c1bfcbd31e54393952da1114 +size 34654009 diff --git a/missions/2025_Orion_Portugal_October/data/motors.mat b/missions/2025_Orion_Portugal_October/data/motors.mat index d080bb2143a8b6a5870a02fac025df5f1e786402..3dba2f0eefabb1900c0d9a27ca80eb73e1bbd6f8 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:e20bdfb789a5363eb38c23a00fe9cda2a75a48557fd8a0edc7eeda0850f06e6b -size 295188 +oid sha256:bf8dc580108868fa3e2f611fc57053f783e5fc2926fbf706df2774a9d3fd55a7 +size 354191