Updated to match changes in radiostack.[ch]xx

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

diff --git a/src/FDM/JSBSim/FGRocket.cpp b/src/FDM/JSBSim/FGRocket.cpp
index 080dff9d5cd825334f2a51085bfd27ca2debcad1..ec1bb72151a001afa3ec5baa04cf7d98d23b6ff5 100644 (file)
--- a/src/FDM/JSBSim/FGRocket.cpp
+++ b/src/FDM/JSBSim/FGRocket.cpp
@@ -43,8 +43,6 @@ INCLUDES
 static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_ROCKET;
 
-extern short debug_lvl;
-
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS IMPLEMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -56,7 +54,7 @@ FGRocket::FGRocket(FGFDMExec* exec, FGConfigFile* Eng_cfg) : FGEngine(exec)
   Name = Eng_cfg->GetValue("NAME");
   Eng_cfg->GetNextConfigLine();
 
-  while (Eng_cfg->GetValue() != "/FG_ROCKET") {
+  while (Eng_cfg->GetValue() != string("/FG_ROCKET")) {
     *Eng_cfg >> token;
     if      (token == "SHR")           *Eng_cfg >> SHR;
     else if (token == "MAX_PC")        *Eng_cfg >> maxPC;
@@ -69,39 +67,27 @@ FGRocket::FGRocket(FGFDMExec* exec, FGConfigFile* Eng_cfg) : FGEngine(exec)
     else cerr << "Unhandled token in Engine config file: " << token << endl;
   }
 
-  if (debug_lvl > 0) {
-    cout << "      Engine Name: " << Name << endl;
-    cout << "      Specific Heat Ratio = " << SHR << endl;
-    cout << "      Maximum Chamber Pressure = " << maxPC << endl;
-    cout << "      Propulsive Efficiency = " << propEff << endl;
-    cout << "      MaxThrottle = " << MaxThrottle << endl;
-    cout << "      MinThrottle = " << MinThrottle << endl;
-    cout << "      FuelFlowMax = " << SLFuelFlowMax << endl;
-    cout << "      OxiFlowMax = " << SLOxiFlowMax << endl;
-    cout << "      Variance = " << Variance << endl;
-  }
+  Debug(0);
 
   EngineNumber = 0;
   Type = etRocket;
 
   PC = 0.0;
   kFactor = (2.0*SHR*SHR/(SHR-1.0))*pow(2.0/(SHR+1), (SHR+1)/(SHR-1));
-
-  if (debug_lvl & 2) cout << "Instantiated: FGRocket" << endl;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 FGRocket::~FGRocket()
 {
-  if (debug_lvl & 2) cout << "Destroyed:    FGRocket" << endl;
+  Debug(1);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-float FGRocket::Calculate(float pe)
+double FGRocket::Calculate(double pe)
 {
-  float Cf;
+  double Cf=0;
 
   ConsumeFuel();
 
@@ -113,7 +99,7 @@ float FGRocket::Calculate(float pe)
     PC = 0.0;
   } else {
     PctPower = Throttle / MaxThrottle;
-    PC = maxPC*PctPower * (1.0 + Variance * ((float)rand()/(float)RAND_MAX - 0.5));
+    PC = maxPC*PctPower * (1.0 + Variance * ((double)rand()/(double)RAND_MAX - 0.5));
     Cf = sqrt(kFactor*(1 - pow(pe/(PC), (SHR-1)/SHR)));
     Flameout = false;
   }
@@ -122,9 +108,56 @@ float FGRocket::Calculate(float pe)
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGRocket::Debug(void)
+//    The bitmasked value choices are as follows:
+//    unset: In this case (the default) JSBSim would only print
+//       out the normally expected messages, essentially echoing
+//       the config files as they are read. If the environment
+//       variable is not set, debug_lvl is set to 1 internally
+//    0: This requests JSBSim not to output any messages
+//       whatsoever.
+//    1: This value explicity requests the normal JSBSim
+//       startup messages
+//    2: This value asks for a message to be printed out when
+//       a class is instantiated
+//    4: When this value is set, a message is displayed when a
+//       FGModel object executes its Run() method
+//    8: When this value is set, various runtime state variables
+//       are printed out periodically
+//    16: When set various parameters are sanity checked and
+//       a message is printed out when they go out of bounds
+
+void FGRocket::Debug(int from)
 {
-    //TODO: Add your source code here
+  if (debug_lvl <= 0) return;
+
+  if (debug_lvl & 1) { // Standard console startup message output
+    if (from == 0) { // Constructor
+      cout << "      Engine Name: " << Name << endl;
+      cout << "      Specific Heat Ratio = " << SHR << endl;
+      cout << "      Maximum Chamber Pressure = " << maxPC << endl;
+      cout << "      Propulsive Efficiency = " << propEff << endl;
+      cout << "      MaxThrottle = " << MaxThrottle << endl;
+      cout << "      MinThrottle = " << MinThrottle << endl;
+      cout << "      FuelFlowMax = " << SLFuelFlowMax << endl;
+      cout << "      OxiFlowMax = " << SLOxiFlowMax << endl;
+      cout << "      Variance = " << Variance << endl;
+    }
+  }
+  if (debug_lvl & 2 ) { // Instantiation/Destruction notification
+    if (from == 0) cout << "Instantiated: FGRocket" << endl;
+    if (from == 1) cout << "Destroyed:    FGRocket" << endl;
+  }
+  if (debug_lvl & 4 ) { // Run() method entry print for FGModel-derived objects
+  }
+  if (debug_lvl & 8 ) { // Runtime state variables
+  }
+  if (debug_lvl & 16) { // Sanity checking
+  }
+  if (debug_lvl & 64) {
+    if (from == 0) { // Constructor
+      cout << IdSrc << endl;
+      cout << IdHdr << endl;
+    }
+  }
 }