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

Correct calculateFrictionDrag() to iterate through all instances of components

Browse Source
This commit is contained in:
JoePfeiffer 2020-03-19 11:01:14 -06:00
parent af3d226b2b
commit 5483c3e659
1 changed files with 76 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java
View File

@ -393,13 +393,19 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
double[] roughnessLimited = new double[Finish.values().length]; double[] roughnessLimited = new double[Finish.values().length];
Arrays.fill(roughnessLimited, Double.NaN); Arrays.fill(roughnessLimited, Double.NaN);
for (RocketComponent c : configuration.getActiveComponents()) { final InstanceMap imap = configuration.getActiveInstances();
for(Map.Entry<RocketComponent, ArrayList<InstanceContext>> entry: imap.entrySet() ) {
final RocketComponent c = entry.getKey();
// Consider only SymmetricComponents and FinSets: // Consider only SymmetricComponents and FinSets:
if (!(c instanceof SymmetricComponent) && if (!(c instanceof SymmetricComponent) &&
!(c instanceof FinSet)) !(c instanceof FinSet))
continue; continue;
// iterate across component instances
final ArrayList<InstanceContext> contextList = entry.getValue();
for(InstanceContext context: contextList ) {
// Calculate the roughness-limited friction coefficient // Calculate the roughness-limited friction coefficient
Finish finish = ((ExternalComponent) c).getFinish(); Finish finish = ((ExternalComponent) c).getFinish();
if (Double.isNaN(roughnessLimited[finish.ordinal()])) { if (Double.isNaN(roughnessLimited[finish.ordinal()])) {
@ -458,7 +464,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
FinSet f = (FinSet) c; FinSet f = (FinSet) c;
double mac = ((FinSetCalc) calcMap.get(c)).getMACLength(); double mac = ((FinSetCalc) calcMap.get(c)).getMACLength();
double cd = componentCf * (1 + 2 * f.getThickness() / mac) * double cd = componentCf * (1 + 2 * f.getThickness() / mac) *
2 * f.getFinCount() * f.getPlanformArea(); 2 * f.getPlanformArea();
finFriction += cd; finFriction += cd;
if (map != null) { if (map != null) {
@ -467,9 +473,9 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
} }
} }
}
// fB may be POSITIVE_INFINITY, but that's ok for us // fB may be POSITIVE_INFINITY, but that's ok for us
double fB = (len + 0.0001) / maxR; double fB = (len + 0.0001) / maxR;
double correction = (1 + 1.0 / (2 * fB)); double correction = (1 + 1.0 / (2 * fB));
@ -483,8 +489,6 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
} }
} }
return (finFriction + correction * bodyFriction) / conditions.getRefArea(); return (finFriction + correction * bodyFriction) / conditions.getRefArea();
} }