Make yasim accept the launchbar and hook properties. They are not tied to anything...

[flightgear.git] / src / FDM / UIUCModel / uiuc_coef_sideforce.cpp

diff --git a/src/FDM/UIUCModel/uiuc_coef_sideforce.cpp b/src/FDM/UIUCModel/uiuc_coef_sideforce.cpp
index dc30657f55c0f227c8fe783a52e2eb05d78573be..d1288bb03babdedf5c1e408c1456de163913a4d3 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_coef_sideforce.cpp
+++ b/src/FDM/UIUCModel/uiuc_coef_sideforce.cpp
@@ -114,7 +114,7 @@ void uiuc_coef_sideforce()
                 CYo = uiuc_ice_filter(CYo_clean,kCYo);
               }
            CYo_save = CYo;
-            CY += CYo;
+            CY += CYo_save;
             break;
           }
         case CY_beta_flag:
@@ -123,8 +123,15 @@ void uiuc_coef_sideforce()
               {
                 CY_beta = uiuc_ice_filter(CY_beta_clean,kCY_beta);
               }
-           CY_beta_save = CY_beta * Beta;
-            CY += CY_beta * Beta;
+           CY_beta_save = CY_beta * Std_Beta;
+           if (eta_q_CY_beta_fac)
+             {
+               CY += CY_beta_save * eta_q_CY_beta_fac;
+             }
+           else
+             {
+               CY += CY_beta_save;
+             }
             break;
           }
         case CY_p_flag:
@@ -136,7 +143,14 @@ void uiuc_coef_sideforce()
             /* CY_p must be mulitplied by b/2U 
                (see Roskam Control book, Part 1, pg. 147) */
            CY_p_save = CY_p * P_body * b_2U;
-            CY += CY_p * P_body * b_2U;
+           if (eta_q_CY_p_fac)
+             {
+               CY += CY_p_save * eta_q_CY_p_fac;
+             }
+           else
+             {
+               CY += CY_p_save;
+             }
             break;
           }
         case CY_r_flag:
@@ -148,7 +162,14 @@ void uiuc_coef_sideforce()
             /* CY_r must be mulitplied by b/2U 
                (see Roskam Control book, Part 1, pg. 147) */
            CY_r_save = CY_r * R_body * b_2U;
-            CY += CY_r * R_body * b_2U;
+           if (eta_q_CY_r_fac)
+             {
+               CY += CY_r_save * eta_q_CY_r_fac;
+             }
+           else
+             {
+               CY += CY_r_save;
+             }
             break;
           }
         case CY_da_flag:
@@ -158,7 +179,7 @@ void uiuc_coef_sideforce()
                 CY_da = uiuc_ice_filter(CY_da_clean,kCY_da);
               }
            CY_da_save = CY_da * aileron;
-            CY += CY_da * aileron;
+            CY += CY_da_save;
             break;
           }
         case CY_dr_flag:
@@ -168,7 +189,14 @@ void uiuc_coef_sideforce()
                 CY_dr = uiuc_ice_filter(CY_dr_clean,kCY_dr);
               }
            CY_dr_save = CY_dr * rudder;
-            CY += CY_dr * rudder;
+           if (eta_q_CY_dr_fac)
+             {
+               CY += CY_dr_save * eta_q_CY_dr_fac;
+             }
+           else
+             {
+               CY += CY_dr_save;
+             }
             break;
           }
         case CY_dra_flag:
@@ -177,8 +205,8 @@ void uiuc_coef_sideforce()
               {
                 CY_dra = uiuc_ice_filter(CY_dra_clean,kCY_dra);
               }
-           CY_dra_save = CY_dra * rudder * Alpha;
-            CY += CY_dra * rudder * Alpha;
+           CY_dra_save = CY_dra * rudder * Std_Alpha;
+            CY += CY_dra_save;
             break;
           }
         case CY_bdot_flag:
@@ -187,8 +215,8 @@ void uiuc_coef_sideforce()
               {
                 CY_bdot = uiuc_ice_filter(CY_bdot_clean,kCY_bdot);
               }
-           CY_bdot_save = CY_bdot * Beta_dot * b_2U;
-            CY += CY_bdot * Beta_dot * b_2U;
+           CY_bdot_save = CY_bdot * Std_Beta_dot * b_2U;
+            CY += CY_bdot_save;
             break;
           }
         case CYfada_flag:
@@ -198,7 +226,7 @@ void uiuc_coef_sideforce()
                                            CYfada_CYArray,
                                            CYfada_nAlphaArray,
                                            CYfada_nda,
-                                           Alpha,
+                                           Std_Alpha,
                                            aileron);
             CY += CYfadaI;
             break;
@@ -210,7 +238,7 @@ void uiuc_coef_sideforce()
                                               CYfbetadr_CYArray,
                                               CYfbetadr_nBetaArray,
                                               CYfbetadr_ndr,
-                                              Beta,
+                                              Std_Beta,
                                               rudder);
             CY += CYfbetadrI;
             break;
@@ -226,8 +254,8 @@ void uiuc_coef_sideforce()
                                               CYfabetaf_nb_nice,
                                               CYfabetaf_nf,
                                               flap_pos,
-                                              Alpha,
-                                              Beta);
+                                              Std_Alpha,
+                                              Std_Beta);
            else
              CYfabetafI = uiuc_3Dinterpolation(CYfabetaf_fArray,
                                                CYfabetaf_aArray,
@@ -237,8 +265,8 @@ void uiuc_coef_sideforce()
                                                CYfabetaf_nbeta,
                                                CYfabetaf_nf,
                                                flap_pos,
-                                               Alpha,
-                                               Beta);
+                                               Std_Alpha,
+                                               Std_Beta);
             CY += CYfabetafI;
             break;
           }
@@ -253,7 +281,7 @@ void uiuc_coef_sideforce()
                                             CYfadaf_nda_nice,
                                             CYfadaf_nf,
                                             flap_pos,
-                                            Alpha,
+                                            Std_Alpha,
                                             aileron);
            else
              CYfadafI = uiuc_3Dinterpolation(CYfadaf_fArray,
@@ -264,7 +292,7 @@ void uiuc_coef_sideforce()
                                              CYfadaf_nda,
                                              CYfadaf_nf,
                                              flap_pos,
-                                             Alpha,
+                                             Std_Alpha,
                                              aileron);
             CY += CYfadafI;
             break;
@@ -280,7 +308,7 @@ void uiuc_coef_sideforce()
                                             CYfadrf_ndr_nice,
                                             CYfadrf_nf,
                                             flap_pos,
-                                            Alpha,
+                                            Std_Alpha,
                                             rudder);
            else
              CYfadrfI = uiuc_3Dinterpolation(CYfadrf_fArray,
@@ -291,7 +319,7 @@ void uiuc_coef_sideforce()
                                              CYfadrf_ndr,
                                              CYfadrf_nf,
                                              flap_pos,
-                                             Alpha,
+                                             Std_Alpha,
                                              rudder);
             CY += CYfadrfI;
             break;
@@ -308,7 +336,7 @@ void uiuc_coef_sideforce()
                                            CYfapf_np_nice,
                                            CYfapf_nf,
                                            flap_pos,
-                                           Alpha,
+                                           Std_Alpha,
                                            p_nondim);
            else
              CYfapfI = uiuc_3Dinterpolation(CYfapf_fArray,
@@ -319,7 +347,7 @@ void uiuc_coef_sideforce()
                                             CYfapf_np,
                                             CYfapf_nf,
                                             flap_pos,
-                                            Alpha,
+                                            Std_Alpha,
                                             p_nondim);
             CY += CYfapfI;
             break;
@@ -336,7 +364,7 @@ void uiuc_coef_sideforce()
                                            CYfarf_nr_nice,
                                            CYfarf_nf,
                                            flap_pos,
-                                           Alpha,
+                                           Std_Alpha,
                                            r_nondim);
            else
              CYfarfI = uiuc_3Dinterpolation(CYfarf_fArray,
@@ -347,7 +375,7 @@ void uiuc_coef_sideforce()
                                             CYfarf_nr,
                                             CYfarf_nf,
                                             flap_pos,
-                                            Alpha,
+                                            Std_Alpha,
                                             r_nondim);
             CY += CYfarfI;
             break;