diff --git a/functions/odeFunctions/ballistic.m b/functions/odeFunctions/ballistic.m index 505fc2cf4aa6678e685c420d484c5ecf6ad9101b..586d36b069df7c1ab511c9842b5a2c8845f541c7 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 be527860a6f4086684210f31a8c9ea105606dcc4..969c9fc5b56eeb841d9a9e03ea65da60d973f84a 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;