From 76a4a5bbaac36ddfc6f8fa56c3edf01f42769583 Mon Sep 17 00:00:00 2001 From: giuliaghirardini <giuliaghirardini2001@gmail.com> Date: Mon, 21 Oct 2024 22:20:54 +0200 Subject: [PATCH] [design-updates][2024_Lyra_Portugal_October] Updated Euroc data --- .../config/environmentConfig.m | 8 ++++---- .../2024_Lyra_Portugal_October/config/rocketConfig.m | 6 +++--- .../2024_Lyra_Portugal_October/config/windConfig.m | 12 ++++++------ .../data/aeroCoefficients.mat | 4 ++-- .../data/aeroCoefficientsHighAOA.mat | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/missions/2024_Lyra_Portugal_October/config/environmentConfig.m b/missions/2024_Lyra_Portugal_October/config/environmentConfig.m index 78a48f9..b6a7d40 100644 --- a/missions/2024_Lyra_Portugal_October/config/environmentConfig.m +++ b/missions/2024_Lyra_Portugal_October/config/environmentConfig.m @@ -4,11 +4,11 @@ environment = Environment(); -environment.lat0 = 39.388727; % [deg] Launchpad latitude -environment.lon0 = -8.287842; % [deg] Launchpad longitude +environment.lat0 = 39.3901711000000; % [deg] Launchpad latitude +environment.lon0 = -8.28954220000000; % [deg] Launchpad longitude environment.z0 = 160; % [m] Launchpad Altitude -environment.omega = 85; % [deg] Launchpad elevation -environment.phi = 133; % [deg] Launchpad azimuth +environment.omega = 84; % [deg] Launchpad elevation +environment.phi = 134.5; % [deg] Launchpad azimuth environment.pin1Length = 0.5603; % [m] Distance from the upper pin to the upper tank cap environment.pin2Length = 0.2055; % [m] Distance from the lower pin to the lower tank cap environment.rampLength = 12; % [m] Total launchpad length diff --git a/missions/2024_Lyra_Portugal_October/config/rocketConfig.m b/missions/2024_Lyra_Portugal_October/config/rocketConfig.m index db3043c..cc61485 100644 --- a/missions/2024_Lyra_Portugal_October/config/rocketConfig.m +++ b/missions/2024_Lyra_Portugal_October/config/rocketConfig.m @@ -49,7 +49,7 @@ airbrakes.mass = 0.936; % [kg] Tota airbrakes.inertia = 1e-9*[3086650; 1931082; 1889047]; % [kg*m^2] Total bay inertia (Body reference) airbrakes.xCg = 30.54 * 1e-3; % [m] Cg relative to bay upper side -airbrakes.enabled = false; % If true, multiple and smooth airbrakes opening will be simulated +airbrakes.enabled = true; % If true, multiple and smooth airbrakes opening will be simulated airbrakes.extension = [1]; % aerobrakes, 1-2-3 for 0%, 50% or 100% opened airbrakes.deltaTime = [0]; % aerobrakes, configurations usage time @@ -95,7 +95,7 @@ motor = Motor(); % motor.name = 'HRE_ARM_P_67_T015_T03'; % % motor.name = 'HRE_ARM_P_40_T030_T03'; -motor.name = 'HRE_ARM_P_41_T030_T03'; +% motor.name = 'HRE_ARM_P_41_T030_T03'; % motor.name = 'HRE_ARM_P_42_T030_T03'; % motor.name = 'HRE_ARM_P_43_T030_T03'; % motor.name = 'HRE_ARM_P_44_T030_T03'; @@ -105,7 +105,7 @@ motor.name = 'HRE_ARM_P_41_T030_T03'; % motor.name = 'HRE_ARM_P_48_T030_T03'; % motor.name = 'HRE_ARM_P_49_T030_T03'; % motor.name = 'HRE_ARM_P_50_T030_T03'; -% motor.name = 'HRE_ARM_P_52_T030_T03'; +motor.name = 'HRE_ARM_P_52_T030_T03'; % motor.name = 'HRE_ARM_P_53_T030_T03'; % motor.name = 'HRE_ARM_P_54_T030_T03'; % motor.name = 'HRE_ARM_P_55_T030_T03'; diff --git a/missions/2024_Lyra_Portugal_October/config/windConfig.m b/missions/2024_Lyra_Portugal_October/config/windConfig.m index 32bd11e..843632f 100644 --- a/missions/2024_Lyra_Portugal_October/config/windConfig.m +++ b/missions/2024_Lyra_Portugal_October/config/windConfig.m @@ -11,13 +11,13 @@ windCustom = WindCustom(); -windCustom.altitudes = [0 140 500 1000 1500 2000 2500 3000 3500 4000]; % [m] Altitudes at which a distribution change occurs -windCustom.magnitudeDistribution = ["u", "g", "g", "g", "g", "g", "g", "g", "g", "g"]; % [-] Distribution type: "u" - uniform, "g" - gaussian -windCustom.magnitudeParameters = [0 7 12 13 13 14 14 15 15 15; - 8.7 1.5 3 3 3 3 3 3 3 3]; % [m/s] Distribution parameters: "u" - [min; max], "g" - [mu; sigma] +windCustom.altitudes = [0 150 500 1000 1500 2000 2500 3000 3500 4000]; % [m] Altitudes at which a distribution change occurs +windCustom.magnitudeDistribution = ["g", "g", "g", "g", "g", "g", "g", "g", "g", "g"]; % [-] Distribution type: "u" - uniform, "g" - gaussian +windCustom.magnitudeParameters = [3 4 6 7 8 11 12 14 15 18; + 1.5 1.5 2 2 2 2 2 2 2 2]; % [m/s] Distribution parameters: "u" - [min; max], "g" - [mu; sigma] windCustom.azimuthDistribution = ["u", "u", "u", "u", "u", "u", "u", "u", "u", "u"]; % [-] Distribution type: "u" - uniform, "g" - gaussian -windCustom.azimuthParameters = [270 270 270 280 270 260 260 240 240 240; - 290 290 290 300 290 280 280 280 280 280]*pi/180; % [deg] Distribution parameters: "u" - [min; max], "g" - [mu; sigma] +windCustom.azimuthParameters = [197 150 160 180 200 200 200 200 200 210; + 217 170 180 200 220 220 220 220 220 230]*pi/180; % [deg] Distribution parameters: "u" - [min; max], "g" - [mu; sigma] % windCustom.altitudes = [0 4500]; % windCustom.magnitudeDistribution = ["u", "u"]; diff --git a/missions/2024_Lyra_Portugal_October/data/aeroCoefficients.mat b/missions/2024_Lyra_Portugal_October/data/aeroCoefficients.mat index cb08e7c..f0f1467 100644 --- a/missions/2024_Lyra_Portugal_October/data/aeroCoefficients.mat +++ b/missions/2024_Lyra_Portugal_October/data/aeroCoefficients.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4067a6efdc402fc246e7d936654eeecfd198a849959357e39b83e01a435ba0f -size 36220522 +oid sha256:3ac070bd5e26176fd73bea5e0a70245b2f9f3fa058322e9bb0ee2070bfed9114 +size 44348273 diff --git a/missions/2024_Lyra_Portugal_October/data/aeroCoefficientsHighAOA.mat b/missions/2024_Lyra_Portugal_October/data/aeroCoefficientsHighAOA.mat index 5220550..966da42 100644 --- a/missions/2024_Lyra_Portugal_October/data/aeroCoefficientsHighAOA.mat +++ b/missions/2024_Lyra_Portugal_October/data/aeroCoefficientsHighAOA.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9deb0d6cb2d344ddd2be49b95d2393484357ed1e5a947247ad1de51fa43da67b -size 5777781 +oid sha256:6991c13f28cbd19798ffa433ec6b584050644041efadbd3cf0b7fed7809a4b47 +size 5778389 -- GitLab