Sync. with JSBSim CVS.

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

diff --git a/src/FDM/JSBSim/FGTank.cpp b/src/FDM/JSBSim/FGTank.cpp
index 22a6113441481c2a57ffd6617f9f49fbd8eefc8d..93092c15979d7c3ed67b26c4d52d52ff7dcac976 100644 (file)
--- a/src/FDM/JSBSim/FGTank.cpp
+++ b/src/FDM/JSBSim/FGTank.cpp
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
  Module:       FGTank.cpp
  Author:       Jon Berndt
@@ -32,60 +32,133 @@ HISTORY
 --------------------------------------------------------------------------------
 01/21/99   JSB   Created
 
-********************************************************************************
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 INCLUDES
-*******************************************************************************/
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+
 #include "FGTank.h"
 
-/*******************************************************************************
-************************************ CODE **************************************
-*******************************************************************************/
+#if !defined ( sgi ) || defined( __GNUC__ ) && (_COMPILER_VERSION < 740)
+using std::cerr;
+using std::endl;
+using std::cout;
+#endif
+
+namespace JSBSim {
+
+static const char *IdSrc = "$Id$";
+static const char *IdHdr = ID_TANK;
 
+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+CLASS IMPLEMENTATION
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 FGTank::FGTank(FGConfigFile* AC_cfg)
 {
-  string type;
+  string token;
+  double X, Y, Z;
 
-  *AC_cfg >> type;                              // Type = 0: fuel, 1: oxidizer
+  type = AC_cfg->GetValue("TYPE");
 
-  if (type == "FUEL") Type = ttFUEL;
+  if      (type == "FUEL")     Type = ttFUEL;
   else if (type == "OXIDIZER") Type = ttOXIDIZER;
-  else Type = ttUNKNOWN;
-  *AC_cfg >> X;                                 // inches
-  *AC_cfg >> Y;                                 // "
-  *AC_cfg >> Z;                                 // "
-  *AC_cfg >> Radius;                            // "
-  *AC_cfg >> Capacity;                          // pounds (amount it can hold)
-  *AC_cfg >> Contents;                          // pounds  (amount it is holding)
+  else                         Type = ttUNKNOWN;
+
+  AC_cfg->GetNextConfigLine();
+  while ((token = AC_cfg->GetValue()) != string("/AC_TANK")) {
+    if (token == "XLOC") *AC_cfg >> X;
+    else if (token == "YLOC") *AC_cfg >> Y;
+    else if (token == "ZLOC") *AC_cfg >> Z;
+    else if (token == "RADIUS") *AC_cfg >> Radius;
+    else if (token == "CAPACITY") *AC_cfg >> Capacity;
+    else if (token == "CONTENTS") *AC_cfg >> Contents;
+    else cerr << "Unknown identifier: " << token << " in tank definition." << endl;
+  }
+
+  vXYZ << X << Y << Z;
+
   Selected = true;
-  if(Capacity != 0)
+
+  if (Capacity != 0) {
     PctFull = 100.0*Contents/Capacity;            // percent full; 0 to 100.0
-  else {
-    Contents=0;
-    PctFull=0;
-  }     
+  } else {
+    Contents = 0;
+    PctFull  = 0;
+  }
+
+  Debug(0);
 }
 
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-FGTank::~FGTank(void)
+FGTank::~FGTank()
 {
+  Debug(1);
 }
 
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-float FGTank::Reduce(float used)
+double FGTank::Reduce(double used)
 {
-  float shortage;
+  double shortage = Contents - used;
 
-  if (used < Contents) {
+  if (shortage >= 0) {
     Contents -= used;
     PctFull = 100.0*Contents/Capacity;
-    return Contents;
   } else {
-    shortage = Contents - used;
     Contents = 0.0;
     PctFull = 0.0;
     Selected = false;
-    return shortage;
   }
+  return shortage;
 }
 
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+//    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 FGTank::Debug(int from)
+{
+  if (debug_lvl <= 0) return;
+
+  if (debug_lvl & 1) { // Standard console startup message output
+    if (from == 0) { // Constructor
+      cout << "      " << type << " tank holds " << Capacity << " lbs. " << type << endl;
+      cout << "      currently at " << PctFull << "% of maximum capacity" << endl;
+      cout << "      Tank location (X, Y, Z): " << vXYZ(eX) << ", " << vXYZ(eY) << ", " << vXYZ(eZ) << endl;
+      cout << "      Effective radius: " << Radius << " inches" << endl;
+    }
+  }
+  if (debug_lvl & 2 ) { // Instantiation/Destruction notification
+    if (from == 0) cout << "Instantiated: FGTank" << endl;
+    if (from == 1) cout << "Destroyed:    FGTank" << 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;
+    }
+  }
+}
+}