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

Correct calculatePressureDrag() to iterate through all instances.

Browse Source
This commit is contained in:
JoePfeiffer 2020-03-19 11:13:40 -06:00
parent 5483c3e659
commit 05185ff3d6
2 changed files with 34 additions and 27 deletions
core/src/net/sf/openrocket/aerodynamics
BarrowmanCalculator.java
barrowman
FinSetCalc.java

9
core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java

@ -515,10 +515,16 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
base = calculateBaseCD(conditions.getMach()); base = calculateBaseCD(conditions.getMach());
total = 0; total = 0;
for (RocketComponent c : configuration.getActiveComponents()) { final InstanceMap imap = configuration.getActiveInstances();
for(Map.Entry<RocketComponent, ArrayList<InstanceContext>> entry: imap.entrySet() ) {
final RocketComponent c = entry.getKey();
if (!c.isAerodynamic()) if (!c.isAerodynamic())
continue; continue;
// iterate across component instances
final ArrayList<InstanceContext> contextList = entry.getValue();
for(InstanceContext context: contextList ) {
// Pressure fore drag // Pressure fore drag
double cd = calcMap.get(c).calculatePressureDragForce(conditions, stagnation, base, double cd = calcMap.get(c).calculatePressureDragForce(conditions, stagnation, base,
warnings); warnings);
@ -547,6 +553,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
radius = s.getAftRadius(); radius = s.getAftRadius();
} }
} }
}
return total; return total;
} }

2
core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java

@ -645,7 +645,7 @@ public class FinSetCalc extends RocketComponentCalc {
// Airfoil assumed to have zero base drag // Airfoil assumed to have zero base drag
// Scale to correct reference area // Scale to correct reference area
drag *= finCount * span * thickness / conditions.getRefArea(); drag *= span * thickness / conditions.getRefArea();
return drag; return drag;
} }