From 61e57eacb5d304d214f6aef87ad8c0df64d2a54d Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Wed, 27 Apr 2022 21:46:41 -0600 Subject: [PATCH] Left a really annoying extra line of debug in BarromanCalcualtor. Somehow managed to have two offseting (in the case of this rocket, anyway) typos in pressure drop calculation. --- .../src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java | 1 - core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java b/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java index ae9d9e404..b12e8983e 100644 --- a/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java +++ b/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java @@ -585,7 +585,6 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator { final InstanceMap imap = configuration.getActiveInstances(); for(Map.Entry> entry: imap.entrySet() ) { final RocketComponent c = entry.getKey(); - log.debug("component " + c); if (!c.isAerodynamic()) continue; diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java index 9b963407e..60117d808 100644 --- a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java +++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java @@ -35,7 +35,7 @@ public abstract class TubeCalc extends RocketComponentCalc { final double Q = conditions.getVelocity() * refArea; // pressure drop - final double deltap = 1.6 * 1000 * Math.pow(Q, 1.85) * Math.pow(Q, 1.85) * length / + final double deltap = 1.6 * Math.pow(Q, 1.85) * length / (Math.pow(diameter, 5) * conditions.getAtmosphericConditions().getPressure()); // convert to CD and return