Merge branch 'ehofman/sound'

[flightgear.git] / src / FDM / JSBSim / models / FGAtmosphere.cpp

diff --git a/src/FDM/JSBSim/models/FGAtmosphere.cpp b/src/FDM/JSBSim/models/FGAtmosphere.cpp
index b1826b716083cf929fabffa0fe36b9c6906a547d..c21e45cbc1dff8ee0a5bce9bc0122440d0c5d7f4 100644 (file)
--- a/src/FDM/JSBSim/models/FGAtmosphere.cpp
+++ b/src/FDM/JSBSim/models/FGAtmosphere.cpp
@@ -48,12 +48,16 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGAtmosphere.h"
-#include <FGState.h>
-#include <FGFDMExec.h>
+#include "FGState.h"
+#include "FGFDMExec.h"
 #include "FGAircraft.h"
 #include "FGPropagate.h"
 #include "FGInertial.h"
-#include <input_output/FGPropertyManager.h>
+#include "input_output/FGPropertyManager.h"
+#include <iostream>
+#include <cstdlib>
+
+using namespace std;
 
 namespace JSBSim {
 
@@ -454,10 +458,12 @@ void FGAtmosphere::Turbulence(void)
     vDirectiondAccelDt(eX) = GaussianRandomNumber();
     vDirectiondAccelDt(eY) = GaussianRandomNumber();
     vDirectiondAccelDt(eZ) = GaussianRandomNumber();
-
+/*
     MagnitudedAccelDt = GaussianRandomNumber();
     MagnitudeAccel    += MagnitudedAccelDt * DeltaT;
     Magnitude         += MagnitudeAccel * DeltaT;
+*/
+    Magnitude         += GaussianRandomNumber() * DeltaT;
 
     vDirectiondAccelDt.Normalize();
     vDirectionAccel += TurbRate * vDirectiondAccelDt * DeltaT;