Fixes to jsbsim.

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

diff --git a/src/FDM/JSBSim/FGTrimLong.cpp b/src/FDM/JSBSim/FGTrimLong.cpp
index 846a264d35e0fc00d80e79123e245220c83ab580..7bc91686ae0de5affb5b59420e25f8833f4a6385 100644 (file)
--- a/src/FDM/JSBSim/FGTrimLong.cpp
+++ b/src/FDM/JSBSim/FGTrimLong.cpp
@@ -334,9 +334,9 @@ float FGTrimLong::qdot_func(float x) {
 /******************************************************************************/
 
 bool FGTrimLong::DoTrim(void) {
-  int k=0,j=0,sum=0,trim_failed=0,jmax=Naxis;
+  int k=0;
   int its;
-  float step,temp,min,max;
+  
 
   if(fgic->GetVtrueKtsIC() < 1) {
     cout << "Trim failed, on-ground trimming not yet implemented." << endl;
@@ -345,7 +345,6 @@ bool FGTrimLong::DoTrim(void) {
     return false;
   }
 
-  trimfp fp;
 
   fgic -> SetAlphaDegIC((alphaMin+alphaMax)/2);
   fdmex -> GetFCS() -> SetDeCmd(0);
@@ -402,22 +401,18 @@ bool FGTrimLong::DoTrim(void) {
           total_its=k;
           k=Ncycles; //force the trim to fail
         }
-
-
-
-      }
+     }
       if( udot > Tolerance ) {
         if(checkLimits(udotf,dth,0,1) == false) {
           cout << "    Sorry, udot doesn't appear to be trimmable" << endl;
           cout << "    Resetting throttles to zero" << endl;
+          setThrottlesPct(0);
           fdmex->GetFCS()->SetThrottleCmd(-1,0);
+          fdmex->RunIC(fgic);
           total_its=k;
           k=Ncycles; //force the trim to fail
         }
-
-
-
-      }
+     }
       if(qdot > A_Tolerance) {
 
         if(checkLimits(qdotf,fdmex->GetFCS()->GetPitchTrimCmd(),-1,1) == false) {
@@ -425,9 +420,6 @@ bool FGTrimLong::DoTrim(void) {
           total_its=k;
           k=Ncycles; //force the trim to fail
         }
-
-
-
       }
     }
     k++;