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

[Fixes 679]

Browse Source 
Remove extra multiplication by finCount in FinSet:getLongitudinalUnitInertia() and FinSet:getRotationalUnitInertia()

Restore check for single fin before transfering to center of fin set in FinSet:getRotationalUnitInertia()
This commit is contained in:
JoePfeiffer 2020-06-24 15:48:44 -06:00
parent 43d6779e12
commit fc393d499e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/net/sf/openrocket/rocketcomponent/FinSet.java
View File

@ -670,14 +670,14 @@ public abstract class FinSet extends ExternalComponent implements RingInstanceab
h2 = h * singlePlanformArea / w; h2 = h * singlePlanformArea / w;
} }
double inertia = (h2 + 2 * w2) / 24; final double inertia = (h2 + 2 * w2) / 24;
if (finCount == 1) if (finCount == 1)
return inertia; return inertia;
final double rFront = this.getFinFront().y; final double rFront = this.getFinFront().y;
return finCount * (inertia + MathUtil.pow2(MathUtil.safeSqrt(h2) + rFront)); return inertia + MathUtil.pow2(MathUtil.safeSqrt(h2) + rFront);
} }
@ -707,9 +707,14 @@ public abstract class FinSet extends ExternalComponent implements RingInstanceab
h = MathUtil.safeSqrt(h * singlePlanformArea/ w); h = MathUtil.safeSqrt(h * singlePlanformArea/ w);
} }
final double inertia = h * h / 12;
if (finCount == 1)
return inertia;
final double rFront = this.getFinFront().y; final double rFront = this.getFinFront().y;
return finCount * (h * h / 12 + MathUtil.pow2(h / 2 + rFront)); return inertia + MathUtil.pow2(h / 2 + rFront);
} }