From 3ef3bdcbab2e540a1c244e084863cdd1acbe5888 Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Fri, 15 Apr 2022 17:04:36 -0600 Subject: [PATCH] Fix typo in FinSetCalc --- .../net/sf/openrocket/aerodynamics/BarrowmanCalculator.java | 5 +++-- .../net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java b/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java index bc1b09d29..d24c9c69c 100644 --- a/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java +++ b/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java @@ -585,6 +585,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator { final InstanceMap imap = configuration.getActiveInstances(); for(Map.Entry> entry: imap.entrySet() ) { final RocketComponent c = entry.getKey(); + if (!c.isAerodynamic()) continue; @@ -596,7 +597,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator { double cd = calcMap.get(c).calculatePressureCD(conditions, stagnation, base, warningSet); total += cd; - + if (forceMap != null) { forceMap.get(c).setPressureCD(cd); } @@ -625,7 +626,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator { } } } - + return total; } diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java index a713d9d53..438cbbc46 100644 --- a/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java +++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java @@ -624,7 +624,7 @@ public class FinSetCalc extends RocketComponentCalc { @Override public double calculateFrictionCD(FlightConditions conditions, double componentCf, WarningSet warnings) { - double cd = componentCf * (1 + 2 * thickness / macLength) * 2; + double cd = componentCf * (1 + 2 * thickness / macLength) * 2 * finArea / conditions.getRefArea(); return cd; }