- fixed fuel-need calculations

[flightgear.git] / src / FDM / JSBSim / FGAtmosphere.h

diff --git a/src/FDM/JSBSim/FGAtmosphere.h b/src/FDM/JSBSim/FGAtmosphere.h
index 6b61ce0b5c3bab5707de38b01e9b73f63dbc7e0b..f88031280a756218e9a828e598e1dd373776d5fd 100644 (file)
--- a/src/FDM/JSBSim/FGAtmosphere.h
+++ b/src/FDM/JSBSim/FGAtmosphere.h
@@ -88,33 +88,35 @@ public:
       @return false if no error */
   bool Run(void);
 
+  bool InitModel(void);
+
   /// Returns the temperature in degrees Rankine.
-  inline float GetTemperature(void) {return temperature;}
+  inline double GetTemperature(void) {return temperature;}
   /** Returns the density in slugs/ft^3.
       <i>This function may <b>only</b> be used if Run() is called first.</i> */
-  inline float GetDensity(void)    {return density;}
+  inline double GetDensity(void)    {return density;}
   /// Returns the pressure in psf.
-  inline float GetPressure(void)   {return pressure;}
+  inline double GetPressure(void)   {return pressure;}
   /// Returns the speed of sound in ft/sec.
-  inline float GetSoundSpeed(void) {return soundspeed;}
+  inline double GetSoundSpeed(void) {return soundspeed;}
 
   /// Returns the sea level temperature in degrees Rankine.
-  inline float GetTemperatureSL(void) { return SLtemperature; }
+  inline double GetTemperatureSL(void) { return SLtemperature; }
   /// Returns the sea level density in slugs/ft^3
-  inline float GetDensitySL(void)     { return SLdensity; }
+  inline double GetDensitySL(void)     { return SLdensity; }
   /// Returns the sea level pressure in psf.
-  inline float GetPressureSL(void)    { return SLpressure; }
+  inline double GetPressureSL(void)    { return SLpressure; }
   /// Returns the sea level speed of sound in ft/sec.
-  inline float GetSoundSpeedSL(void)  { return SLsoundspeed; }
+  inline double GetSoundSpeedSL(void)  { return SLsoundspeed; }
 
   /// Returns the ratio of at-altitude temperature over the sea level value.
-  inline float GetTemperatureRatio(void)  { return temperature*rSLtemperature; }
+  inline double GetTemperatureRatio(void)  { return temperature*rSLtemperature; }
   /// Returns the ratio of at-altitude density over the sea level value.
-  inline float GetDensityRatio(void)     { return density*rSLdensity; }
+  inline double GetDensityRatio(void)    { return density*rSLdensity; }
   /// Returns the ratio of at-altitude pressure over the sea level value.
-  inline float GetPressureRatio(void)     { return pressure*rSLpressure; }
+  inline double GetPressureRatio(void)     { return pressure*rSLpressure; }
   /// Returns the ratio of at-altitude sound speed over the sea level value.
-  inline float GetSoundSpeedRatio(void)   { return soundspeed*rSLsoundspeed; }
+  inline double GetSoundSpeedRatio(void)   { return soundspeed*rSLsoundspeed; }
 
   /// Tells the simulator to use an externally calculated atmosphere model.
   inline void UseExternal(void)          { useExternal=true;  }
@@ -124,39 +126,57 @@ public:
   bool External(void) { return useExternal; }
 
   /// Provides the external atmosphere model with an interface to set the temperature.
-  inline void SetExTemperature(float t)  { exTemperature=t; }
+  inline void SetExTemperature(double t)  { exTemperature=t; }
   /// Provides the external atmosphere model with an interface to set the density.
-  inline void SetExDensity(float d)      { exDensity=d; }
+  inline void SetExDensity(double d)      { exDensity=d; }
   /// Provides the external atmosphere model with an interface to set the pressure.
-  inline void SetExPressure(float p)     { exPressure=p; }
+  inline void SetExPressure(double p)     { exPressure=p; }
 
   /// Sets the wind components in NED frame.
-  inline void SetWindNED(float wN, float wE, float wD) { vWindNED(1)=wN; vWindNED(2)=wE; vWindNED(3)=wD;}
+  inline void SetWindNED(double wN, double wE, double wD) { vWindNED(1)=wN; vWindNED(2)=wE; vWindNED(3)=wD;}
 
   /// Retrieves the wind components in NED frame.
   inline FGColumnVector3& GetWindNED(void) { return vWindNED; }
   
   /** Retrieves the wind direction. The direction is defined as north=0 and
       increases counterclockwise. The wind heading is returned in radians.*/
-  inline float GetWindPsi(void) { return psiw; }
+  inline double GetWindPsi(void) { return psiw; }
+  
+  inline void SetTurbGain(double tt) {TurbGain = tt;}
+  
+  inline double GetTurbPQR(int idx) {return vTurbPQR(idx);}
+  inline FGColumnVector3& GetTurbPQR(void) {return vTurbPQR;}
   
 private:
-  float rho;
+  double rho;
+
+  enum tType {ttBerndt, ttNone} turbType;
 
   int lastIndex;
-  float h;
-  float htab[8];
-  float SLtemperature,SLdensity,SLpressure,SLsoundspeed;
-  float rSLtemperature,rSLdensity,rSLpressure,rSLsoundspeed; //reciprocals
-  float temperature,density,pressure,soundspeed;
+  double h;
+  double htab[8];
+  double SLtemperature,SLdensity,SLpressure,SLsoundspeed;
+  double rSLtemperature,rSLdensity,rSLpressure,rSLsoundspeed; //reciprocals
+  double temperature,density,pressure,soundspeed;
   bool useExternal;
-  float exTemperature,exDensity,exPressure;
+  double exTemperature,exDensity,exPressure;
   
+  double MagnitudedAccelDt, MagnitudeAccel, Magnitude;
+  double TurbGain;
+  FGColumnVector3 vDirectiondAccelDt;
+  FGColumnVector3 vDirectionAccel;
+  FGColumnVector3 vDirection;
+  FGColumnVector3 vTurbulence;
+  FGColumnVector3 vTurbulenceGrad;
+  FGColumnVector3 vBodyTurbGrad;
+  FGColumnVector3 vTurbPQR;
+
   FGColumnVector3 vWindNED;
-  float psiw;
+  double psiw;
 
-  void Calculate(float altitude);
-  void Debug(void);
+  void Calculate(double altitude);
+  void Turbulence(void);
+  void Debug(int from);
 };
 
 /******************************************************************************/