Tweaks to go along with changes in SGSocket.

[flightgear.git] / src / FDM / JSBSim.cxx

diff --git a/src/FDM/JSBSim.cxx b/src/FDM/JSBSim.cxx
index 993e11e56c7c60fb3d75383e30ea5820692d7a51..25a47a69df43a72ec77d1c7a895cdfd590c24d0a 100644 (file)
--- a/src/FDM/JSBSim.cxx
+++ b/src/FDM/JSBSim.cxx
@@ -55,8 +55,6 @@
 
 #include "JSBsim.hxx"
 
-double geocRwyRadius;
-
 /******************************************************************************/
 
 // Initialize the JSBsim flight model, dt is the time increment for
@@ -64,7 +62,7 @@ double geocRwyRadius;
 
 int FGJSBsim::init( double dt ) {
 
-
+  bool result;
 
   FG_LOG( FG_FLIGHT, FG_INFO, "Starting and initializing JSBsim" );
   FG_LOG( FG_FLIGHT, FG_INFO, "  created FDMExec" );
@@ -77,12 +75,17 @@ int FGJSBsim::init( double dt ) {
 
   FDMExec.GetState()->Setdt( dt );
 
-  FDMExec.GetAircraft()->LoadAircraft( aircraft_path.str(),
+  result = FDMExec.GetAircraft()->LoadAircraft( aircraft_path.str(),
                                        engine_path.str(),
                                        current_options.get_aircraft() );
 
-  FG_LOG( FG_FLIGHT, FG_INFO, "  loaded aircraft" <<
-          current_options.get_aircraft() );
+  if (result) {
+    FG_LOG( FG_FLIGHT, FG_INFO, "  loaded aircraft" << current_options.get_aircraft() );
+  } else {
+    FG_LOG( FG_FLIGHT, FG_INFO, "  aircraft" << current_options.get_aircraft()
+                                << " does not exist");
+    return 0;
+  }
 
   FDMExec.GetAtmosphere()->UseInternal();
 
@@ -111,10 +114,12 @@ int FGJSBsim::init( double dt ) {
   fgic->SetRollAngleRadIC(get_Phi());
   fgic->SetPitchAngleRadIC(get_Theta());
   fgic->SetHeadingRadIC(get_Psi());
-  fgic->SetLatitudeRadIC(get_Latitude());
+//  fgic->SetLatitudeRadIC(get_Latitude());
+  fgic->SetLatitudeRadIC(get_Lat_geocentric());
   fgic->SetLongitudeRadIC(get_Longitude());
 
-  FDMExec.GetPosition()->SetRunwayRadius(geocRwyRadius);
+  FDMExec.GetPosition()->SetRunwayRadius(scenery.cur_radius*METER_TO_FEET);
+  FDMExec.GetPosition()->SetSeaLevelRadius(get_Sea_level_radius());
 
   FG_LOG( FG_FLIGHT, FG_INFO, "  phi: " <<  get_Phi());
   FG_LOG( FG_FLIGHT, FG_INFO, "  theta: " <<  get_Theta() );
@@ -123,21 +128,20 @@ int FGJSBsim::init( double dt ) {
   FG_LOG( FG_FLIGHT, FG_INFO, "  lon: " <<  get_Longitude() );
   FG_LOG( FG_FLIGHT, FG_INFO, "  alt: " <<  get_Altitude() );
 
-  if(current_options.get_trim_mode() == true) {
+  //must check > 0, != 0 will give bad result if --notrim set
+  if(current_options.get_trim_mode() > 0) {
     FG_LOG( FG_FLIGHT, FG_INFO, "  Starting trim..." );
     FGTrimLong *fgtrim=new FGTrimLong(&FDMExec,fgic);
     fgtrim->DoTrim();
     fgtrim->Report();
     fgtrim->TrimStats();
     fgtrim->ReportState();
-    
+
     controls.set_elevator_trim(FDMExec.GetFCS()->GetDeCmd());
-    controls.set_trimmed_throttle(FGControls::ALL_ENGINES,FDMExec.GetFCS()->GetThrottleCmd(0)/100);
+    controls.set_throttle(FGControls::ALL_ENGINES,FDMExec.GetFCS()->GetThrottleCmd(0)/100);
     //the trimming routine only knows how to get 1 value for throttle
+
     
-    //for(int i=0;i<FDMExec.GetAircraft()->GetNumEngines();i++) {
-    //  controls.set_throttle(i,FDMExec.GetFCS()->GetThrottleCmd(i)/100);
-    //}
     delete fgtrim;
     FG_LOG( FG_FLIGHT, FG_INFO, "  Trim complete." );
   } else {
@@ -189,8 +193,9 @@ int FGJSBsim::update( int multiloop ) {
   // FCS->SetBrake( controls.get_brake( 0 ) );
 
   // Inform JSBsim of the local terrain altitude; uncommented 5/3/00
-//  FDMExec.GetPosition()->SetRunwayElevation(get_Runway_altitude()); // seems to work
-  FDMExec.GetPosition()->SetRunwayRadius(geocRwyRadius);
+  //  FDMExec.GetPosition()->SetRunwayElevation(get_Runway_altitude()); // seems to work
+  FDMExec.GetPosition()->SetRunwayRadius(scenery.cur_radius*METER_TO_FEET);
+  FDMExec.GetPosition()->SetSeaLevelRadius(get_Sea_level_radius());
 
   FDMExec.GetAtmosphere()->SetExTemperature(get_Static_temperature());
   FDMExec.GetAtmosphere()->SetExPressure(get_Static_pressure());