Fixes from Cameron Moore:

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

diff --git a/src/FDM/JSBSim/FGAtmosphere.h b/src/FDM/JSBSim/FGAtmosphere.h
index fe0fe322b008fc0b5084dd76a92fe32eb9d9eb05..f88031280a756218e9a828e598e1dd373776d5fd 100644 (file)
--- a/src/FDM/JSBSim/FGAtmosphere.h
+++ b/src/FDM/JSBSim/FGAtmosphere.h
@@ -142,9 +142,16 @@ public:
       increases counterclockwise. The wind heading is returned in radians.*/
   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:
   double rho;
 
+  enum tType {ttBerndt, ttNone} turbType;
+
   int lastIndex;
   double h;
   double htab[8];
@@ -154,11 +161,22 @@ private:
   bool useExternal;
   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;
   double psiw;
 
   void Calculate(double altitude);
-  void Debug(void);
+  void Turbulence(void);
+  void Debug(int from);
 };
 
 /******************************************************************************/