fly/flightgear
1
0
Fork 0
Code Activity

Fixed a bug which caused the solid propellant thrusters of the space shuttle to be unconditionnally ignited during the trimming.

Browse source
This commit is contained in:
bcoconni 2016-01-17 10:26:25 +01:00
parent e37e0d1bcf
commit bf851605fb
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/FDM/JSBSim/models/FGPropulsion.cpp
View file

@ -281,15 +281,13 @@ bool FGPropulsion::GetSteadyState(void)
int steady_count = 0, j = 0;
bool steady = false;
bool TrimMode = FDMExec->GetTrimStatus();
bool suspended = FDMExec->IntegrationSuspended();
double TimeStep = FDMExec->GetDeltaT();
vForces.InitMatrix();
vMoments.InitMatrix();
if (!FGModel::Run(false)) {
FDMExec->SetTrimStatus(true);
if (suspended)
FDMExec->ResumeIntegration();
// This is a time marching algorithm so it needs a non-zero time step to
// reach a steady state.
in.TotalDeltaT = 0.5;
@ -317,12 +315,7 @@ bool FGPropulsion::GetSteadyState(void)
}
FDMExec->SetTrimStatus(TrimMode);
if (suspended) {
FDMExec->SuspendIntegration();
in.TotalDeltaT = 0.0;
}
else
in.TotalDeltaT = FDMExec->GetDeltaT() * rate;
in.TotalDeltaT = TimeStep;
return false;
} else {