fly/flightgear
1
0
Fork 0
Code Activity

remove a cvs conflict

Browse source
This commit is contained in:
Erik Hofman 2011-09-26 10:50:48 +02:00
parent 1df7b9cdc2
commit dbe1504858
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/FDM/JSBSim/models/atmosphere/FGWinds.cpp
View file

@ -284,13 +284,8 @@ void FGWinds::Turbulence(double h)
double
T_V = in.totalDeltaT, // for compatibility of nomenclature
sig_p = 1.9/sqrt(L_w*b_w)*sig_w, // Yeager1998, eq. (8)
<<<<<<< FGWinds.cpp
// sig_q = sqrt(M_PI/2/L_w/b_w), // eq. (14)
/// sig_r = sqrt(2*M_PI/3/L_w/b_w), // eq. (17)
=======
//sig_q = sqrt(M_PI/2/L_w/b_w), // eq. (14)
//sig_r = sqrt(2*M_PI/3/L_w/b_w), // eq. (17)
>>>>>>> 1.5
L_p = sqrt(L_w*b_w)/2.6, // eq. (10)
tau_u = L_u/in.V, // eq. (6)
tau_w = L_w/in.V, // eq. (3)