From c0eea29af8ff1f5cdaf2665a1e462bb41883b24f Mon Sep 17 00:00:00 2001 From: mselig Date: Sun, 27 Jul 2003 17:54:18 +0000 Subject: [PATCH] Fixes namespace conflict with the variable ch. Changed to chord_h. --- src/FDM/UIUCModel/uiuc_aircraft.h | 4 ++-- src/FDM/UIUCModel/uiuc_coefficients.cpp | 14 +++++++------- src/FDM/UIUCModel/uiuc_map_geometry.cpp | 2 +- src/FDM/UIUCModel/uiuc_menu_geometry.cpp | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/FDM/UIUCModel/uiuc_aircraft.h b/src/FDM/UIUCModel/uiuc_aircraft.h index 7ce8c05d9..c517c47e9 100644 --- a/src/FDM/UIUCModel/uiuc_aircraft.h +++ b/src/FDM/UIUCModel/uiuc_aircraft.h @@ -755,13 +755,13 @@ struct AIRCRAFT map 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 cbar aircraft_->cbar #define Sw aircraft_->Sw #define ih aircraft_->ih #define bh aircraft_->bh -#define ch aircraft_->ch +#define chord_h aircraft_->chord_h #define Sh aircraft_->Sh diff --git a/src/FDM/UIUCModel/uiuc_coefficients.cpp b/src/FDM/UIUCModel/uiuc_coefficients.cpp index 704e54c31..737e5f7d1 100644 --- a/src/FDM/UIUCModel/uiuc_coefficients.cpp +++ b/src/FDM/UIUCModel/uiuc_coefficients.cpp @@ -127,15 +127,15 @@ void uiuc_coefficients(double dt) { cbar_2U = cbar / (2.0 * V_rel_wind); b_2U = bw / (2.0 * V_rel_wind); - // ch is the horizontal tail chord - ch_2U = ch / (2.0 * V_rel_wind); + // chord_h is the horizontal tail chord + ch_2U = chord_h / (2.0 * V_rel_wind); } 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; cbar_2U = cbar / (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; } else @@ -152,14 +152,14 @@ void uiuc_coefficients(double dt) { cbar_2U = cbar / (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) { 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); 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; } else @@ -176,14 +176,14 @@ void uiuc_coefficients(double dt) { cbar_2U = cbar / (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) { 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); 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; beta_flow_clean_tail = cbar_2U; } diff --git a/src/FDM/UIUCModel/uiuc_map_geometry.cpp b/src/FDM/UIUCModel/uiuc_map_geometry.cpp index eb78ead58..68e5d595f 100644 --- a/src/FDM/UIUCModel/uiuc_map_geometry.cpp +++ b/src/FDM/UIUCModel/uiuc_map_geometry.cpp @@ -73,7 +73,7 @@ void uiuc_map_geometry() geometry_map["Sw"] = Sw_flag ; geometry_map["ih"] = ih_flag ; geometry_map["bh"] = bh_flag ; - geometry_map["ch"] = ch_flag ; + geometry_map["chord_h"] = ch_flag ; geometry_map["Sh"] = Sh_flag ; } diff --git a/src/FDM/UIUCModel/uiuc_menu_geometry.cpp b/src/FDM/UIUCModel/uiuc_menu_geometry.cpp index 09d8100d9..67461d177 100644 --- a/src/FDM/UIUCModel/uiuc_menu_geometry.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_geometry.cpp @@ -173,7 +173,7 @@ void parse_geometry( const string& linetoken2, const string& linetoken3, else uiuc_warnings_errors(1, *command_line); - ch = token_value; + chord_h = token_value; geometryParts -> storeCommands (*command_line); break; } -- 2.39.5