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

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

diff --git a/src/FDM/JSBSim/FGThruster.h b/src/FDM/JSBSim/FGThruster.h
index c49b62c3b6f3194fb49fde1cf66354ac3b277c5a..1d99d475de79e448016b979445e5001ae9809b37 100644 (file)
--- a/src/FDM/JSBSim/FGThruster.h
+++ b/src/FDM/JSBSim/FGThruster.h
@@ -64,34 +64,41 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 class FGThruster : public FGForce {
 
 public:
   /// Constructor
   FGThruster(FGFDMExec *FDMExec);
+  FGThruster(FGFDMExec *FDMExec, FGConfigFile *Eng_cfg );
   /// Destructor
   virtual ~FGThruster();
 
   enum eType {ttNozzle, ttRotor, ttPropeller};
 
-  virtual float Calculate(float) {return 0.0;}
+  virtual double Calculate(double Thrust) { vFn(1)=Thrust; return 0.0; }
   void SetName(string name) {Name = name;}
-  virtual float GetPowerRequired(void) {return 0.0;}
-  virtual void SetdeltaT(float dt) {deltaT = dt;}
-  float GetThrust(void) {return Thrust;}
+  void SetThrusterNumber(int nn) {ThrusterNumber = nn;}
+  virtual void SetRPM(double rpm) {};
+  virtual double GetPowerRequired(void) {return 0.0;}
+  virtual void SetdeltaT(double dt) {deltaT = dt;}
+  double GetThrust(void) {return Thrust;}
   eType GetType(void) {return Type;}
   string GetName(void) {return Name;}
-  virtual float GetRPM(void) { return 0.0; };
+  int GetThrusterNumber(void) {return ThrusterNumber;}
+  virtual double GetRPM(void) { return 0.0; };
 
 protected:
   eType Type;
   string Name;
-  float Thrust;
-  float PowerRequired;
-  float deltaT;
-  virtual void Debug(void);
+  int ThrusterNumber;
+  double Thrust;
+  double PowerRequired;
+  double deltaT;
+  virtual void Debug(int from);
 };
-
+}
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 #endif