[Gcblue-commits] gcb_wx/include/database tcAirDBObject.h,1.11,1.12

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5373/include/database

Modified Files:
	tcAirDBObject.h 
Log Message:
Modified air model to use thrust factor vs. altitude and fuel efficiency vs. alt tables

Index: tcAirDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcAirDBObject.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcAirDBObject.h	26 May 2005 11:53:37 -0000	1.11
--- tcAirDBObject.h	27 May 2005 00:28:04 -0000	1.12
***************
*** 1,4 ****
! /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,6 ----
! /**
! **  @file tcAirDBObject.h
! */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
***************
*** 50,64 ****
      {
      public:
-         float zeroThrustAltitude_m;         ///< [m] altitude where thrust falls to zero with parametric model
          float mfAfterburnFuelRate_kgps;     ///< [kg/s] with afterburners
          float mfAfterburnThrust_N;          ///< [N] afterburners engine thrust
!         float mfDragArea_sm;                ///< equivalent flat plate area for parasitic drag
!         float mfWingArea_sm;                ///< wing (lift) area
!         float mfCdpsub;                     ///< parasitic drag coeff, subsonic, modifies flat plate drag area
!         float mfCdptran;                    ///< transonic
!         float mfCdpsup;                     ///< supersonic
          float mfMcm;                        ///< critical mach number
          float mfMsupm;                      ///< supersonic mach number
!         float mfKdi;                        ///< constant for simplified induced drag model
          float stallSpeed_mps;               ///< [m/s] stall speed at sea level
          float mfGmax;                       ///< max Gs
--- 52,63 ----
      {
      public:
          float mfAfterburnFuelRate_kgps;     ///< [kg/s] with afterburners
          float mfAfterburnThrust_N;          ///< [N] afterburners engine thrust
!         float mfCdpsub;                     ///< parasitic "flat plate" drag area, subsonic
!         float mfCdptran;                    ///< transonic drag area
!         float mfCdpsup;                     ///< supersonic drag area
          float mfMcm;                        ///< critical mach number
          float mfMsupm;                      ///< supersonic mach number
!         float mfKdi;                        ///< constant for induced drag model
          float stallSpeed_mps;               ///< [m/s] stall speed at sea level
          float mfGmax;                       ///< max Gs
***************
*** 66,70 ****
  
          float GetParasiticDragCoefficient(float vmach) const;
!         float GetThrustFactor(float alt_m) const;
          
          virtual const char* GetClassName() {return "Air";} ///< returns class name of database object
--- 65,69 ----
  
          float GetParasiticDragCoefficient(float vmach) const;
!         void GetThrustAndEfficiencyFactors(float alt_m, float& thrustFactor, float& fuelEfficienyFactor) const;
          
          virtual const char* GetClassName() {return "Air";} ///< returns class name of database object
***************
*** 85,94 ****
          
      private:
-         void CalculateParams();        
-         
          // calculated parameters
          float invMachRange; ///< 1 / (width of transonic)
!         float thrustDecayFactor;
!         
  
      };
--- 84,96 ----
          
      private:
          // calculated parameters
          float invMachRange; ///< 1 / (width of transonic)
! 		
! 		std::vector<float> thrustTable; ///< vector of thrust factor vs. altitude point
! 		std::vector<float> fuelEfficiencyTable; ///< vector of fuel efficiency vs. altitude point
! 		static std::vector<float> tableAltitudes; ///< altitudes for thrust and fuel efficiency tables
! 
!         void CalculateParams();
! 		static void InitializeTableAltitudes();
  
      };