[Jsbsim-cvslogs] CVS: JSBSim/utils/aeromatic++ AeroBiplane.cpp, 1.2, 1.3 AeroFighterJet.cpp, 1.12, 1.13 AeroHighPerformance.cpp, 1.11, 1.12 AeroJetTransport.cpp, 1.11, 1.12 AeroLightGA.cpp, 1.12, 1.13 AeroPropTransport.cpp, 1.10, 1.11 Aircraft.cpp, 1.70, 1.71 Aircraft.h, 1.27, 1.28 version, 1.18, 1.19

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

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

Modified Files:
	AeroBiplane.cpp AeroFighterJet.cpp AeroHighPerformance.cpp 
	AeroJetTransport.cpp AeroLightGA.cpp AeroPropTransport.cpp 
	Aircraft.cpp Aircraft.h version 
Log Message:
Improved version of approximation of the Oswald Efficiency factor e

Index: AeroBiplane.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/AeroBiplane.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AeroBiplane.cpp	2 Jan 2016 14:58:27 -0000	1.2
--- AeroBiplane.cpp	18 Aug 2016 12:52:40 -0000	1.3
***************
*** 173,176 ****
--- 173,181 ----
  // ----------------------------------------------------------------------------
  
+ float const Biplane::_fuselage_diameter_t[1][5] =
+ {
+     { 4.0f, 4.0f, 5.5f, 6.0f, 6.5f }
+ };
+ 
  float const Biplane::_wing_loading_t[1][5] =
  {

Index: AeroFighterJet.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/AeroFighterJet.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** AeroFighterJet.cpp	2 Jan 2016 14:58:27 -0000	1.12
--- AeroFighterJet.cpp	18 Aug 2016 12:52:40 -0000	1.13
***************
*** 174,177 ****
--- 174,182 ----
  // ----------------------------------------------------------------------------
  
+ float const Fighter::_fuselage_diameter_t[1][5] =
+ {
+     { 4.0f, 5.5f, 6.0f, 6.5f, 7.0f }
+ };
+ 
  float const Fighter::_wing_loading_t[1][5] =
  {

Index: AeroHighPerformance.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/AeroHighPerformance.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** AeroHighPerformance.cpp	2 Jan 2016 14:58:27 -0000	1.11
--- AeroHighPerformance.cpp	18 Aug 2016 12:52:40 -0000	1.12
***************
*** 175,178 ****
--- 175,183 ----
  // ----------------------------------------------------------------------------
  
+ float const Performance::_fuselage_diameter_t[1][5] =
+ {
+     { 4.0f, 4.0f, 5.0f, 5.5f, 6.0f }
+ };
+ 
  float const Performance::_wing_loading_t[1][5] =
  {

Index: AeroJetTransport.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/AeroJetTransport.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** AeroJetTransport.cpp	2 Jan 2016 14:58:27 -0000	1.11
--- AeroJetTransport.cpp	18 Aug 2016 12:52:40 -0000	1.12
***************
*** 175,178 ****
--- 175,183 ----
  // ----------------------------------------------------------------------------
  
+ float const JetTransport::_fuselage_diameter_t[1][5] =
+ {
+     { 4.0f, 8.0f, 10.0f, 19.5f, 22.5f }
+ };
+ 
  float const JetTransport::_wing_loading_t[1][5] =
  {

Index: AeroLightGA.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/AeroLightGA.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** AeroLightGA.cpp	2 Jan 2016 14:58:27 -0000	1.12
--- AeroLightGA.cpp	18 Aug 2016 12:52:40 -0000	1.13
***************
*** 174,177 ****
--- 174,182 ----
  // ----------------------------------------------------------------------------
  
+ float const Light::_fuselage_diameter_t[1][5] =
+ {
+     { 4.0f, 8.0f, 8.0f, 10.0f, 10.0f }
+ };
+ 
  float const Light::_wing_loading_t[1][5] =
  {

Index: AeroPropTransport.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/AeroPropTransport.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** AeroPropTransport.cpp	2 Jan 2016 14:58:27 -0000	1.10
--- AeroPropTransport.cpp	18 Aug 2016 12:52:40 -0000	1.11
***************
*** 174,177 ****
--- 174,182 ----
  // ----------------------------------------------------------------------------
  
+ float const PropTransport::_fuselage_diameter_t[1][5] =
+ {
+     { 4.0f, 6.0f, 9.0f, 10.0f, 11.0f }
+ };
+ 
  float const PropTransport::_wing_loading_t[1][5] =
  {

Index: Aircraft.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Aircraft.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -r1.70 -r1.71
*** Aircraft.cpp	16 Aug 2016 12:01:46 -0000	1.70
--- Aircraft.cpp	18 Aug 2016 12:52:40 -0000	1.71
***************
*** 148,151 ****
--- 148,152 ----
      Aircraft::_aircraft = this;
  
+ 
      _CL0 = 0.0f; _CLde = 0.0f; _CLq = 0.0f; _CLadot = 0.0f;
      _CD0 = 0.0f; _CDde = 0.0f; _CDbeta = 0.0f;

Index: Aircraft.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Aircraft.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** Aircraft.h	5 Jun 2016 20:00:13 -0000	1.27
--- Aircraft.h	18 Aug 2016 12:52:40 -0000	1.28
***************
*** 57,60 ****
--- 57,61 ----
      }
  
+     virtual float get_fuselage_diameter() { return 0.0f; }
      virtual float get_wing_loading() { return 0.0f; }
      virtual float get_aspect_ratio() { return 0.0f; }
***************
*** 109,112 ****
--- 110,116 ----
      ~Light() {}
  
+     float get_fuselage_diameter() {
+         return _fuselage_diameter_t[_subtype][_engines];
+     }
      float get_wing_loading() {
          return _wing_loading_t[_subtype][_engines];
***************
*** 151,154 ****
--- 155,159 ----
  
  protected:
+     static float const _fuselage_diameter_t[1][5];
      static float const _wing_loading_t[1][5];
      static float const _aspect_ratio_t[1][5];
***************
*** 187,190 ****
--- 192,198 ----
      ~Performance() {}
  
+     float get_fuselage_diameter() {
+         return _fuselage_diameter_t[_subtype][_engines];
+     }
      float get_wing_loading() {
          return _wing_loading_t[_subtype][_engines];
***************
*** 229,232 ****
--- 237,241 ----
  
  protected:
+     static float const _fuselage_diameter_t[1][5];
      static float const _wing_loading_t[1][5];
      static float const _aspect_ratio_t[1][5];
***************
*** 265,268 ****
--- 274,280 ----
      ~Fighter() {}
  
+     float get_fuselage_diameter() {
+         return _fuselage_diameter_t[_subtype][_engines];
+     }
      float get_wing_loading() {
          return _wing_loading_t[_subtype][_engines];
***************
*** 307,310 ****
--- 319,323 ----
  
  protected:
+     static float const _fuselage_diameter_t[1][5];
      static float const _wing_loading_t[1][5];
      static float const _aspect_ratio_t[1][5];
***************
*** 343,346 ****
--- 356,362 ----
      ~JetTransport() {}
  
+     float get_fuselage_diameter() {
+         return _fuselage_diameter_t[_subtype][_engines];
+     }
      float get_wing_loading() {
          return _wing_loading_t[_subtype][_engines];
***************
*** 385,388 ****
--- 401,405 ----
  
  protected:
+     static float const _fuselage_diameter_t[1][5];
      static float const _wing_loading_t[1][5];
      static float const _aspect_ratio_t[1][5];
***************
*** 421,424 ****
--- 438,444 ----
      ~PropTransport() {}
  
+     float get_fuselage_diameter() {
+         return _fuselage_diameter_t[_subtype][_engines];
+     }
      float get_wing_loading() {
          return _wing_loading_t[_subtype][_engines];
***************
*** 463,466 ****
--- 483,487 ----
  
  protected:
+     static float const _fuselage_diameter_t[1][5];
      static float const _wing_loading_t[1][5];
      static float const _aspect_ratio_t[1][5];
***************
*** 508,511 ****
--- 529,535 ----
      bool fdm();
  
+     float get_fuselage_diameter() {
+         return _aircraft[_atype]->get_fuselage_diameter();
+     }
      float get_wing_loading() {
          return _aircraft[_atype]->get_wing_loading();

Index: version
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/version,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** version	16 Aug 2016 12:06:06 -0000	1.18
--- version	18 Aug 2016 12:52:40 -0000	1.19
***************
*** 1 ****
! 3.3.4
--- 1 ----
! 3.3.5