X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FJSBSim%2Fmodels%2FFGPropulsion.cpp;h=85453af7ed968e18f09818d775ed99350d0815f4;hb=024ef128e3395e8c0e32b360abe19b4d345e4f80;hp=a6f45021fb8a3d2972cc66a5ee9ef389dff78fa4;hpb=bfc19675291404ddda86c9b2a12c8f9dab1bc478;p=flightgear.git diff --git a/src/FDM/JSBSim/models/FGPropulsion.cpp b/src/FDM/JSBSim/models/FGPropulsion.cpp index a6f45021f..85453af7e 100644 --- a/src/FDM/JSBSim/models/FGPropulsion.cpp +++ b/src/FDM/JSBSim/models/FGPropulsion.cpp @@ -6,7 +6,7 @@ Purpose: Encapsulates the set of engines and tanks associated with this aircraft - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software @@ -44,20 +44,29 @@ HISTORY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#include "FGPropulsion.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include #include +#include +#include + +#include "FGFDMExec.h" +#include "FGPropulsion.h" +#include "models/FGMassBalance.h" +#include "models/propulsion/FGRocket.h" +#include "models/propulsion/FGTurbine.h" +#include "models/propulsion/FGPiston.h" +#include "models/propulsion/FGElectric.h" +#include "models/propulsion/FGTurboProp.h" +#include "models/propulsion/FGTank.h" +#include "input_output/FGPropertyManager.h" +#include "input_output/FGXMLParse.h" +#include "math/FGColumnVector3.h" + +using namespace std; namespace JSBSim { -static const char *IdSrc = "$Id$"; +static const char *IdSrc = "$Id: FGPropulsion.cpp,v 1.62 2012/07/19 03:50:19 jberndt Exp $"; static const char *IdHdr = ID_PROPULSION; extern short debug_lvl; @@ -71,13 +80,15 @@ FGPropulsion::FGPropulsion(FGFDMExec* exec) : FGModel(exec) { Name = "FGPropulsion"; + InitializedEngines = 0; numSelectedFuelTanks = numSelectedOxiTanks = 0; numTanks = numEngines = 0; numOxiTanks = numFuelTanks = 0; ActiveEngine = -1; // -1: ALL, 0: Engine 1, 1: Engine 2 ... tankJ.InitMatrix(); - refuel = false; - fuel_freeze = false; + refuel = dump = false; + DumpRate = 0.0; + FuelFreeze = false; TotalFuelQuantity = 0.0; IsBound = HavePistonEngine = @@ -85,6 +96,7 @@ FGPropulsion::FGPropulsion(FGFDMExec* exec) : FGModel(exec) HaveRocketEngine = HaveTurboPropEngine = HaveElectricEngine = false; + HasInitializedEngines = false; Debug(0); } @@ -95,66 +107,218 @@ FGPropulsion::~FGPropulsion() { for (unsigned int i=0; iResetToIC(); + + for (unsigned int i=0; iGetType()) { + case FGEngine::etPiston: + ((FGPiston*)Engines[i])->ResetToIC(); + try { + if (HasInitializedEngines && (InitializedEngines & i)) InitRunning(i); + } catch (string str) { + cerr << str << endl; + result = false; + } + break; + case FGEngine::etTurbine: + ((FGTurbine*)Engines[i])->ResetToIC(); + try { + if (HasInitializedEngines && (InitializedEngines & i)) InitRunning(i); + } catch (string str) { + cerr << str << endl; + result = false; + } + break; + default: + break; + } + } + + return result; +} + +//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +bool FGPropulsion::Run(bool Holding) { unsigned int i; - if (FGModel::Run()) return true; - if (FDMExec->Holding()) return false; + if (FGModel::Run(Holding)) return true; + if (Holding) return false; - double dt = State->Getdt(); + RunPreFunctions(); vForces.InitMatrix(); vMoments.InitMatrix(); for (i=0; iCalculate(); + ConsumeFuel(Engines[i]); vForces += Engines[i]->GetBodyForces(); // sum body frame forces vMoments += Engines[i]->GetMoments(); // sum body frame moments } TotalFuelQuantity = 0.0; for (i=0; iCalculate( dt * rate ); + Tanks[i]->Calculate( in.TotalDeltaT, in.TAT_c); if (Tanks[i]->GetType() == FGTank::ttFUEL) { TotalFuelQuantity += Tanks[i]->GetContents(); } } - if (refuel) DoRefuel( dt * rate ); + if (refuel) DoRefuel( in.TotalDeltaT ); + if (dump) DumpFuel( in.TotalDeltaT ); + + RunPostFunctions(); return false; } +//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +// +// The engine can tell us how much fuel it needs, but it is up to the propulsion +// subsystem manager class FGPropulsion to manage fuel flow amongst tanks. Engines +// May burn fuel from more than one tank at a time, and may burn from one tank +// before another - that is, may burn from one tank until the tank is depleted, +// then burn from the next highest priority tank. This can be accompished +// by defining a fuel management system, but this way of specifying priorities +// is more automatic from a user perspective. + +void FGPropulsion::ConsumeFuel(FGEngine* engine) +{ + if (FuelFreeze) return; + if (FDMExec->GetTrimStatus()) return; + + unsigned int TanksWithFuel=0, CurrentFuelTankPriority=1; + unsigned int TanksWithOxidizer=0, CurrentOxidizerTankPriority=1; + vector FeedListFuel, FeedListOxi; + bool Starved = true; // Initially set Starved to true. Set to false in code below. + bool hasOxTanks = false; + + // For this engine, + // 1) Count how many fuel tanks with the current priority level have fuel + // 2) If there none, then try next lower priority (higher number) - that is, + // increment CurrentPriority. + // 3) Build the feed list. + // 4) Do the same for oxidizer tanks, if needed. + + // Process fuel tanks, if any + while ((TanksWithFuel == 0) && (CurrentFuelTankPriority <= numTanks)) { + for (unsigned int i=0; iGetNumSourceTanks(); i++) { + unsigned int TankId = engine->GetSourceTank(i); + FGTank* Tank = Tanks[TankId]; + unsigned int TankPriority = Tank->GetPriority(); + if (TankPriority != 0) { + switch(Tank->GetType()) { + case FGTank::ttFUEL: + if ((Tank->GetContents() > 0.0) && Tank->GetSelected() && (TankPriority == CurrentFuelTankPriority)) { + TanksWithFuel++; + Starved = false; + FeedListFuel.push_back(TankId); + } + break; + case FGTank::ttOXIDIZER: + // Skip this here (done below) + break; + } + } + } + if (TanksWithFuel == 0) CurrentFuelTankPriority++; // No tanks at this priority, try next priority + } + + bool FuelStarved = Starved; + Starved = true; + + // Process Oxidizer tanks, if any + if (engine->GetType() == FGEngine::etRocket) { + while ((TanksWithOxidizer == 0) && (CurrentOxidizerTankPriority <= numTanks)) { + for (unsigned int i=0; iGetNumSourceTanks(); i++) { + unsigned int TankId = engine->GetSourceTank(i); + FGTank* Tank = Tanks[TankId]; + unsigned int TankPriority = Tank->GetPriority(); + if (TankPriority != 0) { + switch(Tank->GetType()) { + case FGTank::ttFUEL: + // Skip this here (done above) + break; + case FGTank::ttOXIDIZER: + hasOxTanks = true; + if (Tank->GetContents() > 0.0 && Tank->GetSelected() && TankPriority == CurrentOxidizerTankPriority) { + TanksWithOxidizer++; + if (TanksWithFuel > 0) Starved = false; + FeedListOxi.push_back(TankId); + } + break; + } + } + } + if (TanksWithOxidizer == 0) CurrentOxidizerTankPriority++; // No tanks at this priority, try next priority + } + } + + bool OxiStarved = Starved; + + engine->SetStarved(FuelStarved || (hasOxTanks && OxiStarved)); // Tanks can be refilled, so be sure to reset engine Starved flag here. + + // No fuel or fuel/oxidizer found at any priority! +// if (Starved) return; + if (FuelStarved || (hasOxTanks && OxiStarved)) return; + + double FuelToBurn = engine->CalcFuelNeed(); // How much fuel does this engine need? + double FuelNeededPerTank = FuelToBurn / TanksWithFuel; // Determine fuel needed per tank. + for (unsigned int i=0; iDrain(FuelNeededPerTank); + } + + if (engine->GetType() == FGEngine::etRocket) { + double OxidizerToBurn = engine->CalcOxidizerNeed(); // How much fuel does this engine need? + double OxidizerNeededPerTank = OxidizerToBurn / TanksWithOxidizer; // Determine fuel needed per tank. + for (unsigned int i=0; iDrain(OxidizerNeededPerTank); + } + } + +} + //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% bool FGPropulsion::GetSteadyState(void) { - double currentThrust = 0, lastThrust=-1; - int steady_count,j=0; - bool steady=false; + double currentThrust = 0, lastThrust = -1; + int steady_count = 0, j = 0; + bool steady = false; + bool TrimMode = FDMExec->GetTrimStatus(); vForces.InitMatrix(); vMoments.InitMatrix(); - if (!FGModel::Run()) { + if (!FGModel::Run(false)) { + FDMExec->SetTrimStatus(true); + for (unsigned int i=0; iSetTrimMode(true); steady=false; steady_count=0; + j=0; while (!steady && j < 6000) { Engines[i]->Calculate(); lastThrust = currentThrust; currentThrust = Engines[i]->GetThrust(); if (fabs(lastThrust-currentThrust) < 0.0001) { steady_count++; - if (steady_count > 120) { steady=true; } + if (steady_count > 120) { + steady=true; + } } else { steady_count=0; } @@ -162,9 +326,10 @@ bool FGPropulsion::GetSteadyState(void) } vForces += Engines[i]->GetBodyForces(); // sum body frame forces vMoments += Engines[i]->GetMoments(); // sum body frame moments - Engines[i]->SetTrimMode(false); } + FDMExec->SetTrimStatus(TrimMode); + return false; } else { return true; @@ -173,25 +338,35 @@ bool FGPropulsion::GetSteadyState(void) //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -bool FGPropulsion::ICEngineStart(void) +void FGPropulsion::InitRunning(int n) { - int j; + if (n >= 0) { // A specific engine is supposed to be initialized - vForces.InitMatrix(); - vMoments.InitMatrix(); + if (n >= (int)GetNumEngines() ) { + throw(string("Tried to initialize a non-existent engine!")); + } - for (unsigned int i=0; iSetTrimMode(true); - j=0; - while (!Engines[i]->GetRunning() && j < 2000) { - Engines[i]->Calculate(); - j++; + in.ThrottleCmd[n] = in.ThrottlePos[n] = 1; // Set the throttle command and position + in.MixtureCmd[n] = in.MixturePos[n] = 1; // Set the mixture command and position + + GetEngine(n)->InitRunning(); + GetSteadyState(); + + InitializedEngines = 1 << n; + HasInitializedEngines = true; + + } else if (n < 0) { // -1 refers to "All Engines" + + for (unsigned int i=0; iInitRunning(); } - vForces += Engines[i]->GetBodyForces(); // sum body frame forces - vMoments += Engines[i]->GetMoments(); // sum body frame moments - Engines[i]->SetTrimMode(false); + + GetSteadyState(); + InitializedEngines = -1; + HasInitializedEngines = true; } - return true; } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -199,10 +374,25 @@ bool FGPropulsion::ICEngineStart(void) bool FGPropulsion::Load(Element* el) { string type, engine_filename; - bool ThrottleAdded = false; Debug(2); + FGModel::Load(el); // Perform base class Load. + + // Process tank definitions first to establish the number of fuel tanks + + Element* tank_element = el->FindElement("tank"); + while (tank_element) { + Tanks.push_back(new FGTank(FDMExec, tank_element, numTanks)); + if (Tanks.back()->GetType() == FGTank::ttFUEL) numFuelTanks++; + else if (Tanks.back()->GetType() == FGTank::ttOXIDIZER) numOxiTanks++; + else {cerr << "Unknown tank type specified." << endl; return false;} + numTanks++; + tank_element = el->FindNextElement("tank"); + } + numSelectedFuelTanks = numFuelTanks; + numSelectedOxiTanks = numOxiTanks; + Element* engine_element = el->FindElement("engine"); while (engine_element) { engine_filename = engine_element->GetAttributeValue("file"); @@ -213,98 +403,93 @@ bool FGPropulsion::Load(Element* el) } engine_filename = FindEngineFullPathname(engine_filename); + if (engine_filename.empty()) { + // error message already printed by FindEngineFullPathname() + return false; + } + document = LoadXMLDocument(engine_filename); document->SetParent(engine_element); type = document->GetName(); - if (type == "piston_engine") { - HavePistonEngine = true; - if (!IsBound) bind(); - Engines.push_back(new FGPiston(FDMExec, document, numEngines)); - } else if (type == "turbine_engine") { - HaveTurbineEngine = true; - if (!IsBound) bind(); - Engines.push_back(new FGTurbine(FDMExec, document, numEngines)); - } else if (type == "turboprop_engine") { - HaveTurboPropEngine = true; - if (!IsBound) bind(); - Engines.push_back(new FGTurboProp(FDMExec, document, numEngines)); - } else if (type == "rocket_engine") { - HaveRocketEngine = true; - if (!IsBound) bind(); - Engines.push_back(new FGRocket(FDMExec, document, numEngines)); - } else if (type == "electric_engine") { - HaveElectricEngine = true; - if (!IsBound) bind(); - Engines.push_back(new FGElectric(FDMExec, document, numEngines)); - } else { - cerr << "Unknown engine type: " << type << endl; - exit(-5); + try { + if (type == "piston_engine") { + HavePistonEngine = true; + if (!IsBound) bind(); + Engines.push_back(new FGPiston(FDMExec, document, numEngines, in)); + } else if (type == "turbine_engine") { + HaveTurbineEngine = true; + if (!IsBound) bind(); + Engines.push_back(new FGTurbine(FDMExec, document, numEngines, in)); + } else if (type == "turboprop_engine") { + HaveTurboPropEngine = true; + if (!IsBound) bind(); + Engines.push_back(new FGTurboProp(FDMExec, document, numEngines, in)); + } else if (type == "rocket_engine") { + HaveRocketEngine = true; + if (!IsBound) bind(); + Engines.push_back(new FGRocket(FDMExec, document, numEngines, in)); + } else if (type == "electric_engine") { + HaveElectricEngine = true; + if (!IsBound) bind(); + Engines.push_back(new FGElectric(FDMExec, document, numEngines, in)); + } else { + cerr << "Unknown engine type: " << type << endl; + exit(-5); + } + } catch (std::string str) { + cerr << endl << fgred << str << reset << endl; + return false; } - FCS->AddThrottle(); - ThrottleAdded = true; - numEngines++; engine_element = el->FindNextElement("engine"); ResetParser(); } - // Process tank definitions + CalculateTankInertias(); - Element* tank_element = el->FindElement("tank"); - while (tank_element) { - Tanks.push_back(new FGTank(FDMExec, tank_element)); - if (Tanks.back()->GetType() == FGTank::ttFUEL) numFuelTanks++; - else if (Tanks.back()->GetType() == FGTank::ttOXIDIZER) numOxiTanks++; - else {cerr << "Unknown tank type specified." << endl; return false;} - numTanks++; - tank_element = el->FindNextElement("tank"); - } - numSelectedFuelTanks = numFuelTanks; - numSelectedOxiTanks = numOxiTanks; + // Process fuel dump rate + if (el->FindElement("dump-rate")) + DumpRate = el->FindElementValueAsNumberConvertTo("dump-rate", "LBS/MIN"); - CalculateTankInertias(); - if (!ThrottleAdded) FCS->AddThrottle(); // need to have at least one throttle + PostLoad(el, PropertyManager); return true; } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -string FGPropulsion::FindEngineFullPathname(string engine_filename) +string FGPropulsion::FindEngineFullPathname(const string& engine_filename) { string fullpath, localpath; string enginePath = FDMExec->GetEnginePath(); string aircraftPath = FDMExec->GetFullAircraftPath(); - ifstream* engine_file = new ifstream(); + ifstream engine_file; string separator = "/"; -# ifdef macintosh - separator = ";"; -# endif fullpath = enginePath + separator; localpath = aircraftPath + separator + "Engines" + separator; - engine_file->open(string(fullpath + engine_filename + ".xml").c_str()); - if ( !engine_file->is_open()) { - engine_file->open(string(localpath + engine_filename + ".xml").c_str()); - if ( !engine_file->is_open()) { + engine_file.open(string(localpath + engine_filename + ".xml").c_str()); + if ( !engine_file.is_open()) { + engine_file.open(string(fullpath + engine_filename + ".xml").c_str()); + if ( !engine_file.is_open()) { cerr << " Could not open engine file: " << engine_filename << " in path " << fullpath << " or " << localpath << endl; return string(""); } else { - return string(localpath + engine_filename + ".xml"); + return string(fullpath + engine_filename + ".xml"); } } - return string(fullpath + engine_filename + ".xml"); + return string(localpath + engine_filename + ".xml"); } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -ifstream* FGPropulsion::FindEngineFile(string engine_filename) +ifstream* FGPropulsion::FindEngineFile(const string& engine_filename) { string fullpath, localpath; string enginePath = FDMExec->GetEnginePath(); @@ -312,19 +497,16 @@ ifstream* FGPropulsion::FindEngineFile(string engine_filename) ifstream* engine_file = new ifstream(); string separator = "/"; -# ifdef macintosh - separator = ";"; -# endif fullpath = enginePath + separator; localpath = aircraftPath + separator + "Engines" + separator; - engine_file->open(string(fullpath + engine_filename + ".xml").c_str()); + engine_file->open(string(localpath + engine_filename + ".xml").c_str()); if ( !engine_file->is_open()) { - engine_file->open(string(localpath + engine_filename + ".xml").c_str()); + engine_file->open(string(fullpath + engine_filename + ".xml").c_str()); if ( !engine_file->is_open()) { cerr << " Could not open engine file: " << engine_filename << " in path " - << fullpath << " or " << localpath << endl; + << localpath << " or " << fullpath << endl; } } return engine_file; @@ -332,7 +514,7 @@ ifstream* FGPropulsion::FindEngineFile(string engine_filename) //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -string FGPropulsion::GetPropulsionStrings(string delimeter) +string FGPropulsion::GetPropulsionStrings(const string& delimiter) const { unsigned int i; @@ -342,21 +524,24 @@ string FGPropulsion::GetPropulsionStrings(string delimeter) for (i=0; iGetEngineLabels(delimeter); + PropulsionStrings += Engines[i]->GetEngineLabels(delimiter); } for (i=0; iGetType() == FGTank::ttFUEL) buf << delimeter << "Fuel Tank " << i; - else if (Tanks[i]->GetType() == FGTank::ttOXIDIZER) buf << delimeter << "Oxidizer Tank " << i; + if (Tanks[i]->GetType() == FGTank::ttFUEL) buf << delimiter << "Fuel Tank " << i; + else if (Tanks[i]->GetType() == FGTank::ttOXIDIZER) buf << delimiter << "Oxidizer Tank " << i; } + PropulsionStrings += buf.str(); + buf.str(""); + return PropulsionStrings; } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -string FGPropulsion::GetPropulsionValues(string delimeter) +string FGPropulsion::GetPropulsionValues(const string& delimiter) const { unsigned int i; @@ -366,50 +551,74 @@ string FGPropulsion::GetPropulsionValues(string delimeter) for (i=0; iGetEngineValues(delimeter); + PropulsionValues += Engines[i]->GetEngineValues(delimiter); } for (i=0; iGetContents(); } + PropulsionValues += buf.str(); + buf.str(""); + return PropulsionValues; } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -FGColumnVector3& FGPropulsion::GetTanksMoment(void) +string FGPropulsion::GetPropulsionTankReport() +{ + string out=""; + stringstream outstream; + for (unsigned int i=0; iGetType() == FGTank::ttFUEL && tank->GetGrainType() != FGTank::gtUNKNOWN) { + tankname = "Solid Fuel"; + } else if (tank->GetType() == FGTank::ttFUEL) { + tankname = "Fuel"; + } else if (tank->GetType() == FGTank::ttOXIDIZER) { + tankname = "Oxidizer"; + } else { + tankname = "(Unknown tank type)"; + } + outstream << highint << left << setw(4) << i << setw(30) << tankname << normint + << right << setw(10) << tank->GetContents() << setw(8) << tank->GetXYZ(eX) + << setw(8) << tank->GetXYZ(eY) << setw(8) << tank->GetXYZ(eZ) + << setw(12) << "*" << setw(12) << "*" + << setw(12) << "*" << endl; + } + return outstream.str(); +} + +//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +const FGColumnVector3& FGPropulsion::GetTanksMoment(void) { - iTank = Tanks.begin(); vXYZtank_arm.InitMatrix(); - while (iTank < Tanks.end()) { - vXYZtank_arm(eX) += (*iTank)->GetXYZ(eX)*(*iTank)->GetContents(); - vXYZtank_arm(eY) += (*iTank)->GetXYZ(eY)*(*iTank)->GetContents(); - vXYZtank_arm(eZ) += (*iTank)->GetXYZ(eZ)*(*iTank)->GetContents(); - iTank++; + for (unsigned int i=0; iGetXYZ() * Tanks[i]->GetContents(); } return vXYZtank_arm; } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -double FGPropulsion::GetTanksWeight(void) +double FGPropulsion::GetTanksWeight(void) const { double Tw = 0.0; - iTank = Tanks.begin(); - while (iTank < Tanks.end()) { - Tw += (*iTank)->GetContents(); - iTank++; - } + for (unsigned int i=0; iGetContents(); + return Tw; } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -FGMatrix33& FGPropulsion::CalculateTankInertias(void) +const FGMatrix33& FGPropulsion::CalculateTankInertias(void) { unsigned int size; @@ -418,9 +627,15 @@ FGMatrix33& FGPropulsion::CalculateTankInertias(void) tankJ = FGMatrix33(); - for (unsigned int i=0; iGetPointmassInertia( lbtoslug * Tanks[i]->GetContents(), - Tanks[i]->GetXYZ() ); + for (unsigned int i=0; iGetXYZ(); + + tankJ += FDMExec->GetMassBalance()->GetPointmassInertia( lbtoslug * Tanks[i]->GetContents(), + vTankStructVec); + tankJ(1,1) += Tanks[i]->GetIxx(); + tankJ(2,2) += Tanks[i]->GetIyy(); + tankJ(3,3) += Tanks[i]->GetIzz(); + } return tankJ; } @@ -531,9 +746,31 @@ void FGPropulsion::DoRefuel(double time_slice) //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +void FGPropulsion::DumpFuel(double time_slice) +{ + unsigned int i; + int TanksDumping = 0; + + for (i=0; iGetContents() > Tanks[i]->GetStandpipe()) ++TanksDumping; + } + + if (TanksDumping == 0) return; + + double dump_rate_per_tank = DumpRate / 60.0 * time_slice / TanksDumping; + + for (i=0; iGetContents() > Tanks[i]->GetStandpipe()) { + Transfer(i, -1, dump_rate_per_tank); + } + } +} + +//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + void FGPropulsion::SetFuelFreeze(bool f) { - fuel_freeze = f; + FuelFreeze = f; for (unsigned int i=0; iSetFuelFreeze(f); } @@ -547,38 +784,37 @@ void FGPropulsion::bind(void) typedef int (FGPropulsion::*iPMF)(void) const; IsBound = true; - + PropertyManager->Tie("propulsion/set-running", this, (iPMF)0, &FGPropulsion::InitRunning, false); if (HaveTurbineEngine) { - PropertyManager->Tie("propulsion/starter_cmd", this, (iPMF)0, &FGPropulsion::SetStarter, true); - PropertyManager->Tie("propulsion/cutoff_cmd", this, (iPMF)0, &FGPropulsion::SetCutoff, true); + PropertyManager->Tie("propulsion/starter_cmd", this, (iPMF)0, &FGPropulsion::SetStarter, false); + PropertyManager->Tie("propulsion/cutoff_cmd", this, (iPMF)0, &FGPropulsion::SetCutoff, false); } if (HavePistonEngine) { - PropertyManager->Tie("propulsion/starter_cmd", this, (iPMF)0, &FGPropulsion::SetStarter, true); - PropertyManager->Tie("propulsion/magneto_cmd", this, (iPMF)0, &FGPropulsion::SetMagnetos, true); + PropertyManager->Tie("propulsion/starter_cmd", this, (iPMF)0, &FGPropulsion::SetStarter, false); + PropertyManager->Tie("propulsion/magneto_cmd", this, (iPMF)0, &FGPropulsion::SetMagnetos, false); } PropertyManager->Tie("propulsion/active_engine", this, (iPMF)&FGPropulsion::GetActiveEngine, &FGPropulsion::SetActiveEngine, true); PropertyManager->Tie("propulsion/total-fuel-lbs", this, &FGPropulsion::GetTotalFuelQuantity); -} + PropertyManager->Tie("propulsion/refuel", this, &FGPropulsion::GetRefuel, + &FGPropulsion::SetRefuel, true); + PropertyManager->Tie("propulsion/fuel_dump", this, &FGPropulsion::GetFuelDump, + &FGPropulsion::SetFuelDump, true); + PropertyManager->Tie("forces/fbx-prop-lbs", this,1, + (PMF)&FGPropulsion::GetForces); + PropertyManager->Tie("forces/fby-prop-lbs", this,2, + (PMF)&FGPropulsion::GetForces); + PropertyManager->Tie("forces/fbz-prop-lbs", this,3, + (PMF)&FGPropulsion::GetForces); + PropertyManager->Tie("moments/l-prop-lbsft", this,1, + (PMF)&FGPropulsion::GetMoments); + PropertyManager->Tie("moments/m-prop-lbsft", this,2, + (PMF)&FGPropulsion::GetMoments); + PropertyManager->Tie("moments/n-prop-lbsft", this,3, + (PMF)&FGPropulsion::GetMoments); -//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -void FGPropulsion::unbind(void) -{ - if (!IsBound) return; - - if (HaveTurbineEngine) { - PropertyManager->Untie("propulsion/starter_cmd"); - PropertyManager->Untie("propulsion/cutoff_cmd"); - } - if (HavePistonEngine) { - PropertyManager->Untie("propulsion/starter_cmd"); - PropertyManager->Untie("propulsion/magneto_cmd"); - } - PropertyManager->Untie("propulsion/active_engine"); - PropertyManager->Untie("propulsion/total-fuel-lbs"); } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%