Updates from JSBSim, including new turbine engine model from David Culp

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

diff --git a/src/FDM/JSBSim/FGTurbine.h b/src/FDM/JSBSim/FGTurbine.h
index 25bcedbd3613038c7cd0b7696d6d3c3c426b66f2..bfeca9c1c68aa30cb47bf02ec0c37e46814f379f 100644 (file)
--- a/src/FDM/JSBSim/FGTurbine.h
+++ b/src/FDM/JSBSim/FGTurbine.h
@@ -42,8 +42,10 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+#include <vector>
 #include "FGEngine.h"
 #include "FGConfigFile.h"
+#include "FGCoefficient.h"
 
 #define ID_TURBINE "$Id$"
 
@@ -51,6 +53,8 @@ INCLUDES
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 class FGTurbine : public FGEngine
 {
 public:
@@ -58,8 +62,21 @@ public:
   ~FGTurbine();
 
   double Calculate(double);
-  
+
 private:
+  typedef vector<FGCoefficient*> CoeffArray;
+  CoeffArray ThrustTables;
+
+  string name;
+  double MaxMilThrust;
+  double MaxAugThrust;
+  
+  double PowerCommand;
+  
+  double ThrottleToPowerCommand(double throttle);
+  double PowerLag(double actual_power, double power_command);
+  double rtau(double delta_power);
+
   void doInlet(void);
   void doCompressor(void);
   void doBleedDuct(void);
@@ -69,11 +86,11 @@ private:
 
   void doTransition(void);
 
-  bool Load(FGConfigFile *AC_cfg);
+  bool Load(FGConfigFile *ENG_cfg);
 
   void Debug(int from);
 };
-
+}
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 #endif