MSVC (warning) fixes.

[flightgear.git] / src / FDM / YASim / PistonEngine.cpp

diff --git a/src/FDM/YASim/PistonEngine.cpp b/src/FDM/YASim/PistonEngine.cpp
index b32dae60cea86fb4e6e993bc4ffdfafe608ae963..75c70d9de29fb9a860b918c6269ed6b407aaaa44 100644 (file)
--- a/src/FDM/YASim/PistonEngine.cpp
+++ b/src/FDM/YASim/PistonEngine.cpp
@@ -11,7 +11,7 @@ PistonEngine::PistonEngine(float power, float speed)
 {
     _boost = 1;
     _running = false;
-    _cranking = false;
+    _fuel = true;
 
     // Presume a BSFC (in lb/hour per HP) of 0.45.  In SI that becomes
     // (2.2 lb/kg, 745.7 W/hp, 3600 sec/hour) 7.62e-08 kg/Ws.
@@ -67,44 +67,9 @@ float PistonEngine::getMaxPower()
     return _power0;
 }
 
-void PistonEngine::setThrottle(float t)
-{
-    _throttle = t;
-}
-
-void PistonEngine::setRunning(bool r)
-{
-    _running = r;
-}
-
-void PistonEngine::setStarter(bool s)
-{
-    _cranking = s;
-}
-
-void PistonEngine::setMagnetos(int m)
-{
-    _magnetos = m;
-}
-
-void PistonEngine::setMixture(float m)
-{
-    _mixture = m;
-}
-
-void PistonEngine::setBoost(float boost)
-{
-    _boost = boost;
-}
-
-bool PistonEngine::isRunning()
-{
-    return _running;
-}
-
 bool PistonEngine::isCranking()
 {
-    return _cranking;
+    return _starter;
 }
 
 float PistonEngine::getTorque()
@@ -129,8 +94,10 @@ float PistonEngine::getEGT()
 
 void PistonEngine::calc(float pressure, float temp, float speed)
 {
-    if(_magnetos == 0 || speed < 200*RPM2RADPS)
+    if(_magnetos == 0 || speed < 60*RPM2RADPS)
        _running = false;
+    else if(_fuel == false)
+        _running = false;
     else
        _running = true;
 
@@ -157,6 +124,7 @@ void PistonEngine::calc(float pressure, float temp, float speed)
     // mixture setting.  Not all of this will burn with the same
     // efficiency.
     _fuelFlow = _mixture * speed * _mixCoeff;
+    if(_fuel == false) _fuelFlow = 0;
 
     // How much fuel could be burned with ideal (i.e. uncorrected!)
     // combustion.
@@ -187,18 +155,25 @@ void PistonEngine::calc(float pressure, float temp, float speed)
     float power = _power0 * burned/_f0;
     _torque = power/speed;
 
-    // Figure that the starter motor produces 20% of the engine's
-    // cruise torque.
-    if(_cranking && !_running)
-       _torque += 0.20f * _power0/_omega0;
+    // Figure that the starter motor produces 15% of the engine's
+    // cruise torque.  Assuming 60RPM starter speed vs. 1800RPM cruise
+    // speed on a 160HP engine, that comes out to about 160*.15/30 ==
+    // 0.8 HP starter motor.  Which sounds about right to me.  I think
+    // I've finally got this tuned. :)
+    if(_starter && !_running)
+       _torque += 0.15f * _power0/_omega0;
 
-    // Also, add a negative torque of 10% of cruise, to represent
+    // Also, add a negative torque of 8% of cruise, to represent
     // internal friction.  Propeller aerodynamic friction is too low
     // at low RPMs to provide a good deceleration.  Interpolate it
-    // away as we approach cruise RPMs, though, to prevent interaction
-    // with the power computations.  Ugly.
-    if(speed > 0 && speed < _omega0)
-       _torque -= 0.05f * (_power0/_omega0) * (1 - speed/_omega0);
+    // away as we approach cruise RPMs (full at 50%, zero at 100%),
+    // though, to prevent interaction with the power computations.
+    // Ugly.
+    if(speed > 0 && speed < _omega0) {
+        float interp = 2 - 2*speed/_omega0;
+        interp = (interp > 1) ? 1 : interp;
+       _torque -= 0.08f * (_power0/_omega0) * interp;
+    }
 
     // Now EGT.  This one gets a little goofy.  We can calculate the
     // work done by an isentropically expanding exhaust gas as the