Port over remaining Point3D usage to the more type and unit safe SG* classes.

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

diff --git a/src/FDM/UIUCModel/uiuc_coef_yaw.cpp b/src/FDM/UIUCModel/uiuc_coef_yaw.cpp
index 5753584e6d90d6df3af560cf19bab9da4391ff61..e8430b2eddf9acf82c643e8271a9850ab16e8706 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_coef_yaw.cpp
+++ b/src/FDM/UIUCModel/uiuc_coef_yaw.cpp
@@ -81,8 +81,7 @@
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA or view http://www.gnu.org/copyleft/gpl.html.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 **********************************************************************/
 
@@ -114,7 +113,7 @@ void uiuc_coef_yaw()
                 Cno = uiuc_ice_filter(Cno_clean,kCno);
               }
            Cno_save = Cno;
-            Cn += Cno;
+            Cn += Cno_save;
             break;
           }
         case Cn_beta_flag:
@@ -123,8 +122,15 @@ void uiuc_coef_yaw()
               {
                 Cn_beta = uiuc_ice_filter(Cn_beta_clean,kCn_beta);
               }
-           Cn_beta_save = Cn_beta * Beta;
-            Cn += Cn_beta * Beta;
+           Cn_beta_save = Cn_beta * Std_Beta;
+           if (eta_q_Cn_beta_fac)
+             {
+               Cn += Cn_beta_save * eta_q_Cn_beta_fac;
+             }
+           else
+             {
+               Cn += Cn_beta_save;
+             }
             break;
           }
         case Cn_p_flag:
@@ -136,7 +142,14 @@ void uiuc_coef_yaw()
             /* Cn_p must be mulitplied by b/2U 
                (see Roskam Control book, Part 1, pg. 147) */
            Cn_p_save = Cn_p * P_body * b_2U;
-            Cn += Cn_p * P_body * b_2U;
+           if (eta_q_Cn_p_fac)
+             {
+               Cn += Cn_p_save * eta_q_Cn_p_fac;
+             }
+           else
+             {
+               Cn += Cn_p_save;
+             }
             break;
           }
         case Cn_r_flag:
@@ -148,7 +161,14 @@ void uiuc_coef_yaw()
             /* Cn_r must be mulitplied by b/2U 
                (see Roskam Control book, Part 1, pg. 147) */
            Cn_r_save = Cn_r * R_body * b_2U;
-            Cn += Cn_r * R_body * b_2U;
+           if (eta_q_Cn_r_fac)
+             {
+               Cn += Cn_r_save * eta_q_Cn_r_fac;
+             }
+           else
+             {
+               Cn += Cn_r_save;
+             }
             break;
           }
         case Cn_da_flag:
@@ -158,7 +178,7 @@ void uiuc_coef_yaw()
                 Cn_da = uiuc_ice_filter(Cn_da_clean,kCn_da);
               }
            Cn_da_save = Cn_da * aileron;
-            Cn += Cn_da * aileron;
+            Cn += Cn_da_save;
             break;
           }
         case Cn_dr_flag:
@@ -168,7 +188,14 @@ void uiuc_coef_yaw()
                 Cn_dr = uiuc_ice_filter(Cn_dr_clean,kCn_dr);
               }
            Cn_dr_save = Cn_dr * rudder;
-            Cn += Cn_dr * rudder;
+           if (eta_q_Cn_dr_fac)
+             {
+               Cn += Cn_dr_save * eta_q_Cn_dr_fac;
+             }
+           else
+             {
+               Cn += Cn_dr_save;
+             }
             break;
           }
         case Cn_q_flag:
@@ -178,7 +205,7 @@ void uiuc_coef_yaw()
                 Cn_q = uiuc_ice_filter(Cn_q_clean,kCn_q);
               }
            Cn_q_save = Cn_q * Q_body * cbar_2U;
-            Cn += Cn_q * Q_body * cbar_2U;
+            Cn += Cn_q_save;
             break;
           }
         case Cn_b3_flag:
@@ -187,8 +214,8 @@ void uiuc_coef_yaw()
               {
                 Cn_b3 = uiuc_ice_filter(Cn_b3_clean,kCn_b3);
               }
-           Cn_b3_save = Cn_b3 * Beta * Beta * Beta;
-            Cn += Cn_b3 * Beta * Beta * Beta;
+           Cn_b3_save = Cn_b3 * Std_Beta * Std_Beta * Std_Beta;
+            Cn += Cn_b3_save;
             break;
           }
         case Cnfada_flag:
@@ -198,7 +225,7 @@ void uiuc_coef_yaw()
                                            Cnfada_CnArray,
                                            Cnfada_nAlphaArray,
                                            Cnfada_nda,
-                                           Alpha,
+                                           Std_Alpha,
                                            aileron);
             Cn += CnfadaI;
             break;
@@ -210,7 +237,7 @@ void uiuc_coef_yaw()
                                               Cnfbetadr_CnArray,
                                               Cnfbetadr_nBetaArray,
                                               Cnfbetadr_ndr,
-                                              Beta,
+                                              Std_Beta,
                                               rudder);
             Cn += CnfbetadrI;
             break;
@@ -226,8 +253,8 @@ void uiuc_coef_yaw()
                                               Cnfabetaf_nb_nice,
                                               Cnfabetaf_nf,
                                               flap_pos,
-                                              Alpha,
-                                              Beta);
+                                              Std_Alpha,
+                                              Std_Beta);
            else
              CnfabetafI = uiuc_3Dinterpolation(Cnfabetaf_fArray,
                                                Cnfabetaf_aArray,
@@ -237,8 +264,8 @@ void uiuc_coef_yaw()
                                                Cnfabetaf_nbeta,
                                                Cnfabetaf_nf,
                                                flap_pos,
-                                               Alpha,
-                                               Beta);
+                                               Std_Alpha,
+                                               Std_Beta);
             Cn += CnfabetafI;
             break;
           }
@@ -253,7 +280,7 @@ void uiuc_coef_yaw()
                                             Cnfadaf_nda_nice,
                                             Cnfadaf_nf,
                                             flap_pos,
-                                            Alpha,
+                                            Std_Alpha,
                                             aileron);
            else
              CnfadafI = uiuc_3Dinterpolation(Cnfadaf_fArray,
@@ -264,7 +291,7 @@ void uiuc_coef_yaw()
                                              Cnfadaf_nda,
                                              Cnfadaf_nf,
                                              flap_pos,
-                                             Alpha,
+                                             Std_Alpha,
                                              aileron);
             Cn += CnfadafI;
             break;
@@ -280,7 +307,7 @@ void uiuc_coef_yaw()
                                             Cnfadrf_ndr_nice,
                                             Cnfadrf_nf,
                                             flap_pos,
-                                            Alpha,
+                                            Std_Alpha,
                                             rudder);
            else
              CnfadrfI = uiuc_3Dinterpolation(Cnfadrf_fArray,
@@ -291,7 +318,7 @@ void uiuc_coef_yaw()
                                              Cnfadrf_ndr,
                                              Cnfadrf_nf,
                                              flap_pos,
-                                             Alpha,
+                                             Std_Alpha,
                                              rudder);
             Cn += CnfadrfI;
             break;
@@ -308,7 +335,7 @@ void uiuc_coef_yaw()
                                            Cnfapf_np_nice,
                                            Cnfapf_nf,
                                            flap_pos,
-                                           Alpha,
+                                           Std_Alpha,
                                            p_nondim);
            else
              CnfapfI = uiuc_3Dinterpolation(Cnfapf_fArray,
@@ -319,7 +346,7 @@ void uiuc_coef_yaw()
                                             Cnfapf_np,
                                             Cnfapf_nf,
                                             flap_pos,
-                                            Alpha,
+                                            Std_Alpha,
                                             p_nondim);
             Cn += CnfapfI;
             break;
@@ -336,7 +363,7 @@ void uiuc_coef_yaw()
                                            Cnfarf_nr_nice,
                                            Cnfarf_nf,
                                            flap_pos,
-                                           Alpha,
+                                           Std_Alpha,
                                            r_nondim);
            else
              CnfarfI = uiuc_3Dinterpolation(Cnfarf_fArray,
@@ -347,7 +374,7 @@ void uiuc_coef_yaw()
                                             Cnfarf_nr,
                                             Cnfarf_nf,
                                             flap_pos,
-                                            Alpha,
+                                            Std_Alpha,
                                             r_nondim);
             Cn += CnfarfI;
             break;