Fix for bug 1304 - crash loading XML route

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

diff --git a/src/FDM/UIUCModel/uiuc_betaprobe.cpp b/src/FDM/UIUCModel/uiuc_betaprobe.cpp
index 5e2afb075b73c181a25b826c920dc79022cdfd8b..bbfed3ed42753977a08c626f65e2db459fc58003 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_betaprobe.cpp
+++ b/src/FDM/UIUCModel/uiuc_betaprobe.cpp
@@ -59,12 +59,11 @@
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- 
+
  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.
+
 **********************************************************************/
 
 #include "uiuc_betaprobe.h"
@@ -74,10 +73,10 @@ void uiuc_betaprobe()
 {
   if (CX && CZ)
     {
-      CLclean_wing = CXclean_wing * sin(Alpha) - CZclean_wing * cos(Alpha);
-      CLiced_wing  = CXiced_wing * sin(Alpha) - CZiced_wing * cos(Alpha);
-      CLclean_tail = CXclean_tail * sin(Alpha) - CZclean_tail * cos(Alpha);
-      CLiced_tail  = CXiced_tail * sin(Alpha) - CZiced_tail * cos(Alpha);
+      CLclean_wing = CXclean_wing * sin(Std_Alpha) - CZclean_wing * cos(Std_Alpha);
+      CLiced_wing  = CXiced_wing * sin(Std_Alpha) - CZiced_wing * cos(Std_Alpha);
+      CLclean_tail = CXclean_tail * sin(Std_Alpha) - CZclean_tail * cos(Std_Alpha);
+      CLiced_tail  = CXiced_tail * sin(Std_Alpha) - CZiced_tail * cos(Std_Alpha);
     }
 
   /* calculate lift per unit span*/
@@ -91,36 +90,36 @@ void uiuc_betaprobe()
   Gamma_clean_tail = Lift_clean_tail / (Density * V_rel_wind);
   Gamma_iced_tail = Lift_iced_tail / (Density * V_rel_wind);
 
-  w_clean_wing = Gamma_clean_wing / (2 * PI * x_probe_wing);
-  w_iced_wing = Gamma_iced_wing / (2 * PI * x_probe_wing);
-  w_clean_tail = Gamma_clean_tail / (2 * PI * x_probe_tail);
-  w_iced_tail = Gamma_iced_tail / (2 * PI * x_probe_tail);
+  w_clean_wing = Gamma_clean_wing / (2 * LS_PI * x_probe_wing);
+  w_iced_wing = Gamma_iced_wing / (2 * LS_PI * x_probe_wing);
+  w_clean_tail = Gamma_clean_tail / (2 * LS_PI * x_probe_tail);
+  w_iced_tail = Gamma_iced_tail / (2 * LS_PI * x_probe_tail);
 
   V_total_clean_wing = sqrt(w_clean_wing*w_clean_wing + 
                            V_rel_wind*V_rel_wind - 
                            2*w_clean_wing*V_rel_wind * 
-                           cos(PI/2 + Alpha));
+                           cos(LS_PI/2 + Std_Alpha));
   V_total_iced_wing = sqrt(w_iced_wing*w_iced_wing + 
                           V_rel_wind*V_rel_wind - 
                           2*w_iced_wing*V_rel_wind * 
-                          cos(PI/2 + Alpha));
+                          cos(LS_PI/2 + Std_Alpha));
   V_total_clean_tail = sqrt(w_clean_tail*w_clean_tail + 
                            V_rel_wind*V_rel_wind - 
                            2*w_clean_tail*V_rel_wind * 
-                           cos(PI/2 + Alpha));
+                           cos(LS_PI/2 + Std_Alpha));
   V_total_iced_tail = sqrt(w_iced_tail*w_iced_tail + 
                           V_rel_wind*V_rel_wind - 
                           2*w_iced_tail*V_rel_wind * 
-                          cos(PI/2 + Alpha));
+                          cos(LS_PI/2 + Std_Alpha));
 
   beta_flow_clean_wing = asin((w_clean_wing / V_total_clean_wing) * 
-                             sin (PI/2 + Alpha));
+                             sin (LS_PI/2 + Std_Alpha));
   beta_flow_iced_wing = asin((w_iced_wing / V_total_iced_wing) * 
-                            sin (PI/2 + Alpha));
+                            sin (LS_PI/2 + Std_Alpha));
   beta_flow_clean_tail = asin((w_clean_tail / V_total_clean_tail) * 
-                             sin (PI/2 + Alpha));
+                             sin (LS_PI/2 + Std_Alpha));
   beta_flow_iced_tail = asin((w_iced_tail / V_total_iced_tail) * 
-                            sin (PI/2 + Alpha));
+                            sin (LS_PI/2 + Std_Alpha));
 
   Dbeta_flow_wing = fabs(beta_flow_clean_wing - beta_flow_iced_wing);
   Dbeta_flow_tail = fabs(beta_flow_clean_tail - beta_flow_iced_tail);