JSBSim updates. This update changes the file format, so an update of the base

[flightgear.git] / src / FDM / JSBSim / FGTrimAxis.cpp

diff --git a/src/FDM/JSBSim/FGTrimAxis.cpp b/src/FDM/JSBSim/FGTrimAxis.cpp
index eca04970aca08c373393e13c0ec8a29b5827921d..485dbd5c2ed5e10ea908e3fa231761a39623f955 100644 (file)
--- a/src/FDM/JSBSim/FGTrimAxis.cpp
+++ b/src/FDM/JSBSim/FGTrimAxis.cpp
@@ -45,6 +45,8 @@ INCLUDES
 #include "FGTrimAxis.h"
 #include "FGAircraft.h"
 #include "FGPropulsion.h"
+#include "FGAerodynamics.h"
+
 
 static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_TRIMAXIS;
@@ -92,8 +94,8 @@ FGTrimAxis::FGTrimAxis(FGFDMExec* fdex, FGInitialCondition* ic, State st,
     control_convert=radtodeg;
     break;
   case tAlpha:
-    control_min=fdmex->GetAircraft()->GetAlphaCLMin();
-    control_max=fdmex->GetAircraft()->GetAlphaCLMax();
+    control_min=fdmex->GetAerodynamics()->GetAlphaCLMin();
+    control_max=fdmex->GetAerodynamics()->GetAlphaCLMax();
     if(control_max <= control_min) {
       control_max=20*degtorad;
       control_min=-5*degtorad;
@@ -321,7 +323,7 @@ bool FGTrimAxis::initTheta(void) {
   while(!level && (i < 100)) {
        theta+=2.0*zDiff;
        fgic->SetPitchAngleDegIC(theta);   
-       fdmex->RunIC(fgic);
+       fdmex->RunIC();
        zAft=fdmex->GetGroundReactions()->GetGearUnit(1)->GetLocalGear(3);
         zForward=fdmex->GetGroundReactions()->GetGearUnit(0)->GetLocalGear(3);
         zDiff = zForward - zAft;
@@ -370,7 +372,7 @@ void FGTrimAxis::SetPhiOnGround(double ff) {
     fgic->SetAltitudeAGLFtIC(hagl);
   }                   
   fgic->SetRollAngleRadIC(ff);
-           
+
 }      
 
 /*****************************************************************************/
@@ -386,7 +388,7 @@ void FGTrimAxis::Run(void) {
   while(!stable) {
     i++;
     last_state_value=state_value;
-    fdmex->RunIC(fgic);
+    fdmex->RunIC();
     getState();
     if(i > 1) {
       if((fabs(last_state_value - state_value) < tolerance) || (i >= 100) )
@@ -409,7 +411,7 @@ void FGTrimAxis::setThrottlesPct(void) {
       //cout << "setThrottlespct: " << i << ", " << control_min << ", " << control_max << ", " << control_value;
       fdmex->GetFCS()->SetThrottleCmd(i,tMin+control_value*(tMax-tMin));
       //cout << "setThrottlespct: " << fdmex->GetFCS()->GetThrottleCmd(i) << endl;
-      fdmex->RunIC(fgic); //apply throttle change
+      fdmex->RunIC(); //apply throttle change
       fdmex->GetPropulsion()->GetSteadyState();
   }
 }