From 72ebd97eeff3d48db0f87c908c65b59102c2b388 Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Tue, 7 Jun 2022 16:37:02 -0600 Subject: [PATCH] Found another couple of instances of fins being multiplied by fincount --- .../aerodynamics/barrowman/FinSetCalc.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java index 438cbbc46..d73317a1e 100644 --- a/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java +++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java @@ -188,7 +188,7 @@ public class FinSetCalc extends RocketComponentCalc { // forces.CrollForce = fins * (macSpan+r) * cna1 * component.getCantAngle() / // conditions.getRefLength(); // With body-fin interference effect: - forces.setCrollForce(finCount * (macSpan + r) * cna1 * (1 + tau) * cantAngle / conditions.getRefLength()); + forces.setCrollForce((macSpan + r) * cna1 * (1 + tau) * cantAngle / conditions.getRefLength()); if (conditions.getAOA() > STALL_ANGLE) { // System.out.println("Fin stalling in roll"); @@ -481,17 +481,17 @@ public class FinSetCalc extends RocketComponentCalc { (conditions.getRefArea() * conditions.getRefLength()); // System.out.println("SPECIAL: " + - // (MathUtil.sign(rollRate) *component.getFinCount() * sum)); - return MathUtil.sign(rollRate) * finCount * sum; + // (MathUtil.sign(rollRate) * sum)); + return MathUtil.sign(rollRate) * sum; } if (mach <= CNA_SUBSONIC) { // System.out.println("BASIC: "+ - // (component.getFinCount() * 2*Math.PI * rollRate * rollSum / + // (2*Math.PI * rollRate * rollSum / // (conditions.getRefArea() * conditions.getRefLength() * // conditions.getVelocity() * conditions.getBeta()))); - return finCount * 2 * Math.PI * rollRate * rollSum / + return 2 * Math.PI * rollRate * rollSum / (conditions.getRefArea() * conditions.getRefLength() * conditions.getVelocity() * conditions.getBeta()); } @@ -512,7 +512,7 @@ public class FinSetCalc extends RocketComponentCalc { * chordLength[i] * (bodyRadius + y); } - return finCount * sum * span / (DIVISIONS - 1) / + return sum * span / (DIVISIONS - 1) / (conditions.getRefArea() * conditions.getRefLength()); }