// $Id$
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <simgear/compiler.h>
#ifdef SG_MATH_EXCEPTION_CLASH
Aerodynamics = fdmex->GetAerodynamics();
GroundReactions = fdmex->GetGroundReactions();
- fgic=new FGInitialCondition(fdmex);
+ fgic=fdmex->GetIC();
needTrim=true;
SGPath aircraft_path( globals->get_fg_root() );
fgSetDouble("/fdm/trim/aileron", FCS->GetDaCmd());
fgSetDouble("/fdm/trim/rudder", FCS->GetDrCmd());
- startup_trim = fgGetNode("/sim/startup/trim", true);
+ startup_trim = fgGetNode("/sim/presets/trim", true);
trimmed = fgGetNode("/fdm/trim/trimmed", true);
trimmed->setBoolValue(false);
aileron_trim = fgGetNode("/fdm/trim/aileron", true );
rudder_trim = fgGetNode("/fdm/trim/rudder", true );
-
- stall_warning = fgGetNode("/sim/aero/alarms/stall-warning",true);
+ stall_warning = fgGetNode("/sim/alarms/stall-warning",true);
stall_warning->setDoubleValue(0);
temperature = fgGetNode("/environment/temperature-degc",true);
pressure = fgGetNode("/environment/pressure-inhg",true);
density = fgGetNode("/environment/density-slugft3",true);
+ turbulence = fgGetNode("environment/turbulence-norm",true);
wind_from_north= fgGetNode("/environment/wind-from-north-fps",true);
wind_from_east = fgGetNode("/environment/wind-from-east-fps" ,true);
}
/******************************************************************************/
FGJSBsim::~FGJSBsim(void) {
- if (fdmex != NULL) {
- delete fdmex; fdmex=NULL;
- delete fgic; fgic=NULL;
- }
+ delete fdmex;
}
/******************************************************************************/
9.0/5.0*(temperature->getDoubleValue()+273.15) );
Atmosphere->SetExPressure(pressure->getDoubleValue()*70.726566);
Atmosphere->SetExDensity(density->getDoubleValue());
+ Atmosphere->SetTurbGain(turbulence->getDoubleValue() *
+ turbulence->getDoubleValue() *
+ 100.0);
} else {
Atmosphere->UseInternal();
}
copy_to_JSBsim();
- fdmex->RunIC(fgic); //loop JSBSim once w/o integrating
+ fdmex->RunIC(); //loop JSBSim once w/o integrating
copy_from_JSBsim(); //update the bus
SG_LOG( SG_FLIGHT, SG_INFO, " Initialized JSBSim with:" );
fgic->SetTerrainAltitudeFtIC( cur_fdm_state->get_ground_elev_ft() );
do_trim();
} else {
- fdmex->RunIC(fgic); //apply any changes made through the set_ functions
+ fdmex->RunIC(); //apply any changes made through the set_ functions
}
needTrim = false;
}
9.0/5.0*(temperature->getDoubleValue()+273.15) );
Atmosphere->SetExPressure(pressure->getDoubleValue()*70.726566);
Atmosphere->SetExDensity(density->getDoubleValue());
+ Atmosphere->SetTurbGain(turbulence->getDoubleValue() *
+ turbulence->getDoubleValue() *
+ 100.0);
Atmosphere->SetWindNED( wind_from_north->getDoubleValue(),
wind_from_east->getDoubleValue(),
update_gear();
- stall_warning->setDoubleValue( Aircraft->GetStallWarn() );
+ stall_warning->setDoubleValue( Aerodynamics->GetStallWarn() );
/* elevator_pos_deg->setDoubleValue( FCS->GetDePos()*SG_RADIANS_TO_DEGREES );
left_aileron_pos_deg->setDoubleValue( FCS->GetDaLPos()*SG_RADIANS_TO_DEGREES );
void FGJSBsim::do_trim(void) {
FGTrim *fgtrim;
- if( fgGetBool("/sim/startup/onground") ) {
+ if( fgGetBool("/sim/presets/onground") ) {
fgic->SetVcalibratedKtsIC(0.0);
- fgtrim=new FGTrim(fdmex,fgic,tGround);
+ fgtrim=new FGTrim(fdmex,tGround);
} else {
- fgtrim=new FGTrim(fdmex,fgic,tLongitudinal);
+ fgtrim=new FGTrim(fdmex,tLongitudinal);
}
if( !fgtrim->DoTrim() ) {
fgtrim->Report();
fgic->SetClimbRateFpsIC( get_Climb_Rate() );
}
}
+