JSBSim tweaks.

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

diff --git a/src/FDM/JSBSim/FGAtmosphere.h b/src/FDM/JSBSim/FGAtmosphere.h
index 3d5b94c42e01b60a9d76615f7632b5812f646df4..1a1bd1aa23362514eba9f00788b8514615fc2e39 100644 (file)
--- a/src/FDM/JSBSim/FGAtmosphere.h
+++ b/src/FDM/JSBSim/FGAtmosphere.h
@@ -44,11 +44,14 @@ INCLUDES
 
 #include "FGModel.h"
 #include "FGMatrix.h"
+
+#define ID_ATMOSPHERE "$Id$"
+
 /*******************************************************************************
 COMMENTS, REFERENCES,  and NOTES
 ********************************************************************************
  
-[1]    Anderson, John D. "Introduction to Flight, Third Edition", McGraw-Hill,
+[1]   Anderson, John D. "Introduction to Flight, Third Edition", McGraw-Hill,
       1989, ISBN 0-07-001641-0
  
 *******************************************************************************
@@ -59,7 +62,7 @@ class FGAtmosphere : public FGModel {
 public:
 
   FGAtmosphere(FGFDMExec*);
-  ~FGAtmosphere(void);
+  ~FGAtmosphere();
   bool Run(void);
 
   inline float GetTemperature(void) {return temperature;}
@@ -79,6 +82,7 @@ public:
 
   inline void UseExternal(void)          { useExternal=true;  }
   inline void UseInternal(void)          { useExternal=false; } //this is the default
+  bool External(void) { return useExternal; }
 
   inline void SetExTemperature(float t)  { exTemperature=t; }
   inline void SetExDensity(float d)      { exDensity=d; }
@@ -86,12 +90,10 @@ public:
 
   inline void SetWindNED(float wN, float wE, float wD) { vWindNED(1)=wN; vWindNED(2)=wE; vWindNED(3)=wD;}
 
-  inline float GetWindN(void) { return vWindNED(1); }
-  inline float GetWindE(void) { return vWindNED(2); }
-  inline float GetWindD(void) { return vWindNED(3); }
-
-  inline FGColumnVector GetWindUVW(void) { return vWindUVW; }
-
+  inline FGColumnVector GetWindNED(void) { return vWindNED; }
+  
+  inline float GetWindPsi(void) { return psiw; }
+  
 protected:
 
 private:
@@ -102,13 +104,14 @@ private:
   float temperature,density,pressure,soundspeed;
   bool useExternal;
   float exTemperature,exDensity,exPressure;
-  FGColumnVector vWindNED,vWindUVW;
+  
+  FGColumnVector vWindNED;
+  float psiw;
 
   void Calculate(float altitude);
-
+  void Debug(void);
 };
 
-
-
 /******************************************************************************/
 #endif
+