X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FJSBSim%2Fmodels%2FFGAuxiliary.h;h=e3baa49117a8d1e64fe9741302d6b56009a1d370;hb=edd83dd7e8fd7162ae49da6113ad797c68769f20;hp=751dd14f116929cce070417584a61831ae67ce72;hpb=0f0f25512d4b5a4c1b56de2ad975abc7285c9bf5;p=flightgear.git diff --git a/src/FDM/JSBSim/models/FGAuxiliary.h b/src/FDM/JSBSim/models/FGAuxiliary.h index 751dd14f1..e3baa4911 100644 --- a/src/FDM/JSBSim/models/FGAuxiliary.h +++ b/src/FDM/JSBSim/models/FGAuxiliary.h @@ -40,7 +40,6 @@ INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #include "FGModel.h" -#include "FGFDMExec.h" #include "math/FGColumnVector3.h" #include "math/FGLocation.h" #include "FGPropagate.h" @@ -172,15 +171,15 @@ public: double GetMagBeta (void) const { return fabs(beta); } double Getalpha (int unit) const { if (unit == inDegrees) return alpha*radtodeg; - else cerr << "Bad units" << endl; return 0.0;} + else return BadUnits(); } double Getbeta (int unit) const { if (unit == inDegrees) return beta*radtodeg; - else cerr << "Bad units" << endl; return 0.0;} + else return BadUnits(); } double Getadot (int unit) const { if (unit == inDegrees) return adot*radtodeg; - else cerr << "Bad units" << endl; return 0.0;} + else return BadUnits(); } double Getbdot (int unit) const { if (unit == inDegrees) return bdot*radtodeg; - else cerr << "Bad units" << endl; return 0.0;} + else return BadUnits(); } double GetMagBeta (int unit) const { if (unit == inDegrees) return fabs(beta)*radtodeg; - else cerr << "Bad units" << endl; return 0.0;} + else return BadUnits(); } double Getqbar (void) const { return qbar; } double GetqbarUW (void) const { return qbarUW; } @@ -281,6 +280,7 @@ private: void CalculateRelativePosition(void); void bind(void); + double BadUnits(void) const; void Debug(int from); };