Andreas Gaeb: fix #222 (JSBSIm reset problems)

[flightgear.git] / src / FDM / JSBSim / models / propulsion / FGNozzle.h

diff --git a/src/FDM/JSBSim/models/propulsion/FGNozzle.h b/src/FDM/JSBSim/models/propulsion/FGNozzle.h
index dfa3ffd7d045a4b2c438d63485bc3225149c429c..d2945ba7b677bf4020d3b9d90fd33850995221c7 100644 (file)
--- a/src/FDM/JSBSim/models/propulsion/FGNozzle.h
+++ b/src/FDM/JSBSim/models/propulsion/FGNozzle.h
@@ -4,7 +4,7 @@
  Author:       Jon S. Berndt
  Date started: 08/24/00
 
- ------------- Copyright (C) 2000  Jon S. Berndt (jsb@hal-pc.org) -------------
+ ------------- Copyright (C) 2000  Jon S. Berndt (jon@jsbsim.org) -------------
 
  This program is free software; you can redistribute it and/or modify it under
  the terms of the GNU Lesser General Public License as published by the Free Software
@@ -44,7 +44,7 @@ INCLUDES
 DEFINITIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#define ID_NOZZLE "$Id$";
+#define ID_NOZZLE "$Id: FGNozzle.h,v 1.8 2009/10/26 03:49:58 jberndt Exp $";
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 FORWARD DECLARATIONS
@@ -63,23 +63,19 @@ CLASS DOCUMENTATION
 @code
 <nozzle name="{string}">
   <pe unit="{PSF}"> {number}  </pe>
-  <expr>  {number}  </expr>
-  <nzl_eff>  {number}  </nzl_eff>
-  <diam unit="{FT | M | IN}"> {number}  </diam>
+  <area unit="{FT2 | M2 | IN2}"> {number}  </area>
 </nozzle>
 @endcode
 
 <h3>Configuration parameters are:</h3>
 <pre>
-    <b>pe</b> -      Nozzle exit pressure.
-    <b>expr</b> -    Nozzle expansion ratio, Ae/At, sqft. dimensionless ratio.
-    <b>nzl_eff</b> - Nozzle efficiency, 0.0 - 1.0.
-    <b>diam</b> -    Nozzle diameter.
+    <b>pe</b> -      Nozzle design exit pressure.
+    <b>area</b> -    Nozzle area at the exit plane.
 </pre>
 
     All parameters MUST be specified.  
     @author Jon S. Berndt
-    @version $Id$
+    @version $Id: FGNozzle.h,v 1.8 2009/10/26 03:49:58 jberndt Exp $
 */
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -94,18 +90,13 @@ public:
   /// Destructor
   ~FGNozzle();
 
-  double Calculate(double CfPc);
-  double GetPowerRequired(void);
+  double Calculate(double vacThrust);
   string GetThrusterLabels(int id, string delimeter);
   string GetThrusterValues(int id, string delimeter);
 
 private:
-  double PE;
-  double ExpR;
-  double nzlEff;
-  double Diameter;
-  double AreaT;
-  double Area2;
+//  double PE;
+  double Area;
   void Debug(int from);
 };
 }