Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • skyward/matlab-dependencies/common
1 result
Select Git revision
Show changes
Commits on Source (2)
Showing
with 25 additions and 12 deletions
......@@ -52,6 +52,7 @@ classdef Rocket < Config
parachutes cell % [-] (nParachutes, nStages) Parachutes onboard
dynamicDerivatives (1, 1) logical % [-] True if dynamic derivatives will be loaded
highAOACoefficients (1, 1) logical % [-] True if highAOACoefficients are loaded
coefficients Coefficient % [-] Aerodynamic coefficients
coefficientsHighAOA Coefficient % [-] Aerodynamic coefficients at high angle of attack
......@@ -150,13 +151,16 @@ classdef Rocket < Config
fullfile(mission.dataPath, 'aeroCoefficients.mat'), ...
coeffName);
if obj.highAOACoefficients
obj.coefficientsHighAOA = Coefficient( ...
fullfile(mission.dataPath, 'aeroCoefficientsHighAOA.mat'), ...
coeffName);
end
answer = '';
if isempty(obj.coefficients.static) || isempty(obj.coefficientsHighAOA.static)
if isempty(obj.coefficients.static) || ...
(obj.highAOACoefficients && isempty(obj.coefficientsHighAOA.static))
answer = questdlg(['Coefficient matrices not found. ' ...
'Do you want to create new matrices?']);
elseif options.checkGeometry
......@@ -195,7 +199,7 @@ classdef Rocket < Config
parserPath = fullfile(mission.msaPath, 'autoMatricesProtub');
addpath(genpath(parserPath));
[obj.coefficients, obj.coefficientsHighAOA] = ...
mainAutoMatProtub(obj);
mainAutoMatProtub(obj, 'computeHighAOA', obj.highAOACoefficients);
case 'Cancel'
error('Rocket creation aborted')
otherwise
......
......@@ -20,6 +20,7 @@ rocket.lengthCenterNoMot = 1.7640; % [m]
% When false, coefficients are saved with current motor's name
% When true, coefficients are saved as 'generic'
rocket.dynamicDerivatives = false; % [-] True if dynamic derivatives will be loaded
rocket.highAOACoefficients = false; % [-] True if separate matrix for high AOA will be loaded
%% PLD - Includes Parafoil + Nose
parafoil = Parafoil();
......
......@@ -20,6 +20,7 @@ rocket.lengthCenterNoMot = 1.7840; % [m]
% When false, coefficients are saved with current motor's name
% When true, coefficients are saved as 'generic'
rocket.dynamicDerivatives = false; % [-] True if dynamic derivatives will be loaded
rocket.highAOACoefficients = false; % [-] True if separate matrix for high AOA will be loaded
%% PLD - Includes Parafoil + Nose
parafoil = Parafoil();
......
......@@ -20,6 +20,7 @@ rocket.lengthCenterNoMot = 1.4470; % [m]
% When false, coefficients are saved with current motor's name
% When true, coefficients are saved as 'generic'
rocket.dynamicDerivatives = false; % [-] True if dynamic derivatives will be loaded
rocket.highAOACoefficients = false; % [-] True if separate matrix for high AOA will be loaded
%% PLD - Includes Parafoil + Nose
parafoil = Parafoil();
......
......@@ -22,6 +22,7 @@ rocket.lengthCenterNoMot = 1.61; % [m]
% When false, coefficients are saved with current motor's name
% When true, coefficients are saved as 'generic'
rocket.dynamicDerivatives = false; % [-] True if dynamic derivatives will be loaded
rocket.highAOACoefficients = false; % [-] True if separate matrix for high AOA will be loaded
%% PLD - Includes Parafoil + Nose
parafoil = Parafoil();
......
......@@ -19,7 +19,7 @@ rocket.lengthCenterNoMot = 1.517; % [m]
% When false, coefficients are saved with current motor's name
% When true, coefficients are saved as 'generic'
rocket.dynamicDerivatives = false; % [-] True if dynamic derivatives will be loaded
rocket.highAOACoefficients = false; % [-] True if separate matrix for high AOA will be loaded
%% PLD - Includes Parafoil + Nose
parafoil = Parafoil();
......
......@@ -19,6 +19,7 @@ rocket.lengthCenterNoMot = 1.517; % [m]
% When false, coefficients are saved with current motor's name
% When true, coefficients are saved as 'generic'
rocket.dynamicDerivatives = false; % [-] True if dynamic derivatives will be loaded
rocket.highAOACoefficients = false; % [-] True if separate matrix for high AOA will be loaded
%% PLD - Includes Parafoil + Nose
parafoil = Parafoil();
......
......@@ -13,6 +13,7 @@ rocket.lengthCenterNoMot = []; % [m]
% When false, coefficients are saved with current motor's name
% When true, coefficients are saved as 'generic'
rocket.dynamicDerivatives = false; % [-] True if dynamic derivatives will be loaded
rocket.highAOACoefficients = false; % [-] True if separate matrix for high AOA will be loaded
%% PLD - Includes Parafoil + Nose
parafoil = Parafoil();
......
......@@ -19,6 +19,7 @@ rocket.lengthCenterNoMot = []; % [m]
% When false, coefficients are saved with current motor's name
% When true, coefficients are saved as 'generic'
rocket.dynamicDerivatives = false; % [-] True if dynamic derivatives will be loaded
rocket.highAOACoefficients = false; % [-] True if separate matrix for high AOA will be loaded
%% PLD - Includes Parafoil + Nose
parafoil = Parafoil();
......
......@@ -13,6 +13,7 @@ rocket.diameter = 0.15; % [m]
% When false, coefficients are saved with current motor's name
% When true, coefficients are saved as 'generic'
rocket.dynamicDerivatives = false; % [-] True if dynamic derivatives will be loaded
rocket.highAOACoefficients = false; % [-] True if separate matrix for high AOA will be loaded
%% PRF - Includes Parafoil + Nose
parafoil = Parafoil();
......
Source diff could not be displayed: it is stored in LFS. Options to address this: view the blob.
Source diff could not be displayed: it is stored in LFS. Options to address this: view the blob.
......@@ -19,6 +19,7 @@ rocket.lengthCenterNoMot = []; % [m]
% When false, coefficients are saved with current motor's name
% When true, coefficients are saved as 'generic'
rocket.dynamicDerivatives = false; % [-] True if dynamic derivatives will be loaded
rocket.highAOACoefficients = false; % [-] True if separate matrix for high AOA will be loaded
%% PLD - Includes Parafoil + Nose
parafoil = Parafoil();
......