Fix for bug #1238: the accelerations, velocities, etc. are now updated to a consisten...

diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx
index d71d8fca2a8ccc62c5fcd5302430ed1ecbdcb949..f6efc4b11f58da89c0405adc345f3cb458ae6474 100644 (file)
--- a/src/FDM/JSBSim/JSBSim.cxx
+++ b/src/FDM/JSBSim/JSBSim.cxx
@@ -1261,8 +1261,6 @@ void FGJSBsim::do_trim(void)
     fgtrim = new FGTrim(fdmex,tFull);
   }
 
-  fdmex->RunIC();
-
   if ( !fgtrim->DoTrim() ) {
     fgtrim->Report();
     fgtrim->TrimStats();

diff --git a/src/FDM/JSBSim/initialization/FGTrim.cpp b/src/FDM/JSBSim/initialization/FGTrim.cpp
index 85de49462590790e546ba2aa8bb2c1a719109412..bb346598a12073a54ed3d8a3c1de150068cfbbf0 100644 (file)
--- a/src/FDM/JSBSim/initialization/FGTrim.cpp
+++ b/src/FDM/JSBSim/initialization/FGTrim.cpp
@@ -242,6 +242,7 @@ bool FGTrim::DoTrim(void) {
 
   fdmex->DisableOutput();
 
+  fdmex->RunIC();
   fdmex->SetTrimStatus(true);
   fdmex->SuspendIntegration();
 
@@ -380,13 +381,15 @@ bool FGTrim::DoTrim(void) {
         cout << endl << "  Trim failed" << endl;
   }
 
+  fdmex->SetTrimStatus(false);
+  fdmex->ResumeIntegration();
+  fdmex->RunIC();
+  fdmex->EnableOutput();
+
   for(i=0;i < fdmex->GetGroundReactions()->GetNumGearUnits();i++){
     fdmex->GetGroundReactions()->GetGearUnit(i)->SetReport(true);
   }
 
-  fdmex->SetTrimStatus(false);
-  fdmex->ResumeIntegration();
-  fdmex->EnableOutput();
   return !trim_failed;
 }