sync JSBSim and FlightGear

diff --git a/src/FDM/JSBSim/FGAerodynamics.h b/src/FDM/JSBSim/FGAerodynamics.h
index 66796a32540f5fd6d2f89b65fe8c8f818e591821..c583564805c35672c6b96a6ccb026f3c39086eda 100644 (file)
--- a/src/FDM/JSBSim/FGAerodynamics.h
+++ b/src/FDM/JSBSim/FGAerodynamics.h
@@ -71,6 +71,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -94,7 +96,6 @@ CLASS DOCUMENTATION
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-namespace JSBSim {
 
 class FGAerodynamics : public FGModel {
 

diff --git a/src/FDM/JSBSim/FGAircraft.cpp b/src/FDM/JSBSim/FGAircraft.cpp
index b8b532a57b2654d7bedb56804dcae1a10edfed00..9125732faa43f9f43958ec0842bd9023893441f1 100644 (file)
--- a/src/FDM/JSBSim/FGAircraft.cpp
+++ b/src/FDM/JSBSim/FGAircraft.cpp
@@ -104,6 +104,7 @@ CLASS IMPLEMENTATION
 FGAircraft::FGAircraft(FGFDMExec* fdmex) : FGModel(fdmex)
 {
   Name = "FGAircraft";
+  WingSpan = 0.0;
   HTailArea = VTailArea = 0.0;
   HTailArm  = VTailArm  = 0.0;
   lbarh = lbarv = 0.0;

diff --git a/src/FDM/JSBSim/FGAircraft.h b/src/FDM/JSBSim/FGAircraft.h
index 0a9b107b6d15afb163d83495a8c86e9bf93fdc8b..bd25f3b2aab6156fd638cfcb2b71026dbabc6629 100644 (file)
--- a/src/FDM/JSBSim/FGAircraft.h
+++ b/src/FDM/JSBSim/FGAircraft.h
@@ -70,6 +70,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -109,8 +111,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGAircraft : public FGModel {
 public:
   /** Constructor

diff --git a/src/FDM/JSBSim/FGAtmosphere.h b/src/FDM/JSBSim/FGAtmosphere.h
index d70526426ebefba3d45a4522371a13be210efe64..0870e9bf64834f097c9c162fde4c81c1157645fb 100644 (file)
--- a/src/FDM/JSBSim/FGAtmosphere.h
+++ b/src/FDM/JSBSim/FGAtmosphere.h
@@ -58,6 +58,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -82,8 +84,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 *******************************************************************************/
 
-namespace JSBSim {
-
 class FGAtmosphere : public FGModel {
 public:
 

diff --git a/src/FDM/JSBSim/FGAuxiliary.cpp b/src/FDM/JSBSim/FGAuxiliary.cpp
index aa188c32c446c1d2b68a1276dceaaa60b37ce17a..a4a430b90fde24fdd969f7632ed6709724329d04 100644 (file)
--- a/src/FDM/JSBSim/FGAuxiliary.cpp
+++ b/src/FDM/JSBSim/FGAuxiliary.cpp
@@ -70,7 +70,7 @@ CLASS IMPLEMENTATION
 FGAuxiliary::FGAuxiliary(FGFDMExec* fdmex) : FGModel(fdmex)
 {
   Name = "FGAuxiliary";
-  vcas = veas = mach = qbar = pt = 0;
+  vcas = veas = mach = qbar = pt = tat = 0;
   psl = rhosl = 1;
   earthPosAngle = 0.0;
   

diff --git a/src/FDM/JSBSim/FGAuxiliary.h b/src/FDM/JSBSim/FGAuxiliary.h
index dcd6efd23c3831700c5e15479a55ca296b2c2185..b9701c4933f6c590f79fe8b27061c36d66f0cde3 100644 (file)
--- a/src/FDM/JSBSim/FGAuxiliary.h
+++ b/src/FDM/JSBSim/FGAuxiliary.h
@@ -54,6 +54,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -75,8 +77,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGAuxiliary : public FGModel {
 public:
   /** Constructor

diff --git a/src/FDM/JSBSim/FGColumnVector3.h b/src/FDM/JSBSim/FGColumnVector3.h
index 35a5c8743a9770d3d6c9f4a2956c62a072a4c45e..1fb89af1ac34e28ca1b492796f826ed36a7552d1 100644 (file)
--- a/src/FDM/JSBSim/FGColumnVector3.h
+++ b/src/FDM/JSBSim/FGColumnVector3.h
@@ -62,12 +62,12 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 DECLARATION: FGColumnVector3
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGColumnVector3 : public FGJSBBase
 {
 public:

diff --git a/src/FDM/JSBSim/FGColumnVector4.h b/src/FDM/JSBSim/FGColumnVector4.h
index ab65e1402cd5d6ed75e0e478d5f0ef67c07ae1f1..8ded42d3299d0c59982f6b84d28124994d497d7f 100644 (file)
--- a/src/FDM/JSBSim/FGColumnVector4.h
+++ b/src/FDM/JSBSim/FGColumnVector4.h
@@ -62,12 +62,12 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 DECLARATION: FGColumnVector4
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGColumnVector4 : public FGJSBBase
 {
 public:

diff --git a/src/FDM/JSBSim/FGConfigFile.h b/src/FDM/JSBSim/FGConfigFile.h
index f415210d842faf1007ba349f85513235b8e23433..c13a65c94d00c884f722caa35c0ea84b12371647 100644 (file)
--- a/src/FDM/JSBSim/FGConfigFile.h
+++ b/src/FDM/JSBSim/FGConfigFile.h
@@ -82,6 +82,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -104,8 +106,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGConfigFile : public FGJSBBase
 {
 public:

diff --git a/src/FDM/JSBSim/FGEngine.h b/src/FDM/JSBSim/FGEngine.h
index 1a23f2b074d78accfe1377cc0400cf9dc118723f..e213002f0f5207698cb614568f2271446a4cc409 100644 (file)
--- a/src/FDM/JSBSim/FGEngine.h
+++ b/src/FDM/JSBSim/FGEngine.h
@@ -69,12 +69,12 @@ DEFINITIONS
 using std::string;
 using std::vector;
 
-namespace JSBSim {
-
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 class FGFDMExec;
 class FGState;
 class FGAtmosphere;

diff --git a/src/FDM/JSBSim/FGFCS.cpp b/src/FDM/JSBSim/FGFCS.cpp
index 0e1d3f81ba709579d04bbc80982adc403b0fdf40..5aaf4e30686a5c49cec3b425a7d6d6ed9b095e79 100644 (file)
--- a/src/FDM/JSBSim/FGFCS.cpp
+++ b/src/FDM/JSBSim/FGFCS.cpp
@@ -80,6 +80,7 @@ FGFCS::FGFCS(FGFDMExec* fdmex) : FGModel(fdmex)
   PTrimCmd = YTrimCmd = RTrimCmd = 0.0;
   GearCmd = GearPos = 1; // default to gear down
   LeftBrake = RightBrake = CenterBrake = 0.0;
+  APAttitudeSetPt = APAltitudeSetPt = APHeadingSetPt = APAirspeedSetPt = 0.0;
   DoNormalize=true;
   
   eMode = mNone;

diff --git a/src/FDM/JSBSim/FGFDMExec.h b/src/FDM/JSBSim/FGFDMExec.h
index 155d3aba9e7a9f17fb3e5380d02ef370f4a82919..a89ffbd26ac7e192579794057edc5d7589205070 100644 (file)
--- a/src/FDM/JSBSim/FGFDMExec.h
+++ b/src/FDM/JSBSim/FGFDMExec.h
@@ -58,6 +58,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -113,8 +115,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGFDMExec : public FGJSBBase
 {
 public:

diff --git a/src/FDM/JSBSim/FGForce.h b/src/FDM/JSBSim/FGForce.h
index a54e69f2b2d28afb9dd5c7b35c27b2492baf82c8..08560e9910965bbb23aa273052d560d79740e1f6 100644 (file)
--- a/src/FDM/JSBSim/FGForce.h
+++ b/src/FDM/JSBSim/FGForce.h
@@ -65,6 +65,12 @@ INCLUDES
 #include "FGColumnVector3.h"
 #include "FGColumnVector4.h"
 
+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+FORWARD DECLARATIONS
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -217,8 +223,6 @@ and vMn, the moments, can be made directly. Otherwise, the usage is similar.<br>
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGForce : public FGJSBBase
 {
 public:

diff --git a/src/FDM/JSBSim/FGGroundReactions.h b/src/FDM/JSBSim/FGGroundReactions.h
index e589263e327755fb89e6b3c7d26d134693b140f1..fc3a7f3fad4f3b236fdb65a7f93387edf40366b7 100644 (file)
--- a/src/FDM/JSBSim/FGGroundReactions.h
+++ b/src/FDM/JSBSim/FGGroundReactions.h
@@ -61,12 +61,12 @@ INCLUDES
 
 #define ID_GROUNDREACTIONS "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGGroundReactions : public FGModel
 {
 public:

diff --git a/src/FDM/JSBSim/FGInertial.h b/src/FDM/JSBSim/FGInertial.h
index 1ec306610be18c47a9daf33ac9ca70272bcc7e94..6e2f4bc11e8c85bf851d47a491e2f4512709a59c 100644 (file)
--- a/src/FDM/JSBSim/FGInertial.h
+++ b/src/FDM/JSBSim/FGInertial.h
@@ -61,13 +61,12 @@ INCLUDES
 
 #define ID_INERTIAL "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-
-namespace JSBSim {
-
 class FGInertial : public FGModel {
 
 public:

diff --git a/src/FDM/JSBSim/FGLGear.cpp b/src/FDM/JSBSim/FGLGear.cpp
index b717df1c11e32a1f8f3aef26b366f7eea74edee0..3a9c4b86ab95784cc9b8c468781f333e48172535 100644 (file)
--- a/src/FDM/JSBSim/FGLGear.cpp
+++ b/src/FDM/JSBSim/FGLGear.cpp
@@ -488,23 +488,23 @@ void FGLGear::Report(ReportType repType)
   case erLand:
     cout << endl << "Touchdown report for " << name << endl;
     cout << "  Sink rate at contact:  " << SinkRate                << " fps,    "
-                                << SinkRate*0.3408          << " mps"     << endl;
+                                << SinkRate*0.3048          << " mps"     << endl;
     cout << "  Contact ground speed:  " << GroundSpeed*.5925       << " knots,  "
-                                << GroundSpeed*0.3408       << " mps"     << endl;
+                                << GroundSpeed*0.3048       << " mps"     << endl;
     cout << "  Maximum contact force: " << MaximumStrutForce       << " lbs,    "
                                 << MaximumStrutForce*4.448  << " Newtons" << endl;
     cout << "  Maximum strut travel:  " << MaximumStrutTravel*12.0 << " inches, "
                                 << MaximumStrutTravel*30.48 << " cm"      << endl;
     cout << "  Distance traveled:     " << LandingDistanceTraveled        << " ft,     "
-                                << LandingDistanceTraveled*0.3408  << " meters"  << endl;
+                                << LandingDistanceTraveled*0.3048  << " meters"  << endl;
     LandingReported = true;
     break;
   case erTakeoff:
     cout << endl << "Takeoff report for " << name << endl;
     cout << "  Distance traveled:                " << TakeoffDistanceTraveled
-         << " ft,     " << TakeoffDistanceTraveled*0.3408  << " meters"  << endl;
+         << " ft,     " << TakeoffDistanceTraveled*0.3048  << " meters"  << endl;
     cout << "  Distance traveled (over 50'):     " << TakeoffDistanceTraveled50ft
-         << " ft,     " << TakeoffDistanceTraveled50ft*0.3408 << " meters" << endl;
+         << " ft,     " << TakeoffDistanceTraveled50ft*0.3048 << " meters" << endl;
     TakeoffReported = true;
     break;
   }

diff --git a/src/FDM/JSBSim/FGMassBalance.h b/src/FDM/JSBSim/FGMassBalance.h
index 7abd554664df803f82ec077c660667e279316640..2ca2b17f18adbe59c8804bef7ddde34a8d12ec41 100644 (file)
--- a/src/FDM/JSBSim/FGMassBalance.h
+++ b/src/FDM/JSBSim/FGMassBalance.h
@@ -48,12 +48,12 @@ INCLUDES
 
 #define ID_MASSBALANCE "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGMassBalance : public FGModel
 {
 

diff --git a/src/FDM/JSBSim/FGModel.cpp b/src/FDM/JSBSim/FGModel.cpp
index dcad25c17615d235839bc16121f097873a55ca98..a4123e1330eb0cc19f83d4fd3c246b07640cc48c 100644 (file)
--- a/src/FDM/JSBSim/FGModel.cpp
+++ b/src/FDM/JSBSim/FGModel.cpp
@@ -94,6 +94,7 @@ FGModel::FGModel(FGFDMExec* fdmex)
   PropertyManager = FDMExec->GetPropertyManager();
   
   exe_ctr     = 1;
+  rate        = 1;
 
   if (debug_lvl & 2) cout << "              FGModel Base Class" << endl;
 }

diff --git a/src/FDM/JSBSim/FGNozzle.h b/src/FDM/JSBSim/FGNozzle.h
index 1c9ab80279b11ac5f17d5d25d6f23f17a7ca13d6..7f92fffffa550d1092c6056606d6abe1876fc8b5 100644 (file)
--- a/src/FDM/JSBSim/FGNozzle.h
+++ b/src/FDM/JSBSim/FGNozzle.h
@@ -50,6 +50,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -69,8 +71,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGNozzle : public FGThruster {
 
 public:

diff --git a/src/FDM/JSBSim/FGOutput.cpp b/src/FDM/JSBSim/FGOutput.cpp
index afe6a7a8d84ff0d1680abfe868bd78cc3d40b1d6..c15d2f188656a7bb610fa219aba87856b81529df 100644 (file)
--- a/src/FDM/JSBSim/FGOutput.cpp
+++ b/src/FDM/JSBSim/FGOutput.cpp
@@ -545,7 +545,7 @@ bool FGOutput::Load(FGConfigFile* AC_cfg)
       OutputProperties.push_back(PropertyManager->GetNode(property));
     }
 
-    if (Output_cfg->GetNextConfigLine() == "EOF") break;
+    if (parameter == "EOF") break;
   }
 
   OutRate = OutRate>120?120:(OutRate<0?0:OutRate);
@@ -590,6 +590,7 @@ void FGOutput::Debug(int from)
         cout << "  " << "Output parameters read inline" << endl;
       else
         cout << "    Output parameters read from file: " << outputInFileName << endl;
+
       if (Filename == "cout" || Filename == "COUT") {
         scratch = "    Log output goes to screen console";
       } else if (!Filename.empty()) {
@@ -603,6 +604,20 @@ void FGOutput::Debug(int from)
         cout << "  No log output" << endl;
         break;
       }
+      
+      if (SubSystems & ssSimulation)      cout << "    Simulation parameters logged" << endl;
+      if (SubSystems & ssAerosurfaces)    cout << "    Aerosurface parameters logged" << endl;
+      if (SubSystems & ssRates)           cout << "    Rate parameters logged" << endl;
+      if (SubSystems & ssVelocities)      cout << "    Velocity parameters logged" << endl;
+      if (SubSystems & ssForces)          cout << "    Force parameters logged" << endl;
+      if (SubSystems & ssMoments)         cout << "    Moments parameters logged" << endl;
+      if (SubSystems & ssAtmosphere)      cout << "    Atmosphere parameters logged" << endl;
+      if (SubSystems & ssMassProps)       cout << "    Mass parameters logged" << endl;
+      if (SubSystems & ssCoefficients)    cout << "    Coefficient parameters logged" << endl;
+      if (SubSystems & ssPosition)        cout << "    Position parameters logged" << endl;
+      if (SubSystems & ssGroundReactions) cout << "    Ground parameters logged" << endl;
+      if (SubSystems & ssFCS)             cout << "    FCS parameters logged" << endl;
+      if (SubSystems & ssPropulsion)      cout << "    Propulsion parameters logged" << endl;
     }
   }
   if (debug_lvl & 2 ) { // Instantiation/Destruction notification

diff --git a/src/FDM/JSBSim/FGOutput.h b/src/FDM/JSBSim/FGOutput.h
index 83b0d7c88c6f7b3cdff0ac9253d6935f2d39be00..664c4f4859d245d9e37631cd75f54f8854f9b21d 100644 (file)
--- a/src/FDM/JSBSim/FGOutput.h
+++ b/src/FDM/JSBSim/FGOutput.h
@@ -58,12 +58,12 @@ INCLUDES
 
 #define ID_OUTPUT "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGOutput : public FGModel
 {
 public:

diff --git a/src/FDM/JSBSim/FGPiston.h b/src/FDM/JSBSim/FGPiston.h
index 3f0d67b6d54bae26107d6a1f4217df1ef63f9dcd..2b14104d1cbb0920f3903e4377e55faeb09834ab 100644 (file)
--- a/src/FDM/JSBSim/FGPiston.h
+++ b/src/FDM/JSBSim/FGPiston.h
@@ -57,6 +57,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES,  and NOTES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -80,8 +82,6 @@ DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGPiston : public FGEngine
 {
 public:

diff --git a/src/FDM/JSBSim/FGPosition.h b/src/FDM/JSBSim/FGPosition.h
index b1f5fde91f893e50fa557c332f1de3b5d61c444f..24444e419e8665d36385db4dad857a8846641172 100644 (file)
--- a/src/FDM/JSBSim/FGPosition.h
+++ b/src/FDM/JSBSim/FGPosition.h
@@ -53,6 +53,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES,  and NOTES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -74,8 +76,6 @@ DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGPosition : public FGModel {
 public:
   /** Constructor

diff --git a/src/FDM/JSBSim/FGPropeller.h b/src/FDM/JSBSim/FGPropeller.h
index 071cefb0e67dad87cdc22d4e4d33d92ed911c4b0..eec3e2d42186ac5c2a59b8837a87a5f6885f1e7f 100644 (file)
--- a/src/FDM/JSBSim/FGPropeller.h
+++ b/src/FDM/JSBSim/FGPropeller.h
@@ -53,6 +53,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -75,7 +77,7 @@ CLASS DOCUMENTATION
     Full Scale Propellers Having 2, 3, and 4 Blades of Clark Y and R.A.F. 6
     Airfoil Sections", NACA Report TN-640, 1938 (?)</li>
     <li>Various NACA Technical Notes and Reports</li>
-    <ul>
+    </ul>
     @author Jon S. Berndt
     @version $Id$
     @see FGEngine
@@ -91,8 +93,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGPropeller : public FGThruster {
 
 public:

diff --git a/src/FDM/JSBSim/FGPropertyManager.cpp b/src/FDM/JSBSim/FGPropertyManager.cpp
index ae942e7d44a9917befcd51748b6411975cf0f323..d0f810ab8ae7a4977731bd258fb35981cb751a23 100644 (file)
--- a/src/FDM/JSBSim/FGPropertyManager.cpp
+++ b/src/FDM/JSBSim/FGPropertyManager.cpp
@@ -28,7 +28,7 @@
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#include <simgear/props/props.hxx>
+#include <simgear/misc/props.hxx>
 #include "FGPropertyManager.h"
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/src/FDM/JSBSim/FGPropertyManager.h b/src/FDM/JSBSim/FGPropertyManager.h
index 8e4d818a267d308040d82fcf004b836ece3e5fd6..c9d80ae51fa5b83875254a9c44f7d042b160d21a 100644 (file)
--- a/src/FDM/JSBSim/FGPropertyManager.h
+++ b/src/FDM/JSBSim/FGPropertyManager.h
@@ -36,7 +36,7 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include <string>
-#include <simgear/props/props.hxx>
+#include <simgear/misc/props.hxx>
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 DEFINITIONS
@@ -50,6 +50,8 @@ FORWARD DECLARATIONS
 
 using namespace std;
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -70,8 +72,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGPropertyManager : public SGPropertyNode {
   public:
     /// Constructor

diff --git a/src/FDM/JSBSim/FGPropulsion.h b/src/FDM/JSBSim/FGPropulsion.h
index 92b0c64ebd716c2de6cbb54fd8323a90790466dd..b262e5415a4987faf884702cef5a3b8c8dab8c7a 100644 (file)
--- a/src/FDM/JSBSim/FGPropulsion.h
+++ b/src/FDM/JSBSim/FGPropulsion.h
@@ -72,6 +72,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -99,8 +101,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGPropulsion : public FGModel
 {
 public:

diff --git a/src/FDM/JSBSim/FGRocket.h b/src/FDM/JSBSim/FGRocket.h
index 0635b8fb8b3763cba85784e7e33cadaaad889087..79d5cce49271ca8b9eedb48f343d3fd780e234a8 100644 (file)
--- a/src/FDM/JSBSim/FGRocket.h
+++ b/src/FDM/JSBSim/FGRocket.h
@@ -51,6 +51,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -104,8 +106,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGRocket : public FGEngine
 {
 public:

diff --git a/src/FDM/JSBSim/FGRotation.h b/src/FDM/JSBSim/FGRotation.h
index db6538aaaaa5fa6824631d01f0d938c9651513cb..442e23d0ccb35fbf73d1228ce7df33a85556ae0f 100644 (file)
--- a/src/FDM/JSBSim/FGRotation.h
+++ b/src/FDM/JSBSim/FGRotation.h
@@ -74,12 +74,12 @@ INCLUDES
 
 #define ID_ROTATION "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGRotation : public FGModel
 {
 public:

diff --git a/src/FDM/JSBSim/FGRotor.h b/src/FDM/JSBSim/FGRotor.h
index 624eb63c389cfbb1cd326af6bbd962dee607cd45..8cf05ed77e2f8538942ac48eb1a5d34b68b12e72 100644 (file)
--- a/src/FDM/JSBSim/FGRotor.h
+++ b/src/FDM/JSBSim/FGRotor.h
@@ -46,12 +46,12 @@ INCLUDES
 
 #define ID_ROTOR "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGRotor : public FGThruster {
 
 public:

diff --git a/src/FDM/JSBSim/FGScript.h b/src/FDM/JSBSim/FGScript.h
index 269a96f0d9dae9a5a309fcf8f442c9ec9642d2b9..575ab25c168dd173a06d8128b512a5add85cee06 100644 (file)
--- a/src/FDM/JSBSim/FGScript.h
+++ b/src/FDM/JSBSim/FGScript.h
@@ -52,6 +52,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -133,8 +135,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGScript : public FGJSBBase
 {
 public:

diff --git a/src/FDM/JSBSim/FGState.h b/src/FDM/JSBSim/FGState.h
index ffab08c731ff994b0e94de31a8997bcbfe3a040d..49c6625a3e61bc5248533ecf52eb68a9be717237 100644 (file)
--- a/src/FDM/JSBSim/FGState.h
+++ b/src/FDM/JSBSim/FGState.h
@@ -87,6 +87,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -108,8 +110,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGState : public FGJSBBase
 {
 public:

diff --git a/src/FDM/JSBSim/FGTable.h b/src/FDM/JSBSim/FGTable.h
index 483e945b5cb6126480d39b5c9ddb2013fd8ad408..e26bba4c2d044a3a4772517feeabffc1df974166 100644 (file)
--- a/src/FDM/JSBSim/FGTable.h
+++ b/src/FDM/JSBSim/FGTable.h
@@ -51,6 +51,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -75,9 +77,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-
-namespace JSBSim {
-
 class FGTable : public FGJSBBase
 {
 public:

diff --git a/src/FDM/JSBSim/FGTank.h b/src/FDM/JSBSim/FGTank.h
index 944e0968c9970e1bbde9c3126b39bada671ddb3e..b36c6e1ab8f7b70a391b5ac4e21bf9bac7873e7f 100644 (file)
--- a/src/FDM/JSBSim/FGTank.h
+++ b/src/FDM/JSBSim/FGTank.h
@@ -70,12 +70,12 @@ DEFINES
 
 #define ID_TANK "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGTank : public FGJSBBase
 {
 public:

diff --git a/src/FDM/JSBSim/FGThruster.h b/src/FDM/JSBSim/FGThruster.h
index 1d99d475de79e448016b979445e5001ae9809b37..d1c2a6deb02cebc82fbdab30afb545d460f8552c 100644 (file)
--- a/src/FDM/JSBSim/FGThruster.h
+++ b/src/FDM/JSBSim/FGThruster.h
@@ -47,6 +47,8 @@ INCLUDES
 
 #define ID_THRUSTER "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -64,8 +66,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGThruster : public FGForce {
 
 public:

diff --git a/src/FDM/JSBSim/FGTranslation.h b/src/FDM/JSBSim/FGTranslation.h
index cd2e9ee52a039ffe8c7e1b1e7c93db31c0906a47..992cf5e8c9fd93c9a9312a7af793e6458dc63dea 100644 (file)
--- a/src/FDM/JSBSim/FGTranslation.h
+++ b/src/FDM/JSBSim/FGTranslation.h
@@ -78,12 +78,12 @@ INCLUDES
 
 #define ID_TRANSLATION "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGTranslation : public FGModel {
 public:
   FGTranslation(FGFDMExec*);

diff --git a/src/FDM/JSBSim/FGTurbine.h b/src/FDM/JSBSim/FGTurbine.h
index bfeca9c1c68aa30cb47bf02ec0c37e46814f379f..9f660a4444270a0e1af3a0cc2835c5054ce0e598 100644 (file)
--- a/src/FDM/JSBSim/FGTurbine.h
+++ b/src/FDM/JSBSim/FGTurbine.h
@@ -49,12 +49,12 @@ INCLUDES
 
 #define ID_TURBINE "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGTurbine : public FGEngine
 {
 public:

diff --git a/src/FDM/JSBSim/FGUtility.h b/src/FDM/JSBSim/FGUtility.h
index 154314d20392860daaac52a50c35c82ee929675e..aca70178366c4b03c22832b9356874f2bbe89dac 100644 (file)
--- a/src/FDM/JSBSim/FGUtility.h
+++ b/src/FDM/JSBSim/FGUtility.h
@@ -46,12 +46,12 @@ DEFINES
 
 #define ID_UTILITY "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGFDMExec;
 class FGState;
 

diff --git a/src/FDM/JSBSim/FGfdmSocket.h b/src/FDM/JSBSim/FGfdmSocket.h
index ff6ef5562684cdd260a9701ffeac93b73ef73a0e..c059834c163a265c4a1dba5055740a086d47cf21 100644 (file)
--- a/src/FDM/JSBSim/FGfdmSocket.h
+++ b/src/FDM/JSBSim/FGfdmSocket.h
@@ -82,14 +82,14 @@ DEFINITIONS
 
 #define ID_FDMSOCKET "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 using std::string;
 
-namespace JSBSim {
-
 class FGfdmSocket : public FGJSBBase
 {
 public:

diff --git a/src/FDM/JSBSim/JSBSim.hxx b/src/FDM/JSBSim/JSBSim.hxx
index 2d83588ec5c24d0b53b4b052ed086a7b2a955eb6..04a10b29934c7e481ec84d21a2dbc656a890bb87 100644 (file)
--- a/src/FDM/JSBSim/JSBSim.hxx
+++ b/src/FDM/JSBSim/JSBSim.hxx
@@ -53,7 +53,7 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#include <simgear/props/props.hxx>
+#include <simgear/misc/props.hxx>
 
 #include <FDM/JSBSim/FGFDMExec.h>
 

diff --git a/src/FDM/JSBSim/Makefile.am b/src/FDM/JSBSim/Makefile.am
index f944ad79bc6dafed1c412892f8a8110f3afe2154..205809e23ad43408bfa9df04386c59c0b9369c10 100644 (file)
--- a/src/FDM/JSBSim/Makefile.am
+++ b/src/FDM/JSBSim/Makefile.am
@@ -46,9 +46,9 @@ libJSBSim_a_SOURCES = \
        FGEngine.cpp FGEngine.h \
        FGTank.cpp FGTank.h \
        FGfdmSocket.cpp FGfdmSocket.h \
-  FGTurbine.cpp FGTurbine.h \
-  FGPropertyManager.cpp FGPropertyManager.h  \
-  FGSimTurbine.cpp FGSimTurbine.h \
+       FGTurbine.cpp FGTurbine.h \
+       FGPropertyManager.cpp FGPropertyManager.h  \
+       FGSimTurbine.cpp FGSimTurbine.h \
        JSBSim.cxx JSBSim.hxx
 
 

diff --git a/src/FDM/JSBSim/filtersjb/FGCondition.cpp b/src/FDM/JSBSim/filtersjb/FGCondition.cpp
index e9cb9be0a0ea1898d4a23f8e0559348c8468b949..0cf9f00cf16ab2c6b1740af73f5d1e9a54a05e21 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/FGCondition.cpp
+++ b/src/FDM/JSBSim/filtersjb/FGCondition.cpp
@@ -75,13 +75,13 @@ FGCondition::FGCondition(FGConfigFile* AC_cfg, FGPropertyManager* PropertyManage
   if (AC_cfg->GetValue("CONDITION_GROUP").empty()) {  // define a condition
 
     *AC_cfg >> property1 >> conditional >> property2;
-    TestParam1 = PropertyManager->GetNode(property1);
+    TestParam1 = PropertyManager->GetNode(property1, true);
     Comparison = mComparison[conditional];
 
     if (property2.find_first_not_of("-.0123456789eE") == string::npos) {
       TestValue = atof(property2.c_str());
     } else {
-      TestParam2 = PropertyManager->GetNode(property2);
+      TestParam2 = PropertyManager->GetNode(property2, true);
     }
 
     isGroup = false;
@@ -253,4 +253,6 @@ void FGCondition::Debug(int from)
     }
   }
 }
-}
+
+} //namespace JSBSim
+

diff --git a/src/FDM/JSBSim/filtersjb/FGCondition.h b/src/FDM/JSBSim/filtersjb/FGCondition.h
index c11decd35e04defb7dcb1af64cf6606ecec8ff96..c8945b0fb21f91c36a648946d755e0689d1a82e6 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/FGCondition.h
+++ b/src/FDM/JSBSim/filtersjb/FGCondition.h
@@ -47,6 +47,8 @@ DEFINITIONS
 
 #define ID_CONDITION "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -62,8 +64,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGCondition : public FGJSBBase
 {
 public:

diff --git a/src/FDM/JSBSim/filtersjb/FGFCSComponent.h b/src/FDM/JSBSim/filtersjb/FGFCSComponent.h
index 688eb63d6cb4d1cdd5ae4eafffe2f649b3116fe1..9920aa5ab44446d7f69e422a4dc4b66118f0311a 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/FGFCSComponent.h
+++ b/src/FDM/JSBSim/filtersjb/FGFCSComponent.h
@@ -114,21 +114,22 @@ public:
   FGPropertyManager* resolveSymbol(string token);
   
 protected:
-   /// Pilot/Aircraft, FCS, Autopilot inputs
-  enum eInputType {itPilotAC, itFCS, itAP, itBias} InputType;
   FGFCS* fcs;
   FGPropertyManager* PropertyManager;
   FGPropertyManager* treenode;
   string Type;
   string Name;
   vector <FGPropertyManager*> InputNodes;
+  vector <float> InputSigns;
   double Input;
   FGPropertyManager* OutputNode;
   double Output;
   bool IsOutput;
   virtual void Debug(int from);
 };
-}
+
+} //namespace JSBSim
+
 #include "../FGFCS.h"
 
 #endif

diff --git a/src/FDM/JSBSim/filtersjb/FGFilter.h b/src/FDM/JSBSim/filtersjb/FGFilter.h
index 95cdc47a569a74a5a1f8fa48217f1fad46dcce11..e524e37a676f605cd88e1ad0a998ab807e5ea4ef 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/FGFilter.h
+++ b/src/FDM/JSBSim/filtersjb/FGFilter.h
@@ -50,6 +50,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -61,24 +63,26 @@ CLASS DOCUMENTATION
 /** Encapsulates a filter for the flight control system.
     Filters are modeled using the Tustin Substitution method. These types of
     filters can currently be modeled:
-    <ol><li>Lag</li>
-    <li>Lead-Lag</li>
-    <li>Washout</li>
-    <li>Integrator</li></ol>
+    
+    - Lag
+    - Lead-Lag
+    - Washout
+    - Integrator
+    - Second order
+
     The filter is specified in the config file like this:
     <pre>
-    
-    &ltCOMPONENT NAME="Elevator Filter" TYPE="LAG_FILTER">
-      INPUT        15
-      C1           600
-      OUTPUT       FG_ELEVATOR_POS
-    &lt/COMPONENT>
+    \<COMPONENT NAME="{name}" TYPE="{LAG_FILTER}"\><BR>
+      INPUT        15<BR>
+      C1           600<BR>
+      OUTPUT       fcs/elevator-pos-rad<BR>
+    \</COMPONENT\>
     </pre>
     @author Jon S. Berndt
     @version $Id$
-    @see <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jsbsim/JSBSim/FGFilter.h?rev=HEAD&content-type=text/vnd.viewcvs-markup">
+    @see <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jsbsim/JSBSim/FGFilter.h?rev=HEAD">
          Header File </a>
-    @see <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jsbsim/JSBSim/FGFilter.cpp?rev=HEAD&content-type=text/vnd.viewcvs-markup">
+    @see <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jsbsim/JSBSim/FGFilter.cpp?rev=HEAD">
          Source File </a>
     */
    
@@ -86,8 +90,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGFilter  : public FGFCSComponent         
 {
 public:

diff --git a/src/FDM/JSBSim/filtersjb/FGKinemat.h b/src/FDM/JSBSim/filtersjb/FGKinemat.h
index 6437ce3685601b4732790251aa06bf2e08d8e7ad..9358a6353de9e63b683342ec14ff778d73f69b5b 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/FGKinemat.h
+++ b/src/FDM/JSBSim/filtersjb/FGKinemat.h
@@ -62,12 +62,12 @@ DEFINES
 
 #define ID_FLAPS "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGKinemat  : public FGFCSComponent {
 public:
   FGKinemat(FGFCS* fcs, FGConfigFile* AC_cfg);

diff --git a/src/FDM/JSBSim/filtersjb/FGSummer.cpp b/src/FDM/JSBSim/filtersjb/FGSummer.cpp
index b045f7d696d63870eef956e448dce5d82841d4ee..5ae13a358c4174308f387c6f43b355e5b2a5245d 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/FGSummer.cpp
+++ b/src/FDM/JSBSim/filtersjb/FGSummer.cpp
@@ -68,6 +68,14 @@ FGSummer::FGSummer(FGFCS* fcs, FGConfigFile* AC_cfg) : FGFCSComponent(fcs),
     if (token == "INPUT") {
       token = AC_cfg->GetValue("INPUT");
       *AC_cfg >> token;
+
+      if (token[0] == '-') {
+        InputSigns.push_back(-1.0);
+        token.erase(0,1);
+      } else {
+        InputSigns.push_back( 1.0);
+      }
+      
       InputNodes.push_back( resolveSymbol(token) );
     } else if (token == "CLIPTO") {
       *AC_cfg >> clipmin >> clipmax;
@@ -105,7 +113,7 @@ bool FGSummer::Run(void )
   Output = 0.0;
 
   for (idx=0; idx<InputNodes.size(); idx++) {
-    Output += InputNodes[idx]->getDoubleValue();
+    Output += InputNodes[idx]->getDoubleValue()*InputSigns[idx];
   }
 
   if (clip) {
@@ -169,4 +177,6 @@ void FGSummer::Debug(int from)
     }
   }
 }
-}
+
+} //namespace JSBSim
+

diff --git a/src/FDM/JSBSim/filtersjb/FGSummer.h b/src/FDM/JSBSim/filtersjb/FGSummer.h
index b2edfda89d5d72fbc7e9381e09aad0f6f704ceab..6bc5ee032f29279f1f34789dd5b1ec1d8cd62d5f 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/FGSummer.h
+++ b/src/FDM/JSBSim/filtersjb/FGSummer.h
@@ -62,6 +62,8 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -85,8 +87,6 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-namespace JSBSim {
-
 class FGSummer  : public FGFCSComponent
 {
 public:

diff --git a/src/FDM/JSBSim/filtersjb/FGSwitch.cpp b/src/FDM/JSBSim/filtersjb/FGSwitch.cpp
index 0cc64a217a40f982fa2d6ab724479fbc7a7ba681..30b633e15d27ef133fe947b8a6e2c3464d5929b6 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/FGSwitch.cpp
+++ b/src/FDM/JSBSim/filtersjb/FGSwitch.cpp
@@ -266,4 +266,6 @@ void FGSwitch::Debug(int from)
     }
   }
 }
-}
+
+} //namespace JSBSim
+

diff --git a/src/FDM/JSBSim/filtersjb/FGSwitch.h b/src/FDM/JSBSim/filtersjb/FGSwitch.h
index b29d86e3b197ba59c42795396c25ba3b7d7aafb1..2a68b7475689452ebbaa6929c96551833c3df8dd 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/FGSwitch.h
+++ b/src/FDM/JSBSim/filtersjb/FGSwitch.h
@@ -47,6 +47,8 @@ DEFINITIONS
 
 #define ID_SWITCH "$Id$"
 
+namespace JSBSim {
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -82,28 +84,28 @@ Within a TEST, a CONDITION_GROUP can be specified. A CONDITION_GROUP allows for
 complex groupings of logical comparisons. Each CONDITION_GROUP contains
 additional conditions, as well as possibly additional CONDITION_GROUPs.
 
-<COMPONENT NAME="switch1" TYPE="SWITCH">
-  <TEST LOGIC="{AND|OR|DEFAULT}" OUTPUT="{property|value}">
-    {property} {conditional} {property|value}
-    <CONDITION_GROUP LOGIC="{AND|OR}">
-      {property} {conditional} {property|value}
-      ...
-    </CONDITION_GROUP>
-    ...
-  </TEST>
-  <TEST LOGIC="{AND|OR}" OUTPUT="{property|value}">
-    {property} {conditional} {property|value}
-    ...
-  </TEST>
-  ...
-</COMPONENT>
+<pre>
+\<COMPONENT NAME="switch1" TYPE="SWITCH"\><BR>
+  \<TEST LOGIC="{AND|OR|DEFAULT}" OUTPUT="{property|value}"\><BR>
+    {property} {conditional} {property|value}<BR>
+    \<CONDITION_GROUP LOGIC="{AND|OR}"\><BR>
+      {property} {conditional} {property|value}<BR>
+      ...<BR>
+    \</CONDITION_GROUP\><BR>
+    ...<BR>
+  \</TEST><BR>
+  \<TEST LOGIC="{AND|OR}" OUTPUT="{property|value}"\><BR>
+    {property} {conditional} {property|value}<BR>
+    ...<BR>
+  \</TEST\><BR>
+  ...<BR>
+\</COMPONENT\>
+</pre>
 */
    
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-namespace JSBSim {
-
 
 class FGSwitch  : public FGFCSComponent
 {
@@ -119,7 +121,6 @@ private:
 
   enum eLogic {elUndef=0, eAND, eOR, eDefault};
   enum eComparison {ecUndef=0, eEQ, eNE, eGT, eGE, eLT, eLE};
-  map <const string, eComparison> mComparison;
 
   struct test {
     vector <FGCondition> conditions;