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

renamed private method

Browse Source
This commit is contained in:
Sampo Niskanen 2011-09-04 17:54:10 +00:00
parent 950dd49561
commit d93e265e90
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java
View File

@ -58,7 +58,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
public Coordinate getCP(Configuration configuration, FlightConditions conditions, public Coordinate getCP(Configuration configuration, FlightConditions conditions,
WarningSet warnings) { WarningSet warnings) {
checkCache(configuration); checkCache(configuration);
AerodynamicForces forces = getNonAxial(configuration, conditions, null, warnings); AerodynamicForces forces = calculateNonAxialForces(configuration, conditions, null, warnings);
return forces.getCP(); return forces.getCP();
} }
@ -83,7 +83,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
// Calculate non-axial force data // Calculate non-axial force data
AerodynamicForces total = getNonAxial(configuration, conditions, map, warnings); AerodynamicForces total = calculateNonAxialForces(configuration, conditions, map, warnings);
// Calculate friction data // Calculate friction data
@ -124,7 +124,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
warnings = ignoreWarningSet; warnings = ignoreWarningSet;
// Calculate non-axial force data // Calculate non-axial force data
AerodynamicForces total = getNonAxial(configuration, conditions, null, warnings); AerodynamicForces total = calculateNonAxialForces(configuration, conditions, null, warnings);
// Calculate friction data // Calculate friction data
total.setFrictionCD(calculateFrictionDrag(configuration, conditions, null, warnings)); total.setFrictionCD(calculateFrictionDrag(configuration, conditions, null, warnings));
@ -150,7 +150,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
/* /*
* Perform the actual CP calculation. * Perform the actual CP calculation.
*/ */
private AerodynamicForces getNonAxial(Configuration configuration, FlightConditions conditions, private AerodynamicForces calculateNonAxialForces(Configuration configuration, FlightConditions conditions,
Map<RocketComponent, AerodynamicForces> map, WarningSet warnings) { Map<RocketComponent, AerodynamicForces> map, WarningSet warnings) {
checkCache(configuration); checkCache(configuration);