Fix stall widths for the "auxilliary" (reverse flow) stalls so they

[flightgear.git] / src / FDM / JSBSim / FGModel.cpp

diff --git a/src/FDM/JSBSim/FGModel.cpp b/src/FDM/JSBSim/FGModel.cpp
index 6520196e6f418e00fa3bbc9b8dc6900944e73d64..3482baf52dd275248332801630e8be190af71620 100644 (file)
--- a/src/FDM/JSBSim/FGModel.cpp
+++ b/src/FDM/JSBSim/FGModel.cpp
@@ -27,7 +27,7 @@
 
 FUNCTIONAL DESCRIPTION
 --------------------------------------------------------------------------------
-This base class for the FGAero, FGRotational, etc. classes defines methods
+This base class for the FGAerodynamics, FGPropagate, etc. classes defines methods
 common to all models.
 
 HISTORY
@@ -49,12 +49,12 @@ INCLUDES
 #include "FGInertial.h"
 #include "FGGroundReactions.h"
 #include "FGAircraft.h"
-#include "FGTranslation.h"
-#include "FGRotation.h"
-#include "FGPosition.h"
+#include "FGPropagate.h"
 #include "FGAuxiliary.h"
 #include "FGOutput.h"
 
+namespace JSBSim {
+
 static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_MODEL;
 
@@ -80,18 +80,17 @@ FGModel::FGModel(FGFDMExec* fdmex)
   Inertial        = 0;
   GroundReactions = 0;
   Aircraft        = 0;
-  Translation     = 0;
-  Rotation        = 0;
-  Position        = 0;
+  Propagate       = 0;
   Auxiliary       = 0;
   Output          = 0;
-  
+
   //in order for FGModel derived classes to self-bind (that is, call
   //their bind function in the constructor, the PropertyManager pointer
   //must be brought up now.
   PropertyManager = FDMExec->GetPropertyManager();
-  
+
   exe_ctr     = 1;
+  rate        = 1;
 
   if (debug_lvl & 2) cout << "              FGModel Base Class" << endl;
 }
@@ -116,12 +115,10 @@ bool FGModel::InitModel(void)
   Inertial        = FDMExec->GetInertial();
   GroundReactions = FDMExec->GetGroundReactions();
   Aircraft        = FDMExec->GetAircraft();
-  Translation     = FDMExec->GetTranslation();
-  Rotation        = FDMExec->GetRotation();
-  Position        = FDMExec->GetPosition();
+  Propagate       = FDMExec->GetPropagate();
   Auxiliary       = FDMExec->GetAuxiliary();
   Output          = FDMExec->GetOutput();
-  
+
   if (!State ||
       !Atmosphere ||
       !FCS ||
@@ -131,9 +128,7 @@ bool FGModel::InitModel(void)
       !Inertial ||
       !GroundReactions ||
       !Aircraft ||
-      !Translation ||
-      !Rotation ||
-      !Position ||
+      !Propagate ||
       !Auxiliary ||
       !Output) return(false);
   else return(true);
@@ -199,4 +194,4 @@ void FGModel::Debug(int from)
     }
   }
 }
-
+}