#include "FGTank.h"
+#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
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-#if !defined ( sgi ) || defined( __GNUC__ )
-using std::cerr;
-using std::endl;
-using std::cout;
-#endif
-
FGTank::FGTank(FGConfigFile* AC_cfg)
{
string token;
double FGTank::Reduce(double used)
{
- double shortage;
+ double shortage = Contents - used;
- if (used < Contents) {
+ if (shortage >= 0) {
Contents -= used;
PctFull = 100.0*Contents/Capacity;
- return 0.0;
} else {
- shortage = Contents - used;
Contents = 0.0;
PctFull = 0.0;
Selected = false;
- return shortage;
}
+ return shortage;
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
}
if (debug_lvl & 16) { // Sanity checking
}
+ if (debug_lvl & 64) {
+ if (from == 0) { // Constructor
+ cout << IdSrc << endl;
+ cout << IdHdr << endl;
+ }
+ }
+}
}
-