Fix a bug: there are exceptions where an turbine engine with a bypass…

… ration > 1.0 does have augmentation
2387137609 · Apr 7, 2017 · 3bb9952 · 3bb9952
1 parent 827f4b0
commit 3bb9952
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/utils/aeromatic++/Aircraft.cpp b/utils/aeromatic++/Aircraft.cpp
@@ -551,7 +551,7 @@ bool Aeromatic::fdm()
     file << " <fileheader>" << std::endl;
     file << "  <author> Aeromatic v " << version << " </author>" << std::endl;
     file << "  <filecreationdate> " << str << " </filecreationdate>" << std::endl;
-    file << "  <version>$Revision: 1.77 $</version>" << std::endl;
+    file << "  <version>$Revision: 1.78 $</version>" << std::endl;
     file << "  <description> Models a " << _name << ". </description>" << std::endl;
     file << " </fileheader>" << std::endl;
     file << std::endl;

diff --git a/utils/aeromatic++/Systems/Propulsion.cpp b/utils/aeromatic++/Systems/Propulsion.cpp
@@ -570,12 +570,11 @@ std::string TurbineEngine::engine()
     {
         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
-    {
+    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);
     file.flags(std::ios::right);

diff --git a/utils/aeromatic++/Systems/Thruster.cpp b/utils/aeromatic++/Systems/Thruster.cpp
@@ -138,6 +138,12 @@ Propeller::Propeller(Propulsion *p) : Thruster(p),
  * Walnut:	 35
  * 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()
 {

diff --git a/utils/aeromatic++/version b/utils/aeromatic++/version
@@ -1 +1 @@
-3.3.9
+3.3.10