hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Found another couple of instances of fins being multiplied by fincount

Browse Source
This commit is contained in:
JoePfeiffer 2022-06-07 16:37:02 -06:00
parent ca9241f562
commit 72ebd97eef
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java
View File

@ -188,7 +188,7 @@ public class FinSetCalc extends RocketComponentCalc {
// forces.CrollForce = fins * (macSpan+r) * cna1 * component.getCantAngle() / // forces.CrollForce = fins * (macSpan+r) * cna1 * component.getCantAngle() /
// conditions.getRefLength(); // conditions.getRefLength();
// With body-fin interference effect: // 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) { if (conditions.getAOA() > STALL_ANGLE) {
// System.out.println("Fin stalling in roll"); // System.out.println("Fin stalling in roll");
@ -481,17 +481,17 @@ public class FinSetCalc extends RocketComponentCalc {
(conditions.getRefArea() * conditions.getRefLength()); (conditions.getRefArea() * conditions.getRefLength());
// System.out.println("SPECIAL: " + // System.out.println("SPECIAL: " +
// (MathUtil.sign(rollRate) *component.getFinCount() * sum)); // (MathUtil.sign(rollRate) * sum));
return MathUtil.sign(rollRate) * finCount * sum; return MathUtil.sign(rollRate) * sum;
} }
if (mach <= CNA_SUBSONIC) { if (mach <= CNA_SUBSONIC) {
// System.out.println("BASIC: "+ // System.out.println("BASIC: "+
// (component.getFinCount() * 2*Math.PI * rollRate * rollSum / // (2*Math.PI * rollRate * rollSum /
// (conditions.getRefArea() * conditions.getRefLength() * // (conditions.getRefArea() * conditions.getRefLength() *
// conditions.getVelocity() * conditions.getBeta()))); // conditions.getVelocity() * conditions.getBeta())));
return finCount * 2 * Math.PI * rollRate * rollSum / return 2 * Math.PI * rollRate * rollSum /
(conditions.getRefArea() * conditions.getRefLength() * (conditions.getRefArea() * conditions.getRefLength() *
conditions.getVelocity() * conditions.getBeta()); conditions.getVelocity() * conditions.getBeta());
} }
@ -512,7 +512,7 @@ public class FinSetCalc extends RocketComponentCalc {
* chordLength[i] * (bodyRadius + y); * chordLength[i] * (bodyRadius + y);
} }
return finCount * sum * span / (DIVISIONS - 1) / return sum * span / (DIVISIONS - 1) /
(conditions.getRefArea() * conditions.getRefLength()); (conditions.getRefArea() * conditions.getRefLength());
} }