1
0
Fork 0

Revert delayed running of fdmex for in-air starts since it does more damage than good.

This commit is contained in:
Erik Hofman 2020-01-31 10:03:31 +01:00
parent 12cd2d8e9b
commit e4c393ba9c
2 changed files with 4 additions and 12 deletions

View file

@ -154,7 +154,7 @@ std::map<std::string,int> FGJSBsim::TURBULENCE_TYPE_NAMES;
static FGTurbulenceSeverityTable TurbulenceSeverityTable;
FGJSBsim::FGJSBsim( double dt )
: FGInterface(dt), delta_t(dt)
: FGInterface(dt)
{
bool result;
if( TURBULENCE_TYPE_NAMES.empty() ) {
@ -237,7 +237,7 @@ FGJSBsim::FGJSBsim( double dt )
terrain = fgGetNode("/sim/fdm/surface", true);
// fdmex->Setdt( dt );
fdmex->Setdt( dt );
result = fdmex->LoadModel( aircraft_path, engine_path, systems_path,
fgGetString("/sim/aero"), false );
@ -437,6 +437,7 @@ void FGJSBsim::init()
common_init();
copy_to_JSBsim();
fdmex->Resume();
fdmex->RunIC(); //loop JSBSim once w/o integrating
if (fgGetBool("/sim/presets/running")) {
Propulsion->InitRunning(-1);
@ -466,16 +467,8 @@ void FGJSBsim::init()
fgic->SetVNorthFpsIC(gndVelNED(1));
fgic->SetVEastFpsIC(gndVelNED(2));
fgic->SetVDownFpsIC(gndVelNED(3));
fdmex->Resume();
do_trim();
}
else
{
do_trim();
fdmex->Resume();
}
fdmex->Setdt( delta_t );
do_trim();
needTrim = false;
}

View file

@ -302,7 +302,6 @@ private:
JSBSim::FGColumnVector3 hook_root_struct;
double hook_length;
double delta_t;
bool crashed;
AircraftMesh_ptr mesh;