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

[#1477] Don't include inactive stages in calculateForceAnalysis

Browse Source
This commit is contained in:
SiboVG 2022-06-24 02:13:01 +02:00
parent f6a608e403
commit 4a79581244
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import static net.sf.openrocket.util.MathUtil.pow2;
import java.util.*; import java.util.*;
import net.sf.openrocket.rocketcomponent.AxialStage;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -152,6 +153,11 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
} }
for( RocketComponent child : comp.getChildren()) { for( RocketComponent child : comp.getChildren()) {
// Ignore inactive stages
if (child instanceof AxialStage &&
!child.getRocket().getSelectedConfiguration().isStageActive(child.getStageNumber())) {
continue;
}
// forces particular to each component // forces particular to each component
AerodynamicForces childForces = calculateForceAnalysis(conds, child, instances, eachForces, assemblyForces, warnings); AerodynamicForces childForces = calculateForceAnalysis(conds, child, instances, eachForces, assemblyForces, warnings);