fly/flightgear
1
0
Fork 0
Code Activity

Sync w. JSBSim as of 20/01/2007

Browse source
This commit is contained in:
ehofman 2007-01-20 09:28:53 +00:00
parent 6094d927d3
commit 4dbedefb32
7 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/FDM/JSBSim/FGFDMExec.cpp
View file

@ -374,7 +374,7 @@ bool FGFDMExec::Run(void)
model_iterator = model_iterator->NextModel; model_iterator = model_iterator->NextModel;
} }
frame = Frame++; Frame++;
if (!Holding()) State->IncrTime(); if (!Holding()) State->IncrTime();
return (success); return (success);
} }

1
src/FDM/JSBSim/FGJSBBase.h
View file

@ -280,7 +280,6 @@ protected:
void Debug(int from) {}; void Debug(int from) {};
static unsigned int frame;
static unsigned int messageId; static unsigned int messageId;
static const double radtodeg; static const double radtodeg;

7
src/FDM/JSBSim/models/FGAtmosphere.cpp
View file

@ -89,6 +89,7 @@ FGAtmosphere::FGAtmosphere(FGFDMExec* fdmex) : FGModel(fdmex)
T_dev_sl = T_dev = delta_T = 0.0; T_dev_sl = T_dev = delta_T = 0.0;
StandardTempOnly = false; StandardTempOnly = false;
first_pass = true;
bind(); bind();
Debug(0); Debug(0);
@ -543,13 +544,15 @@ void FGAtmosphere::Debug(int from)
if (debug_lvl & 16) { // Sanity checking if (debug_lvl & 16) { // Sanity checking
} }
if (debug_lvl & 128) { // Turbulence if (debug_lvl & 128) { // Turbulence
if (frame == 0 && from == 2) { if (first_pass && from == 2) {
first_pass = false;
cout << "vTurbulence(X), vTurbulence(Y), vTurbulence(Z), " cout << "vTurbulence(X), vTurbulence(Y), vTurbulence(Z), "
<< "vTurbulenceGrad(X), vTurbulenceGrad(Y), vTurbulenceGrad(Z), " << "vTurbulenceGrad(X), vTurbulenceGrad(Y), vTurbulenceGrad(Z), "
<< "vDirection(X), vDirection(Y), vDirection(Z), " << "vDirection(X), vDirection(Y), vDirection(Z), "
<< "Magnitude, " << "Magnitude, "
<< "vTurbPQR(P), vTurbPQR(Q), vTurbPQR(R), " << endl; << "vTurbPQR(P), vTurbPQR(Q), vTurbPQR(R), " << endl;
} else if (from == 2) { }
if (from == 2) {
cout << vTurbulence << ", " << vTurbulenceGrad << ", " << vDirection << ", " << Magnitude << ", " << vTurbPQR << endl; cout << vTurbulence << ", " << vTurbulenceGrad << ", " << vDirection << ", " << Magnitude << ", " << vTurbPQR << endl;
} }
} }

1
src/FDM/JSBSim/models/FGAtmosphere.h
View file

@ -185,6 +185,7 @@ protected:
double T_dev_sl, T_dev, delta_T, density_altitude; double T_dev_sl, T_dev, delta_T, density_altitude;
atmType atmosphere; atmType atmosphere;
bool StandardTempOnly; bool StandardTempOnly;
bool first_pass;
double MagnitudedAccelDt, MagnitudeAccel, Magnitude; double MagnitudedAccelDt, MagnitudeAccel, Magnitude;
double TurbGain; double TurbGain;

2
src/FDM/JSBSim/models/FGLGear.cpp
View file

@ -183,7 +183,7 @@ FGLGear::FGLGear(Element* el, FGFDMExec* fdmex, int number) : Exec(fdmex),
FCS = Exec->GetFCS(); FCS = Exec->GetFCS();
MassBalance = Exec->GetMassBalance(); MassBalance = Exec->GetMassBalance();
WOW = lastWOW = true; // should the value be initialized to true? WOW = lastWOW = false;
ReportEnable = true; ReportEnable = true;
FirstContact = false; FirstContact = false;
StartedGroundRun = false; StartedGroundRun = false;

5
src/FDM/JSBSim/models/atmosphere/FGMSIS.cpp
View file

@ -1643,13 +1643,14 @@ void MSIS::Debug(int from)
if (debug_lvl & 16) { // Sanity checking if (debug_lvl & 16) { // Sanity checking
} }
if (debug_lvl & 32) { // Turbulence if (debug_lvl & 32) { // Turbulence
if (frame == 0 && from == 2) { if (first_pass && from == 2) {
cout << "vTurbulence(X), vTurbulence(Y), vTurbulence(Z), " cout << "vTurbulence(X), vTurbulence(Y), vTurbulence(Z), "
<< "vTurbulenceGrad(X), vTurbulenceGrad(Y), vTurbulenceGrad(Z), " << "vTurbulenceGrad(X), vTurbulenceGrad(Y), vTurbulenceGrad(Z), "
<< "vDirection(X), vDirection(Y), vDirection(Z), " << "vDirection(X), vDirection(Y), vDirection(Z), "
<< "Magnitude, " << "Magnitude, "
<< "vTurbPQR(P), vTurbPQR(Q), vTurbPQR(R), " << endl; << "vTurbPQR(P), vTurbPQR(Q), vTurbPQR(R), " << endl;
} else if (from == 2) { }
if (from == 2) {
cout << vTurbulence << ", " << vTurbulenceGrad << ", " << vDirection << ", " << Magnitude << ", " << vTurbPQR << endl; cout << vTurbulence << ", " << vTurbulenceGrad << ", " << vDirection << ", " << Magnitude << ", " << vTurbPQR << endl;
} }
} }

2
src/FDM/JSBSim/models/atmosphere/FGMars.cpp
View file

@ -310,7 +310,7 @@ void FGMars::Debug(int from)
if (debug_lvl & 16) { // Sanity checking if (debug_lvl & 16) { // Sanity checking
} }
if (debug_lvl & 32) { // Turbulence if (debug_lvl & 32) { // Turbulence
if (frame == 0 && from == 2) { if (first_pass && from == 2) {
cout << "vTurbulence(X), vTurbulence(Y), vTurbulence(Z), " cout << "vTurbulence(X), vTurbulence(Y), vTurbulence(Z), "
<< "vTurbulenceGrad(X), vTurbulenceGrad(Y), vTurbulenceGrad(Z), " << "vTurbulenceGrad(X), vTurbulenceGrad(Y), vTurbulenceGrad(Z), "
<< "vDirection(X), vDirection(Y), vDirection(Z), " << "vDirection(X), vDirection(Y), vDirection(Z), "