From e028a0931a9413eb3f1ea22154b299b707feda5a Mon Sep 17 00:00:00 2001
From: MatteoGotti <matteo.gotti@skywarder.eu>
Date: Wed, 31 Jul 2024 17:26:37 +0200
Subject: [PATCH] [fins-dimensioning][functions] bugfix missing rad2deg
---
functions/odeFunctions/ballistic.m | 2 +-
functions/simulations/stdStability.m | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/functions/odeFunctions/ballistic.m b/functions/odeFunctions/ballistic.m
index 505fc2c..586d36b 100644
--- a/functions/odeFunctions/ballistic.m
+++ b/functions/odeFunctions/ballistic.m
@@ -149,7 +149,7 @@ betaOut = beta;
%% INTERPOLATE AERODYNAMIC COEFFICIENTS:
-if abs(alpha)>25*pi/180 || abs(beta)>25*pi/180 && altitude < environment.effectiveRampAltitude
+if abs(rad2deg(alpha))>25*pi/180 || abs(rad2deg(beta))>25*pi/180
coeffsValues = interpN( rocket.coefficientsHighAOA.total,...
{rocket.coefficientsHighAOA.state.alphas, rocket.coefficientsHighAOA.state.machs, ...
rocket.coefficientsHighAOA.state.betas, rocket.coefficientsHighAOA.state.altitudes}, ...
diff --git a/functions/simulations/stdStability.m b/functions/simulations/stdStability.m
index be52786..969c9fc 100644
--- a/functions/simulations/stdStability.m
+++ b/functions/simulations/stdStability.m
@@ -61,8 +61,8 @@ mach = stability.interp.mach(end);
xcg = interpLinear(rocket.motor.time, rocket.xCg, tPad);
%%% create dissileMatcom input data struct
-dissileVars.alpha = sort([-alpha, alpha, 0, -1, 1]);
-dissileVars.beta = beta;
+dissileVars.alpha = sort([-rad2deg(alpha), rad2deg(alpha), 0, -1, 1]);
+dissileVars.beta = rad2deg(beta);
dissileVars.alt = alt;
dissileVars.mach = mach;
dissileVars.xcg = xcg;
--
GitLab