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

[resolves #423][partial] BarrowmanCalculator no longer multiplies instanced leaf nodes.

Browse Source
This commit is contained in:
Daniel_M_Williams 2018-07-28 11:45:31 -04:00
parent 7e5ab5de32
commit 4cb8a03454
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java
View File

@ -195,30 +195,17 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
calcObj.calculateNonaxialForces(conditions, forces, warnings);
// // to account for non axi-symmetric rockets such as a Delta-IV heavy, or a Falcon-9 Heavy
// if(( ! component.isAxisymmetric()) &&( component instanceof RingInstanceable )){
// RingInstanceable ring = (RingInstanceable)component;
// forces.setAxisymmetric(false);
// total.setAxisymmetric(false);
//
// // TODO : Implement Best-Case, Worst-Case Cp calculations
// double minAngle = ring.getAngularOffset(); // angle of minimum CP, MOI
// double maxAngle = minAngle+Math.PI/2; // angle of maximum CP, MOI
//
// // worst case: ignore the CP contribution from *twin* externals
// // NYI
//
// // best case: the twins contribute their full CP broadside
// // NYI
//
// }
// previous unstable version
// int instanceCount = component.getLocations().length;
final boolean isAssembly = (component.allowsChildren() && (component.getInstanceCount() > 1));
// we will need to adjust the calculations *somehow* here...
int instanceCount = component.getLocations().length;
Coordinate x_cp_comp = forces.getCP();
Coordinate x_cp_weighted = x_cp_comp.setWeight(x_cp_comp.weight * instanceCount);
Coordinate x_cp_weighted = x_cp_comp.setWeight(x_cp_comp.weight);
Coordinate x_cp_absolute = component.toAbsolute(x_cp_weighted)[0];
forces.setCP(x_cp_absolute);
double CN_instanced = forces.getCN() * instanceCount;
double CN_instanced = forces.getCN();
forces.setCm(CN_instanced * forces.getCP().x / conditions.getRefLength());
if (map != null) {