Include drag from sources other than SymmetricComponent and FinSet
This commit is contained in:
parent
5d8a95d0a2
commit
784348dadd
@ -341,7 +341,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
|
|||||||
* for thickness as we go on.
|
* for thickness as we go on.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
double finFrictionCD = 0;
|
double otherFrictionCD = 0;
|
||||||
double bodyFrictionCD = 0;
|
double bodyFrictionCD = 0;
|
||||||
double maxR = 0, minX = Double.MAX_VALUE, maxX = 0;
|
double maxR = 0, minX = Double.MAX_VALUE, maxX = 0;
|
||||||
|
|
||||||
@ -407,8 +407,8 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
|
|||||||
final double componentMaxR = Math.max(s.getForeRadius(), s.getAftRadius());
|
final double componentMaxR = Math.max(s.getForeRadius(), s.getAftRadius());
|
||||||
maxR = Math.max(maxR, componentMaxR);
|
maxR = Math.max(maxR, componentMaxR);
|
||||||
|
|
||||||
} else if (c instanceof FinSet) {
|
} else {
|
||||||
finFrictionCD += componentFrictionCD;
|
otherFrictionCD += componentFrictionCD;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (map != null) {
|
if (map != null) {
|
||||||
@ -430,7 +430,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return finFrictionCD + correction * bodyFrictionCD;
|
return otherFrictionCD + correction * bodyFrictionCD;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user