First steps in a weather reorganization. Note especially that

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

diff --git a/src/FDM/JSBSim/FGInertial.h b/src/FDM/JSBSim/FGInertial.h
index b1a0b299b765bfcc8b107b76ca8886f5906637c9..7a1da74cf5c49dc496990858932e452b5b13d972 100644 (file)
--- a/src/FDM/JSBSim/FGInertial.h
+++ b/src/FDM/JSBSim/FGInertial.h
@@ -44,7 +44,7 @@ INCLUDES
 
 #ifdef FGFS
 #  include <simgear/compiler.h>
-#  ifdef FG_HAVE_STD_INCLUDES
+#  ifdef SG_HAVE_STD_INCLUDES
 #    include <vector>
 #  else
 #    include <vector.h>
@@ -55,14 +55,16 @@ INCLUDES
 
 #include "FGModel.h"
 #include "FGConfigFile.h"
+#include "FGMatrix33.h"
+#include "FGColumnVector3.h"
+#include "FGColumnVector4.h"
 
-#define ID_INERTIAL "$Header"
+#define ID_INERTIAL "$Id$"
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-const char *Id_Inertial = "JSBSim $Header$";
 
 class FGInertial : public FGModel {
 
@@ -71,7 +73,26 @@ public:
   ~FGInertial(void);
 
   bool Run(void);
+  FGColumnVector3& GetForces(void) {return vForces;}
+  FGColumnVector3& GetGravity(void) {return vGravity;}
+  double GetForces(int n) {return vForces(n);}
   bool LoadInertial(FGConfigFile* AC_cfg);
+  double SLgravity(void) {return gAccelReference;}
+  double gravity(void) {return gAccel;}
+  double omega(void) {return RotationRate;}
+  double RefRadius(void) {return RadiusReference;}
+
+private:
+  FGColumnVector3 vOmegaLocal;
+  FGColumnVector3 vForces;
+  FGColumnVector3 vRadius;
+  FGColumnVector3 vGravity;
+  double gAccel;
+  double gAccelReference;
+  double RadiusReference;
+  double RotationRate;
+  double GM;
+  void Debug(int from);
 };
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%