fly/flightgear
1
0
Fork 0
Code Activity

Fixed the initialization process for JSBSim models: the error message "FGTrim::calcRotation DistPlane^2 larger than sqrRadius" should no longer be issued

Browse source
This commit is contained in:
Bertrand Coconnier 2016-01-16 19:32:50 +01:00
parent 4d2f9e7955
commit f526dcdf3a
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/FDM/JSBSim/initialization/FGTrim.cpp
View file

@ -57,7 +57,7 @@ using namespace std;
namespace JSBSim { namespace JSBSim {
IDENT(IdSrc,"$Id: FGTrim.cpp,v 1.29 2015/12/13 08:19:57 bcoconni Exp $"); IDENT(IdSrc,"$Id: FGTrim.cpp,v 1.30 2015/12/29 13:44:39 ehofman Exp $");
IDENT(IdHdr,ID_TRIM); IDENT(IdHdr,ID_TRIM);
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@ -74,6 +74,7 @@ FGTrim::FGTrim(FGFDMExec *FDMExec,TrimMode tt)
Debug=0;DebugLevel=0; Debug=0;DebugLevel=0;
fdmex=FDMExec; fdmex=FDMExec;
fgic = *fdmex->GetIC();
total_its=0; total_its=0;
gamma_fallback=false; gamma_fallback=false;
mode=tt; mode=tt;
@ -196,7 +197,6 @@ bool FGTrim::DoTrim(void) {
double aileron0 = FCS->GetDaCmd(); double aileron0 = FCS->GetDaCmd();
double rudder0 = FCS->GetDrCmd(); double rudder0 = FCS->GetDrCmd();
double PitchTrim0 = FCS->GetPitchTrimCmd(); double PitchTrim0 = FCS->GetPitchTrimCmd();
fgic = *fdmex->GetIC();
for(int i=0;i < fdmex->GetGroundReactions()->GetNumGearUnits();i++){ for(int i=0;i < fdmex->GetGroundReactions()->GetNumGearUnits();i++){
fdmex->GetGroundReactions()->GetGearUnit(i)->SetReport(false); fdmex->GetGroundReactions()->GetGearUnit(i)->SetReport(false);
@ -210,6 +210,8 @@ bool FGTrim::DoTrim(void) {
fgic.SetRRadpsIC(0.0); fgic.SetRRadpsIC(0.0);
if (mode == tGround) { if (mode == tGround) {
fdmex->Initialize(&fgic);
fdmex->Run();
trimOnGround(); trimOnGround();
double theta = fgic.GetThetaRadIC(); double theta = fgic.GetThetaRadIC();
double phi = fgic.GetPhiRadIC(); double phi = fgic.GetPhiRadIC();
@ -790,7 +792,6 @@ void FGTrim::setDebug(FGTrimAxis& axis) {
void FGTrim::SetMode(TrimMode tt) { void FGTrim::SetMode(TrimMode tt) {
ClearStates(); ClearStates();
fdmex->GetPropagate()->SetInitialState(&fgic);
mode=tt; mode=tt;
switch(tt) { switch(tt) {
case tFull: case tFull:

14
src/FDM/JSBSim/initialization/FGTrimAxis.cpp
View file

@ -126,17 +126,17 @@ FGTrimAxis::FGTrimAxis(FGFDMExec* fdex, FGInitialCondition* ic, State st,
case tAltAGL: case tAltAGL:
control_min=0; control_min=0;
control_max=30; control_max=30;
control_value=fdmex->GetPropagate()->GetDistanceAGL(); control_value=ic->GetAltitudeAGLFtIC();
solver_eps=tolerance/100; solver_eps=tolerance/100;
break; break;
case tTheta: case tTheta:
control_min=fdmex->GetPropagate()->GetEuler(eTht) - 5*degtorad; control_min=ic->GetThetaRadIC() - 5*degtorad;
control_max=fdmex->GetPropagate()->GetEuler(eTht) + 5*degtorad; control_max=ic->GetThetaRadIC() + 5*degtorad;
state_convert=radtodeg; state_convert=radtodeg;
break; break;
case tPhi: case tPhi:
control_min=fdmex->GetPropagate()->GetEuler(ePhi) - 30*degtorad; control_min=ic->GetPhiRadIC() - 30*degtorad;
control_max=fdmex->GetPropagate()->GetEuler(ePhi) + 30*degtorad; control_max=ic->GetPhiRadIC() + 30*degtorad;
state_convert=radtodeg; state_convert=radtodeg;
control_convert=radtodeg; control_convert=radtodeg;
break; break;
@ -147,8 +147,8 @@ FGTrimAxis::FGTrimAxis(FGFDMExec* fdex, FGInitialCondition* ic, State st,
control_convert=radtodeg; control_convert=radtodeg;
break; break;
case tHeading: case tHeading:
control_min=fdmex->GetPropagate()->GetEuler(ePsi) - 30*degtorad; control_min=ic->GetPsiRadIC() - 30*degtorad;
control_max=fdmex->GetPropagate()->GetEuler(ePsi) + 30*degtorad; control_max=ic->GetPsiRadIC() + 30*degtorad;
state_convert=radtodeg; state_convert=radtodeg;
break; break;
} }