diff --git a/autoMatricesProtub/autoMatProtubConfig.m b/autoMatricesProtub/autoMatProtubConfig.m index 3dc509dc8daa5bcd3cf1cc20702d3a8d776edd0d..e63128535d57029affe46230856d9ad752b6b41f 100644 --- a/autoMatricesProtub/autoMatProtubConfig.m +++ b/autoMatricesProtub/autoMatProtubConfig.m @@ -24,19 +24,19 @@ set(groot,'defaultLegendInterpreter','latex'); %% STATES % State values in which the aerodynamic coefficients will be computed -vars.mach = 0.05:0.05:1; +vars.mach = 0.1:0.1:1.6; vars.alpha = [-22 -15 -10 -7.5 -5 -2.5 -1 -0.5 -0.1 0 0.1 0.5 1 2.5 5 7.5 10 15 22]; vars.beta = [-13 -8 -5 -2.5 -0.1 0 0.1 2.5 5 8 13]; -vars.alt = (0:400:4000); % above local ground (env.z0 will be added in main) +vars.alt = (0:1000:10000); % 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.mach = 0.1:0.1:1.4; varsHighAOA.alpha = [-170 -130 -115 -90.1 -60 -35 -10 -5 -1 0 1 5 10 35 60 90.1 115 130 170]; varsHighAOA.beta = [-170 -130 -115 -90.1 -60 -35 -10 -5 -1 0 1 5 10 35 60 90.1 115 130 170]; -varsHighAOA.alt = (0:400:4000); % above local ground (env.z0 will be added in main) +varsHighAOA.alt = (0:1000:10000); % 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 5dcd6e0dbefdf3ef3a38dc9fae84e8d6fdc714af..5257e59ae5bead73bfd3f5086181812ff009be37 100644 --- a/autoMatricesProtub/mainAutoMatProtub.m +++ b/autoMatricesProtub/mainAutoMatProtub.m @@ -37,6 +37,7 @@ end %% CHOICE OF NUMBER OF XCG timeXcgTotal = rocket.motor.time; xcgTotal = rocket.xcg; +nXcg = autoMatSettings.vars.Nxcg; if nXcg == 1 chosenXcg = xcgTotal(1); diff --git a/simulator/simulatorConfig.m b/simulator/simulatorConfig.m index bd5af2b6618bad17ca67f77e40eb1fadbd8c6e62..9d540798e41a16573e34d1d6c36de1fc430c8633 100644 --- a/simulator/simulatorConfig.m +++ b/simulator/simulatorConfig.m @@ -10,14 +10,14 @@ % SPDX-License-Identifier: GPL-3.0-or-later %% SIMULATION FLAGS -simulator.parafoil = true; % True if parafoil open loop descent needs to be performed +simulator.parafoil = false; % True if parafoil open loop descent needs to be performed % simulator.descent6DOF = false; % True in order to start a 6DOF parachute descent phase -simulator.ballistic = false; % True to run a ballistic (without parachutes) simulation +simulator.ballistic = true; % True to run a ballistic (without parachutes) simulation % NOTE: airbrakes flag is set in rocketConfig %% PLOTS simulator.prints = false; % True to print data after simulation -simulator.plots = false; % True to plot data after simulation -simulator.landingMap = true; % True to run geoplots +simulator.plots = true; % True to plot data after simulation +simulator.landingMap = false; % True to run geoplots simulator.satellite3D = false; % True to plot trajectory on 3D map -simulator.SMonly = true; % True to plot only SM (useful during design!) \ No newline at end of file +simulator.SMonly = false; % True to plot only SM (useful during design!) \ No newline at end of file