Modifications for correcting the unit conversion from kts to fps

JSBSim-Team · Jul 10, 2011 · 2ed24c3 · 2ed24c3
1 parent 2a629f4
commit 2ed24c3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/src/initialization/FGInitialCondition.cpp b/src/initialization/FGInitialCondition.cpp
@@ -61,7 +61,7 @@ using namespace std;
 
 namespace JSBSim {
 
-static const char *IdSrc = "$Id: FGInitialCondition.cpp,v 1.63 2011/06/13 10:30:22 bcoconni Exp $";
+static const char *IdSrc = "$Id: FGInitialCondition.cpp,v 1.64 2011/07/10 19:03:49 jberndt Exp $";
 static const char *IdHdr = ID_INITIALCONDITION;
 
 //******************************************************************************
@@ -581,7 +581,7 @@ void FGInitialCondition::SetWindNEDFpsIC(double wN, double wE, double wD )
 
 void FGInitialCondition::SetCrossWindKtsIC(double cross)
 {
- FGColumnVector3 _vt_NED = Tb2l * Tw2b * FGColumnVector3(vt, 0., 0.);
+ FGColumnVector3 _vt_NED = Tb2l * Tw2b * FGColumnVector3(vt*fpstokts, 0., 0.);
  FGColumnVector3 _vWIND_NED = _vt_NED - vUVW_NED;
  FGColumnVector3 _vCROSS(-sin(psi), cos(psi), 0.);
 
@@ -602,7 +602,7 @@ void FGInitialCondition::SetCrossWindKtsIC(double cross)
 
 void FGInitialCondition::SetHeadWindKtsIC(double head)
 {
- FGColumnVector3 _vt_NED = Tb2l * Tw2b * FGColumnVector3(vt, 0., 0.);
+ FGColumnVector3 _vt_NED = Tb2l * Tw2b * FGColumnVector3(vt*fpstokts, 0., 0.);
  FGColumnVector3 _vWIND_NED = _vt_NED - vUVW_NED;
  FGColumnVector3 _vHEAD(cos(psi), sin(psi), 0.);
 
@@ -638,7 +638,7 @@ void FGInitialCondition::SetWindDownKtsIC(double wD)
 
 void FGInitialCondition::SetWindMagKtsIC(double mag)
 {
- FGColumnVector3 _vt_NED = Tb2l * Tw2b * FGColumnVector3(vt, 0., 0.);
+ FGColumnVector3 _vt_NED = Tb2l * Tw2b * FGColumnVector3(vt*fpstokts, 0., 0.);
  FGColumnVector3 _vWIND_NED = _vt_NED - vUVW_NED;
  FGColumnVector3 _vHEAD(_vWIND_NED(eU), _vWIND_NED(eV), 0.);
  double windMag = _vHEAD.Magnitude();
@@ -1325,10 +1325,6 @@ void FGInitialCondition::bind(void)
  &FGInitialCondition::GetAltitudeAGLFtIC,
  &FGInitialCondition::SetAltitudeAGLFtIC,
  true);
- PropertyManager->Tie("ic/sea-level-radius-ft", this,
- &FGInitialCondition::GetSeaLevelRadiusFtIC,
- &FGInitialCondition::SetSeaLevelRadiusFtIC,
- true);
  PropertyManager->Tie("ic/terrain-elevation-ft", this,
  &FGInitialCondition::GetTerrainElevationFtIC,
  &FGInitialCondition::SetTerrainElevationFtIC,

diff --git a/src/initialization/FGInitialCondition.h b/src/initialization/FGInitialCondition.h
@@ -54,7 +54,7 @@ INCLUDES
 DEFINITIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#define ID_INITIALCONDITION "$Id: FGInitialCondition.h,v 1.27 2011/05/20 00:47:03 bcoconni Exp $"
+#define ID_INITIALCONDITION "$Id: FGInitialCondition.h,v 1.28 2011/07/10 19:03:49 jberndt Exp $"
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 FORWARD DECLARATIONS
@@ -213,7 +213,7 @@ 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.27 2011/05/20 00:47:03 bcoconni Exp $"
+ @version "$Id: FGInitialCondition.h,v 1.28 2011/07/10 19:03:49 jberndt Exp $"
 */
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -237,7 +237,7 @@ class FGInitialCondition : public FGJSBBase, public FGXMLFileRead
  void SetVequivalentKtsIC(double ve);
 
  /** Set true airspeed initial condition in knots.
- @param vt True airspeed in knots */
+ @param vtrue True airspeed in knots */
  void SetVtrueKtsIC(double vtrue) { SetVtrueFpsIC(vtrue*ktstofps); }
 
  /** Set ground speed initial condition in knots.
@@ -375,10 +375,6 @@ class FGInitialCondition : public FGJSBBase, public FGXMLFileRead
  @return Initial altitude AGL in feet */
  double GetAltitudeAGLFtIC(void) const { return position.GetRadius() - sea_level_radius - terrain_elevation; }
 
- /** Gets the initial sea level radius.
- @return Initial sea level radius */
- double GetSeaLevelRadiusFtIC(void) const { return sea_level_radius; }
-
  /** Gets the initial terrain elevation.
  @return Initial terrain elevation in feet */
  double GetTerrainElevationFtIC(void) const { return terrain_elevation; }

diff --git a/src/initialization/FGTrimAxis.cpp b/src/initialization/FGTrimAxis.cpp
@@ -43,7 +43,6 @@ INCLUDES
 #include "models/FGAtmosphere.h"
 #include "FGInitialCondition.h"
 #include "FGTrimAxis.h"
-#include "models/FGAircraft.h"
 #include "models/FGPropulsion.h"
 #include "models/FGAerodynamics.h"
 #include "models/FGFCS.h"
@@ -55,7 +54,7 @@ using namespace std;
 
 namespace JSBSim {
 
-static const char *IdSrc = "$Id: FGTrimAxis.cpp,v 1.10 2010/07/08 11:36:28 jberndt Exp $";
+static const char *IdSrc = "$Id: FGTrimAxis.cpp,v 1.11 2011/07/10 19:03:49 jberndt Exp $";
 static const char *IdHdr = ID_TRIMAXIS;
 
 /*****************************************************************************/
@@ -174,7 +173,7 @@ void FGTrimAxis::getState(void) {
  case tPdot: state_value=fdmex->GetPropagate()->GetPQRdot(1)-state_target; break;
  case tRdot: state_value=fdmex->GetPropagate()->GetPQRdot(3)-state_target; break;
  case tHmgt: state_value=computeHmgt()-state_target; break;
- case tNlf: state_value=fdmex->GetAircraft()->GetNlf()-state_target; break;
+ case tNlf: state_value=fdmex->GetAuxiliary()->GetNlf()-state_target; break;
  case tAll: break;
  }
 }