[Jsbsim-cvslogs] CVS: JSBSim/utils/aeromatic++/Systems Thruster.cpp, 1.26, 1.27

[Erik H. <eh...@us...>]

Update of /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3634/Systems

Modified Files:
	Thruster.cpp 
Log Message:
Adjust ct_factor based on the number of blades and tweak the guessing table for the number fo blades

Index: Thruster.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Thruster.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** Thruster.cpp	11 Jun 2016 10:02:09 -0000	1.26
--- Thruster.cpp	28 Jul 2016 10:58:15 -0000	1.27
***************
*** 305,315 ****
  
      // estimate the number of blades
      if (_Cp0 < 0.035f) {
        _blades = 2;
!     } else if (_Cp0 > 0.160f) {
          _blades = 8;
!     } else if (_Cp0 > 0.105f) {
        _blades = 6;
!     } else if (_Cp0 > 0.065f) {
        _blades = 4;
      } else {
--- 305,316 ----
  
      // estimate the number of blades
+ printf("_Cp0: %f\n", _Cp0);
      if (_Cp0 < 0.035f) {
        _blades = 2;
!     } else if (_Cp0 > 0.280f) {
          _blades = 8;
!     } else if (_Cp0 > 0.140f) {
        _blades = 6;
!     } else if (_Cp0 > 0.070f) {
        _blades = 4;
      } else {
***************
*** 498,507 ****
  
      file << "<propeller version=\"1.01\" name=\"prop\">" << std::endl;
!     file << "  <ixx> " << _ixx << " </ixx>" << std::endl;
      file << "  <diameter unit=\"IN\"> " << (_diameter * FEET_TO_INCH) << " </diameter>" << std::endl;
      file << "  <numblades> " << _blades << " </numblades>" << std::endl;
      file << "  <gearratio> " << _gear_ratio << " </gearratio>" << std::endl;
      file << "  <cp_factor> 1.00 </cp_factor>" << std::endl;
!     file << "  <ct_factor> 1.00 </ct_factor>" << std::endl;
  
      if(_fixed_pitch == false)
--- 499,508 ----
  
      file << "<propeller version=\"1.01\" name=\"prop\">" << std::endl;
!     file << "  <ixx> " << _ixx * _blades << " </ixx>" << std::endl;
      file << "  <diameter unit=\"IN\"> " << (_diameter * FEET_TO_INCH) << " </diameter>" << std::endl;
      file << "  <numblades> " << _blades << " </numblades>" << std::endl;
      file << "  <gearratio> " << _gear_ratio << " </gearratio>" << std::endl;
      file << "  <cp_factor> 1.00 </cp_factor>" << std::endl;
!     file << "  <ct_factor> " << _blades << " </ct_factor> <!-- set to match the number of blades -->" << std::endl;
  
      if(_fixed_pitch == false)