diff --git a/classes/@Rocket/Rocket.m b/classes/@Rocket/Rocket.m index 1dd3d61d0c5ccbe2e74b5311459b2f4821807b32..0e4be4a76d84243943f964c2f76f3efea786e24d 100644 --- a/classes/@Rocket/Rocket.m +++ b/classes/@Rocket/Rocket.m @@ -136,7 +136,7 @@ classdef Rocket < Config obj.parachutes = paraLoader.parachutes; if options.loadCoefficients - obj.loadData(); + obj = obj.loadData(); answer = ''; if isempty(obj.coefficients) || isempty(obj.coefficientsHighAOA) answer = questdlg(['Coefficient matrices not found. ' ... @@ -151,7 +151,7 @@ classdef Rocket < Config parserPath = fullfile(mission.msaPath, 'autoMatricesProtub'); addpath(genpath(parserPath)); mainAutoMatProtub(obj); - obj.loadData(); + obj = obj.loadData(); case 'Cancel' error('Rocket creation aborted') otherwise diff --git a/classes/@Rocket/checkGeometry.m b/classes/@Rocket/checkGeometry.m index 95ce79caa9f4ce858921943986cf6d60914ca6fc..e61422f40605ed733434a8ef1bc5dbd9ff23c935 100644 --- a/classes/@Rocket/checkGeometry.m +++ b/classes/@Rocket/checkGeometry.m @@ -7,8 +7,8 @@ function checks = checkGeometry(obj) % - checks (n fields of geometry, 1): boolean value of the geometry checks xCgRocket = round([ ... - obj.xCg(1); ... - obj.xCg(end) ... + obj.xcg(1); ... + obj.xcg(end) ... ], 3); xCgTest = round([ diff --git a/classes/@Rocket/loadData.m b/classes/@Rocket/loadData.m index 78b4e6d8bbcc3d16d245183558059641baca8036..43d054e196d9878e3bebf4fe7eef81e2f085d3ff 100644 --- a/classes/@Rocket/loadData.m +++ b/classes/@Rocket/loadData.m @@ -15,6 +15,8 @@ dataCoeffs = load(aeroPath); dataCoeffsHighAOA = load(aeroHighAOAPath); if isfield(dataCoeffs, motorName) && isfield(dataCoeffsHighAOA, motorName) + obj.coefficients = struct(); + obj.coefficientsHighAOA = struct(); dataCoeffs = dataCoeffs.(motorName); dataCoeffsHighAOA = dataCoeffsHighAOA.(motorName); else