%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#include "FGPropulsion.h"
+#include "FGPropertyManager.h"
+
static const char *IdSrc = "$Id$";
static const char *IdHdr = ID_PROPULSION;
-extern short debug_lvl;
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
FGPropulsion::FGPropulsion(FGFDMExec* exec) : FGModel(exec)
{
Name = "FGPropulsion";
numSelectedFuelTanks = numSelectedOxiTanks = 0;
numTanks = numEngines = numThrusters = 0;
numOxiTanks = numFuelTanks = 0;
- Forces = new FGColumnVector(3);
- Moments = new FGColumnVector(3);
-
- if (debug_lvl & 2) cout << "Instantiated: " << Name << endl;
+ bind();
+ Debug(0);
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
{
for (unsigned int i=0; i<Engines.size(); i++) delete Engines[i];
Engines.clear();
- if (Forces) delete Forces;
- if (Moments) delete Moments;
- if (debug_lvl & 2) cout << "Destroyed: FGPropulsion" << endl;
+ unbind();
+ Debug(1);
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-bool FGPropulsion::Run(void) {
- float PowerAvailable;
+bool FGPropulsion::Run(void)
+{
+ double PowerAvailable;
dt = State->Getdt();
- Forces->InitMatrix();
- Moments->InitMatrix();
+ vForces.InitMatrix();
+ vMoments.InitMatrix();
if (!FGModel::Run()) {
for (unsigned int i=0; i<numEngines; i++) {
Thrusters[i]->SetdeltaT(dt*rate);
PowerAvailable = Engines[i]->Calculate(Thrusters[i]->GetPowerRequired());
Thrusters[i]->Calculate(PowerAvailable);
- *Forces += Thrusters[i]->GetBodyForces(); // sum body frame forces
- *Moments += Thrusters[i]->GetMoments(); // sum body frame moments
+ vForces += Thrusters[i]->GetBodyForces(); // sum body frame forces
+ vMoments += Thrusters[i]->GetMoments(); // sum body frame moments
}
-
return false;
} else {
return true;
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-bool FGPropulsion::GetSteadyState(void) {
- float PowerAvailable;
- float currentThrust = 0, lastThrust=-1;
+bool FGPropulsion::GetSteadyState(void)
+{
+ double PowerAvailable;
+ double currentThrust = 0, lastThrust=-1;
dt = State->Getdt();
+ int steady_count,j=0;
+ bool steady=false;
- Forces->InitMatrix();
- Moments->InitMatrix();
+ vForces.InitMatrix();
+ vMoments.InitMatrix();
if (!FGModel::Run()) {
for (unsigned int i=0; i<numEngines; i++) {
Engines[i]->SetTrimMode(true);
Thrusters[i]->SetdeltaT(dt*rate);
- while (pow(currentThrust - lastThrust, 2.0) > currentThrust*0.00010) {
+ steady=false;
+ steady_count=0;
+ while (!steady && j < 6000) {
PowerAvailable = Engines[i]->Calculate(Thrusters[i]->GetPowerRequired());
lastThrust = currentThrust;
currentThrust = Thrusters[i]->Calculate(PowerAvailable);
+ if(fabs(lastThrust-currentThrust) < 0.0001) {
+ steady_count++;
+ if(steady_count > 120) { steady=true; }
+ } else {
+ steady_count=0;
+ }
+ j++;
}
- *Forces += Thrusters[i]->GetBodyForces(); // sum body frame forces
- *Moments += Thrusters[i]->GetMoments(); // sum body frame moments
+ vForces += Thrusters[i]->GetBodyForces(); // sum body frame forces
+ vMoments += Thrusters[i]->GetMoments(); // sum body frame moments
Engines[i]->SetTrimMode(false);
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-bool FGPropulsion::LoadPropulsion(FGConfigFile* AC_cfg)
+bool FGPropulsion::ICEngineStart(void)
+{
+ double PowerAvailable;
+ int j;
+ dt = State->Getdt();
+
+ vForces.InitMatrix();
+ vMoments.InitMatrix();
+
+ for (unsigned int i=0; i<numEngines; i++) {
+ Engines[i]->SetTrimMode(true);
+ Thrusters[i]->SetdeltaT(dt*rate);
+ j=0;
+ while (!Engines[i]->GetRunning() && j < 2000) {
+ PowerAvailable = Engines[i]->Calculate(Thrusters[i]->GetPowerRequired());
+ Thrusters[i]->Calculate(PowerAvailable);
+ j++;
+ }
+ vForces += Thrusters[i]->GetBodyForces(); // sum body frame forces
+ vMoments += Thrusters[i]->GetMoments(); // sum body frame moments
+ Engines[i]->SetTrimMode(false);
+ }
+ return true;
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+bool FGPropulsion::Load(FGConfigFile* AC_cfg)
{
string token, fullpath;
string engineFileName, engType;
string thrusterFileName, thrType;
string parameter;
string enginePath = FDMExec->GetEnginePath();
- float xLoc, yLoc, zLoc, Pitch, Yaw;
+ double xLoc, yLoc, zLoc, Pitch, Yaw;
+ double P_Factor = 0, Sense = 0.0;
int Feed;
+ bool ThrottleAdded = false;
# ifndef macintosh
fullpath = enginePath + "/";
AC_cfg->GetNextConfigLine();
- while ((token = AC_cfg->GetValue()) != "/PROPULSION") {
+ while ((token = AC_cfg->GetValue()) != string("/PROPULSION")) {
if (token == "AC_ENGINE") { // ============ READING ENGINES
engType = Eng_cfg.GetValue();
FCS->AddThrottle();
+ ThrottleAdded = true;
if (engType == "FG_ROCKET") {
Engines.push_back(new FGRocket(FDMExec, &Eng_cfg));
} else if (engType == "FG_TURBOPROP") {
Engines.push_back(new FGTurboProp(FDMExec, &Eng_cfg));
} else {
- cerr << " Unrecognized engine type: " << engType << " found in config file.\n";
+ cerr << fgred << " Unrecognized engine type: " << underon << engType
+ << underoff << " found in config file." << fgdef << endl;
+ return false;
}
AC_cfg->GetNextConfigLine();
- while ((token = AC_cfg->GetValue()) != "/AC_ENGINE") {
+ while ((token = AC_cfg->GetValue()) != string("/AC_ENGINE")) {
*AC_cfg >> token;
if (token == "XLOC") { *AC_cfg >> xLoc; }
else if (token == "YLOC") { *AC_cfg >> yLoc; }
cout << " Z = " << zLoc << endl;
cout << " Pitch = " << Pitch << endl;
cout << " Yaw = " << Yaw << endl;
- }
-
+ }
+
Engines[numEngines]->SetPlacement(xLoc, yLoc, zLoc, Pitch, Yaw);
+ Engines[numEngines]->SetEngineNumber(numEngines);
numEngines++;
} else {
- cerr << "Could not read engine config file: " << fullpath
- + engineFileName + ".xml" << endl;
+ cerr << fgred << "\n Could not read engine config file: " << underon <<
+ fullpath + engineFileName + ".xml" << underoff << fgdef << endl;
return false;
}
}
AC_cfg->GetNextConfigLine();
- while ((token = AC_cfg->GetValue()) != "/AC_THRUSTER") {
+ while ((token = AC_cfg->GetValue()) != string("/AC_THRUSTER")) {
*AC_cfg >> token;
if (token == "XLOC") *AC_cfg >> xLoc;
else if (token == "YLOC") *AC_cfg >> yLoc;
else if (token == "ZLOC") *AC_cfg >> zLoc;
else if (token == "PITCH") *AC_cfg >> Pitch;
else if (token == "YAW") *AC_cfg >> Yaw;
+ else if (token == "P_FACTOR") *AC_cfg >> P_Factor;
+ else if (token == "SENSE") *AC_cfg >> Sense;
else cerr << "Unknown identifier: " << token << " in engine file: "
<< engineFileName << endl;
}
Thrusters[numThrusters]->SetLocation(xLoc, yLoc, zLoc);
Thrusters[numThrusters]->SetAnglesToBody(0, Pitch, Yaw);
+ if (thrType == "FG_PROPELLER" && P_Factor > 0.001) {
+ ((FGPropeller*)Thrusters[numThrusters])->SetPFactor(P_Factor);
+ if (debug_lvl > 0) cout << " P-Factor: " << P_Factor << endl;
+ ((FGPropeller*)Thrusters[numThrusters])->SetSense(fabs(Sense)/Sense);
+ if (debug_lvl > 0) cout << " Sense: " << Sense << endl;
+ }
Thrusters[numThrusters]->SetdeltaT(dt*rate);
-
+ Thrusters[numThrusters]->SetThrusterNumber(numThrusters);
numThrusters++;
} else {
AC_cfg->GetNextConfigLine();
}
+ if (!ThrottleAdded) FCS->AddThrottle(); // need to have at least one throttle
+
return true;
}
{
string PropulsionStrings = "";
bool firstime = true;
+ char buffer[5];
for (unsigned int i=0;i<Engines.size();i++) {
- if (!firstime) {
- PropulsionStrings += ", ";
- firstime = false;
- }
+ if (firstime) firstime = false;
+ else PropulsionStrings += ", ";
+
+ sprintf(buffer, "%d", i);
switch(Engines[i]->GetType()) {
case FGEngine::etPiston:
- PropulsionStrings += (Engines[i]->GetName() + "_PwrAvail");
+ PropulsionStrings += (Engines[i]->GetName() + "_PwrAvail[" + buffer + "]");
break;
case FGEngine::etRocket:
- PropulsionStrings += (Engines[i]->GetName() + "_ChamberPress");
+ PropulsionStrings += (Engines[i]->GetName() + "_ChamberPress[" + buffer + "]");
break;
case FGEngine::etTurboJet:
case FGEngine::etTurboProp:
PropulsionStrings += ", ";
+ FGPropeller* Propeller = (FGPropeller*)Thrusters[i];
switch(Thrusters[i]->GetType()) {
case FGThruster::ttNozzle:
- PropulsionStrings += (Thrusters[i]->GetName() + "_Thrust");
+ PropulsionStrings += (Thrusters[i]->GetName() + "_Thrust[" + buffer + "]");
break;
case FGThruster::ttRotor:
break;
case FGThruster::ttPropeller:
- PropulsionStrings += (Thrusters[i]->GetName() + "_Torque, ");
- PropulsionStrings += (Thrusters[i]->GetName() + "_Thrust, ");
- PropulsionStrings += (Thrusters[i]->GetName() + "_RPM");
+ PropulsionStrings += (Thrusters[i]->GetName() + "_Torque[" + buffer + "], ");
+ PropulsionStrings += (Thrusters[i]->GetName() + "_PFactor_Roll[" + buffer + "], ");
+ PropulsionStrings += (Thrusters[i]->GetName() + "_PFactor_Pitch[" + buffer + "], ");
+ PropulsionStrings += (Thrusters[i]->GetName() + "_PFactor_Yaw[" + buffer + "], ");
+ PropulsionStrings += (Thrusters[i]->GetName() + "_Thrust[" + buffer + "], ");
+ if (Propeller->IsVPitch())
+ PropulsionStrings += (Thrusters[i]->GetName() + "_Pitch[" + buffer + "], ");
+ PropulsionStrings += (Thrusters[i]->GetName() + "_RPM[" + buffer + "]");
break;
default:
PropulsionStrings += "INVALID THRUSTER TYPE";
bool firstime = true;
for (unsigned int i=0;i<Engines.size();i++) {
- if (!firstime) {
- PropulsionValues += ", ";
- firstime = false;
- }
+ if (firstime) firstime = false;
+ else PropulsionValues += ", ";
switch(Engines[i]->GetType()) {
case FGEngine::etPiston:
- PropulsionValues += (string(gcvt(((FGRocket*)Engines[i])->GetPowerAvailable(), 10, buff)));
+ PropulsionValues += (string(gcvt(((FGPiston*)Engines[i])->GetPowerAvailable(), 10, buff)));
break;
case FGEngine::etRocket:
PropulsionValues += (string(gcvt(((FGRocket*)Engines[i])->GetChamberPressure(), 10, buff)));
case FGThruster::ttRotor:
break;
case FGThruster::ttPropeller:
- PropulsionValues += (string(gcvt(((FGPropeller*)Thrusters[i])->GetTorque(), 10, buff)) + ", ");
- PropulsionValues += (string(gcvt(((FGPropeller*)Thrusters[i])->GetThrust(), 10, buff)) + ", ");
- PropulsionValues += (string(gcvt(((FGPropeller*)Thrusters[i])->GetRPM(), 10, buff)));
+ FGPropeller* Propeller = (FGPropeller*)Thrusters[i];
+ FGColumnVector3 vPFactor = Propeller->GetPFactor();
+ PropulsionValues += string(gcvt(Propeller->GetTorque(), 10, buff)) + ", ";
+ PropulsionValues += string(gcvt(vPFactor(eRoll), 10, buff)) + ", ";
+ PropulsionValues += string(gcvt(vPFactor(ePitch), 10, buff)) + ", ";
+ PropulsionValues += string(gcvt(vPFactor(eYaw), 10, buff)) + ", ";
+ PropulsionValues += string(gcvt(Propeller->GetThrust(), 10, buff)) + ", ";
+ if (Propeller->IsVPitch())
+ PropulsionValues += string(gcvt(Propeller->GetPitch(), 10, buff)) + ", ";
+ PropulsionValues += string(gcvt(Propeller->GetRPM(), 10, buff));
break;
}
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-FGColumnVector& FGPropulsion::GetTanksCG(void)
+FGColumnVector3& FGPropulsion::GetTanksCG(void)
{
iTank = Tanks.begin();
vXYZtank.InitMatrix();
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-float FGPropulsion::GetTanksWeight(void)
+double FGPropulsion::GetTanksWeight(void)
{
- float Tw = 0.0;
+ double Tw = 0.0;
iTank = Tanks.begin();
while (iTank < Tanks.end()) {
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-float FGPropulsion::GetTanksIxx(const FGColumnVector& vXYZcg)
+double FGPropulsion::GetTanksIxx(const FGColumnVector3& vXYZcg)
{
- float I = 0.0;
+ double I = 0.0;
iTank = Tanks.begin();
while (iTank < Tanks.end()) {
- I += ((*iTank)->GetX() - vXYZcg(eX))*((*iTank)->GetX() - vXYZcg(eX)) * (*iTank)->GetContents()/(144.0*GRAVITY);
+ I += ((*iTank)->GetX() - vXYZcg(eX))*((*iTank)->GetX() - vXYZcg(eX)) * (*iTank)->GetContents()/(144.0*Inertial->gravity());
iTank++;
}
return I;
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-float FGPropulsion::GetTanksIyy(const FGColumnVector& vXYZcg)
+double FGPropulsion::GetTanksIyy(const FGColumnVector3& vXYZcg)
{
- float I = 0.0;
+ double I = 0.0;
iTank = Tanks.begin();
while (iTank < Tanks.end()) {
- I += ((*iTank)->GetY() - vXYZcg(eY))*((*iTank)->GetY() - vXYZcg(eY)) * (*iTank)->GetContents()/(144.0*GRAVITY);
+ I += ((*iTank)->GetY() - vXYZcg(eY))*((*iTank)->GetY() - vXYZcg(eY)) * (*iTank)->GetContents()/(144.0*Inertial->gravity());
iTank++;
}
return I;
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-float FGPropulsion::GetTanksIzz(const FGColumnVector& vXYZcg)
+double FGPropulsion::GetTanksIzz(const FGColumnVector3& vXYZcg)
{
- float I = 0.0;
+ double I = 0.0;
iTank = Tanks.begin();
while (iTank < Tanks.end()) {
- I += ((*iTank)->GetZ() - vXYZcg(eZ))*((*iTank)->GetZ() - vXYZcg(eZ)) * (*iTank)->GetContents()/(144.0*GRAVITY);
+ I += ((*iTank)->GetZ() - vXYZcg(eZ))*((*iTank)->GetZ() - vXYZcg(eZ)) * (*iTank)->GetContents()/(144.0*Inertial->gravity());
iTank++;
}
return I;
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-float FGPropulsion::GetTanksIxz(const FGColumnVector& vXYZcg)
+double FGPropulsion::GetTanksIxz(const FGColumnVector3& vXYZcg)
{
- float I = 0.0;
+ double I = 0.0;
iTank = Tanks.begin();
while (iTank < Tanks.end()) {
- I += ((*iTank)->GetX() - vXYZcg(eX))*((*iTank)->GetZ() - vXYZcg(eZ)) * (*iTank)->GetContents()/(144.0*GRAVITY);
+ I += ((*iTank)->GetX() - vXYZcg(eX))*((*iTank)->GetZ() - vXYZcg(eZ)) * (*iTank)->GetContents()/(144.0*Inertial->gravity());
iTank++;
}
return I;
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-float FGPropulsion::GetTanksIxy(const FGColumnVector& vXYZcg)
+double FGPropulsion::GetTanksIxy(const FGColumnVector3& vXYZcg)
{
- float I = 0.0;
+ double I = 0.0;
iTank = Tanks.begin();
while (iTank != Tanks.end()) {
- I += ((*iTank)->GetX() - vXYZcg(eX))*((*iTank)->GetY() - vXYZcg(eY)) * (*iTank)->GetContents()/(144.0*GRAVITY);
+ I += ((*iTank)->GetX() - vXYZcg(eX))*((*iTank)->GetY() - vXYZcg(eY)) * (*iTank)->GetContents()/(144.0*Inertial->gravity());
iTank++;
}
return I;
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGPropulsion::Debug(void)
+// The bitmasked value choices are as follows:
+// unset: In this case (the default) JSBSim would only print
+// out the normally expected messages, essentially echoing
+// the config files as they are read. If the environment
+// variable is not set, debug_lvl is set to 1 internally
+// 0: This requests JSBSim not to output any messages
+// whatsoever.
+// 1: This value explicity requests the normal JSBSim
+// startup messages
+// 2: This value asks for a message to be printed out when
+// a class is instantiated
+// 4: When this value is set, a message is displayed when a
+// FGModel object executes its Run() method
+// 8: When this value is set, various runtime state variables
+// are printed out periodically
+// 16: When set various parameters are sanity checked and
+// a message is printed out when they go out of bounds
+
+void FGPropulsion::Debug(int from)
{
- //TODO: Add your source code here
+ if (debug_lvl <= 0) return;
+
+ if (debug_lvl & 1) { // Standard console startup message output
+ if (from == 0) { // Constructor
+
+ }
+ }
+ if (debug_lvl & 2 ) { // Instantiation/Destruction notification
+ if (from == 0) cout << "Instantiated: FGPropulsion" << endl;
+ if (from == 1) cout << "Destroyed: FGPropulsion" << endl;
+ }
+ if (debug_lvl & 4 ) { // Run() method entry print for FGModel-derived objects
+ }
+ if (debug_lvl & 8 ) { // Runtime state variables
+ }
+ if (debug_lvl & 16) { // Sanity checking
+ }
+ if (debug_lvl & 64) {
+ if (from == 0) { // Constructor
+ cout << IdSrc << endl;
+ cout << IdHdr << endl;
+ }
+ }
}
+void FGPropulsion::bind(void){
+ /* PropertyManager->Tie("propulsion/num-engines", this,
+ &FGPropulsion::GetNumEngines);
+ PropertyManager->Tie("propulsion/num-tanks", this,
+ &FGPropulsion::GetNumTanks); */
+ PropertyManager->Tie("propulsion/num-sel-fuel-tanks", this,
+ &FGPropulsion::GetnumSelectedFuelTanks);
+ PropertyManager->Tie("propulsion/num-sel-ox-tanks", this,
+ &FGPropulsion::GetnumSelectedOxiTanks);
+ PropertyManager->Tie("propulsion/fbx-prop-lbs", this,1,
+ &FGPropulsion::GetForces);
+ PropertyManager->Tie("propulsion/fby-prop-lbs", this,2,
+ &FGPropulsion::GetForces);
+ PropertyManager->Tie("propulsion/fbz-prop-lbs", this,3,
+ &FGPropulsion::GetForces);
+ PropertyManager->Tie("propulsion/l-prop-lbsft", this,1,
+ &FGPropulsion::GetMoments);
+ PropertyManager->Tie("propulsion/m-prop-lbsft", this,2,
+ &FGPropulsion::GetMoments);
+ PropertyManager->Tie("propulsion/n-prop-lbsft", this,3,
+ &FGPropulsion::GetMoments);
+ //PropertyManager->Tie("propulsion/tanks-weight-lbs", this,
+ // &FGPropulsion::GetTanksWeight);
+}
+
+void FGPropulsion::unbind(void){
+ /* PropertyManager->Untie("propulsion/num-engines");
+ PropertyManager->Untie("propulsion/num-tanks"); */
+ PropertyManager->Untie("propulsion/num-sel-fuel-tanks");
+ PropertyManager->Untie("propulsion/num-sel-ox-tanks");
+ PropertyManager->Untie("propulsion/fbx-prop-lbs");
+ PropertyManager->Untie("propulsion/fby-prop-lbs");
+ PropertyManager->Untie("propulsion/fbz-prop-lbs");
+ PropertyManager->Untie("propulsion/l-prop-lbsft");
+ PropertyManager->Untie("propulsion/m-prop-lbsft");
+ PropertyManager->Untie("propulsion/n-prop-lbsft");
+ //PropertyManager->Untie("propulsion/tanks-weight-lbs");
+}
projects / flightgear.git / blobdiff