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

Merge pull request #789 from JoePfeiffer/fix-768c

Browse Source 
Last fix on issue 768
This commit is contained in:
Daniel Williams 2020-10-10 10:57:19 -04:00 committed by GitHub
commit 8d65218c4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 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

@ -4,6 +4,9 @@ import static net.sf.openrocket.util.MathUtil.pow2;
import java.util.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.aerodynamics.barrowman.FinSetCalc;
import net.sf.openrocket.aerodynamics.barrowman.RocketComponentCalc;
import net.sf.openrocket.rocketcomponent.ComponentAssembly;
@ -29,6 +32,7 @@ import net.sf.openrocket.util.Reflection;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
private static final Logger log = LoggerFactory.getLogger(BarrowmanCalculator.class);
private static final String BARROWMAN_PACKAGE = "net.sf.openrocket.aerodynamics.barrowman";
private static final String BARROWMAN_SUFFIX = "Calc";
@ -328,7 +332,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
if (calcMap == null)
buildCalcMap(configuration);
Re = conditions.getVelocity() * configuration.getLength() /
conditions.getAtmosphericConditions().getKinematicViscosity();
@ -637,7 +641,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
if (!(c instanceof SymmetricComponent))
continue;
SymmetricComponent s = (SymmetricComponent) c;
// iterate across component instances
@ -667,8 +671,10 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
// if I'm the last component, set my base CD
// note: the iterator *should* serve up the next component.... buuuut ....
// this code has is tested, and there's no compelling reason to change.
if (s.getNextSymmetricComponent() == null) {
// this code has is tested, and there's no compelling reason to change.
final SymmetricComponent n = s.getNextSymmetricComponent();
if ((n == null) ||
!configuration.isStageActive(n.getStageNumber())) {
double area = Math.PI * pow2(s.getAftRadius());
double cd = base * area / conditions.getRefArea();
total += cd;

1
core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
View File

@ -182,6 +182,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
private void _setStageActive(final int stageNumber, final boolean _active ) {
if ((0 <= stageNumber) && (stages.containsKey(stageNumber))) {
stages.get(stageNumber).active = _active;
fireChangeEvent();
return;
}
log.error("error: attempt to retrieve via a bad stage number: " + stageNumber);