Updates from Jon (addendum to previous changes).

diff --git a/src/FDM/JSBSim.cxx b/src/FDM/JSBSim.cxx
index 993e11e56c7c60fb3d75383e30ea5820692d7a51..183669eada360e811873c816b202b6fc9cd8acc9 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
@@ -114,7 +112,7 @@ int FGJSBsim::init( double dt ) {
   fgic->SetLatitudeRadIC(get_Latitude());
   fgic->SetLongitudeRadIC(get_Longitude());
 
-  FDMExec.GetPosition()->SetRunwayRadius(geocRwyRadius);
+  FDMExec.GetPosition()->SetRunwayRadius(scenery.cur_radius);
 
   FG_LOG( FG_FLIGHT, FG_INFO, "  phi: " <<  get_Phi());
   FG_LOG( FG_FLIGHT, FG_INFO, "  theta: " <<  get_Theta() );
@@ -130,11 +128,11 @@ int FGJSBsim::init( double dt ) {
     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);
     //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);
     //}
@@ -189,8 +187,8 @@ 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);
 
   FDMExec.GetAtmosphere()->SetExTemperature(get_Static_temperature());
   FDMExec.GetAtmosphere()->SetExPressure(get_Static_pressure());

diff --git a/src/FDM/JSBSim/FGPosition.cpp b/src/FDM/JSBSim/FGPosition.cpp
index 1dcadbedceca851e2d5152966e6716c5b8f6950f..bdbd5668b9c1f2a40eede7feee9abb7f794d4a53 100644 (file)
--- a/src/FDM/JSBSim/FGPosition.cpp
+++ b/src/FDM/JSBSim/FGPosition.cpp
@@ -126,8 +126,6 @@ bool FGPosition:: Run(void) {
 
     DistanceAGL = Radius - RunwayRadius;   // Geocentric
 
-    cout << "h: " << h << "  DistanceAGL: " << DistanceAGL << endl;
-
     hoverb = h/b;
 
     if(Vt > 0) {

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 0ae428858f5e89e58620ff44e36179e33e1c933d..a84d17e01f0420e46b30c798d8db56c992fa73d4 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -85,7 +85,7 @@
 // #defines in uiuc_aircraft.h
 #include "bfi.hxx"
 
-q#include <FDM/UIUCModel/uiuc_aircraft.h>
+#include <FDM/UIUCModel/uiuc_aircraft.h>
 #include <FDM/UIUCModel/uiuc_aircraftdir.h>
 #include <GUI/gui.h>
 #include <Joystick/joystick.hxx>