Index: PropEngine.cpp =================================================================== RCS file: /var/cvs/FlightGear-0.9/source/src/FDM/YASim/PropEngine.cpp,v retrieving revision 1.16 diff -r1.16 PropEngine.cpp 125c125 < _eng->calc(_pressure, _temp, _omega); --- > _eng->calc(_pressure, _temp, _omega ); ***** CVS exited normally with code 1 ***** cvs -z9 diff PropEngine.cpp (in directory C:\cygwin\Flightgear-cvs\source\src\FDM\YASim\) ***** CVS exited normally with code 0 ***** cvs -z9 diff PistonEngine.hpp (in directory C:\cygwin\Flightgear-cvs\source\src\FDM\YASim\) Index: PistonEngine.hpp =================================================================== RCS file: /var/cvs/FlightGear-0.9/source/src/FDM/YASim/PistonEngine.hpp,v retrieving revision 1.4 diff -r1.4 PistonEngine.hpp 17c17,18 < --- > void setEngineSpeed(float engineSpeed); > 21a23 > float getBoost(); 38c40,41 < --- > float _engineSpeed; // > 39a43 > float _boostPressure; 43a48 > float mp; ***** CVS exited normally with code 1 ***** cvs -z9 diff PistonEngine.hpp (in directory C:\cygwin\Flightgear-cvs\source\src\FDM\YASim\) Index: PistonEngine.hpp =================================================================== RCS file: /var/cvs/FlightGear-0.9/source/src/FDM/YASim/PistonEngine.hpp,v retrieving revision 1.4 diff -r1.4 PistonEngine.hpp 17c17,18 < --- > void setEngineSpeed(float engineSpeed); > 21a23 > float getBoost(); 38c40,41 < --- > float _engineSpeed; // > 39a43 > float _boostPressure; 43a48 > ***** CVS exited normally with code 1 ***** cvs -z9 diff PistonEngine.cpp (in directory C:\cygwin\Flightgear-cvs\source\src\FDM\YASim\) Index: PistonEngine.cpp =================================================================== RCS file: /var/cvs/FlightGear-0.9/source/src/FDM/YASim/PistonEngine.cpp,v retrieving revision 1.7 diff -r1.7 PistonEngine.cpp 0a1,5 > #ifdef HAVE_CONFIG_H > # include > #endif > > 3a9,13 > > #include > > #include
> 15c25,26 < --- > > 46c57,58 < --- > > 52a65,67 > > cout << "P: " << P << " _turbo: " << _turbo << " _boost: " << _boost > << " _maxMP: " << _maxMP << endl; 64a80,84 > void PistonEngine::setEngineSpeed(float engineSpeed) > { > _engineSpeed = engineSpeed; > } > 89a110,114 > float PistonEngine::getBoost() > { > return _boostPressure; > } > 94a120 > 96c122,124 < { --- > { > > 112,115d139 < _mp = pressure * (1 + _boost*(_turbo-1)); // turbocharger < float mp = _mp * (0.1f + 0.9f * _throttle); // throttle < _mp *= _throttle; < if(mp > _maxMP) mp = _maxMP; // wastegate 116a141,164 > // Calculate the factor required to modify turbocharger output for > // rpm. A 3rd order polynomial is used to give a non-linear output. > // This provides near-linear output over the normal operating range, with > // fall-off in the over-speed situation. > float rpm_norm = (speed / _engineSpeed); > float rpm_factor = (-0.25 * pow(rpm_norm,3)) + (-0.15 * pow(rpm_norm,2)) > + (1.11 * rpm_norm); > > // We need to adjust the minimum manifold pressure to get a reasonable > // idle speed > float _minMP = (-0.008 * _turbo ) + 0.1; > > // max turbocharger output modified by rpm > _mp = pressure * (1 + (_boost * (_turbo-1) * rpm_factor)); > > // manifold pressure modified by throttle > float mp = _mp * (_minMP + (1 -_minMP) * _throttle); > > if(mp > _maxMP) { > mp = _maxMP; // wastegate > } > > _boostPressure = mp; > ***** CVS exited normally with code 1 ***** cvs -z9 update -P -C PistonEngine.cpp (in directory C:\cygwin\Flightgear-cvs\source\src\FDM\YASim\) (Locally modified PistonEngine.cpp moved to .#PistonEngine.cpp.1.7) U PistonEngine.cpp ***** CVS exited normally with code 0 ***** cvs -z9 diff PropEngine.cpp (in directory C:\cygwin\Flightgear-cvs\source\src\FDM\YASim\) ***** CVS exited normally with code 0 ***** cvs -z9 update -P -C PropEngine.cpp (in directory C:\cygwin\Flightgear-cvs\source\src\FDM\YASim\) (Locally modified PropEngine.cpp moved to .#PropEngine.cpp.1.16) U PropEngine.cpp ***** CVS exited normally with code 0 ***** cvs -z9 diff TurbineEngine.hpp (in directory C:\cygwin\Flightgear-cvs\source\src\FDM\YASim\) ***** CVS exited normally with code 0 ***** cvs -z9 update -P -C TurbineEngine.hpp (in directory C:\cygwin\Flightgear-cvs\source\src\FDM\YASim\) (Locally modified TurbineEngine.hpp moved to .#TurbineEngine.hpp.1.3) U TurbineEngine.hpp ***** CVS exited normally with code 0 ***** cvs -z9 diff YASim.cxx (in directory C:\cygwin\Flightgear-cvs\source\src\FDM\YASim\) Index: YASim.cxx =================================================================== RCS file: /var/cvs/FlightGear-0.9/source/src/FDM/YASim/YASim.cxx,v retrieving revision 1.25 diff -r1.25 YASim.cxx 61,67c61,67 < SG_LOG(SG_FLIGHT,SG_INFO,"YASim solution results:"); < SG_LOG(SG_FLIGHT,SG_INFO," Iterations: "<getSolutionIterations()); < SG_LOG(SG_FLIGHT,SG_INFO," Drag Coefficient: "<< drag); < SG_LOG(SG_FLIGHT,SG_INFO," Lift Ratio: "<getLiftRatio()); < SG_LOG(SG_FLIGHT,SG_INFO," Cruise AoA: "<< aoa); < SG_LOG(SG_FLIGHT,SG_INFO," Tail Incidence: "<< tail); < SG_LOG(SG_FLIGHT,SG_INFO,"Approach Elevator: "<getApproachElevator()); --- > SG_LOG(SG_FLIGHT,SG_WARN,"YASim solution results:"); > SG_LOG(SG_FLIGHT,SG_WARN," Iterations: "<getSolutionIterations()); > SG_LOG(SG_FLIGHT,SG_WARN," Drag Coefficient: "<< drag); > SG_LOG(SG_FLIGHT,SG_WARN," Lift Ratio: "<getLiftRatio()); > SG_LOG(SG_FLIGHT,SG_WARN," Cruise AoA: "<< aoa); > SG_LOG(SG_FLIGHT,SG_WARN," Tail Incidence: "<< tail); > SG_LOG(SG_FLIGHT,SG_WARN,"Approach Elevator: "<getApproachElevator()); 69d68 < 74c73 < SG_LOG(SG_FLIGHT, SG_INFO, buf); --- > SG_LOG(SG_FLIGHT, SG_WARN, buf); ***** CVS exited normally with code 1 ***** cvs -z9 diff FGFDM.cpp (in directory C:\cygwin\Flightgear-cvs\source\src\FDM\YASim\) Index: FGFDM.cpp =================================================================== RCS file: /var/cvs/FlightGear-0.9/source/src/FDM/YASim/FGFDM.cpp,v retrieving revision 1.29 diff -r1.29 FGFDM.cpp 19a20 > #include "AIModel/AIBallistic.hxx" 520a522,526 > node->setFloatValue("mp-pascals", pe->getMP() ); > node->setFloatValue("boost-pressure-inhg", > pe->getBoost() * (1/INHG2PA)); > node->setFloatValue("boost-pressure-psi-gauge", pe->getBoost() * 0.000145 > - 14.695949); 669a676 > 671d677 < PistonEngine* eng = new PistonEngine(engP, engS); 672a679,680 > PistonEngine* eng = new PistonEngine(engP, engS); > eng->setEngineSpeed(engS); 717a726 > eng->setEngineSpeed(engS); ***** CVS exited normally with code 1 *****