Expose the strut compression.

[flightgear.git] / src / FDM / JSBSim / FGEngine.cpp

diff --git a/src/FDM/JSBSim/FGEngine.cpp b/src/FDM/JSBSim/FGEngine.cpp
index b3a1b39294346a2e4107299447537d3b8517b1b7..f0153d998e0cb61fde8fc3337738bdf155cac20a 100644 (file)
--- a/src/FDM/JSBSim/FGEngine.cpp
+++ b/src/FDM/JSBSim/FGEngine.cpp
@@ -68,7 +68,7 @@ CLASS IMPLEMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 
-FGEngine::FGEngine(FGFDMExec* exec)
+FGEngine::FGEngine(FGFDMExec* exec, int engine_number) : EngineNumber(engine_number)
 {
   Name = "";
   Type = etUnknown;
@@ -84,10 +84,10 @@ FGEngine::FGEngine(FGFDMExec* exec)
   FuelNeed = OxidizerNeed = 0.0;
   Starved = Running = Cranking = false;
   PctPower = 0.0;
-  EngineNumber = -1;
   TrimMode = false;
   FuelFlow_gph = 0.0;
   FuelFlow_pph = 0.0;
+  FuelFreeze = false;
 
   FDMExec = exec;
   State = FDMExec->GetState();
@@ -100,7 +100,11 @@ FGEngine::FGEngine(FGFDMExec* exec)
   Output = FDMExec->GetOutput();
 
   PropertyManager = FDMExec->GetPropertyManager();
-
+  
+  char property_name[80];
+  snprintf(property_name, 80, "propulsion/engine[%u]/thrust", EngineNumber);
+  PropertyManager->Tie( property_name, &Thrust);
+  
   Debug(0);
 }
 
@@ -108,6 +112,12 @@ FGEngine::FGEngine(FGFDMExec* exec)
 
 FGEngine::~FGEngine()
 {
+  if (Thruster) delete Thruster;
+
+  char property_name[80];
+  snprintf(property_name, 80, "propulsion/engine[%u]/thrust", EngineNumber);
+  PropertyManager->Untie( property_name);
+  
   Debug(1);
 }
 
@@ -119,27 +129,37 @@ FGEngine::~FGEngine()
 
 void FGEngine::ConsumeFuel(void)
 {
-  double Fshortage, Oshortage, TanksWithFuel;
+  if (FuelFreeze) return;
+  unsigned int i;
+  double Fshortage, Oshortage, TanksWithFuel, TanksWithOxidizer;
   FGTank* Tank;
+  bool haveOxTanks = false;
 
   if (TrimMode) return;
-  Fshortage = Oshortage = TanksWithFuel = 0.0;
- 
-  // count how many assigned tanks have fuel
-  for (unsigned int i=0; i<SourceTanks.size(); i++) {
+  Fshortage = Oshortage = TanksWithFuel = TanksWithOxidizer = 0.0;
+
+  // count how many assigned tanks have fuel or oxidizer
+  for (i=0; i<SourceTanks.size(); i++) {
     Tank = Propulsion->GetTank(SourceTanks[i]);
-    if (Tank->GetContents() > 0.0) {
-      ++TanksWithFuel;
+    if (Tank->GetType() == FGTank::ttFUEL){
+      if (Tank->GetContents() > 0.0) {
+        ++TanksWithFuel;
+      }
+    } else if (Tank->GetType() == FGTank::ttOXIDIZER) {
+      haveOxTanks = true;
+      if (Tank->GetContents() > 0.0) {
+        ++TanksWithOxidizer;
+      }
     }
   }
-  if (!TanksWithFuel) return;
+  if (!TanksWithFuel || (haveOxTanks && !TanksWithOxidizer)) return;
 
-  for (unsigned int i=0; i<SourceTanks.size(); i++) {
+  for (i=0; i<SourceTanks.size(); i++) {
     Tank = Propulsion->GetTank(SourceTanks[i]);
     if (Tank->GetType() == FGTank::ttFUEL) {
        Fshortage += Tank->Drain(CalcFuelNeed()/TanksWithFuel);
-    } else {
-       Oshortage += Tank->Drain(CalcOxidizerNeed()/TanksWithFuel);
+    } else if (Tank->GetType() == FGTank::ttOXIDIZER) {
+       Oshortage += Tank->Drain(CalcOxidizerNeed()/TanksWithOxidizer);
     }
   }
 
@@ -200,7 +220,7 @@ FGColumnVector3& FGEngine::GetMoments(void)
 bool FGEngine::LoadThruster(FGConfigFile* AC_cfg)
 {
   string token, fullpath, localpath;
-  string thrusterFileName, thrType, engineFileName;
+  string thrType, engineFileName;
   FGConfigFile* Cfg_ptr = 0;
   double xLoc, yLoc, zLoc, Pitch, Yaw;
   double P_Factor = 0, Sense = 0.0;
@@ -237,11 +257,11 @@ bool FGEngine::LoadThruster(FGConfigFile* AC_cfg)
     thrType = Cfg_ptr->GetValue();
 
     if (thrType == "FG_PROPELLER") {
-      Thruster = new FGPropeller(FDMExec, Cfg_ptr);
+      Thruster = new FGPropeller(FDMExec, Cfg_ptr, EngineNumber);
     } else if (thrType == "FG_NOZZLE") {
-      Thruster = new FGNozzle(FDMExec, Cfg_ptr);
+      Thruster = new FGNozzle(FDMExec, Cfg_ptr, EngineNumber);
     } else if (thrType == "FG_DIRECT") {
-      Thruster = new FGThruster( FDMExec, Cfg_ptr);
+      Thruster = new FGThruster( FDMExec, Cfg_ptr, EngineNumber);
     }
 
     AC_cfg->GetNextConfigLine();