Finish resolving merge conflicts
This commit is contained in:
parent
49bf1126c7
commit
c43875af96
@ -568,6 +568,7 @@ public class BarrowmanCalculatorTest {
|
|||||||
testTube.setCDOverridden(false);
|
testTube.setCDOverridden(false);
|
||||||
testForces = calc.getAerodynamicForces(testConfig, testConditions, warnings);
|
testForces = calc.getAerodynamicForces(testConfig, testConditions, warnings);
|
||||||
assertEquals("base CD should be base CD of tube", tubeBaseCD, testForces.getBaseCD(), EPSILON);
|
assertEquals("base CD should be base CD of tube", tubeBaseCD, testForces.getBaseCD(), EPSILON);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tests railbutton drag. Really is testing instancing more than actual drag calculations, and making
|
* Tests railbutton drag. Really is testing instancing more than actual drag calculations, and making
|
||||||
|
Loading…
x
Reference in New Issue
Block a user