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

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

diff --git a/src/FDM/JSBSim/FGFactorGroup.cpp b/src/FDM/JSBSim/FGFactorGroup.cpp
index 32a8d4e71610bb46ad9fff7b33524468895328ec..dce8f32dc08324be803f79d1b331e6400933b623 100644 (file)
--- a/src/FDM/JSBSim/FGFactorGroup.cpp
+++ b/src/FDM/JSBSim/FGFactorGroup.cpp
@@ -51,7 +51,7 @@ INCLUDES
 #include "FGFDMExec.h"
 
 #ifndef FGFS
-#  if defined(sgi) && !defined(__GNUC__)
+#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
 #    include <iomanip.h>
 #  else
 #    include <iomanip>
@@ -60,6 +60,8 @@ INCLUDES
 #  include STL_IOMANIP
 #endif
 
+namespace JSBSim {
+
 static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_FACTORGROUP;
 
@@ -71,6 +73,7 @@ FGFactorGroup::FGFactorGroup( FGFDMExec* fdmex ) : FGCoefficient( fdmex)
 {
   FDMExec = fdmex;
   totalValue = 0;
+  IsFactor = true;
   Debug(0);
 }  
 
@@ -121,7 +124,6 @@ double FGFactorGroup::TotalValue(void)
      totalValue += sum[i]->TotalValue();
      SDtotal += sum[i]->GetSD();
   }
-  //cout << totalValue << "  " << FGCoefficient::TotalValue() << endl;
   totalValue *= FGCoefficient::TotalValue();
   SDtotal *= FGCoefficient::GetSD();
   Debug(2);
@@ -130,13 +132,10 @@ double FGFactorGroup::TotalValue(void)
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-void FGFactorGroup::bind(FGPropertyManager* parent) {
-  
-  cout << "In FGFactorGroup::bind" << endl;
-  cout << parent->getName() << endl;
+void FGFactorGroup::bind(FGPropertyManager* parent)
+{
   unsigned i;
   node=parent->GetNode(name,true);
-  cout << node->getName() << endl;
   node->SetString("description",description);
   FGCoefficient::bind(node);
   for (i=0; i < sum.size(); i++) { 
@@ -148,9 +147,9 @@ void FGFactorGroup::bind(FGPropertyManager* parent) {
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
   
-void FGFactorGroup::unbind(void) {
+void FGFactorGroup::unbind(void)
+{
   unsigned i;
-  
   FGCoefficient::unbind();
   for (i=0; i < sum.size(); i++) { 
     sum[i]->unbind();
@@ -204,3 +203,4 @@ void FGFactorGroup::Debug(int from)
   }
 }
 
+}