X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FJSBSim%2Fmodels%2FFGGroundReactions.h;h=5774918ad3a005927f2442fac911f09069d10440;hb=642735ab18421db87a07d6841dd720fd4615bfff;hp=64bfafa1bfbb850115deeb26d3f77409f2b76fe2;hpb=ec454158fee605314172422bf0934263b5e1fe42;p=flightgear.git diff --git a/src/FDM/JSBSim/models/FGGroundReactions.h b/src/FDM/JSBSim/models/FGGroundReactions.h index 64bfafa1b..5774918ad 100644 --- a/src/FDM/JSBSim/models/FGGroundReactions.h +++ b/src/FDM/JSBSim/models/FGGroundReactions.h @@ -45,7 +45,7 @@ INCLUDES #include "math/FGColumnVector3.h" #include "input_output/FGXMLElement.h" -#define ID_GROUNDREACTIONS "$Id: FGGroundReactions.h,v 1.20 2011/05/20 03:18:36 jberndt Exp $" +#define ID_GROUNDREACTIONS "$Id: FGGroundReactions.h,v 1.24 2011/08/21 15:13:22 bcoconni Exp $" /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% FORWARD DECLARATIONS @@ -78,19 +78,6 @@ CLASS DOCUMENTATION CLASS DECLARATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -class MultiplierIterator -{ -public: - MultiplierIterator(FGGroundReactions* GndReactions); - MultiplierIterator& operator++(); - FGPropagate::LagrangeMultiplier* operator*() { return multiplier; } -private: - FGGroundReactions* GroundReactions; - FGPropagate::LagrangeMultiplier* multiplier; - int gearNum; - int entry; -}; - class FGGroundReactions : public FGModel { public: @@ -114,7 +101,6 @@ public: string GetGroundReactionStrings(string delimeter) const; string GetGroundReactionValues(string delimeter) const; bool GetWOW(void) const; - void UpdateForcesAndMoments(void); int GetNumGearUnits(void) const { return (int)lGear.size(); } @@ -123,10 +109,16 @@ public: @return a pointer to the FGLGear instance of the gear unit requested */ FGLGear* GetGearUnit(int gear) const { return lGear[gear]; } + void RegisterLagrangeMultiplier(LagrangeMultiplier* lmult) { multipliers.push_back(lmult); } + vector * GetMultipliersList(void) { return &multipliers; } + + FGLGear::Inputs in; + private: vector lGear; FGColumnVector3 vForces; FGColumnVector3 vMoments; + vector multipliers; void bind(void); void Debug(int from);