Don't use turbulence model by default because it is still under development.

diff --git a/src/FDM/JSBSim/FGAtmosphere.cpp b/src/FDM/JSBSim/FGAtmosphere.cpp
index acc7613cb9f1dc2a934bc0466d650248162dcf49..2a19dd91d0fba0e5b9dfa8685d22b72a9a765b61 100644 (file)
--- a/src/FDM/JSBSim/FGAtmosphere.cpp
+++ b/src/FDM/JSBSim/FGAtmosphere.cpp
@@ -91,8 +91,8 @@ FGAtmosphere::FGAtmosphere(FGFDMExec* fdmex) : FGModel(fdmex),
   htab[7]=259186.352; //ft.
 
   MagnitudedAccelDt = MagnitudeAccel = Magnitude = 0.0;
-//  turbType = ttNone;
-  turbType = ttBerndt; // temporarily disable turbulence until fully tested
+  turbType = ttNone;
+//  turbType = ttBerndt; // temporarily disable turbulence until fully tested
   TurbGain = 100.0;
 
   if (debug_lvl & 2) cout << "Instantiated: " << Name << endl;

diff --git a/src/FDM/JSBSim/FGInitialCondition.cpp b/src/FDM/JSBSim/FGInitialCondition.cpp
index b407f0375fb9e5f96435d11b0d2603c545914a97..92346f8635f280ff667da3ad782825e0a461d104 100644 (file)
--- a/src/FDM/JSBSim/FGInitialCondition.cpp
+++ b/src/FDM/JSBSim/FGInitialCondition.cpp
@@ -664,9 +664,8 @@ bool FGInitialCondition::solve(double *y,double x)
   i=0;
   while ((fabs(d) > eps) && (i < 100)) {
     d=(x3-x1)/d0;
-    if (f3-f1 != 0.0) x2 = x1-d*d0*f1/(f3-f1);
-    else              x2 = x1-d*d0*f1/0.01; // TONY: What is correct? This is a WAG.
-
+    x2 = x1-d*d0*f1/(f3-f1);
+    
     f2=(this->*sfunc)(x2)-x;
     //cout << "solve x1,x2,x3: " << x1 << "," << x2 << "," << x3 << endl;
     //cout << "                " << f1 << "," << f2 << "," << f3 << endl;