From 8fd3e5869323e0f373997c49b463350bbe21586f Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Fri, 16 Dec 2022 10:15:52 -0700 Subject: [PATCH] Revert "add transonic warning". Implementing full aero instead This reverts commit c9de2085f95bdf8bafcc2053ec6f408ddd0b3160. --- core/resources/l10n/messages.properties | 2 +- core/src/net/sf/openrocket/aerodynamics/Warning.java | 2 -- .../sf/openrocket/aerodynamics/barrowman/RailButtonCalc.java | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index 459cc134b..c63e110ca 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -1865,7 +1865,7 @@ Warning.TUBE_SEPARATION = Space between tube fins may not result in accurate sim Warning.TUBE_OVERLAP = Overlapping tube fins may not result in accurate simulations. Warning.EMPTY_BRANCH = Simulation branch contains no data Warning.SEPARATION_ORDER = Stages separated in an unreasonable order -Warning.RAILBUTTON_TRANSONIC = Railbutton drag calculations may be inaccurate at transonic or supersonic speeds + ! Scale dialog ScaleDialog.lbl.scaleRocket = Entire rocket ScaleDialog.lbl.scaleSubselection = Selection and all subcomponents diff --git a/core/src/net/sf/openrocket/aerodynamics/Warning.java b/core/src/net/sf/openrocket/aerodynamics/Warning.java index 2a3ff0eff..ae7c94e35 100644 --- a/core/src/net/sf/openrocket/aerodynamics/Warning.java +++ b/core/src/net/sf/openrocket/aerodynamics/Warning.java @@ -399,6 +399,4 @@ public abstract class Warning { public static final Warning SEPARATION_ORDER = new Other(trans.get("Warning.SEPARATION_ORDER")); public static final Warning EMPTY_BRANCH = new Other(trans.get("Warning.EMPTY_BRANCH")); - - public static final Warning RAILBUTTON_TRANSONIC = new Other(trans.get("Warning.RAILBUTTON_TRANSONIC")); } diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/RailButtonCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/RailButtonCalc.java index e76e5de00..a1800cf30 100644 --- a/core/src/net/sf/openrocket/aerodynamics/barrowman/RailButtonCalc.java +++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/RailButtonCalc.java @@ -8,7 +8,6 @@ import org.slf4j.LoggerFactory; import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.Warning; import net.sf.openrocket.aerodynamics.WarningSet; import net.sf.openrocket.rocketcomponent.RailButton; import net.sf.openrocket.rocketcomponent.RocketComponent; @@ -97,7 +96,6 @@ public class RailButtonCalc extends RocketComponentCalc { // add to CDmul CDmul += cd; } - return CDmul*stagnationCD * refArea / conditions.getRefArea(); } }