From: ehofman Date: Tue, 22 Jul 2008 08:49:15 +0000 (+0000) Subject: Sync. with JSBSim CVS (header cleanups). X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3b3f6719746e3877a3aeedbd6b944a55960ae792;p=flightgear.git Sync. with JSBSim CVS (header cleanups). --- diff --git a/src/FDM/JSBSim/FGFDMExec.cpp b/src/FDM/JSBSim/FGFDMExec.cpp index 5ed9ce531..3bf7c700b 100644 --- a/src/FDM/JSBSim/FGFDMExec.cpp +++ b/src/FDM/JSBSim/FGFDMExec.cpp @@ -41,19 +41,6 @@ COMMENTS, REFERENCES, and NOTES INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# include STL_IOSTREAM -# include STL_ITERATOR -#else -# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740) -# include -# else -# include -# endif -# include -#endif - #include "FGFDMExec.h" #include "FGState.h" #include @@ -77,6 +64,9 @@ INCLUDES #include #include +#include +#include + namespace JSBSim { static const char *IdSrc = "$Id$"; diff --git a/src/FDM/JSBSim/FGFDMExec.h b/src/FDM/JSBSim/FGFDMExec.h index 6a92a2e81..787a43d75 100644 --- a/src/FDM/JSBSim/FGFDMExec.h +++ b/src/FDM/JSBSim/FGFDMExec.h @@ -68,6 +68,7 @@ FORWARD DECLARATIONS namespace JSBSim { class FGScript; +class FGTrim; /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% CLASS DOCUMENTATION diff --git a/src/FDM/JSBSim/FGState.cpp b/src/FDM/JSBSim/FGState.cpp index 53d40ec2c..f5fc784f2 100644 --- a/src/FDM/JSBSim/FGState.cpp +++ b/src/FDM/JSBSim/FGState.cpp @@ -36,16 +36,7 @@ HISTORY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# include -#else -# if defined(sgi) && !defined(__GNUC__) -# include -# else -# include -# endif -#endif +#include #include "FGState.h" diff --git a/src/FDM/JSBSim/FGState.h b/src/FDM/JSBSim/FGState.h index 079377c15..d1ca3d74f 100644 --- a/src/FDM/JSBSim/FGState.h +++ b/src/FDM/JSBSim/FGState.h @@ -41,21 +41,7 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# else -# include -# endif -#else -# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740) -# include -# else -# include -# endif -#endif - +#include #include #include #include "FGJSBBase.h" diff --git a/src/FDM/JSBSim/initialization/FGInitialCondition.cpp b/src/FDM/JSBSim/initialization/FGInitialCondition.cpp index 5975a048a..bbfebe7ce 100644 --- a/src/FDM/JSBSim/initialization/FGInitialCondition.cpp +++ b/src/FDM/JSBSim/initialization/FGInitialCondition.cpp @@ -42,21 +42,6 @@ you have chosen your IC's wisely) even after setting it up with this class. INCLUDES *******************************************************************************/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# else -# include -# endif -#else -# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740) -# include -# else -# include -# endif -#endif - #include "FGInitialCondition.h" #include #include @@ -66,8 +51,8 @@ INCLUDES #include #include #include - #include +#include namespace JSBSim { diff --git a/src/FDM/JSBSim/initialization/FGTrim.cpp b/src/FDM/JSBSim/initialization/FGTrim.cpp index 8979f9e3b..099ec495a 100644 --- a/src/FDM/JSBSim/initialization/FGTrim.cpp +++ b/src/FDM/JSBSim/initialization/FGTrim.cpp @@ -23,12 +23,10 @@ Further information about the GNU Lesser General Public License can also be found on the world wide web at http://www.gnu.org. - HISTORY -------------------------------------------------------------------------------- 9/8/99 TP Created - FUNCTIONAL DESCRIPTION -------------------------------------------------------------------------------- @@ -43,12 +41,10 @@ scheme. */ INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#include - -#include +#include +#include "FGTrim.h" #include #include "FGInitialCondition.h" -#include "FGTrim.h" #include #include #include diff --git a/src/FDM/JSBSim/initialization/FGTrimAxis.cpp b/src/FDM/JSBSim/initialization/FGTrimAxis.cpp index 8557adc89..5124c31bb 100644 --- a/src/FDM/JSBSim/initialization/FGTrimAxis.cpp +++ b/src/FDM/JSBSim/initialization/FGTrimAxis.cpp @@ -37,8 +37,7 @@ INCLUDES #endif #include -#include - +#include #include #include #include "FGInitialCondition.h" @@ -47,7 +46,6 @@ INCLUDES #include #include - namespace JSBSim { static const char *IdSrc = "$Id$"; diff --git a/src/FDM/JSBSim/input_output/FGPropertyManager.cpp b/src/FDM/JSBSim/input_output/FGPropertyManager.cpp index cf36fddc9..991badb90 100755 --- a/src/FDM/JSBSim/input_output/FGPropertyManager.cpp +++ b/src/FDM/JSBSim/input_output/FGPropertyManager.cpp @@ -63,12 +63,7 @@ string FGPropertyManager::mkPropertyName(string name, bool lowercase) { else if( isspace(name[i]) ) name[i]='-'; } - /* - for(i=0;i #include -#ifdef FGFS -# include -#else -# include "simgear/props/props.hxx" -#endif +#include "simgear/props/props.hxx" #include "FGJSBBase.h" diff --git a/src/FDM/JSBSim/input_output/FGScript.cpp b/src/FDM/JSBSim/input_output/FGScript.cpp index 0d032fbde..e0cddc34b 100755 --- a/src/FDM/JSBSim/input_output/FGScript.cpp +++ b/src/FDM/JSBSim/input_output/FGScript.cpp @@ -41,23 +41,13 @@ COMMENTS, REFERENCES, and NOTES INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# include STL_IOSTREAM -# include STL_ITERATOR -#else -# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740) -# include -# else -# include -# endif -# include -#endif - #include "FGScript.h" #include #include +#include +#include + namespace JSBSim { static const char *IdSrc = "$Id$"; diff --git a/src/FDM/JSBSim/input_output/FGXMLElement.cpp b/src/FDM/JSBSim/input_output/FGXMLElement.cpp index a32ce27c7..b683d32b3 100755 --- a/src/FDM/JSBSim/input_output/FGXMLElement.cpp +++ b/src/FDM/JSBSim/input_output/FGXMLElement.cpp @@ -29,29 +29,9 @@ INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #include "FGXMLElement.h" -#ifdef FGFS -# ifndef __BORLANDC__ -# include -# endif -# ifdef SG_HAVE_STD_INCLUDES -# include -# include -# else -# include -# include -# endif -#else -# if defined (sgi) && !defined(__GNUC__) -# include -# include -# else -# include -# include -# endif -#endif - -#include -#include + +#include +#include /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% FORWARD DECLARATIONS diff --git a/src/FDM/JSBSim/input_output/FGXMLElement.h b/src/FDM/JSBSim/input_output/FGXMLElement.h index b30dfaf53..acfb07436 100755 --- a/src/FDM/JSBSim/input_output/FGXMLElement.h +++ b/src/FDM/JSBSim/input_output/FGXMLElement.h @@ -34,35 +34,16 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# include -# include -# include -# else -# include -# include -# include -# include -# endif -#else -# include -# include -# include -# include - using std::string; - using std::map; - using std::vector; - using std::cout; - using std::endl; -#endif - using std::string; - using std::map; - using std::vector; - using std::cout; - using std::endl; +#include +#include +#include +#include + +using std::string; +using std::map; +using std::vector; +using std::cout; +using std::endl; #include diff --git a/src/FDM/JSBSim/input_output/FGXMLParse.cpp b/src/FDM/JSBSim/input_output/FGXMLParse.cpp index d00d074c7..5a57040a4 100755 --- a/src/FDM/JSBSim/input_output/FGXMLParse.cpp +++ b/src/FDM/JSBSim/input_output/FGXMLParse.cpp @@ -30,7 +30,7 @@ INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #include "FGXMLParse.h" -#include +#include namespace JSBSim { diff --git a/src/FDM/JSBSim/input_output/FGXMLParse.h b/src/FDM/JSBSim/input_output/FGXMLParse.h index 2d58acf44..c96690243 100755 --- a/src/FDM/JSBSim/input_output/FGXMLParse.h +++ b/src/FDM/JSBSim/input_output/FGXMLParse.h @@ -34,17 +34,13 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# include STL_STRING -#else -# include -# include - using std::string; - using std::cout; - using std::cerr; - using std::endl; -#endif +#include +#include + +using std::string; +using std::cout; +using std::cerr; +using std::endl; #include "FGXMLElement.h" #include "simgear/xml/easyxml.hxx" diff --git a/src/FDM/JSBSim/input_output/FGfdmSocket.h b/src/FDM/JSBSim/input_output/FGfdmSocket.h index 14330bfea..59db72325 100644 --- a/src/FDM/JSBSim/input_output/FGfdmSocket.h +++ b/src/FDM/JSBSim/input_output/FGfdmSocket.h @@ -39,31 +39,16 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#include - -#ifdef FGFS -# include -# include STL_STRING -# include STL_IOSTREAM -# include STL_FSTREAM - SG_USING_STD(cout); - SG_USING_STD(endl); -#else -# include -# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740) -# include -# include -# else -# include -# include - using std::cout; - using std::endl; -# endif -#endif - +#include +#include +#include +#include #include #include "FGJSBBase.h" +using std::cout; +using std::endl; + #if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__) #include #include @@ -77,9 +62,7 @@ INCLUDES #endif #ifdef _MSC_VER - -#pragma comment (lib,"WSock32.lib") - +# pragma comment (lib,"WSock32.lib") #endif /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/src/FDM/JSBSim/math/FGColumnVector3.cpp b/src/FDM/JSBSim/math/FGColumnVector3.cpp index f34afe592..73f291b30 100644 --- a/src/FDM/JSBSim/math/FGColumnVector3.cpp +++ b/src/FDM/JSBSim/math/FGColumnVector3.cpp @@ -38,7 +38,7 @@ INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #include "FGColumnVector3.h" -#include +#include namespace JSBSim { diff --git a/src/FDM/JSBSim/math/FGColumnVector3.h b/src/FDM/JSBSim/math/FGColumnVector3.h index 58af989ed..5fe76e77a 100644 --- a/src/FDM/JSBSim/math/FGColumnVector3.h +++ b/src/FDM/JSBSim/math/FGColumnVector3.h @@ -39,44 +39,19 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#include -#ifdef FGFS -# include -# include -# include STL_STRING -# include STL_FSTREAM -# include STL_IOSTREAM - SG_USING_STD(string); - SG_USING_STD(ostream); - SG_USING_STD(istream); - SG_USING_STD(cerr); - SG_USING_STD(cout); - SG_USING_STD(endl); -#else -# include -# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740) -# include -# include -# include -# else -# include -# include -# if defined(sgi) && !defined(__GNUC__) -# include -# else -# include -# if !(defined(_MSC_VER) && _MSC_VER <= 1200) - using std::sqrt; -# endif -# endif - using std::ostream; - using std::istream; - using std::cerr; - using std::cout; - using std::endl; -# endif - using std::string; -#endif +#include +#include +#include +#include +#include + +using std::ostream; +using std::istream; +using std::cerr; +using std::cout; +using std::endl; +using std::sqrt; +using std::string; #include "FGJSBBase.h" diff --git a/src/FDM/JSBSim/math/FGLocation.cpp b/src/FDM/JSBSim/math/FGLocation.cpp index 6ba2328df..4eea80ad2 100644 --- a/src/FDM/JSBSim/math/FGLocation.cpp +++ b/src/FDM/JSBSim/math/FGLocation.cpp @@ -38,20 +38,7 @@ HISTORY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# else -# include -# endif -#else -# if defined(sgi) && !defined(__GNUC__) -# include -# else -# include -# endif -#endif +#include #include "FGLocation.h" #include diff --git a/src/FDM/JSBSim/math/FGMatrix33.h b/src/FDM/JSBSim/math/FGMatrix33.h index 1204612c1..4e8234bfd 100644 --- a/src/FDM/JSBSim/math/FGMatrix33.h +++ b/src/FDM/JSBSim/math/FGMatrix33.h @@ -40,41 +40,18 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#include -#ifdef FGFS -# include -# include -# include STL_STRING -# include STL_FSTREAM -# include STL_IOSTREAM - SG_USING_STD(string); - SG_USING_STD(ostream); - SG_USING_STD(istream); - SG_USING_STD(cerr); - SG_USING_STD(cout); - SG_USING_STD(endl); -#else -# include -# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740) - include - include -# include -# else -# include -# include -# if defined(sgi) && !defined(__GNUC__) -# include -# else -# include -# endif - using std::ostream; - using std::istream; - using std::cerr; - using std::cout; - using std::endl; -# endif - using std::string; -#endif +#include +#include +#include +#include +#include + +using std::ostream; +using std::istream; +using std::cerr; +using std::cout; +using std::endl; +using std::string; #include "FGColumnVector3.h" #include "FGJSBBase.h" diff --git a/src/FDM/JSBSim/math/FGQuaternion.cpp b/src/FDM/JSBSim/math/FGQuaternion.cpp index 700d7a3c5..6ab1c3954 100644 --- a/src/FDM/JSBSim/math/FGQuaternion.cpp +++ b/src/FDM/JSBSim/math/FGQuaternion.cpp @@ -38,30 +38,12 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# include -# include STL_IOSTREAM - SG_USING_STD(cerr); - SG_USING_STD(cout); - SG_USING_STD(endl); -#else -# include -# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740) -# include -# include -# else -# include -# if defined(sgi) && !defined(__GNUC__) -# include -# else -# include -# endif - using std::cerr; - using std::cout; - using std::endl; -# endif -#endif +#include +#include +#include +using std::cerr; +using std::cout; +using std::endl; #include "FGMatrix33.h" #include "FGColumnVector3.h" diff --git a/src/FDM/JSBSim/math/FGTable.cpp b/src/FDM/JSBSim/math/FGTable.cpp index ed45983c6..e3c9fcf5c 100644 --- a/src/FDM/JSBSim/math/FGTable.cpp +++ b/src/FDM/JSBSim/math/FGTable.cpp @@ -37,12 +37,7 @@ INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #include "FGTable.h" - -#if defined ( sgi ) && !defined( __GNUC__ ) && (_COMPILER_VERSION < 740) -# include -#else -# include -#endif +#include using namespace std; diff --git a/src/FDM/JSBSim/models/FGAerodynamics.h b/src/FDM/JSBSim/models/FGAerodynamics.h index 140816273..0f5c6c145 100644 --- a/src/FDM/JSBSim/models/FGAerodynamics.h +++ b/src/FDM/JSBSim/models/FGAerodynamics.h @@ -38,19 +38,8 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# include -# else -# include -# include -# endif -#else -# include -# include -#endif +#include +#include #include "FGModel.h" #include diff --git a/src/FDM/JSBSim/models/FGAircraft.cpp b/src/FDM/JSBSim/models/FGAircraft.cpp index c1d3ec86f..5dd8612c6 100644 --- a/src/FDM/JSBSim/models/FGAircraft.cpp +++ b/src/FDM/JSBSim/models/FGAircraft.cpp @@ -41,22 +41,7 @@ INCLUDES #include #include -#ifdef FGFS -# ifndef __BORLANDC__ -# include -# endif -# ifdef SG_HAVE_STD_INCLUDES -# include -# else -# include -# endif -#else -# if defined (sgi) && !defined(__GNUC__) -# include -# else -# include -# endif -#endif +#include #include "FGAircraft.h" #include "FGMassBalance.h" diff --git a/src/FDM/JSBSim/models/FGAircraft.h b/src/FDM/JSBSim/models/FGAircraft.h index 485d0efd3..f833c3a79 100644 --- a/src/FDM/JSBSim/models/FGAircraft.h +++ b/src/FDM/JSBSim/models/FGAircraft.h @@ -38,16 +38,7 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# else -# include -# endif -#else -# include -#endif +#include #include "FGModel.h" #include diff --git a/src/FDM/JSBSim/models/FGAtmosphere.cpp b/src/FDM/JSBSim/models/FGAtmosphere.cpp index 95afb8092..dda86fc13 100644 --- a/src/FDM/JSBSim/models/FGAtmosphere.cpp +++ b/src/FDM/JSBSim/models/FGAtmosphere.cpp @@ -64,7 +64,6 @@ static const char *IdHdr = ID_ATMOSPHERE; CLASS IMPLEMENTATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ - FGAtmosphere::FGAtmosphere(FGFDMExec* fdmex) : FGModel(fdmex) { Name = "FGAtmosphere"; diff --git a/src/FDM/JSBSim/models/FGBuoyantForces.h b/src/FDM/JSBSim/models/FGBuoyantForces.h index 86f5d696f..4cd87259f 100644 --- a/src/FDM/JSBSim/models/FGBuoyantForces.h +++ b/src/FDM/JSBSim/models/FGBuoyantForces.h @@ -39,19 +39,8 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# include -# else -# include -# include -# endif -#else -# include -# include -#endif +#include +#include #include "FGModel.h" #include "FGGasCell.h" diff --git a/src/FDM/JSBSim/models/FGExternalReactions.h b/src/FDM/JSBSim/models/FGExternalReactions.h index 16db9c7b1..f32cab28f 100755 --- a/src/FDM/JSBSim/models/FGExternalReactions.h +++ b/src/FDM/JSBSim/models/FGExternalReactions.h @@ -38,10 +38,6 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -#endif - #include "FGModel.h" #include "FGExternalForce.h" #include diff --git a/src/FDM/JSBSim/models/FGFCS.h b/src/FDM/JSBSim/models/FGFCS.h index 3868118ca..6b1bd5a22 100644 --- a/src/FDM/JSBSim/models/FGFCS.h +++ b/src/FDM/JSBSim/models/FGFCS.h @@ -38,16 +38,7 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# else -# include -# endif -#else -# include -#endif +#include #include #include diff --git a/src/FDM/JSBSim/models/FGGasCell.cpp b/src/FDM/JSBSim/models/FGGasCell.cpp index 255b7abae..f876defd6 100644 --- a/src/FDM/JSBSim/models/FGGasCell.cpp +++ b/src/FDM/JSBSim/models/FGGasCell.cpp @@ -42,11 +42,9 @@ INCLUDES #include #include "FGGasCell.h" -#if !defined ( sgi ) || defined( __GNUC__ ) && (_COMPILER_VERSION < 740) using std::cerr; using std::endl; using std::cout; -#endif namespace JSBSim { diff --git a/src/FDM/JSBSim/models/FGGasCell.h b/src/FDM/JSBSim/models/FGGasCell.h index 4c1759a54..010c6c8eb 100644 --- a/src/FDM/JSBSim/models/FGGasCell.h +++ b/src/FDM/JSBSim/models/FGGasCell.h @@ -45,22 +45,11 @@ INCLUDES #include #include -#ifdef FGFS -# include -# include STL_STRING - SG_USING_STD(string); - SG_USING_STD(cerr); - SG_USING_STD(endl); - SG_USING_STD(cout); -#else -# include - using std::string; -# if !defined(sgi) || defined(__GNUC__) || (_COMPILER_VERSION >= 740) - using std::cerr; - using std::endl; - using std::cout; -# endif -#endif +#include +using std::string; +using std::cerr; +using std::endl; +using std::cout; /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% DEFINITIONS diff --git a/src/FDM/JSBSim/models/FGGroundReactions.h b/src/FDM/JSBSim/models/FGGroundReactions.h index 2a1b8e242..a7870f167 100644 --- a/src/FDM/JSBSim/models/FGGroundReactions.h +++ b/src/FDM/JSBSim/models/FGGroundReactions.h @@ -38,16 +38,7 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# else -# include -# endif -#else -# include -#endif +#include #include "FGModel.h" #include "FGLGear.h" diff --git a/src/FDM/JSBSim/models/FGInertial.h b/src/FDM/JSBSim/models/FGInertial.h index 03671d60b..adf46d359 100644 --- a/src/FDM/JSBSim/models/FGInertial.h +++ b/src/FDM/JSBSim/models/FGInertial.h @@ -38,16 +38,7 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# else -# include -# endif -#else -# include -#endif +#include #include "FGModel.h" #include diff --git a/src/FDM/JSBSim/models/FGInput.h b/src/FDM/JSBSim/models/FGInput.h index a20e741f8..6ccaddfbb 100755 --- a/src/FDM/JSBSim/models/FGInput.h +++ b/src/FDM/JSBSim/models/FGInput.h @@ -40,19 +40,8 @@ INCLUDES #include "FGModel.h" -#ifdef FGFS -# include -# include STL_IOSTREAM -# include STL_FSTREAM -#else -# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740) -# include -# include -# else -# include -# include -# endif -#endif +#include +#include #include #include diff --git a/src/FDM/JSBSim/models/FGLGear.h b/src/FDM/JSBSim/models/FGLGear.h index 8fe0bb20f..fae36f62c 100644 --- a/src/FDM/JSBSim/models/FGLGear.h +++ b/src/FDM/JSBSim/models/FGLGear.h @@ -38,10 +38,6 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -#endif - #include #include #include diff --git a/src/FDM/JSBSim/models/FGModel.h b/src/FDM/JSBSim/models/FGModel.h index 3260d22cc..369a5255c 100644 --- a/src/FDM/JSBSim/models/FGModel.h +++ b/src/FDM/JSBSim/models/FGModel.h @@ -42,21 +42,7 @@ INCLUDES #include #include -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# else -# include -# endif -#else -# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740) -# include -# else -# include -# endif -#endif - +#include #include /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/src/FDM/JSBSim/models/FGOutput.cpp b/src/FDM/JSBSim/models/FGOutput.cpp index b3c54658c..7da464e0e 100644 --- a/src/FDM/JSBSim/models/FGOutput.cpp +++ b/src/FDM/JSBSim/models/FGOutput.cpp @@ -68,7 +68,6 @@ INCLUDES static const int endianTest = 1; #define isLittleEndian (*((char *) &endianTest ) != 0) - namespace JSBSim { static const char *IdSrc = "$Id$"; diff --git a/src/FDM/JSBSim/models/FGOutput.h b/src/FDM/JSBSim/models/FGOutput.h index 335dcfeaf..7194c119b 100644 --- a/src/FDM/JSBSim/models/FGOutput.h +++ b/src/FDM/JSBSim/models/FGOutput.h @@ -41,19 +41,8 @@ INCLUDES #include "FGModel.h" -#ifdef FGFS -# include -# include STL_IOSTREAM -# include STL_FSTREAM -#else -# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740) -# include -# include -# else -# include -# include -# endif -#endif +#include +#include #include "input_output/FGfdmSocket.h" #include "input_output/FGXMLFileRead.h" diff --git a/src/FDM/JSBSim/models/FGPropagate.cpp b/src/FDM/JSBSim/models/FGPropagate.cpp index 2f2abc647..943d0b2fa 100644 --- a/src/FDM/JSBSim/models/FGPropagate.cpp +++ b/src/FDM/JSBSim/models/FGPropagate.cpp @@ -53,28 +53,8 @@ COMMENTS, REFERENCES, and NOTES INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# include -# else -# include -# include -# endif -#else -# if defined(sgi) && !defined(__GNUC__) -# include -# if (_COMPILER_VERSION < 740) -# include -# else -# include -# endif -# else -# include -# include -# endif -#endif +#include +#include #include "FGPropagate.h" #include diff --git a/src/FDM/JSBSim/models/FGPropulsion.cpp b/src/FDM/JSBSim/models/FGPropulsion.cpp index aff448a59..7a0d6f156 100644 --- a/src/FDM/JSBSim/models/FGPropulsion.cpp +++ b/src/FDM/JSBSim/models/FGPropulsion.cpp @@ -167,16 +167,16 @@ bool FGPropulsion::Run(void) bool FGPropulsion::GetSteadyState(void) { - double currentThrust = 0, lastThrust=-1; - int steady_count,j=0; - bool steady=false; + double currentThrust = 0, lastThrust = -1; + int steady_count = 0, j = 0; + bool steady = false; vForces.InitMatrix(); vMoments.InitMatrix(); if (!FGModel::Run()) { for (unsigned int i=0; iSetTrimMode(true); steady=false; steady_count=0; @@ -189,16 +189,16 @@ bool FGPropulsion::GetSteadyState(void) steady_count++; if (steady_count > 120) { steady=true; - cout << " Steady state found at thrust: " << currentThrust << " lbs." << endl; +// cout << " Steady state found at thrust: " << currentThrust << " lbs." << endl; } } else { steady_count=0; } j++; } - if (j >= 6000) { - cout << " Could not find a steady state for this engine." << endl; - } +// if (j >= 6000) { +// cout << " Could not find a steady state for this engine." << endl; +// } vForces += Engines[i]->GetBodyForces(); // sum body frame forces vMoments += Engines[i]->GetMoments(); // sum body frame moments Engines[i]->SetTrimMode(false); diff --git a/src/FDM/JSBSim/models/FGPropulsion.h b/src/FDM/JSBSim/models/FGPropulsion.h index 71351477e..b812f1968 100644 --- a/src/FDM/JSBSim/models/FGPropulsion.h +++ b/src/FDM/JSBSim/models/FGPropulsion.h @@ -38,19 +38,8 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# include -# else -# include -# include -# endif -#else -# include -# include -#endif +#include +#include #include "FGModel.h" #include diff --git a/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h b/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h index 8e0fa14f4..3ce2f4154 100644 --- a/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h +++ b/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h @@ -37,15 +37,11 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -#endif - -#include -#include #include #include #include +#include +#include /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% DEFINITIONS @@ -54,6 +50,7 @@ DEFINITIONS #define ID_FCSCOMPONENT "$Id$" using std::string; +using std::vector; /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% FORWARD DECLARATIONS diff --git a/src/FDM/JSBSim/models/flight_control/FGGain.h b/src/FDM/JSBSim/models/flight_control/FGGain.h index d0f501e4e..7ab7925c3 100644 --- a/src/FDM/JSBSim/models/flight_control/FGGain.h +++ b/src/FDM/JSBSim/models/flight_control/FGGain.h @@ -37,18 +37,13 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# include STL_STRING - SG_USING_STD(string); -#else -# include -#endif - #include "FGFCSComponent.h" +#include #include #include +using std::string; + /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% DEFINITIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ diff --git a/src/FDM/JSBSim/models/flight_control/FGKinemat.cpp b/src/FDM/JSBSim/models/flight_control/FGKinemat.cpp index ad2034b0b..5949cf710 100644 --- a/src/FDM/JSBSim/models/flight_control/FGKinemat.cpp +++ b/src/FDM/JSBSim/models/flight_control/FGKinemat.cpp @@ -37,11 +37,10 @@ COMMENTS, REFERENCES, and NOTES INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ +#include "FGKinemat.h" #include #include -#include "FGKinemat.h" - namespace JSBSim { static const char *IdSrc = "$Id$"; diff --git a/src/FDM/JSBSim/models/flight_control/FGKinemat.h b/src/FDM/JSBSim/models/flight_control/FGKinemat.h index 71eeedffb..13d2ec7d9 100644 --- a/src/FDM/JSBSim/models/flight_control/FGKinemat.h +++ b/src/FDM/JSBSim/models/flight_control/FGKinemat.h @@ -37,20 +37,13 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# else -# include -# endif -#else -# include -#endif - -#include #include "FGFCSComponent.h" #include +#include +#include + +using std::vector; +using std::string; /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% DEFINITIONS diff --git a/src/FDM/JSBSim/models/flight_control/FGPID.cpp b/src/FDM/JSBSim/models/flight_control/FGPID.cpp index e2395e3a1..27be32c32 100755 --- a/src/FDM/JSBSim/models/flight_control/FGPID.cpp +++ b/src/FDM/JSBSim/models/flight_control/FGPID.cpp @@ -101,9 +101,6 @@ FGPID::FGPID(FGFCS* fcs, Element* element) : FGFCSComponent(fcs, element) } } - //if (element->FindElement("kp")) Kp = element->FindElementValueAsNumber("kp"); - //if (element->FindElement("ki")) Ki = element->FindElementValueAsNumber("ki"); - //if (element->FindElement("kd")) Kd = element->FindElementValueAsNumber("kd"); if (element->FindElement("trigger")) { Trigger = PropertyManager->GetNode(element->FindElementValue("trigger")); } diff --git a/src/FDM/JSBSim/models/flight_control/FGPID.h b/src/FDM/JSBSim/models/flight_control/FGPID.h index b365f3537..754ae14d2 100755 --- a/src/FDM/JSBSim/models/flight_control/FGPID.h +++ b/src/FDM/JSBSim/models/flight_control/FGPID.h @@ -38,16 +38,9 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# include STL_STRING - SG_USING_STD(string); -#else -# include -#endif - #include "FGFCSComponent.h" #include +#include /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% DEFINITIONS @@ -55,6 +48,10 @@ DEFINITIONS #define ID_PID "$Id$" +using std::string; + +using std::string; + /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% FORWARD DECLARATIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ diff --git a/src/FDM/JSBSim/models/flight_control/FGSummer.h b/src/FDM/JSBSim/models/flight_control/FGSummer.h index ed65eead9..cc11352f5 100644 --- a/src/FDM/JSBSim/models/flight_control/FGSummer.h +++ b/src/FDM/JSBSim/models/flight_control/FGSummer.h @@ -37,20 +37,10 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# else -# include -# endif -#else -# include -#endif - -#include #include "FGFCSComponent.h" #include +#include +#include /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% DEFINITIONS @@ -58,6 +48,12 @@ DEFINITIONS #define ID_SUMMER "$Id$" +using std::vector; +using std::string; + +using std::vector; +using std::string; + /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% FORWARD DECLARATIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ diff --git a/src/FDM/JSBSim/models/propulsion/FGEngine.cpp b/src/FDM/JSBSim/models/propulsion/FGEngine.cpp index 08c2e5be6..bcca56cb7 100644 --- a/src/FDM/JSBSim/models/propulsion/FGEngine.cpp +++ b/src/FDM/JSBSim/models/propulsion/FGEngine.cpp @@ -37,27 +37,13 @@ HISTORY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# ifdef SG_HAVE_STD_INCLUDES -# include -# else -# include -# endif -#else -# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740) -# include -# else -# include -# endif -#endif - #include "FGEngine.h" #include "FGTank.h" #include "FGPropeller.h" #include "FGNozzle.h" #include #include +#include namespace JSBSim { diff --git a/src/FDM/JSBSim/models/propulsion/FGEngine.h b/src/FDM/JSBSim/models/propulsion/FGEngine.h index 1f2456837..225c39a0f 100644 --- a/src/FDM/JSBSim/models/propulsion/FGEngine.h +++ b/src/FDM/JSBSim/models/propulsion/FGEngine.h @@ -43,24 +43,12 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#ifdef FGFS -# include -# include STL_STRING - SG_USING_STD(string); -# ifdef SG_HAVE_STD_INCLUDES -# include -# else -# include -# endif -#else -# include -# include -#endif - #include #include "FGThruster.h" #include #include +#include +#include /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% DEFINITIONS diff --git a/src/FDM/JSBSim/models/propulsion/FGPiston.cpp b/src/FDM/JSBSim/models/propulsion/FGPiston.cpp index 8e300b944..2297ebaef 100644 --- a/src/FDM/JSBSim/models/propulsion/FGPiston.cpp +++ b/src/FDM/JSBSim/models/propulsion/FGPiston.cpp @@ -167,16 +167,16 @@ FGPiston::FGPiston(FGFDMExec* exec, Element* el, int engine_number) /* Manifold_Pressure_Lookup = new - 0 0.2 0.4 0.6 0.8 1 -0 1.0000 1.0000 1.0000 1.0000 1.0000 1.0000 -1000 0.7778 0.8212 0.8647 0.9081 0.9516 0.9950 -2000 0.5556 0.6424 0.7293 0.8162 0.9031 0.9900 -3000 0.3333 0.4637 0.5940 0.7243 0.8547 0.9850 -4000 0.2000 0.2849 0.4587 0.6324 0.8062 0.9800 -5000 0.2000 0.2000 0.3233 0.5406 0.7578 0.9750 -6000 0.2000 0.2000 0.2000 0.4487 0.7093 0.9700 -7000 0.2000 0.2000 0.2000 0.2000 0.4570 0.7611 -8000 0.2000 0.2000 0.2000 0.2000 0.2047 0.5522 + 0 0.2 0.4 0.6 0.8 1 +0 1.0000 1.0000 1.0000 1.0000 1.0000 1.0000 +1000 0.7778 0.8212 0.8647 0.9081 0.9516 0.9950 +2000 0.5556 0.6424 0.7293 0.8162 0.9031 0.9900 +3000 0.3333 0.4637 0.5940 0.7243 0.8547 0.9850 +4000 0.2000 0.2849 0.4587 0.6324 0.8062 0.9800 +5000 0.2000 0.2000 0.3233 0.5406 0.7578 0.9750 +6000 0.2000 0.2000 0.2000 0.4487 0.7093 0.9700 +7000 0.2000 0.2000 0.2000 0.2000 0.4570 0.7611 +8000 0.2000 0.2000 0.2000 0.2000 0.2047 0.5522 */ // Read inputs from engine data file where present. @@ -513,8 +513,8 @@ void FGPiston::doBoostControl(void) void FGPiston::doMAP(void) { - suction_loss = pow( ThrottlePos*0.98, RPM/MaxRPM ); - MAP = p_amb * suction_loss; + suction_loss = pow( ThrottlePos*0.98, RPM/MaxRPM ); + MAP = p_amb * suction_loss; if(Boosted) { // If takeoff boost is fitted, we currently assume the following throttle map: @@ -599,10 +599,10 @@ void FGPiston::doFuelFlow(void) double AFR = 10+(12*(1-Mixture));// mixture 10:1 to 22:1 m_dot_fuel = m_dot_air / AFR; FuelFlow_gph = m_dot_fuel - * 3600 // seconds to hours - * 2.2046 // kg to lb - / 6.0; // lb to gal_us of gasoline -// / 6.6; // lb to gal_us of kerosene + * 3600 // seconds to hours + * 2.2046 // kg to lb + / 6.0; // lb to gal_us of gasoline +// / 6.6; // lb to gal_us of kerosene } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -627,15 +627,14 @@ void FGPiston::doEnginePower(void) double T_amb_sea_lev_degF = KelvinToFahrenheit(288); // FIXME: this needs to be generalized - double ManXRPM, ME, Adjusted_BSFC; // Convienience term for use in the calculations - ME = Mixture_Efficiency_Correlation->GetValue(m_dot_fuel/m_dot_air); - Adjusted_BSFC = (1/ThrottlePos) * BSFC; - Percentage_Power = 1.000; + double ME, Adjusted_BSFC; // Convienience term for use in the calculations + ME = Mixture_Efficiency_Correlation->GetValue(m_dot_fuel/m_dot_air); + Adjusted_BSFC = (1/ThrottlePos) * BSFC; + Percentage_Power = 1.000; - if( Magnetos != 3 ) - Percentage_Power *= SparkFailDrop; + if ( Magnetos != 3 ) Percentage_Power *= SparkFailDrop; - HP = (FuelFlow_gph * 6.0 / Adjusted_BSFC )* ME * suction_loss * Percentage_Power; + HP = (FuelFlow_gph * 6.0 / Adjusted_BSFC )* ME * suction_loss * Percentage_Power; } else { @@ -775,7 +774,7 @@ void FGPiston::doOilPressure(void) { double Oil_Press_Relief_Valve = 60; // FIXME: may vary by engine double Oil_Press_RPM_Max = MaxRPM * 0.75; // 75% of max rpm FIXME: may vary by engine - double Design_Oil_Temp = 358; // degK; FIXME: may vary by engine + double Design_Oil_Temp = 358; // degK; FIXME: may vary by engine double Oil_Viscosity_Index = 0.25; OilPressure_psi = (Oil_Press_Relief_Valve / Oil_Press_RPM_Max) * RPM; diff --git a/src/FDM/JSBSim/models/propulsion/FGTank.cpp b/src/FDM/JSBSim/models/propulsion/FGTank.cpp index 7f6d411b1..9827c5606 100644 --- a/src/FDM/JSBSim/models/propulsion/FGTank.cpp +++ b/src/FDM/JSBSim/models/propulsion/FGTank.cpp @@ -38,11 +38,9 @@ INCLUDES #include "FGTank.h" -#if !defined ( sgi ) || defined( __GNUC__ ) && (_COMPILER_VERSION < 740) using std::cerr; using std::endl; using std::cout; -#endif namespace JSBSim { diff --git a/src/FDM/JSBSim/models/propulsion/FGTank.h b/src/FDM/JSBSim/models/propulsion/FGTank.h index 9fbce75b8..f9bb0332f 100644 --- a/src/FDM/JSBSim/models/propulsion/FGTank.h +++ b/src/FDM/JSBSim/models/propulsion/FGTank.h @@ -48,12 +48,8 @@ INCLUDES #include #include #include - -#ifdef FGFS -# include -#endif - #include + using std::string; using std::cerr; using std::endl; @@ -210,13 +206,38 @@ public: /** Resets the tank parameters to the initial conditions */ void ResetToIC(void); + /** If the tank is supplying fuel, this function returns true. + @return true if this tank is feeding an engine.*/ bool GetSelected(void) {return Selected;} + + /** Gets the tank fill level. + @return the fill level in percent, from 0 to 100.*/ double GetPctFull(void) {return PctFull;} + + /** Gets the capacity of the tank. + @return the capacity of the tank in pounds. */ double GetCapacity(void) {return Capacity;} + + /** Gets the contents of the tank. + @return the contents of the tank in pounds. */ double GetContents(void) const {return Contents;} + + /** Gets the temperature of the fuel. + The temperature of the fuel is calculated if an initial tempearture is + given in the configuration file. + @return the temperature of the fuel in degrees C IF an initial temperature + is given, otherwise 0.0 C is returned. */ double GetTemperature_degC(void) {return Temperature;} + + /** Gets the temperature of the fuel. + The temperature of the fuel is calculated if an initial tempearture is + given in the configuration file. + @return the temperature of the fuel in degrees F IF an initial temperature + is given, otherwise 32 degrees F is returned. */ double GetTemperature(void) {return CelsiusToFahrenheit(Temperature);} + double GetStandpipe(void) {return Standpipe;} + const FGColumnVector3 GetXYZ(void); const double GetXYZ(int idx);