First steps in a weather reorganization. Note especially that

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

diff --git a/src/FDM/flight.cxx b/src/FDM/flight.cxx
index 15404ec27f6df506299daafe3ec386777b8a480a..6d404dd76676717a91580d529bd93636735a6c31 100644 (file)
--- a/src/FDM/flight.cxx
+++ b/src/FDM/flight.cxx
@@ -188,10 +188,6 @@ FGInterface::common_init ()
     SG_LOG( SG_FLIGHT, SG_INFO,
             "...initializing ground elevation to " << ground_elev_ft
             << "ft..." );
-    SG_LOG( SG_FLIGHT, SG_INFO, "common_init(): set ground elevation "
-            << ground_elev_ft );
-    base_fdm_state.set_Runway_altitude( ground_elev_ft );
-    set_Runway_altitude( ground_elev_ft );
 
     // Set sea-level radius
     SG_LOG( SG_FLIGHT, SG_INFO, "...initializing sea-level radius..." );
@@ -204,7 +200,7 @@ FGInterface::common_init ()
                     * SGD_DEGREES_TO_RADIANS,
                   fgGetDouble("/position/altitude-ft") * SG_FEET_TO_METER,
                   &sea_level_radius_meters, &lat_geoc );
-    set_Sea_level_radius( sea_level_radius_meters * SG_METER_TO_FEET );
+    _set_Sea_level_radius( sea_level_radius_meters * SG_METER_TO_FEET );
 
     // Set initial velocities
     SG_LOG( SG_FLIGHT, SG_INFO, "...initializing velocities..." );
@@ -355,9 +351,19 @@ FGInterface::bind ()
 
                                // Climb and slip (read-only)
   fgTie("/velocities/vertical-speed-fps", this,
-       &FGInterface::get_Climb_Rate); // read-only
+       &FGInterface::get_Climb_Rate,
+  &FGInterface::set_Climb_Rate ); 
+  fgTie("/velocities/glideslope", this,
+  &FGInterface::get_Gamma_vert_rad,
+  &FGInterface::set_Gamma_vert_rad );
   fgTie("/velocities/side-slip-rad", this,
        &FGInterface::get_Beta); // read-only
+  fgTie("/velocities/side-slip-deg", this,
+  &FGInterface::get_Beta_deg); // read-only
+  fgTie("/velocities/alpha-deg", this,
+  &FGInterface::get_Alpha_deg); // read-only
+  fgTie("/accelerations/nlf", this,
+  &FGInterface::get_Nlf); // read-only
 }
 
 
@@ -391,7 +397,12 @@ FGInterface::unbind ()
   fgUntie("/velocities/vBody-fps");
   fgUntie("/velocities/wBody-fps");
   fgUntie("/velocities/vertical-speed-fps");
+  fgUntie("/velocities/glideslope");
   fgUntie("/velocities/side-slip-rad");
+  fgUntie("/velocities/side-slip-deg");
+  fgUntie("/velocities/alpha-deg");
+  fgUntie("/accelerations/nlf");
+  
 }
 
 /**
@@ -540,33 +551,6 @@ void FGInterface::extrapolate( int time_offset ) {
     geocentric_position_v[2] = radius;
 }
 
-
-// Set the altitude (force)
-void fgFDMForceAltitude(const string &model, double alt_meters) {
-    SG_LOG(SG_FLIGHT,SG_INFO, "fgFDMForceAltitude: " << alt_meters );
-
-    double sea_level_radius_meters;
-    double lat_geoc;
-
-    // Set the FG variables first
-    sgGeodToGeoc( base_fdm_state.get_Latitude(), alt_meters, 
-                 &sea_level_radius_meters, &lat_geoc);
-
-    base_fdm_state.set_Altitude( alt_meters * SG_METER_TO_FEET );
-    base_fdm_state.set_Sea_level_radius( sea_level_radius_meters *
-                                        SG_METER_TO_FEET ); 
-               
-    cur_fdm_state->set_Altitude( alt_meters * SG_METER_TO_FEET );
-    cur_fdm_state->set_Sea_level_radius( sea_level_radius_meters * 
-                                         SG_METER_TO_FEET );                     
-
-    // additional work needed for some flight models
-    if ( model == "larcsim" ) {
-       ls_ForceAltitude( base_fdm_state.get_Altitude() );
-    }
-}
-
-
 // Positions
 void FGInterface::set_Latitude(double lat) {
     geodetic_position_v[0] = lat;
@@ -627,15 +611,6 @@ void FGInterface::set_Gamma_vert_rad( double gamma) {
     gamma_vert_rad = gamma;
 }
 
-// Earth
-void FGInterface::set_Sea_level_radius(double slr) {
-    sea_level_radius = slr;
-}
-
-void FGInterface::set_Runway_altitude(double ralt) {
-    runway_altitude = ralt;
-}
-
 void FGInterface::set_Static_pressure(double p) { static_pressure = p; }
 void FGInterface::set_Static_temperature(double T) { static_temperature = T; }
 void FGInterface::set_Density(double rho) { density = rho; }