Updated to match changes in radiostack.[ch]xx

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

diff --git a/src/FDM/JSBSim/FGNozzle.cpp b/src/FDM/JSBSim/FGNozzle.cpp
index c5faef38b9514efaf0525e4019008664e64d33ef..b7340183888f0ed9deec81cb89612d125d94eb01 100644 (file)
--- a/src/FDM/JSBSim/FGNozzle.cpp
+++ b/src/FDM/JSBSim/FGNozzle.cpp
@@ -35,13 +35,18 @@ HISTORY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+#ifdef FGFS
+#  include <simgear/compiler.h>
+#  include STL_ALGORITHM
+#else
+#  include <algorithm>
+#endif
+
 #include "FGNozzle.h"
 
 static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_NOZZLE;
 
-extern short debug_lvl;
-
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS IMPLEMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -52,60 +57,96 @@ FGNozzle::FGNozzle(FGFDMExec* FDMExec, FGConfigFile* Nzl_cfg) : FGThruster(FDMEx
   string token;
 
   Name = Nzl_cfg->GetValue("NAME");
-  cout << "      Nozzle Name: " << Name << endl;
   Nzl_cfg->GetNextConfigLine();
-  while (Nzl_cfg->GetValue() != "/FG_NOZZLE") {
+  while (Nzl_cfg->GetValue() != string("/FG_NOZZLE")) {
     *Nzl_cfg >> token;
-    if (token == "PE") {
-      *Nzl_cfg >> PE;
-      cout << "      Nozzle Exit Pressure = " << PE << endl;
-    } else if (token == "EXPR") {
-      *Nzl_cfg >> ExpR;
-      cout << "      Nozzle Expansion Ratio = " << ExpR << endl;
-    } else if (token == "NZL_EFF") {
-      *Nzl_cfg >> nzlEff;
-      cout << "      Nozzle Efficiency = " << nzlEff << endl;
-    } else if (token == "DIAM") {
-      *Nzl_cfg >> Diameter;
-      cout << "      Nozzle Diameter = " << Diameter << endl;
-    } else {
-      cout << "Unhandled token in Nozzle config file: " << token << endl;
-    }
+    if      (token == "PE")      *Nzl_cfg >> PE;
+    else if (token == "EXPR")    *Nzl_cfg >> ExpR;
+    else if (token == "NZL_EFF") *Nzl_cfg >> nzlEff;
+    else if (token == "DIAM")    *Nzl_cfg >> Diameter;
+    else cerr << "Unhandled token in Nozzle config file: " << token << endl;
   }
 
-  if (debug_lvl & 2) cout << "Instantiated: FGNozzle" << endl;
+  Thrust = 0;
+  Type = ttNozzle;
+  Area2 = (Diameter*Diameter/4.0)*M_PI;
+  AreaT = Area2/ExpR;
+
+  Debug(0);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 FGNozzle::~FGNozzle()
 {
-  if (debug_lvl & 2) cout << "Destroyed:    FGNozzle" << endl;
+  Debug(1);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-float FGNozzle::Calculate(float CfPc)
+double FGNozzle::Calculate(double CfPc)
 {
-  float Thrust;
-  float pAtm = fdmex->GetAtmosphere()->GetPressure();
-  
-  Thrust = (CfPc + (PE - pAtm)*ExpR) * (Diameter / ExpR) * nzlEff;
+  double pAtm = fdmex->GetAtmosphere()->GetPressure();
+  Thrust = max((double)0.0, (CfPc * AreaT + (PE - pAtm)*Area2) * nzlEff);
+  vFn(1) = Thrust;
 
   return Thrust;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-float FGNozzle::GetPowerRequired(void)
+double FGNozzle::GetPowerRequired(void)
 {
   return PE;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGNozzle::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 FGNozzle::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 << "      Nozzle Name: " << Name << endl;
+      cout << "      Nozzle Exit Pressure = " << PE << endl;
+      cout << "      Nozzle Expansion Ratio = " << ExpR << endl;
+      cout << "      Nozzle Efficiency = " << nzlEff << endl;
+      cout << "      Nozzle Diameter = " << Diameter << endl;
+    }
+  }
+  if (debug_lvl & 2 ) { // Instantiation/Destruction notification
+    if (from == 0) cout << "Instantiated: FGNozzle" << endl;
+    if (from == 1) cout << "Destroyed:    FGNozzle" << 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;
+    }
+  }
 }