fly/flightgear
1
0
Fork 0
Code Activity

warning fixes

Browse source
This commit is contained in:
torsten 2009-08-20 21:53:29 +00:00 • committed by Tim Moore
parent 5e9864994c
commit 4d977e9411
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Environment/environment_ctrl.cxx
View file

@ -264,11 +264,11 @@ FGInterpolateEnvironmentCtrl::bucket::lessThan(bucket *a, bucket *b)
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
FGMetarCtrl::FGMetarCtrl( SGSubsystem * environmentCtrl ) FGMetarCtrl::FGMetarCtrl( SGSubsystem * environmentCtrl )
: _environmentCtrl(environmentCtrl), :
station_elevation_ft(0.0),
metar_valid(false), metar_valid(false),
setup_winds_aloft(true), setup_winds_aloft(true),
wind_interpolation_required(true), wind_interpolation_required(true),
station_elevation_ft(0.0),
// Interpolation constant definitions. // Interpolation constant definitions.
EnvironmentUpdatePeriodSec( 0.2 ), EnvironmentUpdatePeriodSec( 0.2 ),
MaxWindChangeKtsSec( 0.2 ), MaxWindChangeKtsSec( 0.2 ),
@ -277,7 +277,8 @@ FGMetarCtrl::FGMetarCtrl( SGSubsystem * environmentCtrl )
MaxCloudAltitudeChangeFtSec( 20.0 ), MaxCloudAltitudeChangeFtSec( 20.0 ),
MaxCloudThicknessChangeFtSec( 50.0 ), MaxCloudThicknessChangeFtSec( 50.0 ),
MaxCloudInterpolationHeightFt( 5000.0 ), MaxCloudInterpolationHeightFt( 5000.0 ),
MaxCloudInterpolationDeltaFt( 4000.0 ) MaxCloudInterpolationDeltaFt( 4000.0 ),
_environmentCtrl(environmentCtrl)
{ {
windModulator = new FGBasicWindModulator(); windModulator = new FGBasicWindModulator();

4
src/Environment/ridge_lift.cxx
View file

@ -174,7 +174,7 @@ void FGRidgeLift::update(double dt) {
double ground_wind_from_rad = _surface_wind_from_deg_node->getDoubleValue() * SG_DEGREES_TO_RADIANS + SG_PI; double ground_wind_from_rad = _surface_wind_from_deg_node->getDoubleValue() * SG_DEGREES_TO_RADIANS + SG_PI;
// compute the remaining probes // compute the remaining probes
for (int i = 1; i < sizeof(probe_elev_m)/sizeof(probe_elev_m[0]); i++) { for (unsigned i = 1; i < sizeof(probe_elev_m)/sizeof(probe_elev_m[0]); i++) {
SGGeoc probe = myGeocPos.advanceRadM( ground_wind_from_rad, dist_probe_m[i] ); SGGeoc probe = myGeocPos.advanceRadM( ground_wind_from_rad, dist_probe_m[i] );
// convert to geodetic position for ground level computation // convert to geodetic position for ground level computation
SGGeod probeGeod = SGGeod::fromGeoc( probe ); SGGeod probeGeod = SGGeod::fromGeoc( probe );
@ -193,7 +193,7 @@ void FGRidgeLift::update(double dt) {
slope[2] = (probe_elev_m[2] - probe_elev_m[3]) / dist_probe_m[3]; slope[2] = (probe_elev_m[2] - probe_elev_m[3]) / dist_probe_m[3];
slope[3] = (probe_elev_m[4] - probe_elev_m[0]) / -dist_probe_m[4]; slope[3] = (probe_elev_m[4] - probe_elev_m[0]) / -dist_probe_m[4];
for (int i = 0; i < sizeof(slope)/sizeof(slope[0]); i++) for (unsigned i = 0; i < sizeof(slope)/sizeof(slope[0]); i++)
adj_slope[i] = sin(atan(5.0 * pow ( (fabs(slope[i])),1.7) ) ) *sign(slope[i]); adj_slope[i] = sin(atan(5.0 * pow ( (fabs(slope[i])),1.7) ) ) *sign(slope[i]);
//adjustment //adjustment