From dbe150485884a287d24303ba46c05f595aa271f3 Mon Sep 17 00:00:00 2001 From: Erik Hofman Date: Mon, 26 Sep 2011 10:50:48 +0200 Subject: [PATCH] remove a cvs conflict --- src/FDM/JSBSim/models/atmosphere/FGWinds.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/FDM/JSBSim/models/atmosphere/FGWinds.cpp b/src/FDM/JSBSim/models/atmosphere/FGWinds.cpp index e54c348ec..c24648e3a 100644 --- a/src/FDM/JSBSim/models/atmosphere/FGWinds.cpp +++ b/src/FDM/JSBSim/models/atmosphere/FGWinds.cpp @@ -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) -- 2.39.5