fly/flightgear
1
0
Fork 0
Code Activity

Exports the parameters of JSBSim ground reactions friction resolver to the property tree for debugging.

Browse source
This commit is contained in:
Bertrand Coconnier 2017-03-11 14:00:20 +01:00
parent 579f215005
commit 0d342f526e
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/FDM/JSBSim/models/FGAccelerations.cpp
View file

@ -104,6 +104,8 @@ bool FGAccelerations::InitModel(void)
vGravAccel.InitMatrix(); vGravAccel.InitMatrix();
vBodyAccel.InitMatrix(); vBodyAccel.InitMatrix();
maxiter = 50;
matrixSize = iter = 0;
return true; return true;
} }
@ -255,6 +257,7 @@ void FGAccelerations::ResolveFrictionForces(double dt)
FGColumnVector3 vdot, wdot; FGColumnVector3 vdot, wdot;
vector<LagrangeMultiplier*>& multipliers = *in.MultipliersList; vector<LagrangeMultiplier*>& multipliers = *in.MultipliersList;
size_t n = multipliers.size(); size_t n = multipliers.size();
matrixSize = n;
vFrictionForces.InitMatrix(); vFrictionForces.InitMatrix();
vFrictionMoments.InitMatrix(); vFrictionMoments.InitMatrix();
@ -303,7 +306,7 @@ void FGAccelerations::ResolveFrictionForces(double dt)
} }
// Resolve the Lagrange multipliers with the projected Gauss-Seidel method // Resolve the Lagrange multipliers with the projected Gauss-Seidel method
for (int iter=0; iter < 50; iter++) { for (iter=0; iter < maxiter; iter = iter+1) {
double norm = 0.; double norm = 0.;
for (unsigned int i=0; i < n; i++) { for (unsigned int i=0; i < n; i++) {
@ -384,6 +387,10 @@ void FGAccelerations::bind(void)
PropertyManager->Tie("forces/fbx-gear-lbs", this, eX, (PMF)&FGAccelerations::GetGroundForces); PropertyManager->Tie("forces/fbx-gear-lbs", this, eX, (PMF)&FGAccelerations::GetGroundForces);
PropertyManager->Tie("forces/fby-gear-lbs", this, eY, (PMF)&FGAccelerations::GetGroundForces); PropertyManager->Tie("forces/fby-gear-lbs", this, eY, (PMF)&FGAccelerations::GetGroundForces);
PropertyManager->Tie("forces/fbz-gear-lbs", this, eZ, (PMF)&FGAccelerations::GetGroundForces); PropertyManager->Tie("forces/fbz-gear-lbs", this, eZ, (PMF)&FGAccelerations::GetGroundForces);
iter = PropertyManager->CreatePropertyObject<int>("numerical/friction-resolver/iterations");
maxiter = PropertyManager->CreatePropertyObject<int>("numerical/friction-resolver/max-iterations");
matrixSize = PropertyManager->CreatePropertyObject<int>("numerical/friction-resolver/matrix-size");
} }
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

2
src/FDM/JSBSim/models/FGAccelerations.h
View file

@ -40,6 +40,7 @@ INCLUDES
#include <vector> #include <vector>
#include "simgear/props/propertyObject.hxx"
#include "models/FGModel.h" #include "models/FGModel.h"
#include "math/FGColumnVector3.h" #include "math/FGColumnVector3.h"
#include "math/LagrangeMultiplier.h" #include "math/LagrangeMultiplier.h"
@ -391,6 +392,7 @@ private:
FGColumnVector3 vGravAccel; FGColumnVector3 vGravAccel;
FGColumnVector3 vFrictionForces; FGColumnVector3 vFrictionForces;
FGColumnVector3 vFrictionMoments; FGColumnVector3 vFrictionMoments;
simgear::PropertyObject<int> iter, maxiter, matrixSize;
int gravType; int gravType;
bool gravTorque; bool gravTorque;