fly/flightgear
1
0
Fork 0
Code Activity

Fixes namespace conflict with the variable ch. Changed to chord_h.

Browse source
This commit is contained in:
mselig 2003-07-27 17:54:18 +00:00
parent c1fa7f95bd
commit c0eea29af8
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/FDM/UIUCModel/uiuc_aircraft.h
View file

@ -755,13 +755,13 @@ struct AIRCRAFT
map <string,int> geometry_map; map <string,int> geometry_map;
#define geometry_map aircraft_->geometry_map #define geometry_map aircraft_->geometry_map
double bw, cbar, Sw, ih, bh, ch, Sh; double bw, cbar, Sw, ih, bh, chord_h, Sh;
#define bw aircraft_->bw #define bw aircraft_->bw
#define cbar aircraft_->cbar #define cbar aircraft_->cbar
#define Sw aircraft_->Sw #define Sw aircraft_->Sw
#define ih aircraft_->ih #define ih aircraft_->ih
#define bh aircraft_->bh #define bh aircraft_->bh
#define ch aircraft_->ch #define chord_h aircraft_->chord_h
#define Sh aircraft_->Sh #define Sh aircraft_->Sh

14
src/FDM/UIUCModel/uiuc_coefficients.cpp
View file

@ -127,15 +127,15 @@ void uiuc_coefficients(double dt)
{ {
cbar_2U = cbar / (2.0 * V_rel_wind); cbar_2U = cbar / (2.0 * V_rel_wind);
b_2U = bw / (2.0 * V_rel_wind); b_2U = bw / (2.0 * V_rel_wind);
// ch is the horizontal tail chord // chord_h is the horizontal tail chord
ch_2U = ch / (2.0 * V_rel_wind); ch_2U = chord_h / (2.0 * V_rel_wind);
} }
else if (use_dyn_on_speed_curve1) else if (use_dyn_on_speed_curve1)
{ {
V_rel_wind_dum = dyn_on_speed_zero + V_rel_wind * (dyn_on_speed - dyn_on_speed_zero)/dyn_on_speed; V_rel_wind_dum = dyn_on_speed_zero + V_rel_wind * (dyn_on_speed - dyn_on_speed_zero)/dyn_on_speed;
cbar_2U = cbar / (2.0 * V_rel_wind_dum); cbar_2U = cbar / (2.0 * V_rel_wind_dum);
b_2U = bw / (2.0 * V_rel_wind_dum); b_2U = bw / (2.0 * V_rel_wind_dum);
ch_2U = ch / (2.0 * V_rel_wind_dum); ch_2U = chord_h / (2.0 * V_rel_wind_dum);
Std_Alpha_dot = 0.0; Std_Alpha_dot = 0.0;
} }
else else
@ -152,14 +152,14 @@ void uiuc_coefficients(double dt)
{ {
cbar_2U = cbar / (2.0 * fabs(U_body)); cbar_2U = cbar / (2.0 * fabs(U_body));
b_2U = bw / (2.0 * fabs(U_body)); b_2U = bw / (2.0 * fabs(U_body));
ch_2U = ch / (2.0 * fabs(U_body)); ch_2U = chord_h / (2.0 * fabs(U_body));
} }
else if (use_dyn_on_speed_curve1) else if (use_dyn_on_speed_curve1)
{ {
U_body_dum = dyn_on_speed_zero + fabs(U_body) * (dyn_on_speed - dyn_on_speed_zero)/dyn_on_speed; U_body_dum = dyn_on_speed_zero + fabs(U_body) * (dyn_on_speed - dyn_on_speed_zero)/dyn_on_speed;
cbar_2U = cbar / (2.0 * U_body_dum); cbar_2U = cbar / (2.0 * U_body_dum);
b_2U = bw / (2.0 * U_body_dum); b_2U = bw / (2.0 * U_body_dum);
ch_2U = ch / (2.0 * U_body_dum); ch_2U = chord_h / (2.0 * U_body_dum);
Std_Alpha_dot = 0.0; Std_Alpha_dot = 0.0;
} }
else else
@ -176,14 +176,14 @@ void uiuc_coefficients(double dt)
{ {
cbar_2U = cbar / (2.0 * U_body); cbar_2U = cbar / (2.0 * U_body);
b_2U = bw / (2.0 * U_body); b_2U = bw / (2.0 * U_body);
ch_2U = ch / (2.0 * U_body); ch_2U = chord_h / (2.0 * U_body);
} }
else if (use_dyn_on_speed_curve1) else if (use_dyn_on_speed_curve1)
{ {
U_body_dum = dyn_on_speed_zero + U_body * (dyn_on_speed - dyn_on_speed_zero)/dyn_on_speed; U_body_dum = dyn_on_speed_zero + U_body * (dyn_on_speed - dyn_on_speed_zero)/dyn_on_speed;
cbar_2U = cbar / (2.0 * U_body_dum); cbar_2U = cbar / (2.0 * U_body_dum);
b_2U = bw / (2.0 * U_body_dum); b_2U = bw / (2.0 * U_body_dum);
ch_2U = ch / (2.0 * U_body_dum); ch_2U = chord_h / (2.0 * U_body_dum);
Std_Alpha_dot = 0.0; Std_Alpha_dot = 0.0;
beta_flow_clean_tail = cbar_2U; beta_flow_clean_tail = cbar_2U;
} }

2
src/FDM/UIUCModel/uiuc_map_geometry.cpp
View file

@ -73,7 +73,7 @@ void uiuc_map_geometry()
geometry_map["Sw"] = Sw_flag ; geometry_map["Sw"] = Sw_flag ;
geometry_map["ih"] = ih_flag ; geometry_map["ih"] = ih_flag ;
geometry_map["bh"] = bh_flag ; geometry_map["bh"] = bh_flag ;
geometry_map["ch"] = ch_flag ; geometry_map["chord_h"] = ch_flag ;
geometry_map["Sh"] = Sh_flag ; geometry_map["Sh"] = Sh_flag ;
} }

2
src/FDM/UIUCModel/uiuc_menu_geometry.cpp
View file

@ -173,7 +173,7 @@ void parse_geometry( const string& linetoken2, const string& linetoken3,
else else
uiuc_warnings_errors(1, *command_line); uiuc_warnings_errors(1, *command_line);
ch = token_value; chord_h = token_value;
geometryParts -> storeCommands (*command_line); geometryParts -> storeCommands (*command_line);
break; break;
} }