From 3940895df7a7e31e0fa88ee9d95482bd72e72caf Mon Sep 17 00:00:00 2001 From: giuliaghirardini <giuliaghirardini2001@gmail.com> Date: Thu, 14 Nov 2024 16:03:03 +0100 Subject: [PATCH] [design-updates][simulator] Added design plot function to avoid many plots to pop up while iteratively calling simulator for design puposes --- common | 2 +- simulator/mainSimulator.m | 1 + simulator/simulatorConfig.m | 5 +++-- simulator/src/designPlots.m | 22 ++++++++++++++++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 simulator/src/designPlots.m diff --git a/common b/common index 5284cad0..980f4165 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 5284cad0c7c8e41cfcf7a299437780e1eaa3619d +Subproject commit 980f4165e3b771afc96141ea1dadb033d5a42320 diff --git a/simulator/mainSimulator.m b/simulator/mainSimulator.m index 04846a9b..2294620f 100644 --- a/simulator/mainSimulator.m +++ b/simulator/mainSimulator.m @@ -89,4 +89,5 @@ toc(tStart) prints(ascent, descent, environment) if settings.simulator.plots, stdPlots(ascent, descent, rocket, environment, settings); end +if settings.simulator.SMonly, designPlots(ascent, descent, rocket, environment, settings); end end \ No newline at end of file diff --git a/simulator/simulatorConfig.m b/simulator/simulatorConfig.m index 977961b2..6a92c67f 100644 --- a/simulator/simulatorConfig.m +++ b/simulator/simulatorConfig.m @@ -22,6 +22,7 @@ simulator.unitTest = true; % NOTE: airbrakes enable flag is set in rocketConfig %% PLOTS -simulator.plots = true; % True to plot data after simulation +simulator.plots = false; % True to plot data after simulation simulator.landingMap = true; % True to run geoplots -simulator.satellite3D = false; % True to plot trajectory on 3D map \ No newline at end of file +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 diff --git a/simulator/src/designPlots.m b/simulator/src/designPlots.m new file mode 100644 index 00000000..68c77c78 --- /dev/null +++ b/simulator/src/designPlots.m @@ -0,0 +1,22 @@ +function designPlots(ascent, descent, rocket, environment, settings) +arguments + ascent struct + descent struct + rocket Rocket + environment Environment + settings Settings +end + +tAscent = ascent.state.time; + +%%% Stability Margin +figure('Name','Stability Margins - ascent Phase','NumberTitle','off'); +plot(tAscent, -ascent.coeff.XCPlon, '.',... + tAscent, -ascent.coeff.XCPlat, '.',... + tAscent, ascent.coeff.XCPtot, '.'); + +title('Stability margin vs time'), grid on; +legend('Longitudinal', 'Lateral', 'Total') +xlabel('Time (s)'); ylabel('S.M.(/)') +ylim([0 6.5]) +end \ No newline at end of file -- GitLab