Sync w. JSBSim as of 20/01/2007

diff --git a/src/FDM/JSBSim/FGFDMExec.cpp b/src/FDM/JSBSim/FGFDMExec.cpp
index f5b920900c6f9fc20161f3cd05a727ae77a12f39..51c3b43c641d1a49067eb40f02db5eecffb015d3 100644 (file)
--- a/src/FDM/JSBSim/FGFDMExec.cpp
+++ b/src/FDM/JSBSim/FGFDMExec.cpp
@@ -374,7 +374,7 @@ bool FGFDMExec::Run(void)
     model_iterator = model_iterator->NextModel;
   }
 
-  frame = Frame++;
+  Frame++;
   if (!Holding()) State->IncrTime();
   return (success);
 }

diff --git a/src/FDM/JSBSim/FGJSBBase.h b/src/FDM/JSBSim/FGJSBBase.h
index 1fda8afc7e364d815127d07e8fbdbf74e5ca5cd9..6147248e68aba3a66f49a75d8dcaea580fb2f562 100644 (file)
--- a/src/FDM/JSBSim/FGJSBBase.h
+++ b/src/FDM/JSBSim/FGJSBBase.h
@@ -280,7 +280,6 @@ protected:
 
   void Debug(int from) {};
 
-  static unsigned int frame;
   static unsigned int messageId;
 
   static const double radtodeg;

diff --git a/src/FDM/JSBSim/models/FGAtmosphere.cpp b/src/FDM/JSBSim/models/FGAtmosphere.cpp
index 5da2bb0b569cf6e2bcf21cfcb4c478ef2858d8cb..8c4712b5557b9e83d299812011409570eb4a9f51 100644 (file)
--- a/src/FDM/JSBSim/models/FGAtmosphere.cpp
+++ b/src/FDM/JSBSim/models/FGAtmosphere.cpp
@@ -89,6 +89,7 @@ FGAtmosphere::FGAtmosphere(FGFDMExec* fdmex) : FGModel(fdmex)
 
   T_dev_sl = T_dev = delta_T = 0.0;
   StandardTempOnly = false;
+  first_pass = true;
 
   bind();
   Debug(0);
@@ -543,13 +544,15 @@ void FGAtmosphere::Debug(int from)
   if (debug_lvl & 16) { // Sanity checking
   }
   if (debug_lvl & 128) { // Turbulence
-    if (frame == 0 && from == 2) {
+    if (first_pass && from == 2) {
+      first_pass = false;
       cout << "vTurbulence(X), vTurbulence(Y), vTurbulence(Z), "
            << "vTurbulenceGrad(X), vTurbulenceGrad(Y), vTurbulenceGrad(Z), "
            << "vDirection(X), vDirection(Y), vDirection(Z), "
            << "Magnitude, "
            << "vTurbPQR(P), vTurbPQR(Q), vTurbPQR(R), " << endl;
-    } else if (from == 2) {
+    } 
+    if (from == 2) {
       cout << vTurbulence << ", " << vTurbulenceGrad << ", " << vDirection << ", " << Magnitude << ", " << vTurbPQR << endl;
     }
   }

diff --git a/src/FDM/JSBSim/models/FGAtmosphere.h b/src/FDM/JSBSim/models/FGAtmosphere.h
index 06f32a812ac58b1e30d6268a8e2285901c04140b..12e7af38fa3421c4fa88911c98765594361704a8 100644 (file)
--- a/src/FDM/JSBSim/models/FGAtmosphere.h
+++ b/src/FDM/JSBSim/models/FGAtmosphere.h
@@ -185,6 +185,7 @@ protected:
   double T_dev_sl, T_dev, delta_T, density_altitude;
   atmType atmosphere;
   bool StandardTempOnly;
+  bool first_pass;
 
   double MagnitudedAccelDt, MagnitudeAccel, Magnitude;
   double TurbGain;

diff --git a/src/FDM/JSBSim/models/FGLGear.cpp b/src/FDM/JSBSim/models/FGLGear.cpp
index dc0c1b98b8f00a907906905782d796ff955112d1..201d0ed85d0a10a5104719b85fbe09cf02b81fe9 100644 (file)
--- a/src/FDM/JSBSim/models/FGLGear.cpp
+++ b/src/FDM/JSBSim/models/FGLGear.cpp
@@ -183,7 +183,7 @@ FGLGear::FGLGear(Element* el, FGFDMExec* fdmex, int number) : Exec(fdmex),
   FCS         = Exec->GetFCS();
   MassBalance = Exec->GetMassBalance();
 
-  WOW = lastWOW = true; // should the value be initialized to true?
+  WOW = lastWOW = false;
   ReportEnable = true;
   FirstContact = false;
   StartedGroundRun = false;

diff --git a/src/FDM/JSBSim/models/atmosphere/FGMSIS.cpp b/src/FDM/JSBSim/models/atmosphere/FGMSIS.cpp
index 7fe318209507206df7e02b622404b1ebf6663793..2c86c6ddf04fd428548b59904b797b74f93560c3 100755 (executable)
--- a/src/FDM/JSBSim/models/atmosphere/FGMSIS.cpp
+++ b/src/FDM/JSBSim/models/atmosphere/FGMSIS.cpp
@@ -1643,13 +1643,14 @@ void MSIS::Debug(int from)
   if (debug_lvl & 16) { // Sanity checking
   }
   if (debug_lvl & 32) { // Turbulence
-    if (frame == 0 && from == 2) {
+    if (first_pass && from == 2) {
       cout << "vTurbulence(X), vTurbulence(Y), vTurbulence(Z), "
            << "vTurbulenceGrad(X), vTurbulenceGrad(Y), vTurbulenceGrad(Z), "
            << "vDirection(X), vDirection(Y), vDirection(Z), "
            << "Magnitude, "
            << "vTurbPQR(P), vTurbPQR(Q), vTurbPQR(R), " << endl;
-    } else if (from == 2) {
+    }
+    if (from == 2) {
       cout << vTurbulence << ", " << vTurbulenceGrad << ", " << vDirection << ", " << Magnitude << ", " << vTurbPQR << endl;
     }
   }

diff --git a/src/FDM/JSBSim/models/atmosphere/FGMars.cpp b/src/FDM/JSBSim/models/atmosphere/FGMars.cpp
index 414f1ef530e463d52733fc410e3d249441c74a7d..848455d5cdc3e59fecb13d0d33516e8312bfdf1c 100755 (executable)
--- a/src/FDM/JSBSim/models/atmosphere/FGMars.cpp
+++ b/src/FDM/JSBSim/models/atmosphere/FGMars.cpp
@@ -310,7 +310,7 @@ void FGMars::Debug(int from)
   if (debug_lvl & 16) { // Sanity checking
   }
   if (debug_lvl & 32) { // Turbulence
-    if (frame == 0 && from == 2) {
+    if (first_pass && from == 2) {
       cout << "vTurbulence(X), vTurbulence(Y), vTurbulence(Z), "
            << "vTurbulenceGrad(X), vTurbulenceGrad(Y), vTurbulenceGrad(Z), "
            << "vDirection(X), vDirection(Y), vDirection(Z), "