[Jsbsim-cvslogs] CVS: JSBSim/utils/aeromatic++/Systems Propulsion.cpp, 1.38, 1.39 Thruster.cpp, 1.28, 1.29

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

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

Modified Files:
	Propulsion.cpp Thruster.cpp 
Log Message:
Fix a bug: there are exceptions where an turbine engine with a bypass ration > 1.0 does have augmentation

Index: Propulsion.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Propulsion.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** Propulsion.cpp	28 Jul 2016 10:58:29 -0000	1.38
--- Propulsion.cpp	7 Apr 2017 07:26:19 -0000	1.39
***************
*** 571,580 ****
          if (_bypass_ratio < 0.07f) _bypass_ratio = 0.07f;
          tsfc =  0.635f - 0.144f * log10f(_oapr) * log10f(_bypass_ratio);
-         atsfc = 3.27f - 0.451f * log10f(2.9f * _oapr / _bypass_ratio);
      }
!     else
!     {
          tsfc = 0.7533f - 0.161f * log10f(0.0625f * _oapr * _bypass_ratio);
      }
  
      file.precision(1);
--- 571,579 ----
          if (_bypass_ratio < 0.07f) _bypass_ratio = 0.07f;
          tsfc =  0.635f - 0.144f * log10f(_oapr) * log10f(_bypass_ratio);
      }
!     else {
          tsfc = 0.7533f - 0.161f * log10f(0.0625f * _oapr * _bypass_ratio);
      }
+     atsfc = 3.27f - 0.451f * log10f(2.9f * _oapr / _bypass_ratio);
  
      file.precision(1);

Index: Thruster.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Thruster.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** Thruster.cpp	18 Aug 2016 12:52:40 -0000	1.28
--- Thruster.cpp	7 Apr 2017 07:26:19 -0000	1.29
***************
*** 139,142 ****
--- 139,148 ----
   * Oak:		 46
   * Aluminum:	167
+  *
+  * The code is based on:
+  *   PROPELLER BLADE ELEMENT MOMENTUM THEORY WITH VORTEX WAKE DEFLECTION
+  *   M. K. Rwigema, 2010
+  *   School of Mechanical, Industrial and Aeronautical Engineering
+  *   http://www.icas.org/ICAS_ARCHIVE/ICAS2010/PAPERS/434.PDF
   */
  void  Propeller::bladeElement()