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

diff --git a/src/FDM/UIUCModel/uiuc_aircraft.h b/src/FDM/UIUCModel/uiuc_aircraft.h
index 7ce8c05d96a4c0c5a73186cf1e7171824da853b4..c517c47e96e6b5216e3ad1be3414aba6f7204754 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_aircraft.h
+++ b/src/FDM/UIUCModel/uiuc_aircraft.h
@@ -755,13 +755,13 @@ struct AIRCRAFT
   map <string,int> 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 704e54c3116056b40f350b424f03d4c9391d057d..737e5f7d1dd302b4e0352562428c0e33659b0193 100644 (file)
--- 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 eb78ead586c86f07d850558036ba2418290679fc..68e5d595fae106c72ba30886ca5c8b6ee9ae08b1 100644 (file)
--- 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 09d8100d9ce66e03cb34e831f9ca8aa904369e59..67461d177eb6ab369f7ebe4bd448beb0347d7c0a 100644 (file)
--- 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;
        }