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

Move component-level calculations out of instance loop

Browse Source
This commit is contained in:
JoePfeiffer 2022-04-05 17:00:19 -06:00
parent 5c62ad725a
commit 56949560c4
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,9 +352,10 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
for(Map.Entry<RocketComponent, ArrayList<InstanceContext>> entry: imap.entrySet() ) {
final RocketComponent c = entry.getKey();
// iterate across component instances
final ArrayList<InstanceContext> contextList = entry.getValue();
for(InstanceContext context: contextList ) {
//Handle Overriden CD for Whole Rocket
if(c.isCDOverridden()) {
continue;
}
// Calculate the roughness-limited friction coefficient
Finish finish = ((ExternalComponent) c).getFinish();
@ -385,10 +386,9 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
}
//Handle Overriden CD for Whole Rocket
if(c.isCDOverridden()) {
continue;
}
// iterate across component instances
final ArrayList<InstanceContext> contextList = entry.getValue();
for(InstanceContext context: contextList ) {
// Calculate the friction drag: