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

Merge pull request #2122 from JoePfeiffer/fix-2115

Browse Source 
Railbutton pressure drag tweaks
This commit is contained in:
Joe Pfeiffer 2023-03-19 18:58:32 -06:00 committed by GitHub
commit 98fb726c4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 113 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/barrowman/RailButtonCalc.java
View File

@ -58,8 +58,10 @@ public class RailButtonCalc extends RocketComponentCalc {
final double notchArea = (button.getOuterDiameter() - button.getInnerDiameter()) * button.getInnerHeight(); final double notchArea = (button.getOuterDiameter() - button.getInnerDiameter()) * button.getInnerHeight();
final double refArea = outerArea - notchArea; final double refArea = outerArea - notchArea;
// accumulate Cd contribution from each rail button // accumulate Cd contribution from each rail button. If velocity is 0 just set CDmul to a value previously
// competed for velocity MathUtil.EPSILON and skip the loop to avoid division by 0
double CDmul = 0.0; double CDmul = 0.0;
if (conditions.getMach() > MathUtil.EPSILON) {
for (int i = 0; i < button.getInstanceCount(); i++) { for (int i = 0; i < button.getInstanceCount(); i++) {
// compute boundary layer height at button location. I can't find a good reference for the // compute boundary layer height at button location. I can't find a good reference for the
@ -95,6 +97,16 @@ public class RailButtonCalc extends RocketComponentCalc {
// add to CDmul // add to CDmul
CDmul += cd; CDmul += cd;
}
// since we'll be multiplying by the instance count up in BarrowmanCalculator,
// we want to return the mean CD instead of the total
CDmul /= button.getInstanceCount();
} else {
// value at velocity of MathUtil.EPSILON
CDmul = 8.786395072609939E-4;
} }
return CDmul * stagnationCD * refArea / conditions.getRefArea(); return CDmul * stagnationCD * refArea / conditions.getRefArea();

67
core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java
View File

@ -20,11 +20,13 @@ import net.sf.openrocket.rocketcomponent.FlightConfiguration;
import net.sf.openrocket.rocketcomponent.NoseCone; import net.sf.openrocket.rocketcomponent.NoseCone;
import net.sf.openrocket.rocketcomponent.ParallelStage; import net.sf.openrocket.rocketcomponent.ParallelStage;
import net.sf.openrocket.rocketcomponent.PodSet; import net.sf.openrocket.rocketcomponent.PodSet;
import net.sf.openrocket.rocketcomponent.RailButton;
import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.rocketcomponent.Transition; import net.sf.openrocket.rocketcomponent.Transition;
import net.sf.openrocket.rocketcomponent.TrapezoidFinSet; import net.sf.openrocket.rocketcomponent.TrapezoidFinSet;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.util.MathUtil;
import net.sf.openrocket.util.TestRockets; import net.sf.openrocket.util.TestRockets;
public class BarrowmanCalculatorTest { public class BarrowmanCalculatorTest {
@ -497,4 +499,69 @@ public class BarrowmanCalculatorTest {
assertEquals("should be warning from podset airframe overlap", 1, warnings.size()); assertEquals("should be warning from podset airframe overlap", 1, warnings.size());
} }
/**
* Tests railbutton drag. Really is testing instancing more than actual drag calculations, and making
* sure we don't divide by 0 when not moving
*/
@Test
public void testRailButtonDrag() {
// minimal rocket with nothing on it but two railbuttons
final Rocket rocket = new Rocket();
final AxialStage stage = new AxialStage();
rocket.addChild(stage);
// phantom tubes have no drag to confuse things
final BodyTube phantom = new BodyTube();
phantom.setOuterRadius(0);
stage.addChild(phantom);
// set up test environment
WarningSet warnings = new WarningSet();
final FlightConfiguration config = rocket.getSelectedConfiguration();
final FlightConditions conditions = new FlightConditions(config);
final BarrowmanCalculator calc = new BarrowmanCalculator();
// part 1: instancing
// Put two individual railbuttons and get their CD
final RailButton button1 = new RailButton();
button1.setInstanceCount(1);
button1.setAxialOffset(1.0);
phantom.addChild(button1);
final RailButton button2 = new RailButton();
button2.setInstanceCount(1);
button2.setAxialOffset(2.0);
phantom.addChild(button2);
final AerodynamicForces individualForces = calc.getAerodynamicForces(config, conditions, warnings);
final double individualCD = individualForces.getCD();
// get rid of individual buttons and put in a railbutton set with two instances at same locations as original
// railbuttons
phantom.removeChild(button1);
phantom.removeChild(button2);
final RailButton buttons = new RailButton();
buttons.setInstanceCount(2);
buttons.setAxialOffset(1.0);
buttons.setInstanceSeparation(1.0);
final AerodynamicForces pairForces = calc.getAerodynamicForces(config, conditions, warnings);
final double pairCD = pairForces.getCD();
assertEquals("two individual railbuttons should have same CD as a pair", individualCD, pairCD, EPSILON);
// part 2: test at Mach 0
conditions.setMach(MathUtil.EPSILON);
final AerodynamicForces epsForces = calc.getAerodynamicForces(config, conditions, warnings);
final double epsCD = epsForces.getCD();
conditions.setMach(0);
final AerodynamicForces zeroForces = calc.getAerodynamicForces(config, conditions, warnings);
final double zeroCD = zeroForces.getCD();
assertEquals("drag at mach 0 should equal drag at mach MathUtil.EPSILON", epsCD, zeroCD, EPSILON);
} }
}