From 4a79581244c56f9f69831c2efd0513408de95603 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 24 Jun 2022 02:13:01 +0200 Subject: [PATCH] [#1477] Don't include inactive stages in calculateForceAnalysis --- .../net/sf/openrocket/aerodynamics/BarrowmanCalculator.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java b/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java index b1d2f3bfc..034e9cc02 100644 --- a/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java +++ b/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java @@ -4,6 +4,7 @@ import static net.sf.openrocket.util.MathUtil.pow2; import java.util.*; +import net.sf.openrocket.rocketcomponent.AxialStage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -152,6 +153,11 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator { } for( RocketComponent child : comp.getChildren()) { + // Ignore inactive stages + if (child instanceof AxialStage && + !child.getRocket().getSelectedConfiguration().isStageActive(child.getStageNumber())) { + continue; + } // forces particular to each component AerodynamicForces childForces = calculateForceAnalysis(conds, child, instances, eachForces, assemblyForces, warnings);