Merge branch 'jmt/units-fix' into maint

[flightgear.git] / src / FDM / JSBSim / models / FGAircraft.cpp

diff --git a/src/FDM/JSBSim/models/FGAircraft.cpp b/src/FDM/JSBSim/models/FGAircraft.cpp
index 2e65dc021a62d8e052eaed52557556c069966891..75f9fba590b680eeb7b79a6273d8228e26fd2145 100644 (file)
--- a/src/FDM/JSBSim/models/FGAircraft.cpp
+++ b/src/FDM/JSBSim/models/FGAircraft.cpp
@@ -52,7 +52,11 @@ INCLUDES
 #include "FGAerodynamics.h"
 #include "FGFDMExec.h"
 #include "FGPropagate.h"
+#include "FGPropulsion.h"
 #include "input_output/FGPropertyManager.h"
+#include <iostream>
+
+using namespace std;
 
 namespace JSBSim {
 
@@ -110,6 +114,8 @@ bool FGAircraft::Run(void)
   if (FGModel::Run()) return true;
   if (FDMExec->Holding()) return false;
 
+  RunPreFunctions();
+
   vForces.InitMatrix();
   if (!HoldDown) {
     vForces += Aerodynamics->GetForces();
@@ -135,6 +141,8 @@ bool FGAircraft::Run(void)
   vNwcg = Aerodynamics->GetTb2w() * vNcg;
   vNwcg(3) = -1*vNwcg(3) + 1;
 
+  RunPostFunctions();
+
   return false;
 }
 
@@ -195,6 +203,8 @@ bool FGAircraft::Load(Element* el)
     }
   }
 
+  FGModel::PostLoad(el);
+
   Debug(2);
 
   return true;