From f0b16844b543db392a961b92477f0acaa7ba6c78 Mon Sep 17 00:00:00 2001
From: Bertrand Coconnier <bcoconni@users.sourceforge.net>
Date: Sun, 1 Jul 2018 19:08:39 +0200
Subject: [PATCH] Sync'ed JSBSim
- Air density now takes humidity into account.
- The protocol of input sockets is no longer case sensitive
- Late bounded properties are now cached for better performance.
---
src/FDM/JSBSim/FGFDMExec.cpp | 7 -
src/FDM/JSBSim/FGFDMExec.h | 6 -
src/FDM/JSBSim/FGJSBBase.cpp | 3 -
src/FDM/JSBSim/FGJSBBase.h | 9 -
src/FDM/JSBSim/JSBSim.cpp | 6 -
src/FDM/JSBSim/JSBSim.cxx | 5 +-
src/FDM/JSBSim/JSBSim.hxx | 1 +
.../initialization/FGInitialCondition.cpp | 5 -
.../initialization/FGInitialCondition.h | 7 -
src/FDM/JSBSim/initialization/FGTrim.cpp | 3 -
src/FDM/JSBSim/initialization/FGTrim.h | 7 -
src/FDM/JSBSim/initialization/FGTrimAxis.cpp | 5 -
src/FDM/JSBSim/initialization/FGTrimAxis.h | 2 -
.../JSBSim/input_output/FGGroundCallback.h | 8 -
src/FDM/JSBSim/input_output/FGInputSocket.cpp | 3 -
src/FDM/JSBSim/input_output/FGInputSocket.h | 6 -
src/FDM/JSBSim/input_output/FGInputType.cpp | 9 +-
src/FDM/JSBSim/input_output/FGInputType.h | 6 -
src/FDM/JSBSim/input_output/FGModelLoader.cpp | 3 -
src/FDM/JSBSim/input_output/FGModelLoader.h | 6 -
src/FDM/JSBSim/input_output/FGOutputFG.cpp | 3 -
src/FDM/JSBSim/input_output/FGOutputFG.h | 7 -
src/FDM/JSBSim/input_output/FGOutputFile.cpp | 3 -
src/FDM/JSBSim/input_output/FGOutputFile.h | 7 -
.../JSBSim/input_output/FGOutputSocket.cpp | 5 +-
src/FDM/JSBSim/input_output/FGOutputSocket.h | 7 -
.../JSBSim/input_output/FGOutputTextFile.cpp | 3 -
.../JSBSim/input_output/FGOutputTextFile.h | 7 -
src/FDM/JSBSim/input_output/FGOutputType.cpp | 9 +-
src/FDM/JSBSim/input_output/FGOutputType.h | 6 -
.../JSBSim/input_output/FGPropertyManager.h | 7 -
.../JSBSim/input_output/FGPropertyReader.cpp | 3 -
.../JSBSim/input_output/FGPropertyReader.h | 6 -
src/FDM/JSBSim/input_output/FGScript.cpp | 9 -
src/FDM/JSBSim/input_output/FGScript.h | 8 -
.../JSBSim/input_output/FGUDPInputSocket.cpp | 3 -
.../JSBSim/input_output/FGUDPInputSocket.h | 6 -
src/FDM/JSBSim/input_output/FGXMLElement.cpp | 3 -
src/FDM/JSBSim/input_output/FGXMLElement.h | 7 -
src/FDM/JSBSim/input_output/FGXMLFileRead.h | 6 -
src/FDM/JSBSim/input_output/FGXMLParse.cpp | 3 -
src/FDM/JSBSim/input_output/FGfdmSocket.cpp | 5 -
src/FDM/JSBSim/input_output/FGfdmSocket.h | 6 -
.../JSBSim/input_output/string_utilities.h | 54 -----
src/FDM/JSBSim/math/FGColumnVector3.cpp | 3 -
src/FDM/JSBSim/math/FGColumnVector3.h | 7 -
src/FDM/JSBSim/math/FGCondition.cpp | 6 -
src/FDM/JSBSim/math/FGCondition.h | 7 -
src/FDM/JSBSim/math/FGFunction.cpp | 5 -
src/FDM/JSBSim/math/FGFunction.h | 6 -
src/FDM/JSBSim/math/FGLocation.cpp | 3 -
src/FDM/JSBSim/math/FGLocation.h | 7 -
src/FDM/JSBSim/math/FGMatrix33.cpp | 3 -
src/FDM/JSBSim/math/FGMatrix33.h | 6 -
src/FDM/JSBSim/math/FGModelFunctions.cpp | 3 -
src/FDM/JSBSim/math/FGModelFunctions.h | 6 -
src/FDM/JSBSim/math/FGParameter.h | 6 -
src/FDM/JSBSim/math/FGPropertyValue.cpp | 5 +-
src/FDM/JSBSim/math/FGPropertyValue.h | 8 +-
src/FDM/JSBSim/math/FGQuaternion.cpp | 3 -
src/FDM/JSBSim/math/FGQuaternion.h | 6 -
src/FDM/JSBSim/math/FGRealValue.cpp | 3 -
src/FDM/JSBSim/math/FGRealValue.h | 6 -
src/FDM/JSBSim/math/FGRungeKutta.cpp | 4 -
src/FDM/JSBSim/math/FGRungeKutta.h | 12 +-
src/FDM/JSBSim/math/FGTable.cpp | 5 -
src/FDM/JSBSim/math/FGTable.h | 8 -
src/FDM/JSBSim/math/LagrangeMultiplier.h | 6 -
src/FDM/JSBSim/models/FGAccelerations.cpp | 5 -
src/FDM/JSBSim/models/FGAccelerations.h | 7 -
src/FDM/JSBSim/models/FGAerodynamics.cpp | 5 -
src/FDM/JSBSim/models/FGAerodynamics.h | 7 -
src/FDM/JSBSim/models/FGAircraft.cpp | 13 --
src/FDM/JSBSim/models/FGAircraft.h | 8 -
src/FDM/JSBSim/models/FGAtmosphere.cpp | 39 +++-
src/FDM/JSBSim/models/FGAtmosphere.h | 44 ++--
src/FDM/JSBSim/models/FGAuxiliary.cpp | 5 -
src/FDM/JSBSim/models/FGAuxiliary.h | 7 -
src/FDM/JSBSim/models/FGBuoyantForces.cpp | 5 -
src/FDM/JSBSim/models/FGBuoyantForces.h | 8 -
src/FDM/JSBSim/models/FGExternalForce.cpp | 5 -
src/FDM/JSBSim/models/FGExternalForce.h | 6 -
src/FDM/JSBSim/models/FGExternalReactions.cpp | 14 --
src/FDM/JSBSim/models/FGExternalReactions.h | 7 -
src/FDM/JSBSim/models/FGFCS.cpp | 5 -
src/FDM/JSBSim/models/FGFCS.h | 7 -
src/FDM/JSBSim/models/FGFCSChannel.h | 6 -
src/FDM/JSBSim/models/FGGasCell.cpp | 7 -
src/FDM/JSBSim/models/FGGasCell.h | 6 -
src/FDM/JSBSim/models/FGGroundReactions.cpp | 5 -
src/FDM/JSBSim/models/FGGroundReactions.h | 3 -
src/FDM/JSBSim/models/FGInertial.cpp | 5 -
src/FDM/JSBSim/models/FGInertial.h | 6 -
src/FDM/JSBSim/models/FGInput.cpp | 5 -
src/FDM/JSBSim/models/FGInput.h | 7 -
src/FDM/JSBSim/models/FGLGear.cpp | 5 -
src/FDM/JSBSim/models/FGLGear.h | 7 -
src/FDM/JSBSim/models/FGMassBalance.cpp | 5 -
src/FDM/JSBSim/models/FGMassBalance.h | 6 -
src/FDM/JSBSim/models/FGModel.cpp | 5 -
src/FDM/JSBSim/models/FGModel.h | 6 -
src/FDM/JSBSim/models/FGOutput.cpp | 5 -
src/FDM/JSBSim/models/FGOutput.h | 8 -
src/FDM/JSBSim/models/FGPropagate.cpp | 5 -
src/FDM/JSBSim/models/FGPropagate.h | 7 -
src/FDM/JSBSim/models/FGPropulsion.cpp | 6 -
src/FDM/JSBSim/models/FGPropulsion.h | 8 -
src/FDM/JSBSim/models/FGSurface.cpp | 9 -
src/FDM/JSBSim/models/FGSurface.h | 7 -
src/FDM/JSBSim/models/atmosphere/FGMSIS.cpp | 5 -
src/FDM/JSBSim/models/atmosphere/FGMSIS.h | 7 -
src/FDM/JSBSim/models/atmosphere/FGMars.cpp | 5 -
src/FDM/JSBSim/models/atmosphere/FGMars.h | 7 -
.../atmosphere/FGStandardAtmosphere.cpp | 204 +++++++++++++-----
.../models/atmosphere/FGStandardAtmosphere.h | 61 ++++--
src/FDM/JSBSim/models/atmosphere/FGWinds.cpp | 5 -
src/FDM/JSBSim/models/atmosphere/FGWinds.h | 6 -
.../models/flight_control/FGAccelerometer.cpp | 5 -
.../models/flight_control/FGAccelerometer.h | 6 -
.../models/flight_control/FGActuator.cpp | 5 -
.../JSBSim/models/flight_control/FGActuator.h | 6 -
.../JSBSim/models/flight_control/FGAngles.cpp | 5 -
.../JSBSim/models/flight_control/FGAngles.h | 7 -
.../models/flight_control/FGDeadBand.cpp | 5 -
.../JSBSim/models/flight_control/FGDeadBand.h | 7 -
.../models/flight_control/FGDistributor.cpp | 6 -
.../models/flight_control/FGDistributor.h | 7 -
.../models/flight_control/FGFCSComponent.cpp | 5 -
.../models/flight_control/FGFCSComponent.h | 7 -
.../models/flight_control/FGFCSFunction.cpp | 5 -
.../models/flight_control/FGFCSFunction.h | 7 -
.../JSBSim/models/flight_control/FGFilter.cpp | 5 -
.../JSBSim/models/flight_control/FGFilter.h | 6 -
.../JSBSim/models/flight_control/FGGain.cpp | 5 -
src/FDM/JSBSim/models/flight_control/FGGain.h | 6 -
.../JSBSim/models/flight_control/FGGyro.cpp | 5 -
src/FDM/JSBSim/models/flight_control/FGGyro.h | 6 -
.../models/flight_control/FGKinemat.cpp | 5 -
.../JSBSim/models/flight_control/FGKinemat.h | 6 -
.../models/flight_control/FGMagnetometer.cpp | 5 -
.../models/flight_control/FGMagnetometer.h | 6 -
.../JSBSim/models/flight_control/FGPID.cpp | 5 -
src/FDM/JSBSim/models/flight_control/FGPID.h | 6 -
.../JSBSim/models/flight_control/FGSensor.cpp | 5 -
.../JSBSim/models/flight_control/FGSensor.h | 6 -
.../flight_control/FGSensorOrientation.h | 6 -
.../JSBSim/models/flight_control/FGSummer.cpp | 5 -
.../JSBSim/models/flight_control/FGSummer.h | 7 -
.../JSBSim/models/flight_control/FGSwitch.cpp | 5 -
.../JSBSim/models/flight_control/FGSwitch.h | 7 -
.../models/flight_control/FGWaypoint.cpp | 5 -
.../JSBSim/models/flight_control/FGWaypoint.h | 7 -
.../JSBSim/models/propulsion/FGElectric.cpp | 5 -
src/FDM/JSBSim/models/propulsion/FGElectric.h | 7 -
src/FDM/JSBSim/models/propulsion/FGEngine.cpp | 5 -
src/FDM/JSBSim/models/propulsion/FGEngine.h | 8 -
src/FDM/JSBSim/models/propulsion/FGForce.cpp | 5 -
src/FDM/JSBSim/models/propulsion/FGForce.h | 7 -
src/FDM/JSBSim/models/propulsion/FGNozzle.cpp | 5 -
src/FDM/JSBSim/models/propulsion/FGNozzle.h | 8 -
src/FDM/JSBSim/models/propulsion/FGPiston.cpp | 5 -
.../JSBSim/models/propulsion/FGPropeller.cpp | 5 -
.../JSBSim/models/propulsion/FGPropeller.h | 7 -
src/FDM/JSBSim/models/propulsion/FGRocket.cpp | 5 -
src/FDM/JSBSim/models/propulsion/FGRocket.h | 8 -
src/FDM/JSBSim/models/propulsion/FGRotor.cpp | 7 -
src/FDM/JSBSim/models/propulsion/FGRotor.h | 7 -
src/FDM/JSBSim/models/propulsion/FGTank.cpp | 5 -
src/FDM/JSBSim/models/propulsion/FGTank.h | 7 -
.../JSBSim/models/propulsion/FGThruster.cpp | 5 -
src/FDM/JSBSim/models/propulsion/FGThruster.h | 8 -
.../models/propulsion/FGTransmission.cpp | 6 -
.../JSBSim/models/propulsion/FGTransmission.h | 7 -
.../JSBSim/models/propulsion/FGTurbine.cpp | 5 -
src/FDM/JSBSim/models/propulsion/FGTurbine.h | 4 -
.../JSBSim/models/propulsion/FGTurboProp.cpp | 5 -
.../JSBSim/models/propulsion/FGTurboProp.h | 2 -
177 files changed, 275 insertions(+), 1135 deletions(-)
diff --git a/src/FDM/JSBSim/FGFDMExec.cpp b/src/FDM/JSBSim/FGFDMExec.cpp
index 10e7ba80b..7df9dede6 100644
--- a/src/FDM/JSBSim/FGFDMExec.cpp
+++ b/src/FDM/JSBSim/FGFDMExec.cpp
@@ -72,9 +72,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGFDMExec.cpp,v 1.194 2017/03/03 23:00:39 bcoconni Exp $");
-IDENT(IdHdr,ID_FDMEXEC);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -1212,11 +1209,7 @@ void FGFDMExec::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
}
-
-
diff --git a/src/FDM/JSBSim/FGFDMExec.h b/src/FDM/JSBSim/FGFDMExec.h
index f59810d40..eed012af7 100644
--- a/src/FDM/JSBSim/FGFDMExec.h
+++ b/src/FDM/JSBSim/FGFDMExec.h
@@ -51,12 +51,6 @@ INCLUDES
#include "models/FGOutput.h"
#include "simgear/misc/sg_path.hxx"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_FDMEXEC "$Id: FGFDMExec.h,v 1.106 2017/02/25 14:23:18 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/FGJSBBase.cpp b/src/FDM/JSBSim/FGJSBBase.cpp
index a57d52898..75e7807f4 100644
--- a/src/FDM/JSBSim/FGJSBBase.cpp
+++ b/src/FDM/JSBSim/FGJSBBase.cpp
@@ -46,9 +46,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGJSBBase.cpp,v 1.42 2016/01/17 18:42:52 bcoconni Exp $");
-IDENT(IdHdr,ID_JSBBASE);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/FGJSBBase.h b/src/FDM/JSBSim/FGJSBBase.h
index 0e7929e41..ad0705a0f 100644
--- a/src/FDM/JSBSim/FGJSBBase.h
+++ b/src/FDM/JSBSim/FGJSBBase.h
@@ -48,13 +48,6 @@ INCLUDES
#ifndef M_PI
# define M_PI 3.14159265358979323846
#endif
-#define IDENT(a,b) static const char* const (a)[] = {b,(a)[0]}
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_JSBBASE "$Id: FGJSBBase.h,v 1.45 2016/01/10 12:07:49 bcoconni Exp $"
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
@@ -70,7 +63,6 @@ CLASS DOCUMENTATION
* This class provides universal constants, utility functions, messaging
* functions, and enumerated constants to JSBSim.
@author Jon S. Berndt
- @version $Id: FGJSBBase.h,v 1.45 2016/01/10 12:07:49 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -396,4 +388,3 @@ enum {inNone = 0, inDegrees, inRadians, inMeters, inFeet };
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/JSBSim.cpp b/src/FDM/JSBSim/JSBSim.cpp
index 3561bff71..63138ceb5 100644
--- a/src/FDM/JSBSim/JSBSim.cpp
+++ b/src/FDM/JSBSim/JSBSim.cpp
@@ -73,12 +73,6 @@ using namespace std;
using JSBSim::FGXMLFileRead;
using JSBSim::Element;
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-IDENT(IdSrc,"$Id: JSBSim.cpp,v 1.90 2017/02/25 14:23:18 bcoconni Exp $");
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
GLOBAL DATA
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx
index 86b3fd124..0ea57c37b 100644
--- a/src/FDM/JSBSim/JSBSim.cxx
+++ b/src/FDM/JSBSim/JSBSim.cxx
@@ -55,13 +55,13 @@
#include <FDM/JSBSim/models/FGPropagate.h>
#include <FDM/JSBSim/models/FGAuxiliary.h>
#include <FDM/JSBSim/models/FGInertial.h>
-#include <FDM/JSBSim/models/FGAtmosphere.h>
#include <FDM/JSBSim/models/FGMassBalance.h>
#include <FDM/JSBSim/models/FGAerodynamics.h>
#include <FDM/JSBSim/models/FGLGear.h>
#include <FDM/JSBSim/models/FGGroundReactions.h>
#include <FDM/JSBSim/models/FGPropulsion.h>
#include <FDM/JSBSim/models/FGAccelerations.h>
+#include <FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.h>
#include <FDM/JSBSim/models/atmosphere/FGWinds.h>
#include <FDM/JSBSim/models/propulsion/FGEngine.h>
#include <FDM/JSBSim/models/propulsion/FGPiston.h>
@@ -342,6 +342,7 @@ FGJSBsim::FGJSBsim( double dt )
temperature = fgGetNode("/environment/temperature-degc",true);
pressure = fgGetNode("/environment/pressure-inhg",true);
pressureSL = fgGetNode("/environment/pressure-sea-level-inhg",true);
+ dew_point = fgGetNode("/environment/dewpoint-degc", true);
ground_wind = fgGetNode("/environment/config/boundary/entry[0]/wind-speed-kt",true);
turbulence_gain = fgGetNode("/environment/turbulence/magnitude-norm",true);
turbulence_rate = fgGetNode("/environment/turbulence/rate-hz",true);
@@ -692,6 +693,8 @@ bool FGJSBsim::copy_to_JSBsim()
Atmosphere->SetTemperature(temperature->getDoubleValue(), get_Altitude(), FGAtmosphere::eCelsius);
Atmosphere->SetPressureSL(FGAtmosphere::eInchesHg, pressureSL->getDoubleValue());
+ static_cast<FGStandardAtmosphere*>(Atmosphere)->SetDewPoint(FGAtmosphere::eCelsius,
+ dew_point->getDoubleValue());
Winds->SetTurbType((FGWinds::tType)TURBULENCE_TYPE_NAMES[turbulence_model->getStringValue()]);
switch( Winds->GetTurbType() ) {
diff --git a/src/FDM/JSBSim/JSBSim.hxx b/src/FDM/JSBSim/JSBSim.hxx
index 7654d54bd..6c3458852 100644
--- a/src/FDM/JSBSim/JSBSim.hxx
+++ b/src/FDM/JSBSim/JSBSim.hxx
@@ -282,6 +282,7 @@ private:
SGPropertyNode_ptr temperature;
SGPropertyNode_ptr pressure;
SGPropertyNode_ptr pressureSL;
+ SGPropertyNode_ptr dew_point;
SGPropertyNode_ptr ground_wind;
SGPropertyNode_ptr turbulence_gain;
SGPropertyNode_ptr turbulence_rate;
diff --git a/src/FDM/JSBSim/initialization/FGInitialCondition.cpp b/src/FDM/JSBSim/initialization/FGInitialCondition.cpp
index ae0b84559..6c0d59464 100644
--- a/src/FDM/JSBSim/initialization/FGInitialCondition.cpp
+++ b/src/FDM/JSBSim/initialization/FGInitialCondition.cpp
@@ -58,9 +58,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGInitialCondition.cpp,v 1.114 2017/02/25 14:23:18 bcoconni Exp $");
-IDENT(IdHdr,ID_INITIALCONDITION);
-
//******************************************************************************
FGInitialCondition::FGInitialCondition(FGFDMExec *FDMExec) : fdmex(FDMExec)
@@ -1528,8 +1525,6 @@ void FGInitialCondition::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/initialization/FGInitialCondition.h b/src/FDM/JSBSim/initialization/FGInitialCondition.h
index e9d209cbf..96ff69fe8 100644
--- a/src/FDM/JSBSim/initialization/FGInitialCondition.h
+++ b/src/FDM/JSBSim/initialization/FGInitialCondition.h
@@ -51,12 +51,6 @@ INCLUDES
#include "math/FGQuaternion.h"
#include "simgear/misc/sg_path.hxx"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_INITIALCONDITION "$Id: FGInitialCondition.h,v 1.48 2017/02/25 14:23:18 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -221,7 +215,6 @@ CLASS DOCUMENTATION
@property ic/r-rad_sec (read/write) Yaw rate initial condition in radians/second
@author Tony Peden
- @version "$Id: FGInitialCondition.h,v 1.48 2017/02/25 14:23:18 bcoconni Exp $"
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/initialization/FGTrim.cpp b/src/FDM/JSBSim/initialization/FGTrim.cpp
index 22072d83c..0dabc461b 100644
--- a/src/FDM/JSBSim/initialization/FGTrim.cpp
+++ b/src/FDM/JSBSim/initialization/FGTrim.cpp
@@ -57,9 +57,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGTrim.cpp,v 1.34 2016/06/12 09:09:02 bcoconni Exp $");
-IDENT(IdHdr,ID_TRIM);
-
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FGTrim::FGTrim(FGFDMExec *FDMExec,TrimMode tt)
diff --git a/src/FDM/JSBSim/initialization/FGTrim.h b/src/FDM/JSBSim/initialization/FGTrim.h
index 5c8b76401..633eb4863 100644
--- a/src/FDM/JSBSim/initialization/FGTrim.h
+++ b/src/FDM/JSBSim/initialization/FGTrim.h
@@ -56,12 +56,6 @@ INCLUDES
#include <vector>
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_TRIM "$Id: FGTrim.h,v 1.11 2014/05/01 18:32:54 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -120,7 +114,6 @@ CLASS DOCUMENTATION
@endcode
@author Tony Peden
- @version "$Id: FGTrim.h,v 1.11 2014/05/01 18:32:54 bcoconni Exp $"
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/initialization/FGTrimAxis.cpp b/src/FDM/JSBSim/initialization/FGTrimAxis.cpp
index d78e53d99..f0e8298e1 100644
--- a/src/FDM/JSBSim/initialization/FGTrimAxis.cpp
+++ b/src/FDM/JSBSim/initialization/FGTrimAxis.cpp
@@ -56,9 +56,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGTrimAxis.cpp,v 1.19 2015/09/28 20:50:41 bcoconni Exp $");
-IDENT(IdHdr,ID_TRIMAXIS);
-
/*****************************************************************************/
FGTrimAxis::FGTrimAxis(FGFDMExec* fdex, FGInitialCondition* ic, State st,
@@ -361,8 +358,6 @@ void FGTrimAxis::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/initialization/FGTrimAxis.h b/src/FDM/JSBSim/initialization/FGTrimAxis.h
index ebbd9db03..883deca7e 100644
--- a/src/FDM/JSBSim/initialization/FGTrimAxis.h
+++ b/src/FDM/JSBSim/initialization/FGTrimAxis.h
@@ -48,8 +48,6 @@ INCLUDES
DEFINITIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-#define ID_TRIMAXIS "$Id: FGTrimAxis.h,v 1.7 2013/11/24 16:53:15 bcoconni Exp $"
-
#define DEFAULT_TOLERANCE 0.001
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/input_output/FGGroundCallback.h b/src/FDM/JSBSim/input_output/FGGroundCallback.h
index 3c122ba1d..bffa7ef2b 100644
--- a/src/FDM/JSBSim/input_output/FGGroundCallback.h
+++ b/src/FDM/JSBSim/input_output/FGGroundCallback.h
@@ -41,12 +41,6 @@ INCLUDES
#include "simgear/structure/SGReferenced.hxx"
#include "simgear/structure/SGSharedPtr.hxx"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_GROUNDCALLBACK "$Id: FGGroundCallback.h,v 1.18 2014/11/30 12:35:32 bcoconni Exp $"
-
namespace JSBSim {
class FGLocation;
@@ -62,7 +56,6 @@ CLASS DOCUMENTATION
ball formed earth with an adjustable terrain elevation.
@author Mathias Froehlich
- @version $Id: FGGroundCallback.h,v 1.18 2014/11/30 12:35:32 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -179,7 +172,6 @@ private:
double mTerrainLevelRadius;
};
-
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
diff --git a/src/FDM/JSBSim/input_output/FGInputSocket.cpp b/src/FDM/JSBSim/input_output/FGInputSocket.cpp
index 7ebc6b970..5bda60430 100644
--- a/src/FDM/JSBSim/input_output/FGInputSocket.cpp
+++ b/src/FDM/JSBSim/input_output/FGInputSocket.cpp
@@ -52,9 +52,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id");
-IDENT(IdHdr,ID_INPUTSOCKET);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/FGInputSocket.h b/src/FDM/JSBSim/input_output/FGInputSocket.h
index ba886ee71..904ea3451 100644
--- a/src/FDM/JSBSim/input_output/FGInputSocket.h
+++ b/src/FDM/JSBSim/input_output/FGInputSocket.h
@@ -41,12 +41,6 @@ INCLUDES
#include "FGInputType.h"
#include "input_output/FGfdmSocket.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_INPUTSOCKET "$Id: FGInputSocket.h,v 1.1 2015/02/15 12:04:32 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/FGInputType.cpp b/src/FDM/JSBSim/input_output/FGInputType.cpp
index 4aceed6f9..91b071100 100644
--- a/src/FDM/JSBSim/input_output/FGInputType.cpp
+++ b/src/FDM/JSBSim/input_output/FGInputType.cpp
@@ -44,13 +44,10 @@ INCLUDES
#include "input_output/FGXMLElement.h"
#include "input_output/FGPropertyManager.h"
-namespace JSBSim {
-
-IDENT(IdSrc,"$Id: FGInputType.cpp,v 1.4 2015/08/23 09:43:31 bcoconni Exp $");
-IDENT(IdHdr,ID_INPUTTYPE);
-
using namespace std;
+namespace JSBSim {
+
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -160,8 +157,6 @@ void FGInputType::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/input_output/FGInputType.h b/src/FDM/JSBSim/input_output/FGInputType.h
index ab55987c7..04bb0e5e9 100644
--- a/src/FDM/JSBSim/input_output/FGInputType.h
+++ b/src/FDM/JSBSim/input_output/FGInputType.h
@@ -40,12 +40,6 @@ INCLUDES
#include "models/FGModel.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_INPUTTYPE "$Id: FGInputType.h,v 1.3 2015/08/23 09:37:16 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/FGModelLoader.cpp b/src/FDM/JSBSim/input_output/FGModelLoader.cpp
index 25df074f1..6170b1bc6 100644
--- a/src/FDM/JSBSim/input_output/FGModelLoader.cpp
+++ b/src/FDM/JSBSim/input_output/FGModelLoader.cpp
@@ -46,9 +46,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc, "$Id: FGModelLoader.cpp,v 1.5 2017/03/18 16:17:42 bcoconni Exp $");
-IDENT(IdHdr, ID_MODELLOADER);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/FGModelLoader.h b/src/FDM/JSBSim/input_output/FGModelLoader.h
index 6b18a0a8b..7e5a32df1 100644
--- a/src/FDM/JSBSim/input_output/FGModelLoader.h
+++ b/src/FDM/JSBSim/input_output/FGModelLoader.h
@@ -43,12 +43,6 @@ INCLUDES
#include "FGXMLElement.h"
#include "simgear/misc/sg_path.hxx"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_MODELLOADER "$Id: FGModelLoader.h,v 1.2 2017/02/25 14:23:18 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/FGOutputFG.cpp b/src/FDM/JSBSim/input_output/FGOutputFG.cpp
index 52e0e5e7d..6d4d185c8 100644
--- a/src/FDM/JSBSim/input_output/FGOutputFG.cpp
+++ b/src/FDM/JSBSim/input_output/FGOutputFG.cpp
@@ -71,9 +71,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGOutputFG.cpp,v 1.9 2014/02/17 05:01:55 jberndt Exp $");
-IDENT(IdHdr,ID_OUTPUTFG);
-
// (stolen from FGFS native_fdm.cxx)
// The function htond is defined this way due to the way some
// processors and OSes treat floating point values. Some will raise
diff --git a/src/FDM/JSBSim/input_output/FGOutputFG.h b/src/FDM/JSBSim/input_output/FGOutputFG.h
index 1fb195414..93a10f15a 100644
--- a/src/FDM/JSBSim/input_output/FGOutputFG.h
+++ b/src/FDM/JSBSim/input_output/FGOutputFG.h
@@ -43,12 +43,6 @@ INCLUDES
#include "input_output/net_fdm.hxx"
#include "input_output/FGfdmSocket.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_OUTPUTFG "$Id: FGOutputFG.h,v 1.3 2013/01/12 18:08:40 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -84,4 +78,3 @@ private:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/input_output/FGOutputFile.cpp b/src/FDM/JSBSim/input_output/FGOutputFile.cpp
index f75b09d7e..dd24cce2c 100644
--- a/src/FDM/JSBSim/input_output/FGOutputFile.cpp
+++ b/src/FDM/JSBSim/input_output/FGOutputFile.cpp
@@ -47,9 +47,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGOutputFile.cpp,v 1.10 2017/02/25 14:23:18 bcoconni Exp $");
-IDENT(IdHdr,ID_OUTPUTFILE);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/FGOutputFile.h b/src/FDM/JSBSim/input_output/FGOutputFile.h
index cab11906a..89e3f8004 100644
--- a/src/FDM/JSBSim/input_output/FGOutputFile.h
+++ b/src/FDM/JSBSim/input_output/FGOutputFile.h
@@ -41,12 +41,6 @@ INCLUDES
#include "FGFDMExec.h"
#include "FGOutputType.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_OUTPUTFILE "$Id: FGOutputFile.h,v 1.8 2017/02/25 14:23:18 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -129,4 +123,3 @@ private:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/input_output/FGOutputSocket.cpp b/src/FDM/JSBSim/input_output/FGOutputSocket.cpp
index f81932a3d..6592efd9c 100644
--- a/src/FDM/JSBSim/input_output/FGOutputSocket.cpp
+++ b/src/FDM/JSBSim/input_output/FGOutputSocket.cpp
@@ -61,9 +61,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGOutputSocket.cpp,v 1.9 2014/02/17 05:01:22 jberndt Exp $");
-IDENT(IdHdr,ID_OUTPUTSOCKET);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -107,7 +104,7 @@ void FGOutputSocket::SetOutputName(const string& fname)
SockPort = atoi(port.c_str());
- if (proto == "UDP")
+ if (to_upper(proto) == "UDP")
SockProtocol = FGfdmSocket::ptUDP;
else // Default to TCP
SockProtocol = FGfdmSocket::ptTCP;
diff --git a/src/FDM/JSBSim/input_output/FGOutputSocket.h b/src/FDM/JSBSim/input_output/FGOutputSocket.h
index c753329fc..8c62907ee 100644
--- a/src/FDM/JSBSim/input_output/FGOutputSocket.h
+++ b/src/FDM/JSBSim/input_output/FGOutputSocket.h
@@ -42,12 +42,6 @@ INCLUDES
#include "input_output/net_fdm.hxx"
#include "input_output/FGfdmSocket.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_OUTPUTSOCKET "$Id: FGOutputSocket.h,v 1.3 2013/01/12 18:08:40 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -118,4 +112,3 @@ protected:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/input_output/FGOutputTextFile.cpp b/src/FDM/JSBSim/input_output/FGOutputTextFile.cpp
index b000f417c..51379fe83 100644
--- a/src/FDM/JSBSim/input_output/FGOutputTextFile.cpp
+++ b/src/FDM/JSBSim/input_output/FGOutputTextFile.cpp
@@ -65,9 +65,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGOutputTextFile.cpp,v 1.13 2017/02/25 14:23:18 bcoconni Exp $");
-IDENT(IdHdr,ID_OUTPUTTEXTFILE);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/FGOutputTextFile.h b/src/FDM/JSBSim/input_output/FGOutputTextFile.h
index 0dc31c160..010db2a98 100644
--- a/src/FDM/JSBSim/input_output/FGOutputTextFile.h
+++ b/src/FDM/JSBSim/input_output/FGOutputTextFile.h
@@ -43,12 +43,6 @@ INCLUDES
#include "FGOutputFile.h"
#include "simgear/io/iostreams/sgstream.hxx"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_OUTPUTTEXTFILE "$Id: FGOutputTextFile.h,v 1.5 2017/02/25 14:23:18 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -98,4 +92,3 @@ protected:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/input_output/FGOutputType.cpp b/src/FDM/JSBSim/input_output/FGOutputType.cpp
index bd3f727f9..45e50e21c 100644
--- a/src/FDM/JSBSim/input_output/FGOutputType.cpp
+++ b/src/FDM/JSBSim/input_output/FGOutputType.cpp
@@ -46,13 +46,10 @@ INCLUDES
#include "math/FGTemplateFunc.h"
#include "math/FGFunctionValue.h"
-namespace JSBSim {
-
-IDENT(IdSrc,"$Id: FGOutputType.cpp,v 1.17 2015/08/23 09:43:31 bcoconni Exp $");
-IDENT(IdHdr,ID_OUTPUTTYPE);
-
using namespace std;
+namespace JSBSim {
+
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -294,8 +291,6 @@ void FGOutputType::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/input_output/FGOutputType.h b/src/FDM/JSBSim/input_output/FGOutputType.h
index 07599fca5..8ed767310 100644
--- a/src/FDM/JSBSim/input_output/FGOutputType.h
+++ b/src/FDM/JSBSim/input_output/FGOutputType.h
@@ -40,12 +40,6 @@ INCLUDES
#include "models/FGModel.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_OUTPUTTYPE "$Id: FGOutputType.h,v 1.11 2015/08/23 09:43:31 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/FGPropertyManager.h b/src/FDM/JSBSim/input_output/FGPropertyManager.h
index 3850a510c..26f0cd465 100644
--- a/src/FDM/JSBSim/input_output/FGPropertyManager.h
+++ b/src/FDM/JSBSim/input_output/FGPropertyManager.h
@@ -49,12 +49,6 @@ INCLUDES
#include "FGJSBBase.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_PROPERTYMANAGER "$Id: FGPropertyManager.h,v 1.30 2016/05/05 15:32:42 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -697,4 +691,3 @@ class FGPropertyManager
};
}
#endif // FGPROPERTYMANAGER_H
-
diff --git a/src/FDM/JSBSim/input_output/FGPropertyReader.cpp b/src/FDM/JSBSim/input_output/FGPropertyReader.cpp
index f2956cdba..2950c0c02 100644
--- a/src/FDM/JSBSim/input_output/FGPropertyReader.cpp
+++ b/src/FDM/JSBSim/input_output/FGPropertyReader.cpp
@@ -45,9 +45,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGPropertyReader.cpp,v 1.5 2014/06/14 11:58:31 bcoconni Exp $");
-IDENT(IdHdr,ID_PROPERTYREADER);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/FGPropertyReader.h b/src/FDM/JSBSim/input_output/FGPropertyReader.h
index d8539b438..53640e008 100644
--- a/src/FDM/JSBSim/input_output/FGPropertyReader.h
+++ b/src/FDM/JSBSim/input_output/FGPropertyReader.h
@@ -44,12 +44,6 @@ INCLUDES
#include "simgear/props/props.hxx"
#include "input_output/FGPropertyManager.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_PROPERTYREADER "$Id: FGPropertyReader.h,v 1.3 2014/06/14 11:58:31 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/FGScript.cpp b/src/FDM/JSBSim/input_output/FGScript.cpp
index 58c99fcc3..2e1dc6abb 100644
--- a/src/FDM/JSBSim/input_output/FGScript.cpp
+++ b/src/FDM/JSBSim/input_output/FGScript.cpp
@@ -59,13 +59,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGScript.cpp,v 1.65 2017/02/25 14:23:18 bcoconni Exp $");
-IDENT(IdHdr,ID_FGSCRIPT);
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-GLOBAL DECLARATIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -696,8 +689,6 @@ void FGScript::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/input_output/FGScript.h b/src/FDM/JSBSim/input_output/FGScript.h
index 95b4a811a..1c78f1f8f 100644
--- a/src/FDM/JSBSim/input_output/FGScript.h
+++ b/src/FDM/JSBSim/input_output/FGScript.h
@@ -45,12 +45,6 @@ INCLUDES
#include "input_output/FGPropertyManager.h"
#include "simgear/misc/sg_path.hxx"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_FGSCRIPT "$Id: FGScript.h,v 1.31 2017/02/25 14:23:18 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -163,7 +157,6 @@ CLASS DOCUMENTATION
comes the "run" section, where the conditions are
described in "event" clauses.</p>
@author Jon S. Berndt
- @version "$Id: FGScript.h,v 1.31 2017/02/25 14:23:18 bcoconni Exp $"
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -272,4 +265,3 @@ private:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/input_output/FGUDPInputSocket.cpp b/src/FDM/JSBSim/input_output/FGUDPInputSocket.cpp
index e26ee95ce..ecf520c6b 100644
--- a/src/FDM/JSBSim/input_output/FGUDPInputSocket.cpp
+++ b/src/FDM/JSBSim/input_output/FGUDPInputSocket.cpp
@@ -49,9 +49,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id");
-IDENT(IdHdr,ID_UDPINPUTSOCKET);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/FGUDPInputSocket.h b/src/FDM/JSBSim/input_output/FGUDPInputSocket.h
index e58d3cd04..216cfaa33 100644
--- a/src/FDM/JSBSim/input_output/FGUDPInputSocket.h
+++ b/src/FDM/JSBSim/input_output/FGUDPInputSocket.h
@@ -40,12 +40,6 @@ INCLUDES
#include "FGInputSocket.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_UDPINPUTSOCKET ""
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/FGXMLElement.cpp b/src/FDM/JSBSim/input_output/FGXMLElement.cpp
index 799445e04..986adbf72 100644
--- a/src/FDM/JSBSim/input_output/FGXMLElement.cpp
+++ b/src/FDM/JSBSim/input_output/FGXMLElement.cpp
@@ -45,9 +45,6 @@ FORWARD DECLARATIONS
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGXMLElement.cpp,v 1.56 2016/09/11 11:26:04 bcoconni Exp $");
-IDENT(IdHdr,ID_XMLELEMENT);
-
bool Element::converterIsInitialized = false;
map <string, map <string, double> > Element::convert;
diff --git a/src/FDM/JSBSim/input_output/FGXMLElement.h b/src/FDM/JSBSim/input_output/FGXMLElement.h
index ff9f62a34..cacab4235 100644
--- a/src/FDM/JSBSim/input_output/FGXMLElement.h
+++ b/src/FDM/JSBSim/input_output/FGXMLElement.h
@@ -41,12 +41,6 @@ INCLUDES
#include "simgear/structure/SGSharedPtr.hxx"
#include "math/FGColumnVector3.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_XMLELEMENT "$Id: FGXMLElement.h,v 1.25 2015/07/12 19:34:08 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -137,7 +131,6 @@ CLASS DOCUMENTATION
- GAL = gallon (U.S. liquid)
@author Jon S. Berndt
- @version $Id: FGXMLElement.h,v 1.25 2015/07/12 19:34:08 bcoconni Exp $
*/
class Element;
diff --git a/src/FDM/JSBSim/input_output/FGXMLFileRead.h b/src/FDM/JSBSim/input_output/FGXMLFileRead.h
index 62bc3421c..77e4cba32 100644
--- a/src/FDM/JSBSim/input_output/FGXMLFileRead.h
+++ b/src/FDM/JSBSim/input_output/FGXMLFileRead.h
@@ -42,12 +42,6 @@ INCLUDES
#include "simgear/misc/sg_path.hxx"
#include "simgear/io/iostreams/sgstream.hxx"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_XMLFILEREAD "$Id: FGXMLFileRead.h,v 1.10 2017/02/25 14:23:18 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/FGXMLParse.cpp b/src/FDM/JSBSim/input_output/FGXMLParse.cpp
index 00b30457f..ec40c5750 100644
--- a/src/FDM/JSBSim/input_output/FGXMLParse.cpp
+++ b/src/FDM/JSBSim/input_output/FGXMLParse.cpp
@@ -42,9 +42,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGXMLParse.cpp,v 1.16 2014/06/09 11:52:06 bcoconni Exp $");
-IDENT(IdHdr,ID_XMLPARSE);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/FGfdmSocket.cpp b/src/FDM/JSBSim/input_output/FGfdmSocket.cpp
index 433078481..ea4f1218e 100644
--- a/src/FDM/JSBSim/input_output/FGfdmSocket.cpp
+++ b/src/FDM/JSBSim/input_output/FGfdmSocket.cpp
@@ -57,9 +57,6 @@ using std::string;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGfdmSocket.cpp,v 1.32 2017/03/11 12:12:12 bcoconni Exp $");
-IDENT(IdHdr,ID_FDMSOCKET);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -433,8 +430,6 @@ void FGfdmSocket::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/input_output/FGfdmSocket.h b/src/FDM/JSBSim/input_output/FGfdmSocket.h
index 8f933f42f..ead5d7095 100644
--- a/src/FDM/JSBSim/input_output/FGfdmSocket.h
+++ b/src/FDM/JSBSim/input_output/FGfdmSocket.h
@@ -61,12 +61,6 @@ INCLUDES
# pragma comment (lib,"WSock32.lib")
#endif
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_FDMSOCKET "$Id: FGfdmSocket.h,v 1.24 2016/04/17 13:13:29 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/input_output/string_utilities.h b/src/FDM/JSBSim/input_output/string_utilities.h
index f21b14db0..21980deb6 100644
--- a/src/FDM/JSBSim/input_output/string_utilities.h
+++ b/src/FDM/JSBSim/input_output/string_utilities.h
@@ -44,22 +44,6 @@ INCLUDES
#include <vector>
#include <stdio.h>
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_STRINGUTILS "$Id: string_utilities.h,v 1.24 2015/08/16 16:06:28 bcoconni Exp $"
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-FORWARD DECLARATIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-CLASS DOCUMENTATION
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS DECLARATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -74,16 +58,6 @@ CLASS DECLARATION
extern bool is_number(const std::string& str);
std::vector <std::string> split(std::string str, char d);
- // These functions are built-ins for:
- // * C++11
- // * libc++ for all C++ language versions
- // * Visual Studio for versions greater than 2010 (1700 -> MSVC++ 11.0 and VS 2012)
-#if !defined(_LIBCPP_VERSION) && _MSC_VER < 1700 && __cplusplus < 201103L
- extern std::string to_string(int);
- extern std::string to_string(double);
- extern std::string to_string(float);
-#endif
-
extern std::string replace(std::string str, const std::string& old, const std::string& newstr);
#else
#include <cctype>
@@ -165,33 +139,6 @@ CLASS DECLARATION
return str_array;
}
- // These functions are built-ins for:
- // * C++11
- // * libc++ for all C++ language versions
- // * Visual Studio for versions greater than 2010 (1700 -> MSVC++ 11.0 and VS 2012)
-#if !defined(_LIBCPP_VERSION) && _MSC_VER < 1700 && __cplusplus < 201103L
- std::string to_string(int i)
- {
- char buffer[32];
- sprintf(buffer, "%d", i);
- return std::string(buffer);
- }
-
- std::string to_string(float x)
- {
- std::ostringstream o;
- if (!(o << x)) std::cerr << "Bad float to string conversion" << std::endl;
- return o.str();
- }
-
- std::string to_string(double x)
- {
- std::ostringstream o;
- if (!(o << x)) std::cerr << "Bad double to string conversion" << std::endl;
- return o.str();
- }
-#endif
-
std::string replace(std::string str, const std::string& oldstr, const std::string& newstr)
{
std::string temp = str;
@@ -207,4 +154,3 @@ CLASS DECLARATION
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/math/FGColumnVector3.cpp b/src/FDM/JSBSim/math/FGColumnVector3.cpp
index 95f97135f..8ee499e7e 100644
--- a/src/FDM/JSBSim/math/FGColumnVector3.cpp
+++ b/src/FDM/JSBSim/math/FGColumnVector3.cpp
@@ -48,9 +48,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGColumnVector3.cpp,v 1.17 2014/01/13 10:46:03 ehofman Exp $");
-IDENT(IdHdr,ID_COLUMNVECTOR3);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/math/FGColumnVector3.h b/src/FDM/JSBSim/math/FGColumnVector3.h
index cd66076c6..6312e0000 100644
--- a/src/FDM/JSBSim/math/FGColumnVector3.h
+++ b/src/FDM/JSBSim/math/FGColumnVector3.h
@@ -42,12 +42,6 @@ INCLUDES
#include <iosfwd>
#include <string>
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_COLUMNVECTOR3 "$Id: FGColumnVector3.h,v 1.18 2013/11/30 10:25:33 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -60,7 +54,6 @@ CLASS DOCUMENTATION
/** This class implements a 3 element column vector.
@author Jon S. Berndt, Tony Peden, et. al.
- @version $Id: FGColumnVector3.h,v 1.18 2013/11/30 10:25:33 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/math/FGCondition.cpp b/src/FDM/JSBSim/math/FGCondition.cpp
index 0187c3f70..7f8bda66a 100644
--- a/src/FDM/JSBSim/math/FGCondition.cpp
+++ b/src/FDM/JSBSim/math/FGCondition.cpp
@@ -45,9 +45,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGCondition.cpp,v 1.21 2015/02/27 20:36:47 bcoconni Exp $");
-IDENT(IdHdr,ID_CONDITION);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -326,11 +323,8 @@ void FGCondition::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
} //namespace JSBSim
-
diff --git a/src/FDM/JSBSim/math/FGCondition.h b/src/FDM/JSBSim/math/FGCondition.h
index f373b7983..592c5a017 100644
--- a/src/FDM/JSBSim/math/FGCondition.h
+++ b/src/FDM/JSBSim/math/FGCondition.h
@@ -40,12 +40,6 @@ INCLUDES
#include <map>
#include "FGJSBBase.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_CONDITION "$Id: FGCondition.h,v 1.8 2015/02/27 20:36:47 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -99,4 +93,3 @@ private:
};
}
#endif
-
diff --git a/src/FDM/JSBSim/math/FGFunction.cpp b/src/FDM/JSBSim/math/FGFunction.cpp
index 65726e922..bb42bf202 100644
--- a/src/FDM/JSBSim/math/FGFunction.cpp
+++ b/src/FDM/JSBSim/math/FGFunction.cpp
@@ -44,9 +44,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGFunction.cpp,v 1.59 2017/03/11 19:31:47 bcoconni Exp $");
-IDENT(IdHdr,ID_FUNCTION);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -865,8 +862,6 @@ void FGFunction::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/math/FGFunction.h b/src/FDM/JSBSim/math/FGFunction.h
index b704eab44..a3f5918e2 100644
--- a/src/FDM/JSBSim/math/FGFunction.h
+++ b/src/FDM/JSBSim/math/FGFunction.h
@@ -39,12 +39,6 @@ INCLUDES
#include "FGParameter.h"
#include "input_output/FGPropertyManager.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_FUNCTION "$Id: FGFunction.h,v 1.33 2017/03/11 19:31:47 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/math/FGLocation.cpp b/src/FDM/JSBSim/math/FGLocation.cpp
index 49903ac0e..32e1ccd0b 100644
--- a/src/FDM/JSBSim/math/FGLocation.cpp
+++ b/src/FDM/JSBSim/math/FGLocation.cpp
@@ -47,9 +47,6 @@ INCLUDES
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGLocation.cpp,v 1.34 2015/09/20 20:53:13 bcoconni Exp $");
-IDENT(IdHdr,ID_LOCATION);
-
// Set up the default ground callback object.
FGGroundCallback_ptr FGLocation::GroundCallback = NULL;
diff --git a/src/FDM/JSBSim/math/FGLocation.h b/src/FDM/JSBSim/math/FGLocation.h
index 0ce83f453..10b8a3cc7 100644
--- a/src/FDM/JSBSim/math/FGLocation.h
+++ b/src/FDM/JSBSim/math/FGLocation.h
@@ -47,12 +47,6 @@ INCLUDES
#include "FGMatrix33.h"
#include "input_output/FGGroundCallback.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_LOCATION "$Id: FGLocation.h,v 1.35 2015/09/20 20:53:13 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -150,7 +144,6 @@ CLASS DOCUMENTATION
@see W. C. Durham "Aircraft Dynamics & Control", section 2.2
@author Mathias Froehlich
- @version $Id: FGLocation.h,v 1.35 2015/09/20 20:53:13 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/math/FGMatrix33.cpp b/src/FDM/JSBSim/math/FGMatrix33.cpp
index 1cc0d46ae..5aebe1a4c 100644
--- a/src/FDM/JSBSim/math/FGMatrix33.cpp
+++ b/src/FDM/JSBSim/math/FGMatrix33.cpp
@@ -49,9 +49,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGMatrix33.cpp,v 1.16 2014/01/13 10:46:03 ehofman Exp $");
-IDENT(IdHdr,ID_MATRIX33);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/math/FGMatrix33.h b/src/FDM/JSBSim/math/FGMatrix33.h
index 2f266bbc3..001f000b8 100644
--- a/src/FDM/JSBSim/math/FGMatrix33.h
+++ b/src/FDM/JSBSim/math/FGMatrix33.h
@@ -45,12 +45,6 @@ INCLUDES
#include "FGColumnVector3.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_MATRIX33 "$Id: FGMatrix33.h,v 1.17 2012/11/22 22:04:06 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/math/FGModelFunctions.cpp b/src/FDM/JSBSim/math/FGModelFunctions.cpp
index a3626b47f..36b026460 100644
--- a/src/FDM/JSBSim/math/FGModelFunctions.cpp
+++ b/src/FDM/JSBSim/math/FGModelFunctions.cpp
@@ -49,9 +49,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGModelFunctions.cpp,v 1.15 2015/03/28 14:49:01 bcoconni Exp $");
-IDENT(IdHdr,ID_MODELFUNCTIONS);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/math/FGModelFunctions.h b/src/FDM/JSBSim/math/FGModelFunctions.h
index 7d3d2d664..cbc985943 100644
--- a/src/FDM/JSBSim/math/FGModelFunctions.h
+++ b/src/FDM/JSBSim/math/FGModelFunctions.h
@@ -41,12 +41,6 @@ INCLUDES
#include "FGJSBBase.h"
#include "input_output/FGPropertyReader.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_MODELFUNCTIONS "$Id: FGModelFunctions.h,v 1.11 2014/05/30 17:26:42 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/math/FGParameter.h b/src/FDM/JSBSim/math/FGParameter.h
index 3b16e5bc8..3995038b4 100644
--- a/src/FDM/JSBSim/math/FGParameter.h
+++ b/src/FDM/JSBSim/math/FGParameter.h
@@ -37,12 +37,6 @@ INCLUDES
#include <string>
#include "simgear/structure/SGSharedPtr.hxx"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_PARAMETER "$Id: FGParameter.h,v 1.6 2011/04/05 20:20:21 andgi Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/math/FGPropertyValue.cpp b/src/FDM/JSBSim/math/FGPropertyValue.cpp
index dd420aad2..e610f0729 100644
--- a/src/FDM/JSBSim/math/FGPropertyValue.cpp
+++ b/src/FDM/JSBSim/math/FGPropertyValue.cpp
@@ -34,9 +34,6 @@ INCLUDES
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGPropertyValue.cpp,v 1.11 2014/01/13 10:46:03 ehofman Exp $");
-IDENT(IdHdr,ID_PROPERTYVALUE);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -74,6 +71,8 @@ FGPropertyNode* FGPropertyValue::GetNode(void) const
throw(std::string("FGPropertyValue::GetValue() The property " +
PropertyName + " does not exist."));
}
+
+ PropertyNode = node;
}
return node;
diff --git a/src/FDM/JSBSim/math/FGPropertyValue.h b/src/FDM/JSBSim/math/FGPropertyValue.h
index 27adb18a6..b912060c8 100644
--- a/src/FDM/JSBSim/math/FGPropertyValue.h
+++ b/src/FDM/JSBSim/math/FGPropertyValue.h
@@ -38,12 +38,6 @@ INCLUDES
#include "FGParameter.h"
#include "input_output/FGPropertyManager.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_PROPERTYVALUE "$Id: FGPropertyValue.h,v 1.11 2013/09/27 19:43:01 jberndt Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -81,7 +75,7 @@ protected:
private:
FGPropertyManager* PropertyManager; // Property root used to do late binding.
- FGPropertyNode_ptr PropertyNode;
+ mutable FGPropertyNode_ptr PropertyNode;
std::string PropertyName;
int Sign;
};
diff --git a/src/FDM/JSBSim/math/FGQuaternion.cpp b/src/FDM/JSBSim/math/FGQuaternion.cpp
index 7dfbc538e..1895423c6 100644
--- a/src/FDM/JSBSim/math/FGQuaternion.cpp
+++ b/src/FDM/JSBSim/math/FGQuaternion.cpp
@@ -57,9 +57,6 @@ using std::endl;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
namespace JSBSim {
-
-IDENT(IdSrc,"$Id: FGQuaternion.cpp,v 1.24 2014/01/13 10:46:03 ehofman Exp $");
-IDENT(IdHdr,ID_QUATERNION);
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/math/FGQuaternion.h b/src/FDM/JSBSim/math/FGQuaternion.h
index 3692dcc0d..ffff9d027 100644
--- a/src/FDM/JSBSim/math/FGQuaternion.h
+++ b/src/FDM/JSBSim/math/FGQuaternion.h
@@ -44,12 +44,6 @@ SENTRY
#include "FGJSBBase.h"
#include "FGColumnVector3.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- DEFINITIONS
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_QUATERNION "$Id: FGQuaternion.h,v 1.26 2013/11/24 16:53:15 bcoconni Exp $"
-
namespace JSBSim {
class FGMatrix33;
diff --git a/src/FDM/JSBSim/math/FGRealValue.cpp b/src/FDM/JSBSim/math/FGRealValue.cpp
index 13faa5c2d..fe16afb1e 100644
--- a/src/FDM/JSBSim/math/FGRealValue.cpp
+++ b/src/FDM/JSBSim/math/FGRealValue.cpp
@@ -36,9 +36,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGRealValue.cpp,v 1.7 2014/11/18 18:38:27 bcoconni Exp $");
-IDENT(IdHdr,ID_REALVALUE);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/math/FGRealValue.h b/src/FDM/JSBSim/math/FGRealValue.h
index 6f7483318..14753f8ab 100644
--- a/src/FDM/JSBSim/math/FGRealValue.h
+++ b/src/FDM/JSBSim/math/FGRealValue.h
@@ -36,12 +36,6 @@ INCLUDES
#include "FGParameter.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_REALVALUE "$Id: FGRealValue.h,v 1.7 2014/11/18 18:38:25 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/math/FGRungeKutta.cpp b/src/FDM/JSBSim/math/FGRungeKutta.cpp
index da2117c4d..7d1f0f6ce 100644
--- a/src/FDM/JSBSim/math/FGRungeKutta.cpp
+++ b/src/FDM/JSBSim/math/FGRungeKutta.cpp
@@ -44,9 +44,6 @@ using std::cout;
using std::endl;
namespace JSBSim {
-
-IDENT(IdSrc,"$Id: FGRungeKutta.cpp,v 1.3 2014/01/13 10:46:03 ehofman Exp $");
-IDENT(IdHdr,ID_RUNGEKUTTA);
const double FGRungeKutta::RealLimit = 1e30;
@@ -227,5 +224,4 @@ double FGRKFehlberg::approximate(double x, double y)
return y4_val;
}
-
} // namespace JSBSim
diff --git a/src/FDM/JSBSim/math/FGRungeKutta.h b/src/FDM/JSBSim/math/FGRungeKutta.h
index 692957725..d921ff0bb 100644
--- a/src/FDM/JSBSim/math/FGRungeKutta.h
+++ b/src/FDM/JSBSim/math/FGRungeKutta.h
@@ -35,16 +35,8 @@ SENTRY
#define FGRUNGEKUTTA_H
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- INCLUDES
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-// #include "FGJSBBase.h" // later
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- DEFINITIONS
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_RUNGEKUTTA "$Id: FGRungeKutta.h,v 1.1 2010/06/02 04:05:13 jberndt Exp $"
+INCLUDES
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
namespace JSBSim {
diff --git a/src/FDM/JSBSim/math/FGTable.cpp b/src/FDM/JSBSim/math/FGTable.cpp
index a60120221..0e207fbb0 100644
--- a/src/FDM/JSBSim/math/FGTable.cpp
+++ b/src/FDM/JSBSim/math/FGTable.cpp
@@ -47,9 +47,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGTable.cpp,v 1.33 2017/03/11 19:31:48 bcoconni Exp $");
-IDENT(IdHdr,ID_TABLE);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -713,8 +710,6 @@ void FGTable::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/math/FGTable.h b/src/FDM/JSBSim/math/FGTable.h
index ff9427066..a24990798 100644
--- a/src/FDM/JSBSim/math/FGTable.h
+++ b/src/FDM/JSBSim/math/FGTable.h
@@ -44,12 +44,6 @@ INCLUDES
#include "FGParameter.h"
#include "input_output/FGPropertyManager.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_TABLE "$Id: FGTable.h,v 1.16 2017/03/11 19:31:48 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -233,7 +227,6 @@ combustion_efficiency = Lookup_Combustion_Efficiency->GetValue(equivalence_ratio
@endcode
@author Jon S. Berndt
-@version $Id: FGTable.h,v 1.16 2017/03/11 19:31:48 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -322,4 +315,3 @@ private:
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/math/LagrangeMultiplier.h b/src/FDM/JSBSim/math/LagrangeMultiplier.h
index b754c5b38..e5cbe586c 100644
--- a/src/FDM/JSBSim/math/LagrangeMultiplier.h
+++ b/src/FDM/JSBSim/math/LagrangeMultiplier.h
@@ -34,12 +34,6 @@ SENTRY
INCLUDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_LAGRANGEMULTIPLIER "$Id: LagrangeMultiplier.h,v 1.2 2011/08/21 15:13:22 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/FGAccelerations.cpp b/src/FDM/JSBSim/models/FGAccelerations.cpp
index 62fc0e977..905206ad6 100644
--- a/src/FDM/JSBSim/models/FGAccelerations.cpp
+++ b/src/FDM/JSBSim/models/FGAccelerations.cpp
@@ -60,9 +60,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGAccelerations.cpp,v 1.29 2016/05/22 10:28:23 bcoconni Exp $");
-IDENT(IdHdr,ID_ACCELERATIONS);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -426,8 +423,6 @@ void FGAccelerations::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGAccelerations.h b/src/FDM/JSBSim/models/FGAccelerations.h
index 85dda88bb..5ae56def8 100644
--- a/src/FDM/JSBSim/models/FGAccelerations.h
+++ b/src/FDM/JSBSim/models/FGAccelerations.h
@@ -45,12 +45,6 @@ INCLUDES
#include "math/LagrangeMultiplier.h"
#include "math/FGMatrix33.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_ACCELERATIONS "$Id: FGAccelerations.h,v 1.20 2016/05/22 10:28:23 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -96,7 +90,6 @@ CLASS DOCUMENTATION
NASA SP-8024, May 1969
@author Jon S. Berndt, Mathias Froehlich, Bertrand Coconnier
- @version $Id: FGAccelerations.h,v 1.20 2016/05/22 10:28:23 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/FGAerodynamics.cpp b/src/FDM/JSBSim/models/FGAerodynamics.cpp
index 1e0ae7172..cedddf601 100644
--- a/src/FDM/JSBSim/models/FGAerodynamics.cpp
+++ b/src/FDM/JSBSim/models/FGAerodynamics.cpp
@@ -50,9 +50,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGAerodynamics.cpp,v 1.60 2016/05/30 19:05:58 bcoconni Exp $");
-IDENT(IdHdr,ID_AERODYNAMICS);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -698,8 +695,6 @@ void FGAerodynamics::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGAerodynamics.h b/src/FDM/JSBSim/models/FGAerodynamics.h
index f0adf6632..fa83b7f99 100644
--- a/src/FDM/JSBSim/models/FGAerodynamics.h
+++ b/src/FDM/JSBSim/models/FGAerodynamics.h
@@ -47,12 +47,6 @@ INCLUDES
#include "math/FGColumnVector3.h"
#include "math/FGMatrix33.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_AERODYNAMICS "$Id: FGAerodynamics.h,v 1.30 2014/09/03 17:26:28 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -295,4 +289,3 @@ private:
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/FGAircraft.cpp b/src/FDM/JSBSim/models/FGAircraft.cpp
index 36dff9737..143d9f6bf 100644
--- a/src/FDM/JSBSim/models/FGAircraft.cpp
+++ b/src/FDM/JSBSim/models/FGAircraft.cpp
@@ -52,17 +52,6 @@ using namespace std;
namespace JSBSim {
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-GLOBAL DATA
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-IDENT(IdSrc,"$Id: FGAircraft.cpp,v 1.43 2015/01/31 14:56:21 bcoconni Exp $");
-IDENT(IdHdr,ID_AIRCRAFT);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -266,8 +255,6 @@ void FGAircraft::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGAircraft.h b/src/FDM/JSBSim/models/FGAircraft.h
index fa7f149b6..8582c64b8 100644
--- a/src/FDM/JSBSim/models/FGAircraft.h
+++ b/src/FDM/JSBSim/models/FGAircraft.h
@@ -43,12 +43,6 @@ INCLUDES
#include "FGModel.h"
#include "math/FGMatrix33.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_AIRCRAFT "$Id: FGAircraft.h,v 1.25 2015/07/12 19:34:08 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -88,7 +82,6 @@ CLASS DOCUMENTATION
@endcode
@author Jon S. Berndt
- @version $Id: FGAircraft.h,v 1.25 2015/07/12 19:34:08 bcoconni Exp $
@see Cooke, Zyda, Pratt, and McGhee, "NPSNET: Flight Simulation Dynamic Modeling
Using Quaternions", Presence, Vol. 1, No. 4, pp. 404-420 Naval Postgraduate
School, January 1994
@@ -204,4 +197,3 @@ private:
} // namespace JSBSim
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/FGAtmosphere.cpp b/src/FDM/JSBSim/models/FGAtmosphere.cpp
index bbac2744b..b971eece0 100644
--- a/src/FDM/JSBSim/models/FGAtmosphere.cpp
+++ b/src/FDM/JSBSim/models/FGAtmosphere.cpp
@@ -50,9 +50,6 @@ INCLUDES
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGAtmosphere.cpp,v 1.62 2016/01/16 12:05:47 bcoconni Exp $");
-IDENT(IdHdr,ID_ATMOSPHERE);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -136,7 +133,7 @@ void FGAtmosphere::Calculate(double altitude)
Pressure = node->GetDouble("atmosphere/override/pressure");
if (!PropertyManager->HasNode("atmosphere/override/density"))
- Density = Pressure/(Reng*Temperature);
+ Density = GetDensity(altitude);
else
Density = node->GetDouble("atmosphere/override/density");
@@ -193,13 +190,39 @@ double FGAtmosphere::ConvertToRankine(double t, eTemperature unit) const
targetTemp = t + 459.67;
break;
case eCelsius:
- targetTemp = t*9.0/5.0 + 32.0 + 459.67;
+ targetTemp = (t + 273.15) * 1.8;
break;
case eRankine:
targetTemp = t;
break;
case eKelvin:
- targetTemp = t*9.0/5.0;
+ targetTemp = t*1.8;
+ break;
+ default:
+ break;
+ }
+
+ return targetTemp;
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+double FGAtmosphere::ConvertFromRankine(double t, eTemperature unit) const
+{
+ double targetTemp=0;
+
+ switch(unit) {
+ case eFahrenheit:
+ targetTemp = t - 459.67;
+ break;
+ case eCelsius:
+ targetTemp = t/1.8 - 273.15;
+ break;
+ case eRankine:
+ targetTemp = t;
+ break;
+ case eKelvin:
+ targetTemp = t/1.8;
break;
default:
break;
@@ -236,7 +259,7 @@ double FGAtmosphere::ConvertToPSF(double p, ePressure unit) const
double FGAtmosphere::ConvertFromPSF(double p, ePressure unit) const
{
- double targetPressure=0; // Pressure in PSF
+ double targetPressure=0; // Pressure
switch(unit) {
case ePSF:
@@ -318,8 +341,6 @@ void FGAtmosphere::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- std::cout << IdSrc << std::endl;
- std::cout << IdHdr << std::endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGAtmosphere.h b/src/FDM/JSBSim/models/FGAtmosphere.h
index 632473aa2..be017af18 100644
--- a/src/FDM/JSBSim/models/FGAtmosphere.h
+++ b/src/FDM/JSBSim/models/FGAtmosphere.h
@@ -41,12 +41,6 @@ INCLUDES
#include <vector>
#include "models/FGModel.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_ATMOSPHERE "$Id: FGAtmosphere.h,v 1.32 2016/01/10 15:56:30 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -74,7 +68,6 @@ CLASS DOCUMENTATION
@property atmosphere/a-ratio
@author Jon Berndt
- @version $Id: FGAtmosphere.h,v 1.32 2016/01/10 15:56:30 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -230,7 +223,7 @@ protected:
double Viscosity, KinematicViscosity;
/// Calculate the atmosphere for the given altitude.
- void Calculate(double altitude);
+ virtual void Calculate(double altitude);
/// Calculates the density altitude given any temperature or pressure bias.
/// Calculated density for the specified geometric altitude given any temperature
@@ -246,19 +239,33 @@ protected:
/// @param geometricAlt
virtual double CalculatePressureAltitude(double pressure, double geometricAlt) { return geometricAlt; }
- // Converts to Rankine from one of several unit systems.
- virtual double ConvertToRankine(double t, eTemperature unit) const;
+ /// Converts to Rankine from one of several unit systems.
+ double ConvertToRankine(double t, eTemperature unit) const;
- // Converts to PSF (pounds per square foot) from one of several unit systems.
- virtual double ConvertToPSF(double t, ePressure unit=ePSF) const;
+ /// Converts from Rankine to one of several unit systems.
+ double ConvertFromRankine(double t, eTemperature unit) const;
- // Converts from PSF (pounds per square foot) to one of several unit systems.
- virtual double ConvertFromPSF(double t, ePressure unit=ePSF) const;
+ /// Converts to PSF (pounds per square foot) from one of several unit systems.
+ double ConvertToPSF(double t, ePressure unit=ePSF) const;
- static const double Rstar; // Universal gas constant - ft*lbf/R/mol
- static const double Mair; // Mean molecular weight - slug/mol
- static const double g0; // Sea-level acceleration of gravity - ft/s^2
- static double Reng; // Specific gas constant - ft*lbf/slug/R
+ /// Converts from PSF (pounds per square foot) to one of several unit systems.
+ double ConvertFromPSF(double t, ePressure unit=ePSF) const;
+
+ /// @name ISA constants
+ //@{
+ /// Universal gas constant - ft*lbf/R/mol
+ static const double Rstar;
+ /// Mean molecular weight for air - slug/mol
+ static const double Mair;
+ /** Sea-level acceleration of gravity - ft/s^2.
+ This constant is defined to compute the International Standard Atmosphere.
+ It is by definition the sea level gravity at a latitude of 45deg. This
+ value is fixed whichever gravity model is used by FGInertial.
+ */
+ static const double g0;
+ /// Specific gas constant for air - ft*lbf/slug/R
+ static double Reng;
+ //@}
static const double SHRatio;
@@ -271,4 +278,3 @@ protected:
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/FGAuxiliary.cpp b/src/FDM/JSBSim/models/FGAuxiliary.cpp
index ee5f2a6ca..0aac15c8b 100644
--- a/src/FDM/JSBSim/models/FGAuxiliary.cpp
+++ b/src/FDM/JSBSim/models/FGAuxiliary.cpp
@@ -51,9 +51,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGAuxiliary.cpp,v 1.72 2016/05/21 11:45:22 bcoconni Exp $");
-IDENT(IdHdr,ID_AUXILIARY);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -461,8 +458,6 @@ void FGAuxiliary::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGAuxiliary.h b/src/FDM/JSBSim/models/FGAuxiliary.h
index c7f198bdf..1c5ab210b 100644
--- a/src/FDM/JSBSim/models/FGAuxiliary.h
+++ b/src/FDM/JSBSim/models/FGAuxiliary.h
@@ -44,12 +44,6 @@ INCLUDES
#include "math/FGMatrix33.h"
#include "math/FGLocation.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_AUXILIARY "$Id: FGAuxiliary.h,v 1.31 2015/09/20 20:53:13 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -99,7 +93,6 @@ CLASS DOCUMENTATION
to the JSBSim vPQRdot vector, and the w parameter is equivalent to vPQR.
@author Tony Peden, Jon Berndt
- @version $Id: FGAuxiliary.h,v 1.31 2015/09/20 20:53:13 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/FGBuoyantForces.cpp b/src/FDM/JSBSim/models/FGBuoyantForces.cpp
index ed3356aaa..1aacfd488 100644
--- a/src/FDM/JSBSim/models/FGBuoyantForces.cpp
+++ b/src/FDM/JSBSim/models/FGBuoyantForces.cpp
@@ -47,9 +47,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGBuoyantForces.cpp,v 1.31 2017/06/03 19:49:20 bcoconni Exp $");
-IDENT(IdHdr,ID_BUOYANTFORCES);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -303,8 +300,6 @@ void FGBuoyantForces::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGBuoyantForces.h b/src/FDM/JSBSim/models/FGBuoyantForces.h
index e4a0ffee1..835666bd9 100644
--- a/src/FDM/JSBSim/models/FGBuoyantForces.h
+++ b/src/FDM/JSBSim/models/FGBuoyantForces.h
@@ -46,12 +46,6 @@ INCLUDES
#include "FGGasCell.h"
#include "math/FGColumnVector3.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_BUOYANTFORCES "$Id: FGBuoyantForces.h,v 1.18 2013/11/24 11:40:55 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -95,7 +89,6 @@ CLASS DOCUMENTATION
See FGGasCell for the full configuration file format for gas cells.
@author Anders Gidenstam, Jon S. Berndt
- @version $Id: FGBuoyantForces.h,v 1.18 2013/11/24 11:40:55 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -195,4 +188,3 @@ private:
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/FGExternalForce.cpp b/src/FDM/JSBSim/models/FGExternalForce.cpp
index 7c5aa894c..3057e2e09 100644
--- a/src/FDM/JSBSim/models/FGExternalForce.cpp
+++ b/src/FDM/JSBSim/models/FGExternalForce.cpp
@@ -74,9 +74,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGExternalForce.cpp,v 1.22 2017/06/04 21:06:08 bcoconni Exp $");
-IDENT(IdHdr,ID_EXTERNALFORCE);
-
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FGPropertyVector3::FGPropertyVector3(FGPropertyManager* pm,
@@ -262,8 +259,6 @@ void FGExternalForce::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGExternalForce.h b/src/FDM/JSBSim/models/FGExternalForce.h
index 81760543b..0d73ce47a 100644
--- a/src/FDM/JSBSim/models/FGExternalForce.h
+++ b/src/FDM/JSBSim/models/FGExternalForce.h
@@ -45,12 +45,6 @@ INCLUDES
#include "math/FGColumnVector3.h"
#include "simgear/props/propertyObject.hxx"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_EXTERNALFORCE "$Id: FGExternalForce.h,v 1.19 2017/06/04 21:06:08 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/FGExternalReactions.cpp b/src/FDM/JSBSim/models/FGExternalReactions.cpp
index 46574e412..5007f8ada 100644
--- a/src/FDM/JSBSim/models/FGExternalReactions.cpp
+++ b/src/FDM/JSBSim/models/FGExternalReactions.cpp
@@ -47,17 +47,6 @@ using namespace std;
namespace JSBSim {
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-GLOBAL DATA
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-IDENT(IdSrc,"$Id: FGExternalReactions.cpp,v 1.25 2017/06/04 21:06:08 bcoconni Exp $");
-IDENT(IdHdr,ID_EXTERNALREACTIONS);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -202,11 +191,8 @@ void FGExternalReactions::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
} // namespace JSBSim
-
diff --git a/src/FDM/JSBSim/models/FGExternalReactions.h b/src/FDM/JSBSim/models/FGExternalReactions.h
index 9e6d1160f..599165578 100644
--- a/src/FDM/JSBSim/models/FGExternalReactions.h
+++ b/src/FDM/JSBSim/models/FGExternalReactions.h
@@ -42,12 +42,6 @@ INCLUDES
#include "FGModel.h"
#include "math/FGColumnVector3.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_EXTERNALREACTIONS "$Id: FGExternalReactions.h,v 1.20 2017/06/04 21:06:08 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -182,4 +176,3 @@ private:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/FGFCS.cpp b/src/FDM/JSBSim/models/FGFCS.cpp
index c9276c8f5..26b34caa0 100644
--- a/src/FDM/JSBSim/models/FGFCS.cpp
+++ b/src/FDM/JSBSim/models/FGFCS.cpp
@@ -70,9 +70,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGFCS.cpp,v 1.98 2017/02/25 14:23:18 bcoconni Exp $");
-IDENT(IdHdr,ID_FCS);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -817,8 +814,6 @@ void FGFCS::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGFCS.h b/src/FDM/JSBSim/models/FGFCS.h
index 941475b1d..6b2d66d61 100644
--- a/src/FDM/JSBSim/models/FGFCS.h
+++ b/src/FDM/JSBSim/models/FGFCS.h
@@ -46,12 +46,6 @@ INCLUDES
#include "models/FGLGear.h"
#include "models/FGGroundReactions.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_FCS "$Id: FGFCS.h,v 1.55 2017/03/03 23:03:20 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -584,4 +578,3 @@ private:
}
#endif
-
diff --git a/src/FDM/JSBSim/models/FGFCSChannel.h b/src/FDM/JSBSim/models/FGFCSChannel.h
index 7c9c667c0..9a41c7cb7 100644
--- a/src/FDM/JSBSim/models/FGFCSChannel.h
+++ b/src/FDM/JSBSim/models/FGFCSChannel.h
@@ -40,12 +40,6 @@ INCLUDES
#include <iostream>
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_FCSCHANNEL "$Id: FGFCSChannel.h,v 1.10 2016/04/16 11:00:11 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/FGGasCell.cpp b/src/FDM/JSBSim/models/FGGasCell.cpp
index e7f009b68..ef5a9ea90 100644
--- a/src/FDM/JSBSim/models/FGGasCell.cpp
+++ b/src/FDM/JSBSim/models/FGGasCell.cpp
@@ -50,9 +50,6 @@ using std::max;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGGasCell.cpp,v 1.22 2015/03/28 14:49:02 bcoconni Exp $");
-IDENT(IdHdr,ID_GASCELL);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -492,8 +489,6 @@ void FGGasCell::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
@@ -846,8 +841,6 @@ void FGBallonet::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGGasCell.h b/src/FDM/JSBSim/models/FGGasCell.h
index 563525752..defb85aac 100644
--- a/src/FDM/JSBSim/models/FGGasCell.h
+++ b/src/FDM/JSBSim/models/FGGasCell.h
@@ -46,12 +46,6 @@ INCLUDES
#include <string>
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_GASCELL "$Id: FGGasCell.h,v 1.17 2017/06/03 19:49:20 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/FGGroundReactions.cpp b/src/FDM/JSBSim/models/FGGroundReactions.cpp
index 0c5f48a5b..591c8bba9 100644
--- a/src/FDM/JSBSim/models/FGGroundReactions.cpp
+++ b/src/FDM/JSBSim/models/FGGroundReactions.cpp
@@ -48,9 +48,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGGroundReactions.cpp,v 1.52 2016/05/16 18:19:57 bcoconni Exp $");
-IDENT(IdHdr,ID_GROUNDREACTIONS);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -313,8 +310,6 @@ void FGGroundReactions::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGGroundReactions.h b/src/FDM/JSBSim/models/FGGroundReactions.h
index a7ceed967..aa5058b37 100644
--- a/src/FDM/JSBSim/models/FGGroundReactions.h
+++ b/src/FDM/JSBSim/models/FGGroundReactions.h
@@ -45,8 +45,6 @@ INCLUDES
#include "FGLGear.h"
#include "math/FGColumnVector3.h"
-#define ID_GROUNDREACTIONS "$Id: FGGroundReactions.h,v 1.30 2016/05/16 18:19:57 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -135,4 +133,3 @@ private:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/FGInertial.cpp b/src/FDM/JSBSim/models/FGInertial.cpp
index 9807a9bc3..d2bf1efcc 100644
--- a/src/FDM/JSBSim/models/FGInertial.cpp
+++ b/src/FDM/JSBSim/models/FGInertial.cpp
@@ -43,9 +43,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGInertial.cpp,v 1.31 2014/05/17 15:24:37 jberndt Exp $");
-IDENT(IdHdr,ID_INERTIAL);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -196,8 +193,6 @@ void FGInertial::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGInertial.h b/src/FDM/JSBSim/models/FGInertial.h
index d283fc728..ca657cd1c 100644
--- a/src/FDM/JSBSim/models/FGInertial.h
+++ b/src/FDM/JSBSim/models/FGInertial.h
@@ -43,12 +43,6 @@ INCLUDES
#include "FGModel.h"
#include "math/FGColumnVector3.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_INERTIAL "$Id: FGInertial.h,v 1.22 2013/11/30 21:22:08 jberndt Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/FGInput.cpp b/src/FDM/JSBSim/models/FGInput.cpp
index e1972aeef..944e9e5d4 100644
--- a/src/FDM/JSBSim/models/FGInput.cpp
+++ b/src/FDM/JSBSim/models/FGInput.cpp
@@ -50,9 +50,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGInput.cpp,v 1.35 2017/02/25 14:23:19 bcoconni Exp $");
-IDENT(IdHdr,ID_INPUT);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -240,8 +237,6 @@ void FGInput::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGInput.h b/src/FDM/JSBSim/models/FGInput.h
index 86eb592d3..0f09ea180 100644
--- a/src/FDM/JSBSim/models/FGInput.h
+++ b/src/FDM/JSBSim/models/FGInput.h
@@ -42,12 +42,6 @@ INCLUDES
#include "FGModel.h"
#include "input_output/FGInputType.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_INPUT "$Id: FGInput.h,v 1.14 2017/02/25 14:23:19 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -81,7 +75,6 @@ CLASS DOCUMENTATION
The class FGInput is the manager of the inputs requested by the user. It
manages a list of instances derived from the abstract class FGInputType.
- @version $Id: FGInput.h,v 1.14 2017/02/25 14:23:19 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/FGLGear.cpp b/src/FDM/JSBSim/models/FGLGear.cpp
index 6727fb7e5..816d6125d 100644
--- a/src/FDM/JSBSim/models/FGLGear.cpp
+++ b/src/FDM/JSBSim/models/FGLGear.cpp
@@ -61,9 +61,6 @@ DEFINITIONS
GLOBAL DATA
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-IDENT(IdSrc,"$Id: FGLGear.cpp,v 1.125 2017/02/21 21:14:13 bcoconni Exp $");
-IDENT(IdHdr,ID_LGEAR);
-
// Body To Structural (body frame is rotated 180 deg about Y and lengths are given in
// ft instead of inches)
const FGMatrix33 FGLGear::Tb2s(-1./inchtoft, 0., 0., 0., 1./inchtoft, 0., 0., 0., -1./inchtoft);
@@ -935,8 +932,6 @@ void FGLGear::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGLGear.h b/src/FDM/JSBSim/models/FGLGear.h
index 92b4e6467..20e3e3b7a 100644
--- a/src/FDM/JSBSim/models/FGLGear.h
+++ b/src/FDM/JSBSim/models/FGLGear.h
@@ -45,12 +45,6 @@ INCLUDES
#include "math/LagrangeMultiplier.h"
#include "FGSurface.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_LGEAR "$Id: FGLGear.h,v 1.66 2017/03/11 12:07:22 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -178,7 +172,6 @@ CLASS DOCUMENTATION
</contact>
@endcode
@author Jon S. Berndt
- @version $Id: FGLGear.h,v 1.66 2017/03/11 12:07:22 bcoconni Exp $
@see Richard E. McFarland, "A Standard Kinematic Model for Flight Simulation at
NASA-Ames", NASA CR-2497, January 1975
@see Barnes W. McCormick, "Aerodynamics, Aeronautics, and Flight Mechanics",
diff --git a/src/FDM/JSBSim/models/FGMassBalance.cpp b/src/FDM/JSBSim/models/FGMassBalance.cpp
index 58fb622a8..9e4295523 100644
--- a/src/FDM/JSBSim/models/FGMassBalance.cpp
+++ b/src/FDM/JSBSim/models/FGMassBalance.cpp
@@ -51,9 +51,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGMassBalance.cpp,v 1.55 2016/03/26 18:54:27 bcoconni Exp $");
-IDENT(IdHdr,ID_MASSBALANCE);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -548,8 +545,6 @@ void FGMassBalance::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGMassBalance.h b/src/FDM/JSBSim/models/FGMassBalance.h
index b7c31176c..208a07c14 100644
--- a/src/FDM/JSBSim/models/FGMassBalance.h
+++ b/src/FDM/JSBSim/models/FGMassBalance.h
@@ -44,12 +44,6 @@ INCLUDES
#include "math/FGColumnVector3.h"
#include "math/FGMatrix33.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_MASSBALANCE "$Id: FGMassBalance.h,v 1.38 2016/12/21 08:08:32 ehofman Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONSS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/FGModel.cpp b/src/FDM/JSBSim/models/FGModel.cpp
index 85f1a5c51..c5f37bd87 100644
--- a/src/FDM/JSBSim/models/FGModel.cpp
+++ b/src/FDM/JSBSim/models/FGModel.cpp
@@ -46,9 +46,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGModel.cpp,v 1.27 2017/02/25 14:23:19 bcoconni Exp $");
-IDENT(IdHdr,ID_MODEL);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
GLOBAL DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -191,8 +188,6 @@ void FGModel::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGModel.h b/src/FDM/JSBSim/models/FGModel.h
index aa254ab6e..c488025db 100644
--- a/src/FDM/JSBSim/models/FGModel.h
+++ b/src/FDM/JSBSim/models/FGModel.h
@@ -43,12 +43,6 @@ INCLUDES
#include "math/FGModelFunctions.h"
#include "simgear/misc/sg_path.hxx"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_MODEL "$Id: FGModel.h,v 1.26 2017/02/25 14:23:19 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/FGOutput.cpp b/src/FDM/JSBSim/models/FGOutput.cpp
index 88a200a44..09820383a 100644
--- a/src/FDM/JSBSim/models/FGOutput.cpp
+++ b/src/FDM/JSBSim/models/FGOutput.cpp
@@ -53,9 +53,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGOutput.cpp,v 1.87 2017/02/25 14:23:19 bcoconni Exp $");
-IDENT(IdHdr,ID_OUTPUT);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -357,8 +354,6 @@ void FGOutput::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGOutput.h b/src/FDM/JSBSim/models/FGOutput.h
index b5b7396b7..94e90a25f 100644
--- a/src/FDM/JSBSim/models/FGOutput.h
+++ b/src/FDM/JSBSim/models/FGOutput.h
@@ -44,12 +44,6 @@ INCLUDES
#include "input_output/FGOutputType.h"
#include "math/FGTemplateFunc.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_OUTPUT "$Id: FGOutput.h,v 1.34 2017/02/25 14:23:19 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -122,7 +116,6 @@ CLASS DOCUMENTATION
The class FGOutput is the manager of the outputs requested by the user. It
manages a list of instances derived from the abstract class FGOutputType.
- @version $Id: FGOutput.h,v 1.34 2017/02/25 14:23:19 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -244,4 +237,3 @@ private:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/FGPropagate.cpp b/src/FDM/JSBSim/models/FGPropagate.cpp
index 632c224f1..3996af7d1 100644
--- a/src/FDM/JSBSim/models/FGPropagate.cpp
+++ b/src/FDM/JSBSim/models/FGPropagate.cpp
@@ -79,9 +79,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGPropagate.cpp,v 1.132 2017/02/25 14:23:19 bcoconni Exp $");
-IDENT(IdHdr,ID_PROPAGATE);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -958,8 +955,6 @@ void FGPropagate::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGPropagate.h b/src/FDM/JSBSim/models/FGPropagate.h
index fd3275973..6664c60b5 100644
--- a/src/FDM/JSBSim/models/FGPropagate.h
+++ b/src/FDM/JSBSim/models/FGPropagate.h
@@ -45,12 +45,6 @@ INCLUDES
#include "math/FGMatrix33.h"
#include <deque>
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_PROPAGATE "$Id: FGPropagate.h,v 1.85 2016/04/16 12:24:39 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -92,7 +86,6 @@ CLASS DOCUMENTATION
@endcode
@author Jon S. Berndt, Mathias Froehlich, Bertrand Coconnier
- @version $Id: FGPropagate.h,v 1.85 2016/04/16 12:24:39 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/FGPropulsion.cpp b/src/FDM/JSBSim/models/FGPropulsion.cpp
index ef9227b83..6aae33d20 100644
--- a/src/FDM/JSBSim/models/FGPropulsion.cpp
+++ b/src/FDM/JSBSim/models/FGPropulsion.cpp
@@ -65,12 +65,8 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGPropulsion.cpp,v 1.88 2017/02/25 14:23:19 bcoconni Exp $");
-IDENT(IdHdr,ID_PROPULSION);
-
extern short debug_lvl;
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -827,8 +823,6 @@ void FGPropulsion::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/FGPropulsion.h b/src/FDM/JSBSim/models/FGPropulsion.h
index b842ffdd4..5bd69ff7d 100644
--- a/src/FDM/JSBSim/models/FGPropulsion.h
+++ b/src/FDM/JSBSim/models/FGPropulsion.h
@@ -46,12 +46,6 @@ INCLUDES
#include "propulsion/FGEngine.h"
#include "math/FGMatrix33.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_PROPULSION "$Id: FGPropulsion.h,v 1.37 2017/02/25 14:23:19 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -93,7 +87,6 @@ CLASS DOCUMENTATION
@endcode
@author Jon S. Berndt
- @version $Id: FGPropulsion.h,v 1.37 2017/02/25 14:23:19 bcoconni Exp $
@see
FGEngine
FGTank
@@ -231,4 +224,3 @@ private:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/FGSurface.cpp b/src/FDM/JSBSim/models/FGSurface.cpp
index bf47892ee..28bc241c1 100644
--- a/src/FDM/JSBSim/models/FGSurface.cpp
+++ b/src/FDM/JSBSim/models/FGSurface.cpp
@@ -45,13 +45,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGSurface.cpp,v 1.5 2014/01/28 09:42:21 ehofman Exp $");
-IDENT(IdHdr,ID_SURFACE);
-
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-GLOBAL DECLARATIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -183,5 +176,3 @@ string FGSurface::GetSurfaceValues(string delimeter) const
}
} // namespace JSBSim
-
-
diff --git a/src/FDM/JSBSim/models/FGSurface.h b/src/FDM/JSBSim/models/FGSurface.h
index f05819fcc..69e339894 100644
--- a/src/FDM/JSBSim/models/FGSurface.h
+++ b/src/FDM/JSBSim/models/FGSurface.h
@@ -40,12 +40,6 @@ INCLUDES
#include "FGFDMExec.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_SURFACE "$Id: FGSurface.h,v 1.5 2014/01/28 09:42:21 ehofman Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -144,4 +138,3 @@ private:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/atmosphere/FGMSIS.cpp b/src/FDM/JSBSim/models/atmosphere/FGMSIS.cpp
index 38ff4f833..eb22ae780 100644
--- a/src/FDM/JSBSim/models/atmosphere/FGMSIS.cpp
+++ b/src/FDM/JSBSim/models/atmosphere/FGMSIS.cpp
@@ -66,9 +66,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGMSIS.cpp,v 1.24 2014/01/13 10:46:07 ehofman Exp $");
-IDENT(IdHdr,ID_MSIS);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
EXTERNAL GLOBAL DATA
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -1635,8 +1632,6 @@ void MSIS::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/atmosphere/FGMSIS.h b/src/FDM/JSBSim/models/atmosphere/FGMSIS.h
index 345a65ad5..17be784f8 100644
--- a/src/FDM/JSBSim/models/atmosphere/FGMSIS.h
+++ b/src/FDM/JSBSim/models/atmosphere/FGMSIS.h
@@ -43,12 +43,6 @@ INCLUDES
#include "models/FGAtmosphere.h"
#include "FGFDMExec.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_MSIS "$Id: FGMSIS.h,v 1.9 2011/05/20 03:18:36 jberndt Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -75,7 +69,6 @@ CLASS DOCUMENTATION
and check http://www.brodo.de/english/pub/nrlmsise/index.html for
updated releases of this package.
@author David Culp
- @version $Id: FGMSIS.h,v 1.9 2011/05/20 03:18:36 jberndt Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/atmosphere/FGMars.cpp b/src/FDM/JSBSim/models/atmosphere/FGMars.cpp
index 8bc320fd9..6362f70ce 100644
--- a/src/FDM/JSBSim/models/atmosphere/FGMars.cpp
+++ b/src/FDM/JSBSim/models/atmosphere/FGMars.cpp
@@ -48,9 +48,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGMars.cpp,v 1.13 2014/01/13 10:46:07 ehofman Exp $");
-IDENT(IdHdr,ID_MARS);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -125,8 +122,6 @@ void FGMars::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/atmosphere/FGMars.h b/src/FDM/JSBSim/models/atmosphere/FGMars.h
index e98634ecf..a16825571 100644
--- a/src/FDM/JSBSim/models/atmosphere/FGMars.h
+++ b/src/FDM/JSBSim/models/atmosphere/FGMars.h
@@ -40,12 +40,6 @@ INCLUDES
#include "models/FGAtmosphere.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_MARS "$Id: FGMars.h,v 1.8 2009/10/02 10:30:09 jberndt Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -58,7 +52,6 @@ CLASS DOCUMENTATION
/** Models the Martian atmosphere.
@author Jon Berndt
- @version $Id: FGMars.h,v 1.8 2009/10/02 10:30:09 jberndt Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.cpp b/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.cpp
index 2fc030a25..147a9be19 100644
--- a/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.cpp
+++ b/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.cpp
@@ -37,6 +37,9 @@ COMMENTS, REFERENCES, and NOTES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
[1] Anderson, John D. "Introduction to Flight, Third Edition", McGraw-Hill,
1989, ISBN 0-07-001641-0
+[2] Sonntag, D. "Important New Values of the Physical Constants of 1986,
+ Vapour Pressure Formulations based on the IST-90 and Psychrometer
+ Formulae", Z. Meteorol., 70 (5), pp. 340-344, 1990
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
INCLUDES
@@ -50,9 +53,6 @@ INCLUDES
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGStandardAtmosphere.cpp,v 1.24 2014/05/17 15:07:48 jberndt Exp $");
-IDENT(IdHdr,ID_STANDARDATMOSPHERE);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -60,10 +60,17 @@ CLASS IMPLEMENTATION
// Effective radius of the earth at a specific latitude per ISA 1976 (converted to ft)
// r0 = 6356766 m
const double FGStandardAtmosphere::EarthRadius = 6356766.0/FGJSBBase::fttom;
+/** Sonntag constants based on ref [2]. They are valid for temperatures between
+ -45 degC (-49 degF) and 60 degC (140 degF) with a precision of +/-0.35 degC
+ (+/-0.63 degF) */
+const double FGStandardAtmosphere::a = 611.2/FGJSBBase::psftopa; // psf
+const double FGStandardAtmosphere::b = 17.62; // 1/degC
+const double FGStandardAtmosphere::c = 243.12; // degC
+const double FGStandardAtmosphere::Mwater = 18.016 * FGJSBBase::kgtoslug / 1000.0; // slug/mol
FGStandardAtmosphere::FGStandardAtmosphere(FGFDMExec* fdmex)
: FGAtmosphere(fdmex), TemperatureBias(0.0), TemperatureDeltaGradient(0.0),
- StdAtmosTemperatureTable(9)
+ VaporPressure(0.0), SaturatedVaporPressure(0.0), StdAtmosTemperatureTable(9)
{
Name = "FGStandardAtmosphere";
@@ -97,8 +104,9 @@ FGStandardAtmosphere::FGStandardAtmosphere(FGFDMExec* fdmex)
<< 278385.8268 << 336.5028 // 84.852 86.000
<< 298556.4304 << 336.5028; // 91.000 - First layer in high altitude regime
- PressureBreakpointVector.resize(StdAtmosTemperatureTable.GetNumRows());
- LapseRateVector.resize(StdAtmosTemperatureTable.GetNumRows());
+ unsigned int numRows = StdAtmosTemperatureTable.GetNumRows();
+ PressureBreakpoints.resize(numRows);
+ LapseRates.resize(numRows);
// Assume the altitude to fade out the gradient at is at the highest
// altitude in the table. Above that, other functions are used to
@@ -120,7 +128,7 @@ FGStandardAtmosphere::~FGStandardAtmosphere()
bool FGStandardAtmosphere::InitModel(void)
{
- PressureBreakpointVector[0] = StdSLpressure = SLpressure = Pressure = 2116.228; // psf
+ PressureBreakpoints[0] = StdSLpressure = SLpressure = Pressure = 2116.228; // psf
TemperatureDeltaGradient = 0.0;
TemperatureBias = 0.0;
CalculateLapseRates();
@@ -129,7 +137,8 @@ bool FGStandardAtmosphere::InitModel(void)
StdSLtemperature = SLtemperature = StdAtmosTemperatureTable(1, 1);
StdSLdensity = SLdensity = StdSLpressure / (Reng * StdSLtemperature);
- StdPressureBreakpointVector = PressureBreakpointVector;
+ StdPressureBreakpoints = PressureBreakpoints;
+ StdLapseRates = LapseRates;
CalculateStdDensityBreakpoints();
@@ -146,6 +155,18 @@ bool FGStandardAtmosphere::InitModel(void)
return true;
}
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGStandardAtmosphere::Calculate(double altitude)
+{
+ FGAtmosphere::Calculate(altitude);
+ SaturatedVaporPressure = CalculateVaporPressure(Temperature);
+
+ // Make sure the partial pressure of water vapor never becomes higher than the
+ // saturated vapor pressure.
+ if (VaporPressure > SaturatedVaporPressure)
+ VaporPressure = SaturatedVaporPressure;
+}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
// Get the actual pressure as modeled at a specified altitude
@@ -174,14 +195,14 @@ double FGStandardAtmosphere::GetPressure(double altitude) const
double Tmb = GetTemperature(GeometricAltitude(BaseAlt));
double deltaH = GeoPotAlt - BaseAlt;
- double Lmb = LapseRateVector[b];
+ double Lmb = LapseRates[b];
if (Lmb != 0.0) {
double Exp = g0*Mair / (Rstar*Lmb);
double factor = Tmb/(Tmb + Lmb*deltaH);
- return PressureBreakpointVector[b]*pow(factor, Exp);
+ return PressureBreakpoints[b]*pow(factor, Exp);
} else
- return PressureBreakpointVector[b]*exp(-g0*Mair*deltaH/(Rstar*Tmb));
+ return PressureBreakpoints[b]*exp(-g0*Mair*deltaH/(Rstar*Tmb));
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -190,7 +211,7 @@ void FGStandardAtmosphere::SetPressureSL(ePressure unit, double pressure)
{
double press = ConvertToPSF(pressure, unit);
- PressureBreakpointVector[0] = press;
+ PressureBreakpoints[0] = press;
CalculatePressureBreakpoints();
}
@@ -213,10 +234,13 @@ double FGStandardAtmosphere::GetTemperature(double altitude) const
else {
// We don't need to add TemperatureDeltaGradient*GeoPotAlt here because
// the lapse rate vector already accounts for the temperature gradient.
- T = StdAtmosTemperatureTable.GetValue(0.0) + GeoPotAlt*LapseRateVector[0];
+ T = StdAtmosTemperatureTable.GetValue(0.0) + GeoPotAlt*LapseRates[0];
}
- T += TemperatureBias + TemperatureDeltaGradient * GradientFadeoutAltitude;
+ T += TemperatureBias;
+
+ if (GeoPotAlt <= GradientFadeoutAltitude)
+ T += TemperatureDeltaGradient * GradientFadeoutAltitude;
return T;
}
@@ -237,7 +261,7 @@ double FGStandardAtmosphere::GetStdTemperature(double altitude) const
if (GeoPotAlt >= 0.0)
temp = StdAtmosTemperatureTable.GetValue(GeoPotAlt);
else
- temp = StdAtmosTemperatureTable.GetValue(0.0) + GeoPotAlt*LapseRateVector[0];
+ temp = StdAtmosTemperatureTable.GetValue(0.0) + GeoPotAlt*LapseRates[0];
} else if (altitude < 360892.4) { // 110 km - station 9
@@ -282,14 +306,14 @@ double FGStandardAtmosphere::GetStdPressure(double altitude) const
double Tmb = GetStdTemperature(GeometricAltitude(BaseAlt));
double deltaH = GeoPotAlt - BaseAlt;
- double Lmb = LapseRateVector[b];
+ double Lmb = LapseRates[b];
if (Lmb != 0.0) {
double Exp = g0*Mair / (Rstar*Lmb);
double factor = Tmb/(Tmb + Lmb*deltaH);
- return StdPressureBreakpointVector[b]*pow(factor, Exp);
+ return StdPressureBreakpoints[b]*pow(factor, Exp);
} else
- return StdPressureBreakpointVector[b]*exp(-g0*Mair*deltaH/(Rstar*Tmb));
+ return StdPressureBreakpoints[b]*exp(-g0*Mair*deltaH/(Rstar*Tmb));
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -300,14 +324,29 @@ double FGStandardAtmosphere::GetStdDensity(double altitude) const
return GetStdPressure(altitude)/(Reng * GetStdTemperature(altitude));
}
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+// Get the density, taking into account the water vapor in the air.
+
+double FGStandardAtmosphere::GetDensity(double altitude) const
+{
+ double P = GetPressure(altitude);
+ double Pa = P - VaporPressure; // Partial pressure of air
+
+ return (Pa/Reng + Mwater*VaporPressure/Rstar)/GetTemperature(altitude);
+}
+
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
void FGStandardAtmosphere::SetTemperature(double t, double h, eTemperature unit)
{
- double targetSLtemp = ConvertToRankine(t, unit);
+ double targetTemp = ConvertToRankine(t, unit);
+ double GeoPotAlt = GeopotentialAltitude(h);
+
+ TemperatureBias = targetTemp - GetStdTemperature(h);
+
+ if (GeoPotAlt <= GradientFadeoutAltitude)
+ TemperatureBias -= TemperatureDeltaGradient * (GradientFadeoutAltitude - GeoPotAlt);
- TemperatureBias = 0.0;
- TemperatureBias = targetSLtemp - GetTemperature(h);
CalculatePressureBreakpoints();
}
@@ -387,7 +426,7 @@ void FGStandardAtmosphere::SetTemperatureGradedDelta(double deltemp, double h, e
void FGStandardAtmosphere::CalculateLapseRates()
{
unsigned int numRows = StdAtmosTemperatureTable.GetNumRows();
- LapseRateVector.clear();
+ LapseRates.clear();
for (unsigned int bh=0; bh < numRows-1; bh++)
{
@@ -395,7 +434,7 @@ void FGStandardAtmosphere::CalculateLapseRates()
double t1 = StdAtmosTemperatureTable(bh+2,1);
double h0 = StdAtmosTemperatureTable(bh+1,0);
double h1 = StdAtmosTemperatureTable(bh+2,0);
- LapseRateVector.push_back((t1 - t0) / (h1 - h0) - TemperatureDeltaGradient);
+ LapseRates.push_back((t1 - t0) / (h1 - h0) - TemperatureDeltaGradient);
}
}
@@ -403,7 +442,7 @@ void FGStandardAtmosphere::CalculateLapseRates()
void FGStandardAtmosphere::CalculatePressureBreakpoints()
{
- for (unsigned int b=0; b<PressureBreakpointVector.size()-1; b++) {
+ for (unsigned int b=0; b<PressureBreakpoints.size()-1; b++) {
double BaseTemp = StdAtmosTemperatureTable(b+1,1);
double BaseAlt = StdAtmosTemperatureTable(b+1,0);
double UpperAlt = StdAtmosTemperatureTable(b+2,0);
@@ -411,13 +450,13 @@ void FGStandardAtmosphere::CalculatePressureBreakpoints()
double Tmb = BaseTemp
+ TemperatureBias
+ (GradientFadeoutAltitude - BaseAlt)*TemperatureDeltaGradient;
- if (LapseRateVector[b] != 0.00) {
- double Lmb = LapseRateVector[b];
+ if (LapseRates[b] != 0.00) {
+ double Lmb = LapseRates[b];
double Exp = g0*Mair / (Rstar*Lmb);
double factor = Tmb/(Tmb + Lmb*deltaH);
- PressureBreakpointVector[b+1] = PressureBreakpointVector[b]*pow(factor, Exp);
+ PressureBreakpoints[b+1] = PressureBreakpoints[b]*pow(factor, Exp);
} else {
- PressureBreakpointVector[b+1] = PressureBreakpointVector[b]*exp(-g0*Mair*deltaH/(Rstar*Tmb));
+ PressureBreakpoints[b+1] = PressureBreakpoints[b]*exp(-g0*Mair*deltaH/(Rstar*Tmb));
}
}
}
@@ -435,7 +474,7 @@ void FGStandardAtmosphere::ResetSLTemperature()
void FGStandardAtmosphere::ResetSLPressure()
{
- PressureBreakpointVector[0] = StdSLpressure; // psf
+ PressureBreakpoints[0] = StdSLpressure; // psf
CalculatePressureBreakpoints();
}
@@ -443,9 +482,9 @@ void FGStandardAtmosphere::ResetSLPressure()
void FGStandardAtmosphere::CalculateStdDensityBreakpoints()
{
- StdDensityBreakpointVector.clear();
- for (unsigned int i = 0; i < StdPressureBreakpointVector.size(); i++) {
- StdDensityBreakpointVector.push_back(StdPressureBreakpointVector[i] / (Reng * StdAtmosTemperatureTable(i + 1, 1)));
+ StdDensityBreakpoints.clear();
+ for (unsigned int i = 0; i < StdPressureBreakpoints.size(); i++) {
+ StdDensityBreakpoints.push_back(StdPressureBreakpoints[i] / (Reng * StdAtmosTemperatureTable(i + 1, 1)));
}
}
@@ -455,19 +494,16 @@ double FGStandardAtmosphere::CalculateDensityAltitude(double density, double geo
{
// Work out which layer we're dealing with
unsigned int b = 0;
- for (; b < StdDensityBreakpointVector.size() - 2; b++) {
- if (density >= StdDensityBreakpointVector[b + 1])
+ for (; b < StdDensityBreakpoints.size() - 2; b++) {
+ if (density >= StdDensityBreakpoints[b + 1])
break;
}
// Get layer properties
double Tmb = StdAtmosTemperatureTable(b + 1, 1);
double Hb = StdAtmosTemperatureTable(b + 1, 0);
- double UpperTemp = StdAtmosTemperatureTable(b + 2, 1);
- double UpperAlt = StdAtmosTemperatureTable(b + 2, 0);
- double deltaH = UpperAlt - Hb;
- double Lmb = (UpperTemp - Tmb) / deltaH;
- double pb = StdDensityBreakpointVector[b];
+ double Lmb = StdLapseRates[b];
+ double pb = StdDensityBreakpoints[b];
double density_altitude = 0.0;
@@ -489,19 +525,16 @@ double FGStandardAtmosphere::CalculatePressureAltitude(double pressure, double g
{
// Work out which layer we're dealing with
unsigned int b = 0;
- for (; b < StdPressureBreakpointVector.size() - 2; b++) {
- if (pressure >= StdPressureBreakpointVector[b + 1])
+ for (; b < StdPressureBreakpoints.size() - 2; b++) {
+ if (pressure >= StdPressureBreakpoints[b + 1])
break;
}
// Get layer properties
double Tmb = StdAtmosTemperatureTable(b + 1, 1);
double Hb = StdAtmosTemperatureTable(b + 1, 0);
- double UpperTemp = StdAtmosTemperatureTable(b + 2, 1);
- double UpperAlt = StdAtmosTemperatureTable(b + 2, 0);
- double deltaH = UpperAlt - Hb;
- double Lmb = (UpperTemp - Tmb) / deltaH;
- double Pb = StdPressureBreakpointVector[b];
+ double Lmb = StdLapseRates[b];
+ double Pb = StdPressureBreakpoints[b];
double pressure_altitude = 0.0;
@@ -520,6 +553,72 @@ double FGStandardAtmosphere::CalculatePressureAltitude(double pressure, double g
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+double FGStandardAtmosphere::CalculateVaporPressure(double temperature)
+{
+ double temperature_degC = temperature/1.8-273.15;
+ return a*exp(b*temperature_degC/(c+temperature_degC));
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGStandardAtmosphere::SetDewPoint(eTemperature unit, double dewpoint)
+{
+ VaporPressure = CalculateVaporPressure(ConvertToRankine(dewpoint, unit));
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+double FGStandardAtmosphere::GetDewPoint(eTemperature to) const
+{
+ double dewpoint_degC;
+
+ if (VaporPressure <= 0.0)
+ dewpoint_degC = -c;
+ else {
+ double x = log(VaporPressure/a);
+ dewpoint_degC = c*x / (b - x);
+ }
+
+ return ConvertFromRankine(1.8*(dewpoint_degC + 273.15), to);
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGStandardAtmosphere::SetVaporPressure(ePressure unit, double Pa)
+{
+ VaporPressure = ConvertToPSF(Pa, unit);
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+double FGStandardAtmosphere::GetVaporPressure(ePressure to) const
+{
+ return ConvertFromPSF(VaporPressure, to);
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+double FGStandardAtmosphere::GetSaturatedVaporPressure(ePressure to) const
+{
+ return ConvertFromPSF(SaturatedVaporPressure, to);
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+double FGStandardAtmosphere::GetRelativeHumidity(void) const
+{
+ return 100.0*VaporPressure/SaturatedVaporPressure;
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGStandardAtmosphere::SetRelativeHumidity(double RH)
+{
+ VaporPressure = 0.01*RH*SaturatedVaporPressure;
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
void FGStandardAtmosphere::bind(void)
{
typedef double (FGStandardAtmosphere::*PMFi)(int) const;
@@ -533,6 +632,17 @@ void FGStandardAtmosphere::bind(void)
PropertyManager->Tie("atmosphere/P-sl-psf", this, ePSF,
(PMFi)&FGStandardAtmosphere::GetPressureSL,
(PMF)&FGStandardAtmosphere::SetPressureSL);
+ PropertyManager->Tie("atmosphere/dew-point-R", this, eRankine,
+ (PMFi)&FGStandardAtmosphere::GetDewPoint,
+ (PMF)&FGStandardAtmosphere::SetDewPoint);
+ PropertyManager->Tie("atmosphere/vapor-pressure-psf", this, ePSF,
+ (PMFi)&FGStandardAtmosphere::GetVaporPressure,
+ (PMF)&FGStandardAtmosphere::SetVaporPressure);
+ PropertyManager->Tie("atmosphere/saturated-vapor-pressure-psf", this, ePSF,
+ (PMFi)&FGStandardAtmosphere::GetSaturatedVaporPressure);
+ PropertyManager->Tie("atmosphere/RH", this,
+ &FGStandardAtmosphere::GetRelativeHumidity,
+ &FGStandardAtmosphere::SetRelativeHumidity);
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -576,8 +686,6 @@ void FGStandardAtmosphere::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- std::cout << IdSrc << std::endl;
- std::cout << IdHdr << std::endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.h b/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.h
index 0c5fef10a..efbb1d305 100644
--- a/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.h
+++ b/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.h
@@ -42,12 +42,6 @@ INCLUDES
#include "math/FGTable.h"
#include "models/FGAtmosphere.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_STANDARDATMOSPHERE "$Id: FGStandardAtmosphere.h,v 1.17 2012/04/13 13:18:27 jberndt Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -93,7 +87,6 @@ consistently and accurately calculated.
@author Jon Berndt
@see "U.S. Standard Atmosphere, 1976", NASA TM-X-74335
- @version $Id: FGStandardAtmosphere.h,v 1.17 2012/04/13 13:18:27 jberndt Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -238,23 +231,60 @@ public:
//@{
/// Returns the standard density at a specified altitude
virtual double GetStdDensity(double altitude) const;
+ /// Returns the standard density at a specified altitude
+ virtual double GetDensity(double altitude) const;
+ //@}
+
+ // *************************************************************************
+ ///@name Humidity access functions
+ //@{
+ /** Sets the dew point.
+ @param dewpoint The dew point in the units specified
+ @param unit The unit of measure that the specified dew point is supplied
+ in. */
+ void SetDewPoint(eTemperature unit, double dewpoint);
+ /** Returns the dew point.
+ @param to The unit of measure that the dew point should be supplied in. */
+ double GetDewPoint(eTemperature to) const;
+ /** Sets the partial pressure of water vapor.
+ @param Pv The vapor pressure in the units specified
+ @param unit The unit of measure that the specified vapor pressure is
+ supplied in. */
+ void SetVaporPressure(ePressure unit, double Pv);
+ /** Returns the partial pressure of water vapor.
+ @param to The unit of measure that the water vapor should be supplied in. */
+ double GetVaporPressure(ePressure to) const;
+ /** Returns the saturated pressure of water vapor.
+ @param to The unit of measure that the water vapor should be supplied in. */
+ double GetSaturatedVaporPressure(ePressure to) const;
+ /** Sets the relative humidity.
+ @param RH The relative humidity in percent. */
+ void SetRelativeHumidity(double RH);
+ /// Returns the relative humidity in percent.
+ double GetRelativeHumidity(void) const;
//@}
/// Prints the U.S. Standard Atmosphere table.
virtual void PrintStandardAtmosphereTable();
protected:
- double StdSLtemperature, StdSLdensity, StdSLpressure, StdSLsoundspeed; // Standard sea level conditions
+ /// Standard sea level conditions
+ double StdSLtemperature, StdSLdensity, StdSLpressure, StdSLsoundspeed;
double TemperatureBias;
double TemperatureDeltaGradient;
double GradientFadeoutAltitude;
+ double VaporPressure;
+ double SaturatedVaporPressure;
FGTable StdAtmosTemperatureTable;
- std::vector<double> LapseRateVector;
- std::vector<double> PressureBreakpointVector;
- std::vector<double> StdPressureBreakpointVector;
- std::vector<double> StdDensityBreakpointVector;
+ std::vector<double> LapseRates;
+ std::vector<double> PressureBreakpoints;
+ std::vector<double> StdPressureBreakpoints;
+ std::vector<double> StdDensityBreakpoints;
+ std::vector<double> StdLapseRates;
+
+ virtual void Calculate(double altitude);
/// Recalculate the lapse rate vectors when the temperature profile is altered
/// in a way that would change the lapse rates, such as when a gradient is applied.
@@ -296,11 +326,18 @@ protected:
*/
virtual double CalculatePressureAltitude(double pressure, double geometricAlt);
+ /// Calculate the pressure of water vapor with the Magnus formula.
+ double CalculateVaporPressure(double temperature);
+
virtual void bind(void);
void Debug(int from);
/// Earth radius in ft as defined for ISA 1976
static const double EarthRadius;
+ /// Constants for the Magnus formula (vapor pressure)
+ static const double a, b, c;
+ /// Mean molecular weight for water - slug/mol
+ static const double Mwater;
};
} // namespace JSBSim
diff --git a/src/FDM/JSBSim/models/atmosphere/FGWinds.cpp b/src/FDM/JSBSim/models/atmosphere/FGWinds.cpp
index 3d4f0d266..2b7adf436 100644
--- a/src/FDM/JSBSim/models/atmosphere/FGWinds.cpp
+++ b/src/FDM/JSBSim/models/atmosphere/FGWinds.cpp
@@ -51,9 +51,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGWinds.cpp,v 1.15 2015/02/27 20:49:36 bcoconni Exp $");
-IDENT(IdHdr,ID_WINDS);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -609,8 +606,6 @@ void FGWinds::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/atmosphere/FGWinds.h b/src/FDM/JSBSim/models/atmosphere/FGWinds.h
index d30242c89..6a4cffb48 100644
--- a/src/FDM/JSBSim/models/atmosphere/FGWinds.h
+++ b/src/FDM/JSBSim/models/atmosphere/FGWinds.h
@@ -43,12 +43,6 @@ INCLUDES
#include "math/FGMatrix33.h"
#include "math/FGTable.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_WINDS "$Id: FGWinds.h,v 1.11 2015/02/27 20:36:47 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/flight_control/FGAccelerometer.cpp b/src/FDM/JSBSim/models/flight_control/FGAccelerometer.cpp
index eceac67a9..084e71152 100644
--- a/src/FDM/JSBSim/models/flight_control/FGAccelerometer.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGAccelerometer.cpp
@@ -51,9 +51,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGAccelerometer.cpp,v 1.17 2015/08/09 17:29:48 bcoconni Exp $");
-IDENT(IdHdr,ID_ACCELEROMETER);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -149,8 +146,6 @@ void FGAccelerometer::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGAccelerometer.h b/src/FDM/JSBSim/models/flight_control/FGAccelerometer.h
index 07af37e8b..3a4daf5b7 100644
--- a/src/FDM/JSBSim/models/flight_control/FGAccelerometer.h
+++ b/src/FDM/JSBSim/models/flight_control/FGAccelerometer.h
@@ -41,12 +41,6 @@ INCLUDES
#include "math/FGColumnVector3.h"
#include "FGSensorOrientation.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_ACCELEROMETER "$Id: FGAccelerometer.h,v 1.9 2015/03/07 18:48:22 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/flight_control/FGActuator.cpp b/src/FDM/JSBSim/models/flight_control/FGActuator.cpp
index 453752775..99e30d83e 100644
--- a/src/FDM/JSBSim/models/flight_control/FGActuator.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGActuator.cpp
@@ -48,9 +48,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGActuator.cpp,v 1.38 2015/07/12 19:34:08 bcoconni Exp $");
-IDENT(IdHdr,ID_ACTUATOR);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -356,8 +353,6 @@ void FGActuator::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGActuator.h b/src/FDM/JSBSim/models/flight_control/FGActuator.h
index a75254c32..41e2988fc 100644
--- a/src/FDM/JSBSim/models/flight_control/FGActuator.h
+++ b/src/FDM/JSBSim/models/flight_control/FGActuator.h
@@ -39,12 +39,6 @@ INCLUDES
#include "FGFCSComponent.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_ACTUATOR "$Id: FGActuator.h,v 1.20 2015/02/27 20:36:47 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/flight_control/FGAngles.cpp b/src/FDM/JSBSim/models/flight_control/FGAngles.cpp
index d17914a00..2322f6425 100644
--- a/src/FDM/JSBSim/models/flight_control/FGAngles.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGAngles.cpp
@@ -74,9 +74,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGAngles.cpp,v 1.5 2016/07/27 22:42:47 andgi Exp $");
-IDENT(IdHdr,ID_ANGLES);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -198,8 +195,6 @@ void FGAngles::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGAngles.h b/src/FDM/JSBSim/models/flight_control/FGAngles.h
index 35098f511..08bed2091 100644
--- a/src/FDM/JSBSim/models/flight_control/FGAngles.h
+++ b/src/FDM/JSBSim/models/flight_control/FGAngles.h
@@ -41,12 +41,6 @@ INCLUDES
#include <string>
#include "FGFCSComponent.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_ANGLES "$Id: FGAngles.h,v 1.1 2013/06/20 04:37:28 jberndt Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -75,7 +69,6 @@ CLASS DOCUMENTATION
@endcode
@author Jon S. Berndt
- @version $Id: FGAngles.h,v 1.1 2013/06/20 04:37:28 jberndt Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/flight_control/FGDeadBand.cpp b/src/FDM/JSBSim/models/flight_control/FGDeadBand.cpp
index 6fa9d3bef..c6c8125fc 100644
--- a/src/FDM/JSBSim/models/flight_control/FGDeadBand.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGDeadBand.cpp
@@ -46,9 +46,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGDeadBand.cpp,v 1.14 2014/01/13 10:46:07 ehofman Exp $");
-IDENT(IdHdr,ID_DEADBAND);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -166,8 +163,6 @@ void FGDeadBand::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGDeadBand.h b/src/FDM/JSBSim/models/flight_control/FGDeadBand.h
index 5162f880c..f41db2fb3 100644
--- a/src/FDM/JSBSim/models/flight_control/FGDeadBand.h
+++ b/src/FDM/JSBSim/models/flight_control/FGDeadBand.h
@@ -39,12 +39,6 @@ INCLUDES
#include "FGFCSComponent.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_DEADBAND "$Id$"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -79,7 +73,6 @@ CLASS DOCUMENTATION
produce no output. For example, say that the width value is 2.0. If the
input is between -1.0 and +1.0, the output will be zero.
@author Jon S. Berndt
- @version $Id$
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/flight_control/FGDistributor.cpp b/src/FDM/JSBSim/models/flight_control/FGDistributor.cpp
index ac1959cca..c7f033f5d 100644
--- a/src/FDM/JSBSim/models/flight_control/FGDistributor.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGDistributor.cpp
@@ -48,9 +48,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGDistributor.cpp,v 1.7 2015/02/27 20:46:01 bcoconni Exp $");
-IDENT(IdHdr,ID_DISTRIBUTOR);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -182,11 +179,8 @@ void FGDistributor::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
} //namespace JSBSim
-
diff --git a/src/FDM/JSBSim/models/flight_control/FGDistributor.h b/src/FDM/JSBSim/models/flight_control/FGDistributor.h
index 0c4a895b5..55adf40f9 100644
--- a/src/FDM/JSBSim/models/flight_control/FGDistributor.h
+++ b/src/FDM/JSBSim/models/flight_control/FGDistributor.h
@@ -45,12 +45,6 @@ INCLUDES
#include "math/FGPropertyValue.h"
#include "math/FGRealValue.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_DISTRIBUTOR "$Id: FGDistributor.h,v 1.7 2015/03/28 14:49:02 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -99,7 +93,6 @@ Here's an example:
Note: In the "logic" attribute, "AND" is the default logic, if none is supplied.
@author Jon S. Berndt
-@version $Id: FGDistributor.h,v 1.7 2015/03/28 14:49:02 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/flight_control/FGFCSComponent.cpp b/src/FDM/JSBSim/models/flight_control/FGFCSComponent.cpp
index c753259a6..12289dc1e 100644
--- a/src/FDM/JSBSim/models/flight_control/FGFCSComponent.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGFCSComponent.cpp
@@ -49,9 +49,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGFCSComponent.cpp,v 1.42 2016/02/27 16:54:15 bcoconni Exp $");
-IDENT(IdHdr,ID_FCSCOMPONENT);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -363,8 +360,6 @@ void FGFCSComponent::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h b/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h
index 18af1ff38..2929b0f0a 100644
--- a/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h
+++ b/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h
@@ -43,12 +43,6 @@ INCLUDES
#include "FGJSBBase.h"
#include "math/FGPropertyValue.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_FCSCOMPONENT "$Id: FGFCSComponent.h,v 1.28 2016/02/27 16:54:16 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -83,7 +77,6 @@ CLASS DOCUMENTATION
- FGAngle
@author Jon S. Berndt
- @version $Id: FGFCSComponent.h,v 1.28 2016/02/27 16:54:16 bcoconni Exp $
@see Documentation for the FGFCS class, and for the configuration file class
*/
diff --git a/src/FDM/JSBSim/models/flight_control/FGFCSFunction.cpp b/src/FDM/JSBSim/models/flight_control/FGFCSFunction.cpp
index 118267c05..69cb5cf97 100644
--- a/src/FDM/JSBSim/models/flight_control/FGFCSFunction.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGFCSFunction.cpp
@@ -47,9 +47,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGFCSFunction.cpp,v 1.15 2014/01/13 10:46:08 ehofman Exp $");
-IDENT(IdHdr,ID_FCSFUNCTION);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -142,8 +139,6 @@ void FGFCSFunction::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGFCSFunction.h b/src/FDM/JSBSim/models/flight_control/FGFCSFunction.h
index f5fa5249c..90b828fb7 100644
--- a/src/FDM/JSBSim/models/flight_control/FGFCSFunction.h
+++ b/src/FDM/JSBSim/models/flight_control/FGFCSFunction.h
@@ -40,12 +40,6 @@ INCLUDES
#include "FGFCSComponent.h"
#include "math/FGFunction.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_FCSFUNCTION "$Id: FGFCSFunction.h,v 1.9 2013/11/24 11:40:57 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -104,7 +98,6 @@ a function (from an aero specification):
</function>
@endcode
- @version $Id: FGFCSFunction.h,v 1.9 2013/11/24 11:40:57 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/flight_control/FGFilter.cpp b/src/FDM/JSBSim/models/flight_control/FGFilter.cpp
index 2d7902287..a00e14bf1 100644
--- a/src/FDM/JSBSim/models/flight_control/FGFilter.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGFilter.cpp
@@ -48,9 +48,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGFilter.cpp,v 1.21 2015/09/27 20:26:23 bcoconni Exp $");
-IDENT(IdHdr,ID_FILTER);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -351,8 +348,6 @@ void FGFilter::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGFilter.h b/src/FDM/JSBSim/models/flight_control/FGFilter.h
index b899126d3..26b556fcf 100644
--- a/src/FDM/JSBSim/models/flight_control/FGFilter.h
+++ b/src/FDM/JSBSim/models/flight_control/FGFilter.h
@@ -39,12 +39,6 @@ INCLUDES
#include "FGFCSComponent.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_FILTER "$Id: FGFilter.h,v 1.14 2014/01/02 21:58:42 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/flight_control/FGGain.cpp b/src/FDM/JSBSim/models/flight_control/FGGain.cpp
index 0a2cad21d..a517f9603 100644
--- a/src/FDM/JSBSim/models/flight_control/FGGain.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGGain.cpp
@@ -47,9 +47,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGGain.cpp,v 1.25 2014/01/13 10:46:09 ehofman Exp $");
-IDENT(IdHdr,ID_GAIN);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -247,8 +244,6 @@ void FGGain::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGGain.h b/src/FDM/JSBSim/models/flight_control/FGGain.h
index 9726fb0ad..e09f4b06e 100644
--- a/src/FDM/JSBSim/models/flight_control/FGGain.h
+++ b/src/FDM/JSBSim/models/flight_control/FGGain.h
@@ -40,12 +40,6 @@ INCLUDES
#include "FGFCSComponent.h"
#include "math/FGTable.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_GAIN "$Id$"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/flight_control/FGGyro.cpp b/src/FDM/JSBSim/models/flight_control/FGGyro.cpp
index d1849465d..c36afcaf2 100644
--- a/src/FDM/JSBSim/models/flight_control/FGGyro.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGGyro.cpp
@@ -48,9 +48,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGGyro.cpp,v 1.11 2015/07/12 19:34:08 bcoconni Exp $");
-IDENT(IdHdr,ID_GYRO);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -130,8 +127,6 @@ void FGGyro::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGGyro.h b/src/FDM/JSBSim/models/flight_control/FGGyro.h
index a3399088f..ca2f4fc11 100644
--- a/src/FDM/JSBSim/models/flight_control/FGGyro.h
+++ b/src/FDM/JSBSim/models/flight_control/FGGyro.h
@@ -42,12 +42,6 @@ INCLUDES
#include "math/FGMatrix33.h"
#include "FGSensorOrientation.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_GYRO "$Id: FGGyro.h,v 1.7 2013/11/24 11:40:57 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/flight_control/FGKinemat.cpp b/src/FDM/JSBSim/models/flight_control/FGKinemat.cpp
index 05d41ab70..34d4722a5 100644
--- a/src/FDM/JSBSim/models/flight_control/FGKinemat.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGKinemat.cpp
@@ -47,9 +47,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGKinemat.cpp,v 1.16 2016/06/12 14:47:46 bcoconni Exp $");
-IDENT(IdHdr,ID_FLAPS);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -209,8 +206,6 @@ void FGKinemat::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGKinemat.h b/src/FDM/JSBSim/models/flight_control/FGKinemat.h
index 70d8e6d77..97de792bf 100644
--- a/src/FDM/JSBSim/models/flight_control/FGKinemat.h
+++ b/src/FDM/JSBSim/models/flight_control/FGKinemat.h
@@ -40,12 +40,6 @@ INCLUDES
#include "FGFCSComponent.h"
#include <vector>
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_FLAPS "$Id: FGKinemat.h,v 1.13 2016/07/09 11:35:39 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/flight_control/FGMagnetometer.cpp b/src/FDM/JSBSim/models/flight_control/FGMagnetometer.cpp
index b7203e5b7..f194831c2 100644
--- a/src/FDM/JSBSim/models/flight_control/FGMagnetometer.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGMagnetometer.cpp
@@ -50,9 +50,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGMagnetometer.cpp,v 1.10 2015/07/12 19:34:08 bcoconni Exp $");
-IDENT(IdHdr,ID_MAGNETOMETER);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -185,8 +182,6 @@ void FGMagnetometer::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGMagnetometer.h b/src/FDM/JSBSim/models/flight_control/FGMagnetometer.h
index c0dac1433..0c2029f20 100644
--- a/src/FDM/JSBSim/models/flight_control/FGMagnetometer.h
+++ b/src/FDM/JSBSim/models/flight_control/FGMagnetometer.h
@@ -45,12 +45,6 @@ INCLUDES
#include "math/FGMatrix33.h"
#include "FGSensorOrientation.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_MAGNETOMETER "$Id: FGMagnetometer.h,v 1.5 2013/11/24 11:40:57 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/flight_control/FGPID.cpp b/src/FDM/JSBSim/models/flight_control/FGPID.cpp
index 20bd629da..b0cbf2e64 100644
--- a/src/FDM/JSBSim/models/flight_control/FGPID.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGPID.cpp
@@ -44,9 +44,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGPID.cpp,v 1.24 2014/01/13 10:46:09 ehofman Exp $");
-IDENT(IdHdr,ID_PID);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -278,8 +275,6 @@ void FGPID::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGPID.h b/src/FDM/JSBSim/models/flight_control/FGPID.h
index 6961859bf..81475c81c 100644
--- a/src/FDM/JSBSim/models/flight_control/FGPID.h
+++ b/src/FDM/JSBSim/models/flight_control/FGPID.h
@@ -40,12 +40,6 @@ INCLUDES
#include "FGFCSComponent.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_PID "$Id: FGPID.h,v 1.16 2014/01/02 21:58:42 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/flight_control/FGSensor.cpp b/src/FDM/JSBSim/models/flight_control/FGSensor.cpp
index 969219903..4bf2fd7a5 100644
--- a/src/FDM/JSBSim/models/flight_control/FGSensor.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGSensor.cpp
@@ -47,9 +47,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGSensor.cpp,v 1.28 2015/07/12 19:34:08 bcoconni Exp $");
-IDENT(IdHdr,ID_SENSOR);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -354,8 +351,6 @@ void FGSensor::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGSensor.h b/src/FDM/JSBSim/models/flight_control/FGSensor.h
index a183c2525..c7416d580 100644
--- a/src/FDM/JSBSim/models/flight_control/FGSensor.h
+++ b/src/FDM/JSBSim/models/flight_control/FGSensor.h
@@ -40,12 +40,6 @@ INCLUDES
#include "FGFCSComponent.h"
#include <string>
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_SENSOR "$Id: FGSensor.h,v 1.24 2014/01/02 21:58:42 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/flight_control/FGSensorOrientation.h b/src/FDM/JSBSim/models/flight_control/FGSensorOrientation.h
index c56820808..0c62034d0 100644
--- a/src/FDM/JSBSim/models/flight_control/FGSensorOrientation.h
+++ b/src/FDM/JSBSim/models/flight_control/FGSensorOrientation.h
@@ -44,12 +44,6 @@ INCLUDES
#include <iostream>
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_SensorOrientation "$Id: FGSensorOrientation.h,v 1.6 2015/07/13 21:50:26 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
diff --git a/src/FDM/JSBSim/models/flight_control/FGSummer.cpp b/src/FDM/JSBSim/models/flight_control/FGSummer.cpp
index 37d7dffff..d3cb38521 100644
--- a/src/FDM/JSBSim/models/flight_control/FGSummer.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGSummer.cpp
@@ -45,9 +45,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGSummer.cpp,v 1.10 2014/01/13 10:46:10 ehofman Exp $");
-IDENT(IdHdr,ID_SUMMER);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -141,8 +138,6 @@ void FGSummer::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGSummer.h b/src/FDM/JSBSim/models/flight_control/FGSummer.h
index 12a198d01..bd3c2610c 100644
--- a/src/FDM/JSBSim/models/flight_control/FGSummer.h
+++ b/src/FDM/JSBSim/models/flight_control/FGSummer.h
@@ -39,12 +39,6 @@ INCLUDES
#include "FGFCSComponent.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_SUMMER "$Id: FGSummer.h,v 1.9 2009/10/24 22:59:30 jberndt Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -99,7 +93,6 @@ CLASS DOCUMENTATION
</pre>
@author Jon S. Berndt
- @version $Id: FGSummer.h,v 1.9 2009/10/24 22:59:30 jberndt Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/flight_control/FGSwitch.cpp b/src/FDM/JSBSim/models/flight_control/FGSwitch.cpp
index 0ca9d07dc..57b8c337a 100644
--- a/src/FDM/JSBSim/models/flight_control/FGSwitch.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGSwitch.cpp
@@ -70,9 +70,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGSwitch.cpp,v 1.29 2014/01/13 10:46:10 ehofman Exp $");
-IDENT(IdHdr,ID_SWITCH);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -224,8 +221,6 @@ void FGSwitch::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGSwitch.h b/src/FDM/JSBSim/models/flight_control/FGSwitch.h
index ff5fe0c40..d0da611b4 100644
--- a/src/FDM/JSBSim/models/flight_control/FGSwitch.h
+++ b/src/FDM/JSBSim/models/flight_control/FGSwitch.h
@@ -44,12 +44,6 @@ INCLUDES
#include "math/FGCondition.h"
#include "math/FGPropertyValue.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_SWITCH "$Id: FGSwitch.h,v 1.18 2013/11/24 11:40:57 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -127,7 +121,6 @@ ap/attitude_hold takes the value 1), the value of the switch component will be
whatever value fcs/roll-ap-error-summer is.
@author Jon S. Berndt
-@version $Id: FGSwitch.h,v 1.18 2013/11/24 11:40:57 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/flight_control/FGWaypoint.cpp b/src/FDM/JSBSim/models/flight_control/FGWaypoint.cpp
index a57ceb944..135c40781 100644
--- a/src/FDM/JSBSim/models/flight_control/FGWaypoint.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGWaypoint.cpp
@@ -46,9 +46,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGWaypoint.cpp,v 1.8 2016/05/05 15:32:42 bcoconni Exp $");
-IDENT(IdHdr,ID_WAYPOINT);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -238,8 +235,6 @@ void FGWaypoint::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/flight_control/FGWaypoint.h b/src/FDM/JSBSim/models/flight_control/FGWaypoint.h
index be768522d..848397212 100644
--- a/src/FDM/JSBSim/models/flight_control/FGWaypoint.h
+++ b/src/FDM/JSBSim/models/flight_control/FGWaypoint.h
@@ -41,12 +41,6 @@ INCLUDES
#include "simgear/props/propertyObject.hxx"
#include "FGFCSComponent.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_WAYPOINT "$Id: FGWaypoint.h,v 1.4 2016/04/17 13:19:39 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -93,7 +87,6 @@ CLASS DOCUMENTATION
@endcode
@author Jon S. Berndt
- @version $Id: FGWaypoint.h,v 1.4 2016/04/17 13:19:39 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/propulsion/FGElectric.cpp b/src/FDM/JSBSim/models/propulsion/FGElectric.cpp
index ee7938291..4033bee12 100644
--- a/src/FDM/JSBSim/models/propulsion/FGElectric.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGElectric.cpp
@@ -51,9 +51,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGElectric.cpp,v 1.21 2017/06/03 19:49:20 bcoconni Exp $");
-IDENT(IdHdr,ID_ELECTRIC);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -180,8 +177,6 @@ void FGElectric::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/propulsion/FGElectric.h b/src/FDM/JSBSim/models/propulsion/FGElectric.h
index ec746ef87..b3ce5d5a6 100644
--- a/src/FDM/JSBSim/models/propulsion/FGElectric.h
+++ b/src/FDM/JSBSim/models/propulsion/FGElectric.h
@@ -40,12 +40,6 @@ INCLUDES
#include "FGEngine.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_ELECTRIC "$Id: FGElectric.h,v 1.14 2015/02/27 20:36:47 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -64,7 +58,6 @@ CLASS DOCUMENTATION
there is no battery model available, so this motor does not consume any
energy. There is no internal friction.
@author David Culp
- @version "$Id: FGElectric.h,v 1.14 2015/02/27 20:36:47 bcoconni Exp $"
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/propulsion/FGEngine.cpp b/src/FDM/JSBSim/models/propulsion/FGEngine.cpp
index 57649f1b7..31e686ca2 100644
--- a/src/FDM/JSBSim/models/propulsion/FGEngine.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGEngine.cpp
@@ -53,9 +53,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGEngine.cpp,v 1.68 2017/03/03 23:00:39 bcoconni Exp $");
-IDENT(IdHdr,ID_ENGINE);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -311,8 +308,6 @@ void FGEngine::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/propulsion/FGEngine.h b/src/FDM/JSBSim/models/propulsion/FGEngine.h
index 7ed6a6b0e..4bc210341 100644
--- a/src/FDM/JSBSim/models/propulsion/FGEngine.h
+++ b/src/FDM/JSBSim/models/propulsion/FGEngine.h
@@ -49,12 +49,6 @@ INCLUDES
#include "math/FGModelFunctions.h"
#include "math/FGColumnVector3.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_ENGINE "$Id: FGEngine.h,v 1.48 2017/03/03 23:00:39 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -111,7 +105,6 @@ CLASS DOCUMENTATION
documentation for engine and thruster classes.
</pre>
@author Jon S. Berndt
- @version $Id: FGEngine.h,v 1.48 2017/03/03 23:00:39 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -255,4 +248,3 @@ protected:
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/propulsion/FGForce.cpp b/src/FDM/JSBSim/models/propulsion/FGForce.cpp
index d4e1b0395..3954c56ee 100644
--- a/src/FDM/JSBSim/models/propulsion/FGForce.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGForce.cpp
@@ -53,9 +53,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGForce.cpp,v 1.20 2017/05/26 12:25:40 bcoconni Exp $");
-IDENT(IdHdr,ID_FORCE);
-
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FGForce::FGForce(FGFDMExec *FDMExec) :
@@ -201,8 +198,6 @@ void FGForce::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/propulsion/FGForce.h b/src/FDM/JSBSim/models/propulsion/FGForce.h
index e432943f1..30b29ff00 100644
--- a/src/FDM/JSBSim/models/propulsion/FGForce.h
+++ b/src/FDM/JSBSim/models/propulsion/FGForce.h
@@ -61,12 +61,6 @@ INCLUDES
#include "math/FGMatrix33.h"
#include "math/FGColumnVector3.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_FORCE "$Id: FGForce.h,v 1.19 2017/06/03 19:49:20 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -216,7 +210,6 @@ and vMn, the moments, can be made directly. Otherwise, the usage is similar.<br>
<br><br></p>
@author Tony Peden
- @version $Id: FGForce.h,v 1.19 2017/06/03 19:49:20 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/FDM/JSBSim/models/propulsion/FGNozzle.cpp b/src/FDM/JSBSim/models/propulsion/FGNozzle.cpp
index 4a1171b9a..11c546bd9 100644
--- a/src/FDM/JSBSim/models/propulsion/FGNozzle.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGNozzle.cpp
@@ -46,9 +46,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGNozzle.cpp,v 1.17 2014/01/13 10:46:10 ehofman Exp $");
-IDENT(IdHdr,ID_NOZZLE);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -151,8 +148,6 @@ void FGNozzle::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/propulsion/FGNozzle.h b/src/FDM/JSBSim/models/propulsion/FGNozzle.h
index 2ef6e851f..b575edcfd 100644
--- a/src/FDM/JSBSim/models/propulsion/FGNozzle.h
+++ b/src/FDM/JSBSim/models/propulsion/FGNozzle.h
@@ -40,12 +40,6 @@ INCLUDES
#include "FGThruster.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_NOZZLE "$Id: FGNozzle.h,v 1.10 2012/03/18 15:48:36 jentron Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -75,7 +69,6 @@ CLASS DOCUMENTATION
All parameters MUST be specified.
@author Jon S. Berndt
- @version $Id: FGNozzle.h,v 1.10 2012/03/18 15:48:36 jentron Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -101,4 +94,3 @@ private:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/propulsion/FGPiston.cpp b/src/FDM/JSBSim/models/propulsion/FGPiston.cpp
index a61c2f5fd..c41d29cbc 100644
--- a/src/FDM/JSBSim/models/propulsion/FGPiston.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGPiston.cpp
@@ -52,9 +52,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGPiston.cpp,v 1.84 2017/06/03 19:49:20 bcoconni Exp $");
-IDENT(IdHdr,ID_PISTON);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -1072,8 +1069,6 @@ void FGPiston::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/propulsion/FGPropeller.cpp b/src/FDM/JSBSim/models/propulsion/FGPropeller.cpp
index f2910efc2..63c057c34 100644
--- a/src/FDM/JSBSim/models/propulsion/FGPropeller.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGPropeller.cpp
@@ -46,9 +46,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGPropeller.cpp,v 1.63 2017/06/03 19:49:20 bcoconni Exp $");
-IDENT(IdHdr,ID_PROPELLER);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -473,8 +470,6 @@ void FGPropeller::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/propulsion/FGPropeller.h b/src/FDM/JSBSim/models/propulsion/FGPropeller.h
index 720e05058..a5df34fe6 100644
--- a/src/FDM/JSBSim/models/propulsion/FGPropeller.h
+++ b/src/FDM/JSBSim/models/propulsion/FGPropeller.h
@@ -41,12 +41,6 @@ INCLUDES
#include "FGThruster.h"
#include "math/FGTable.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_PROPELLER "$Id: FGPropeller.h,v 1.28 2017/03/03 23:00:39 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -164,7 +158,6 @@ Airfoil Sections", NACA Report TN-640, 1938 (?)
+ Various NACA Technical Notes and Reports
@author Jon S. Berndt
-@version $Id: FGPropeller.h,v 1.28 2017/03/03 23:00:39 bcoconni Exp $
@see FGEngine
@see FGThruster
*/
diff --git a/src/FDM/JSBSim/models/propulsion/FGRocket.cpp b/src/FDM/JSBSim/models/propulsion/FGRocket.cpp
index b2ca883f5..77febba63 100644
--- a/src/FDM/JSBSim/models/propulsion/FGRocket.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGRocket.cpp
@@ -50,9 +50,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGRocket.cpp,v 1.40 2017/06/03 19:49:20 bcoconni Exp $");
-IDENT(IdHdr,ID_ROCKET);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -363,8 +360,6 @@ void FGRocket::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/propulsion/FGRocket.h b/src/FDM/JSBSim/models/propulsion/FGRocket.h
index d258c660a..affc20786 100644
--- a/src/FDM/JSBSim/models/propulsion/FGRocket.h
+++ b/src/FDM/JSBSim/models/propulsion/FGRocket.h
@@ -42,12 +42,6 @@ INCLUDES
#include "math/FGTable.h"
#include "math/FGFunction.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_ROCKET "$Id: FGRocket.h,v 1.22 2015/09/27 09:54:21 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -118,7 +112,6 @@ for the rocket engine to be throttle up to 1. At that time, the solid rocket
fuel begins burning and thrust is provided.
@author Jon S. Berndt
- $Id: FGRocket.h,v 1.22 2015/09/27 09:54:21 bcoconni Exp $
@see FGNozzle,
FGThruster,
FGForce,
@@ -243,4 +236,3 @@ private:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/propulsion/FGRotor.cpp b/src/FDM/JSBSim/models/propulsion/FGRotor.cpp
index 29eae1770..3de14cbdd 100644
--- a/src/FDM/JSBSim/models/propulsion/FGRotor.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGRotor.cpp
@@ -59,9 +59,6 @@ using std::ostringstream;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGRotor.cpp,v 1.24 2015/09/27 10:03:53 bcoconni Exp $");
-IDENT(IdHdr,ID_ROTOR);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
MISC
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -892,13 +889,9 @@ void FGRotor::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
-
} // namespace JSBSim
-
diff --git a/src/FDM/JSBSim/models/propulsion/FGRotor.h b/src/FDM/JSBSim/models/propulsion/FGRotor.h
index fc2cf107d..4809831ff 100644
--- a/src/FDM/JSBSim/models/propulsion/FGRotor.h
+++ b/src/FDM/JSBSim/models/propulsion/FGRotor.h
@@ -44,12 +44,6 @@ INCLUDES
#include "FGThruster.h"
#include "FGTransmission.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_ROTOR "$Id: FGRotor.h,v 1.17 2015/09/27 10:03:53 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -230,7 +224,6 @@ CLASS DOCUMENTATION
</dl>
@author Thomas Kreitler
- @version $Id: FGRotor.h,v 1.17 2015/09/27 10:03:53 bcoconni Exp $
*/
diff --git a/src/FDM/JSBSim/models/propulsion/FGTank.cpp b/src/FDM/JSBSim/models/propulsion/FGTank.cpp
index 9451db599..86045098d 100644
--- a/src/FDM/JSBSim/models/propulsion/FGTank.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGTank.cpp
@@ -48,9 +48,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGTank.cpp,v 1.46 2017/02/21 21:07:04 bcoconni Exp $");
-IDENT(IdHdr,ID_TANK);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -520,8 +517,6 @@ void FGTank::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/propulsion/FGTank.h b/src/FDM/JSBSim/models/propulsion/FGTank.h
index d7ca94661..0c003d6f7 100644
--- a/src/FDM/JSBSim/models/propulsion/FGTank.h
+++ b/src/FDM/JSBSim/models/propulsion/FGTank.h
@@ -49,12 +49,6 @@ INCLUDES
#include "math/FGFunction.h"
#include <string>
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_TANK "$Id: FGTank.h,v 1.32 2017/02/21 21:07:04 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -353,4 +347,3 @@ private:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/propulsion/FGThruster.cpp b/src/FDM/JSBSim/models/propulsion/FGThruster.cpp
index 1f4ddba75..9b70a5d2c 100644
--- a/src/FDM/JSBSim/models/propulsion/FGThruster.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGThruster.cpp
@@ -47,9 +47,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGThruster.cpp,v 1.23 2017/06/03 19:49:20 bcoconni Exp $");
-IDENT(IdHdr,ID_THRUSTER);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -197,8 +194,6 @@ void FGThruster::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/propulsion/FGThruster.h b/src/FDM/JSBSim/models/propulsion/FGThruster.h
index 71c5c9562..26ab7fc08 100644
--- a/src/FDM/JSBSim/models/propulsion/FGThruster.h
+++ b/src/FDM/JSBSim/models/propulsion/FGThruster.h
@@ -42,12 +42,6 @@ INCLUDES
#include "math/FGColumnVector3.h"
#include <string>
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_THRUSTER "$Id: FGThruster.h,v 1.27 2017/03/03 23:00:39 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -74,7 +68,6 @@ CLASS DOCUMENTATION
1.57 (pi/2) results in no thrust at all.
@author Jon Berndt
- @version $Id: FGThruster.h,v 1.27 2017/03/03 23:00:39 bcoconni Exp $
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -141,4 +134,3 @@ protected:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/propulsion/FGTransmission.cpp b/src/FDM/JSBSim/models/propulsion/FGTransmission.cpp
index 6822b22a9..4c756a7a6 100644
--- a/src/FDM/JSBSim/models/propulsion/FGTransmission.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGTransmission.cpp
@@ -48,9 +48,6 @@ using std::endl;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGTransmission.cpp,v 1.4 2014/01/13 10:46:10 ehofman Exp $");
-IDENT(IdHdr,ID_TRANSMISSION);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -197,11 +194,8 @@ void FGTransmission::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
}
-
diff --git a/src/FDM/JSBSim/models/propulsion/FGTransmission.h b/src/FDM/JSBSim/models/propulsion/FGTransmission.h
index 322bf672f..77850a71c 100644
--- a/src/FDM/JSBSim/models/propulsion/FGTransmission.h
+++ b/src/FDM/JSBSim/models/propulsion/FGTransmission.h
@@ -47,12 +47,6 @@ INCLUDES
#include "FGFDMExec.h"
#include "input_output/FGPropertyManager.h"
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-DEFINITIONS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-#define ID_TRANSMISSION "$Id: FGTransmission.h,v 1.1 2012/02/25 14:37:02 jentron Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -176,4 +170,3 @@ private:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/propulsion/FGTurbine.cpp b/src/FDM/JSBSim/models/propulsion/FGTurbine.cpp
index 3b735c14c..0036387ec 100644
--- a/src/FDM/JSBSim/models/propulsion/FGTurbine.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGTurbine.cpp
@@ -52,9 +52,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGTurbine.cpp,v 1.49 2017/06/03 19:49:20 bcoconni Exp $");
-IDENT(IdHdr,ID_TURBINE);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -650,8 +647,6 @@ void FGTurbine::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/propulsion/FGTurbine.h b/src/FDM/JSBSim/models/propulsion/FGTurbine.h
index 51fa575a6..7e2b47754 100644
--- a/src/FDM/JSBSim/models/propulsion/FGTurbine.h
+++ b/src/FDM/JSBSim/models/propulsion/FGTurbine.h
@@ -42,8 +42,6 @@ INCLUDES
#include "FGEngine.h"
-#define ID_TURBINE "$Id: FGTurbine.h,v 1.26 2015/09/27 10:07:53 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -152,7 +150,6 @@ CLASS DOCUMENTATION
/engine/direct.xml
</pre>
@author David P. Culp
- @version "$Id: FGTurbine.h,v 1.26 2015/09/27 10:07:53 bcoconni Exp $"
*/
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -324,4 +321,3 @@ private:
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif
-
diff --git a/src/FDM/JSBSim/models/propulsion/FGTurboProp.cpp b/src/FDM/JSBSim/models/propulsion/FGTurboProp.cpp
index dab3a4a4f..5aba0fcd6 100644
--- a/src/FDM/JSBSim/models/propulsion/FGTurboProp.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGTurboProp.cpp
@@ -55,9 +55,6 @@ using namespace std;
namespace JSBSim {
-IDENT(IdSrc,"$Id: FGTurboProp.cpp,v 1.37 2017/03/11 19:50:03 bcoconni Exp $");
-IDENT(IdHdr,ID_TURBOPROP);
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -611,8 +608,6 @@ void FGTurboProp::Debug(int from)
}
if (debug_lvl & 64) {
if (from == 0) { // Constructor
- cout << IdSrc << endl;
- cout << IdHdr << endl;
}
}
}
diff --git a/src/FDM/JSBSim/models/propulsion/FGTurboProp.h b/src/FDM/JSBSim/models/propulsion/FGTurboProp.h
index 6eeced068..319c8327e 100644
--- a/src/FDM/JSBSim/models/propulsion/FGTurboProp.h
+++ b/src/FDM/JSBSim/models/propulsion/FGTurboProp.h
@@ -46,8 +46,6 @@ INCLUDES
#include "FGEngine.h"
#include "math/FGTable.h"
-#define ID_TURBOPROP "$Id: FGTurboProp.h,v 1.25 2017/02/26 11:41:28 bcoconni Exp $"
-
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/