diff --git a/autoMatricesProtub/autoMatProtubConfig.m b/autoMatricesProtub/autoMatProtubConfig.m index 52ed171d4cbf7754821a7ec1e57485d0de4587c5..4cb74fbae69e4e0cbb2e4d9f63dd6792344c37a3 100644 --- a/autoMatricesProtub/autoMatProtubConfig.m +++ b/autoMatricesProtub/autoMatProtubConfig.m @@ -24,21 +24,17 @@ set(groot,'defaultLegendInterpreter','latex'); %% STATES % State values in which the aerodynamic coefficients will be computed -vars.mach = 0.05:0.05:1; -vars.alpha = [0 0.1 0.5 1 2.5 5 7.5 10 35 60 90.1 115 130 170]; +vars.mach = 0.1:0.1:1; +% vars.alpha = [-60 -35 -10 -7.5 -5 -2.5 -1 -0.5 -0.1 0 0.1 0.5 1 2.5 5 7.5 10 35 60]; +% vars.beta = [-10 -7.5 -5 -2.5 -1 -0.5 -0.1 0 0.1 0.5 1 2.5 5 7.5 10]; +vars.alpha = [0 0.1 0.5 1 2.5 5 7.5 10 35 60]; vars.beta = []; -vars.phi = 0:24:336; % phi = 0:(360/nFins) +% vars.phi = []; +vars.phi = 0:24:360; % phi = 0:(360/nFins) vars.alt = (0:400:4000); % above local ground (env.z0 will be added in main) % xcg discretization vars.Nxcg = 3; % Number of wanted xcgs in order to generate N aerodynamic matrices -%% HIGH AOA -% varsHighAOA.mach = 0.05:0.05:0.7; -% varsHighAOA.alpha = [0 1 5 10 35 60 90.1 115 130 170]; -% varsHighAOA.beta = []; -% varsHighAOA.phi = 0:12:120; % phi = 0:(360/nFins) -% varsHighAOA.alt = (0:400:4000); % above local ground (env.z0 will be added in main) - %% FINS CN partial output saveFinsCN = false; \ No newline at end of file diff --git a/autoMatricesProtub/mainAutoMatProtub.m b/autoMatricesProtub/mainAutoMatProtub.m index 55798cc7b24578f09711f1cb9545c023319e3455..3b94be9ac0c638be51b3594082a9f225d417ae4c 100644 --- a/autoMatricesProtub/mainAutoMatProtub.m +++ b/autoMatricesProtub/mainAutoMatProtub.m @@ -1,4 +1,4 @@ -function [coeffsTot, coeffsTotHighAOA] = mainAutoMatProtub(rocket, environment, settings, options) +function coeffsTot = mainAutoMatProtub(rocket, environment, settings, options) arguments rocket = []; % Empty by default environment Environment = Environment.empty @@ -22,11 +22,9 @@ if isempty(settings), autoMatSettings = Settings('autoMatProtub'); end %% FINALIZE CONFIG (with data not directly editable) % correcting altitudes autoMatSettings.vars.alt = autoMatSettings.vars.alt + environment.z0; -% autoMatSettings.varsHighAOA.alt = autoMatSettings.varsHighAOA.alt + environment.z0; % adding airbrakes length autoMatSettings.vars.hprot = rocket.airbrakes.height; -% autoMatSettings.varsHighAOA.hprot = []; % overriding xcg number if the motor is solid if rocket.motor.type == MotorType.Solid && autoMatSettings.vars.Nxcg ~= 2