fly/flightgear
1
0
Fork 0
Code Activity

Sync. with JSBSim CVS (header cleanups).

Browse source
This commit is contained in:
ehofman 2008-07-22 08:49:15 +00:00
parent b19a270d54
commit 3b3f671974
52 changed files with 185 additions and 598 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/FDM/JSBSim/FGFDMExec.cpp
View file

@ -41,19 +41,6 @@ COMMENTS, REFERENCES, and NOTES
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# include STL_IOSTREAM
# include STL_ITERATOR
#else
# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
# include <iostream.h>
# else
# include <iostream>
# endif
# include <iterator>
#endif
#include "FGFDMExec.h"
#include "FGState.h"
#include <models/FGAtmosphere.h>
@ -77,6 +64,9 @@ INCLUDES
#include <input_output/FGPropertyManager.h>
#include <input_output/FGScript.h>
#include <iostream>
#include <iterator>
namespace JSBSim {
static const char *IdSrc = "$Id$";

1
src/FDM/JSBSim/FGFDMExec.h
View file

@ -68,6 +68,7 @@ FORWARD DECLARATIONS
namespace JSBSim {
class FGScript;
class FGTrim;
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS DOCUMENTATION

11
src/FDM/JSBSim/FGState.cpp
View file

@ -36,16 +36,7 @@ HISTORY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# include <math.h>
#else
# if defined(sgi) && !defined(__GNUC__)
# include <math.h>
# else
# include <cmath>
# endif
#endif
#include <cmath>
#include "FGState.h"

16
src/FDM/JSBSim/FGState.h
View file

@ -41,21 +41,7 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <fstream>
# else
# include <fstream.h>
# endif
#else
# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
# include <fstream.h>
# else
# include <fstream>
# endif
#endif
#include <fstream>
#include <string>
#include <map>
#include "FGJSBBase.h"

17
src/FDM/JSBSim/initialization/FGInitialCondition.cpp
View file

@ -42,21 +42,6 @@ you have chosen your IC's wisely) even after setting it up with this class.
INCLUDES
*******************************************************************************/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <fstream>
# else
# include <fstream.h>
# endif
#else
# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
# include <fstream.h>
# else
# include <fstream>
# endif
#endif
#include "FGInitialCondition.h"
#include <FGFDMExec.h>
#include <models/FGInertial.h>
@ -66,8 +51,8 @@ INCLUDES
#include <input_output/FGPropertyManager.h>
#include <models/FGPropulsion.h>
#include <input_output/FGXMLParse.h>
#include <math/FGQuaternion.h>
#include <fstream>
namespace JSBSim {

8
src/FDM/JSBSim/initialization/FGTrim.cpp
View file

@ -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 <stdlib.h>
#include <FGFDMExec.h>
#include <cstdlib>
#include "FGTrim.h"
#include <models/FGAtmosphere.h>
#include "FGInitialCondition.h"
#include "FGTrim.h"
#include <models/FGAircraft.h>
#include <models/FGMassBalance.h>
#include <models/FGGroundReactions.h>

4
src/FDM/JSBSim/initialization/FGTrimAxis.cpp
View file

@ -37,8 +37,7 @@ INCLUDES
#endif
#include <string>
#include <stdlib.h>
#include <cstdlib>
#include <FGFDMExec.h>
#include <models/FGAtmosphere.h>
#include "FGInitialCondition.h"
@ -47,7 +46,6 @@ INCLUDES
#include <models/FGPropulsion.h>
#include <models/FGAerodynamics.h>
namespace JSBSim {
static const char *IdSrc = "$Id$";

7
src/FDM/JSBSim/input_output/FGPropertyManager.cpp
View file

@ -63,12 +63,7 @@ string FGPropertyManager::mkPropertyName(string name, bool lowercase) {
else if( isspace(name[i]) )
name[i]='-';
}
/*
for(i=0;i<name.length();i++) {
if( name[i] == '/' )
name.erase(i,1);
}
*/
return name;
}

6
src/FDM/JSBSim/input_output/FGPropertyManager.h
View file

@ -37,11 +37,7 @@ INCLUDES
#include <string>
#include <iostream>
#ifdef FGFS
# include <simgear/props/props.hxx>
#else
# include "simgear/props/props.hxx"
#endif
#include "simgear/props/props.hxx"
#include "FGJSBBase.h"

16
src/FDM/JSBSim/input_output/FGScript.cpp
View file

@ -41,23 +41,13 @@ COMMENTS, REFERENCES, and NOTES
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# include STL_IOSTREAM
# include STL_ITERATOR
#else
# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
# include <iostream.h>
# else
# include <iostream>
# endif
# include <iterator>
#endif
#include "FGScript.h"
#include <input_output/FGXMLParse.h>
#include <initialization/FGTrim.h>
#include <iostream>
#include <iterator>
namespace JSBSim {
static const char *IdSrc = "$Id$";

24
src/FDM/JSBSim/input_output/FGXMLElement.cpp
View file

@ -29,29 +29,9 @@ INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#include "FGXMLElement.h"
#ifdef FGFS
# ifndef __BORLANDC__
# include <simgear/compiler.h>
# endif
# ifdef SG_HAVE_STD_INCLUDES
# include <cmath>
# include <cstdlib>
# else
# include <math.h>
# include <stdlib.h>
# endif
#else
# if defined (sgi) && !defined(__GNUC__)
# include <math.h>
# include <stdlib.h>
# else
# include <cmath>
# include <cstdlib>
# endif
#endif
#include <stdlib.h>
#include <math.h>
#include <cmath>
#include <cstdlib>
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS

39
src/FDM/JSBSim/input_output/FGXMLElement.h
View file

@ -34,35 +34,16 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <string>
# include <vector>
# include <iostream>
# include <map>
# else
# include <vector.h>
# include <string>
# include <iostream.h>
# include <map.h>
# endif
#else
# include <string>
# include <map>
# include <iostream>
# include <vector>
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 <string>
#include <map>
#include <iostream>
#include <vector>
using std::string;
using std::map;
using std::vector;
using std::cout;
using std::endl;
#include <math/FGColumnVector3.h>

2
src/FDM/JSBSim/input_output/FGXMLParse.cpp
View file

@ -30,7 +30,7 @@ INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#include "FGXMLParse.h"
#include <stdlib.h>
#include <cstdlib>
namespace JSBSim {

18
src/FDM/JSBSim/input_output/FGXMLParse.h
View file

@ -34,17 +34,13 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# include STL_STRING
#else
# include <string>
# include <iostream>
using std::string;
using std::cout;
using std::cerr;
using std::endl;
#endif
#include <string>
#include <iostream>
using std::string;
using std::cout;
using std::cerr;
using std::endl;
#include "FGXMLElement.h"
#include "simgear/xml/easyxml.hxx"

33
src/FDM/JSBSim/input_output/FGfdmSocket.h
View file

@ -39,31 +39,16 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#include <stdio.h>
#ifdef FGFS
# include <simgear/compiler.h>
# include STL_STRING
# include STL_IOSTREAM
# include STL_FSTREAM
SG_USING_STD(cout);
SG_USING_STD(endl);
#else
# include <string>
# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
# include <iostream.h>
# include <fstream.h>
# else
# include <iostream>
# include <fstream>
using std::cout;
using std::endl;
# endif
#endif
#include <cstdio>
#include <string>
#include <iostream>
#include <fstream>
#include <sys/types.h>
#include "FGJSBBase.h"
using std::cout;
using std::endl;
#if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__)
#include <winsock.h>
#include <io.h>
@ -77,9 +62,7 @@ INCLUDES
#endif
#ifdef _MSC_VER
#pragma comment (lib,"WSock32.lib")
# pragma comment (lib,"WSock32.lib")
#endif
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

2
src/FDM/JSBSim/math/FGColumnVector3.cpp
View file

@ -38,7 +38,7 @@ INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#include "FGColumnVector3.h"
#include <stdio.h>
#include <cstdio>
namespace JSBSim {

51
src/FDM/JSBSim/math/FGColumnVector3.h
View file

@ -39,44 +39,19 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#include <stdlib.h>
#ifdef FGFS
# include <math.h>
# include <simgear/compiler.h>
# 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 <string>
# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
# include <fstream.h>
# include <iostream.h>
# include <math.h>
# else
# include <fstream>
# include <iostream>
# if defined(sgi) && !defined(__GNUC__)
# include <math.h>
# else
# include <cmath>
# 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 <cstdlib>
#include <string>
#include <fstream>
#include <iostream>
#include <cmath>
using std::ostream;
using std::istream;
using std::cerr;
using std::cout;
using std::endl;
using std::sqrt;
using std::string;
#include "FGJSBBase.h"

15
src/FDM/JSBSim/math/FGLocation.cpp
View file

@ -38,20 +38,7 @@ HISTORY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <cmath>
# else
# include <math.h>
# endif
#else
# if defined(sgi) && !defined(__GNUC__)
# include <math.h>
# else
# include <cmath>
# endif
#endif
#include <cmath>
#include "FGLocation.h"
#include <input_output/FGPropertyManager.h>

47
src/FDM/JSBSim/math/FGMatrix33.h
View file

@ -40,41 +40,18 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#include <stdlib.h>
#ifdef FGFS
# include <math.h>
# include <simgear/compiler.h>
# 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 <string>
# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
include <fstream.h>
include <iostream.h>
# include <math.h>
# else
# include <fstream>
# include <iostream>
# if defined(sgi) && !defined(__GNUC__)
# include <math.h>
# else
# include <cmath>
# endif
using std::ostream;
using std::istream;
using std::cerr;
using std::cout;
using std::endl;
# endif
using std::string;
#endif
#include <cstdlib>
#include <string>
#include <fstream>
#include <iostream>
#include <cmath>
using std::ostream;
using std::istream;
using std::cerr;
using std::cout;
using std::endl;
using std::string;
#include "FGColumnVector3.h"
#include "FGJSBBase.h"

30
src/FDM/JSBSim/math/FGQuaternion.cpp
View file

@ -38,30 +38,12 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <math.h>
# include <simgear/compiler.h>
# include STL_IOSTREAM
SG_USING_STD(cerr);
SG_USING_STD(cout);
SG_USING_STD(endl);
#else
# include <string>
# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
# include <iostream.h>
# include <math.h>
# else
# include <iostream>
# if defined(sgi) && !defined(__GNUC__)
# include <math.h>
# else
# include <cmath>
# endif
using std::cerr;
using std::cout;
using std::endl;
# endif
#endif
#include <string>
#include <iostream>
#include <cmath>
using std::cerr;
using std::cout;
using std::endl;
#include "FGMatrix33.h"
#include "FGColumnVector3.h"

7
src/FDM/JSBSim/math/FGTable.cpp
View file

@ -37,12 +37,7 @@ INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#include "FGTable.h"
#if defined ( sgi ) && !defined( __GNUC__ ) && (_COMPILER_VERSION < 740)
# include <iomanip.h>
#else
# include <iomanip>
#endif
#include <iomanip>
using namespace std;

15
src/FDM/JSBSim/models/FGAerodynamics.h
View file

@ -38,19 +38,8 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <vector>
# include <map>
# else
# include <vector.h>
# include <map.h>
# endif
#else
# include <vector>
# include <map>
#endif
#include <vector>
#include <map>
#include "FGModel.h"
#include <math/FGFunction.h>

17
src/FDM/JSBSim/models/FGAircraft.cpp
View file

@ -41,22 +41,7 @@ INCLUDES
#include <sys/stat.h>
#include <sys/types.h>
#ifdef FGFS
# ifndef __BORLANDC__
# include <simgear/compiler.h>
# endif
# ifdef SG_HAVE_STD_INCLUDES
# include <cmath>
# else
# include <math.h>
# endif
#else
# if defined (sgi) && !defined(__GNUC__)
# include <math.h>
# else
# include <cmath>
# endif
#endif
#include <cmath>
#include "FGAircraft.h"
#include "FGMassBalance.h"

11
src/FDM/JSBSim/models/FGAircraft.h
View file

@ -38,16 +38,7 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <vector>
# else
# include <vector.h>
# endif
#else
# include <vector>
#endif
#include <vector>
#include "FGModel.h"
#include <input_output/FGXMLElement.h>

1
src/FDM/JSBSim/models/FGAtmosphere.cpp
View file

@ -64,7 +64,6 @@ static const char *IdHdr = ID_ATMOSPHERE;
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
FGAtmosphere::FGAtmosphere(FGFDMExec* fdmex) : FGModel(fdmex)
{
Name = "FGAtmosphere";

15
src/FDM/JSBSim/models/FGBuoyantForces.h
View file

@ -39,19 +39,8 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <vector>
# include <map>
# else
# include <vector.h>
# include <map.h>
# endif
#else
# include <vector>
# include <map>
#endif
#include <vector>
#include <map>
#include "FGModel.h"
#include "FGGasCell.h"

4
src/FDM/JSBSim/models/FGExternalReactions.h
View file

@ -38,10 +38,6 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
#endif
#include "FGModel.h"
#include "FGExternalForce.h"
#include <input_output/FGXMLElement.h>

11
src/FDM/JSBSim/models/FGFCS.h
View file

@ -38,16 +38,7 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <vector>
# else
# include <vector.h>
# endif
#else
# include <vector>
#endif
#include <vector>
#include <string>
#include <models/flight_control/FGFCSComponent.h>

2
src/FDM/JSBSim/models/FGGasCell.cpp
View file

@ -42,11 +42,9 @@ INCLUDES
#include <models/FGMassBalance.h>
#include "FGGasCell.h"
#if !defined ( sgi ) || defined( __GNUC__ ) && (_COMPILER_VERSION < 740)
using std::cerr;
using std::endl;
using std::cout;
#endif
namespace JSBSim {

21
src/FDM/JSBSim/models/FGGasCell.h
View file

@ -45,22 +45,11 @@ INCLUDES
#include <models/propulsion/FGForce.h>
#include <math/FGFunction.h>
#ifdef FGFS
# include <simgear/compiler.h>
# include STL_STRING
SG_USING_STD(string);
SG_USING_STD(cerr);
SG_USING_STD(endl);
SG_USING_STD(cout);
#else
# include <string>
using std::string;
# if !defined(sgi) || defined(__GNUC__) || (_COMPILER_VERSION >= 740)
using std::cerr;
using std::endl;
using std::cout;
# endif
#endif
#include <string>
using std::string;
using std::cerr;
using std::endl;
using std::cout;
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
DEFINITIONS

11
src/FDM/JSBSim/models/FGGroundReactions.h
View file

@ -38,16 +38,7 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <vector>
# else
# include <vector.h>
# endif
#else
# include <vector>
#endif
#include <vector>
#include "FGModel.h"
#include "FGLGear.h"

11
src/FDM/JSBSim/models/FGInertial.h
View file

@ -38,16 +38,7 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <vector>
# else
# include <vector.h>
# endif
#else
# include <vector>
#endif
#include <vector>
#include "FGModel.h"
#include <math/FGColumnVector3.h>

15
src/FDM/JSBSim/models/FGInput.h
View file

@ -40,19 +40,8 @@ INCLUDES
#include "FGModel.h"
#ifdef FGFS
# include <simgear/compiler.h>
# include STL_IOSTREAM
# include STL_FSTREAM
#else
# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
# include <iostream.h>
# include <fstream.h>
# else
# include <iostream>
# include <fstream>
# endif
#endif
#include <iostream>
#include <fstream>
#include <input_output/FGfdmSocket.h>
#include <input_output/FGXMLElement.h>

4
src/FDM/JSBSim/models/FGLGear.h
View file

@ -38,10 +38,6 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
#endif
#include <FGJSBBase.h>
#include <FGFDMExec.h>
#include <input_output/FGXMLElement.h>

16
src/FDM/JSBSim/models/FGModel.h
View file

@ -42,21 +42,7 @@ INCLUDES
#include <input_output/FGPropertyManager.h>
#include <input_output/FGXMLElement.h>
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <iostream>
# else
# include <iostream.h>
# endif
#else
# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
# include <iostream.h>
# else
# include <iostream>
# endif
#endif
#include <iostream>
#include <string>
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

1
src/FDM/JSBSim/models/FGOutput.cpp
View file

@ -68,7 +68,6 @@ INCLUDES
static const int endianTest = 1;
#define isLittleEndian (*((char *) &endianTest ) != 0)
namespace JSBSim {
static const char *IdSrc = "$Id$";

15
src/FDM/JSBSim/models/FGOutput.h
View file

@ -41,19 +41,8 @@ INCLUDES
#include "FGModel.h"
#ifdef FGFS
# include <simgear/compiler.h>
# include STL_IOSTREAM
# include STL_FSTREAM
#else
# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
# include <iostream.h>
# include <fstream.h>
# else
# include <iostream>
# include <fstream>
# endif
#endif
#include <iostream>
#include <fstream>
#include "input_output/FGfdmSocket.h"
#include "input_output/FGXMLFileRead.h"

24
src/FDM/JSBSim/models/FGPropagate.cpp
View file

@ -53,28 +53,8 @@ COMMENTS, REFERENCES, and NOTES
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <cmath>
# include <iomanip>
# else
# include <math.h>
# include <iomanip.h>
# endif
#else
# if defined(sgi) && !defined(__GNUC__)
# include <math.h>
# if (_COMPILER_VERSION < 740)
# include <iomanip.h>
# else
# include <iomanip>
# endif
# else
# include <cmath>
# include <iomanip>
# endif
#endif
#include <cmath>
#include <iomanip>
#include "FGPropagate.h"
#include <FGState.h>

16
src/FDM/JSBSim/models/FGPropulsion.cpp
View file

@ -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; i<numEngines; i++) {
cout << " Finding steady state for engine " << i << endl;
// cout << " Finding steady state for engine " << i << endl;
Engines[i]->SetTrimMode(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);

15
src/FDM/JSBSim/models/FGPropulsion.h
View file

@ -38,19 +38,8 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <vector>
# include <fstream>
# else
# include <vector.h>
# include <fstream.h>
# endif
#else
# include <vector>
# include <fstream>
#endif
#include <vector>
#include <fstream>
#include "FGModel.h"
#include <models/propulsion/FGEngine.h>

9
src/FDM/JSBSim/models/flight_control/FGFCSComponent.h
View file

@ -37,15 +37,11 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
#endif
#include <string>
#include <vector>
#include <FGJSBBase.h>
#include <input_output/FGPropertyManager.h>
#include <input_output/FGXMLElement.h>
#include <string>
#include <vector>
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
DEFINITIONS
@ -54,6 +50,7 @@ DEFINITIONS
#define ID_FCSCOMPONENT "$Id$"
using std::string;
using std::vector;
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS

11
src/FDM/JSBSim/models/flight_control/FGGain.h
View file

@ -37,18 +37,13 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# include STL_STRING
SG_USING_STD(string);
#else
# include <string>
#endif
#include "FGFCSComponent.h"
#include <string>
#include <input_output/FGXMLElement.h>
#include <math/FGTable.h>
using std::string;
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
DEFINITIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

3
src/FDM/JSBSim/models/flight_control/FGKinemat.cpp
View file

@ -37,11 +37,10 @@ COMMENTS, REFERENCES, and NOTES
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#include "FGKinemat.h"
#include <math.h>
#include <float.h>
#include "FGKinemat.h"
namespace JSBSim {
static const char *IdSrc = "$Id$";

17
src/FDM/JSBSim/models/flight_control/FGKinemat.h
View file

@ -37,20 +37,13 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <vector>
# else
# include <vector.h>
# endif
#else
# include <vector>
#endif
#include <string>
#include "FGFCSComponent.h"
#include <input_output/FGXMLElement.h>
#include <vector>
#include <string>
using std::vector;
using std::string;
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
DEFINITIONS

3
src/FDM/JSBSim/models/flight_control/FGPID.cpp
View file

@ -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"));
}

13
src/FDM/JSBSim/models/flight_control/FGPID.h
View file

@ -38,16 +38,9 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# include STL_STRING
SG_USING_STD(string);
#else
# include <string>
#endif
#include "FGFCSComponent.h"
#include <input_output/FGXMLElement.h>
#include <string>
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
DEFINITIONS
@ -55,6 +48,10 @@ DEFINITIONS
#define ID_PID "$Id$"
using std::string;
using std::string;
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

20
src/FDM/JSBSim/models/flight_control/FGSummer.h
View file

@ -37,20 +37,10 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <vector>
# else
# include <vector.h>
# endif
#else
# include <vector>
#endif
#include <string>
#include "FGFCSComponent.h"
#include <input_output/FGXMLElement.h>
#include <vector>
#include <string>
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
DEFINITIONS
@ -58,6 +48,12 @@ DEFINITIONS
#define ID_SUMMER "$Id$"
using std::vector;
using std::string;
using std::vector;
using std::string;
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

16
src/FDM/JSBSim/models/propulsion/FGEngine.cpp
View file

@ -37,27 +37,13 @@ HISTORY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# ifdef SG_HAVE_STD_INCLUDES
# include <fstream>
# else
# include <fstream.h>
# endif
#else
# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
# include <fstream.h>
# else
# include <fstream>
# endif
#endif
#include "FGEngine.h"
#include "FGTank.h"
#include "FGPropeller.h"
#include "FGNozzle.h"
#include <input_output/FGXMLParse.h>
#include <math/FGColumnVector3.h>
#include <fstream>
namespace JSBSim {

16
src/FDM/JSBSim/models/propulsion/FGEngine.h
View file

@ -43,24 +43,12 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifdef FGFS
# include <simgear/compiler.h>
# include STL_STRING
SG_USING_STD(string);
# ifdef SG_HAVE_STD_INCLUDES
# include <vector>
# else
# include <vector.h>
# endif
#else
# include <vector>
# include <string>
#endif
#include <FGJSBBase.h>
#include "FGThruster.h"
#include <input_output/FGPropertyManager.h>
#include <input_output/FGXMLFileRead.h>
#include <vector>
#include <string>
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
DEFINITIONS

47
src/FDM/JSBSim/models/propulsion/FGPiston.cpp
View file

@ -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;

2
src/FDM/JSBSim/models/propulsion/FGTank.cpp
View file

@ -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 {

31
src/FDM/JSBSim/models/propulsion/FGTank.h
View file

@ -48,12 +48,8 @@ INCLUDES
#include <input_output/FGXMLElement.h>
#include <math/FGColumnVector3.h>
#include <models/FGAuxiliary.h>
#ifdef FGFS
# include <simgear/compiler.h>
#endif
#include <string>
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);