X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FJSBSim%2Fmodels%2FFGModel.cpp;h=81961eb30c53da01037f4659fd54c777a4a58c92;hb=1575fad886a0b18825363d41d53a287e8d36b9c8;hp=71f6cb3ed3d468e5cadb0bd3b7035ff751e161a6;hpb=ad51a9bde2995605984161af1b4273b28ce4fddc;p=flightgear.git diff --git a/src/FDM/JSBSim/models/FGModel.cpp b/src/FDM/JSBSim/models/FGModel.cpp index 71f6cb3ed..81961eb30 100644 --- a/src/FDM/JSBSim/models/FGModel.cpp +++ b/src/FDM/JSBSim/models/FGModel.cpp @@ -38,26 +38,15 @@ HISTORY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ +#include #include "FGModel.h" #include "FGFDMExec.h" -#include "FGAtmosphere.h" -#include "FGFCS.h" -#include "FGPropulsion.h" -#include "FGMassBalance.h" -#include "FGAerodynamics.h" -#include "FGInertial.h" -#include "FGGroundReactions.h" -#include "FGExternalReactions.h" -#include "FGAircraft.h" -#include "FGPropagate.h" -#include "FGAuxiliary.h" -#include using namespace std; namespace JSBSim { -static const char *IdSrc = "$Id: FGModel.cpp,v 1.16 2010/11/18 12:38:06 jberndt Exp $"; +static const char *IdSrc = "$Id: FGModel.cpp,v 1.19 2011/05/22 12:44:30 jberndt Exp $"; static const char *IdHdr = ID_MODEL; /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -77,7 +66,7 @@ FGModel::FGModel(FGFDMExec* fdmex) //must be brought up now. PropertyManager = FDMExec->GetPropertyManager(); - exe_ctr = 1; + exe_ctr = 0; rate = 1; if (debug_lvl & 2) cout << " FGModel Base Class" << endl; @@ -99,13 +88,13 @@ bool FGModel::InitModel(void) //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -bool FGModel::Run() +bool FGModel::Run(bool Holding) { if (debug_lvl & 4) cout << "Entering Run() for model " << Name << endl; if (rate == 1) return false; // Fast exit if nothing to do - if (exe_ctr >= rate) exe_ctr = 1; + if (exe_ctr >= rate) exe_ctr = 0; if (exe_ctr++ == 1) return false; else return true;