#include "FGOutput.h"
#include "FGPropertyManager.h"
+namespace JSBSim {
+
static const char *IdSrc = "$Id$";
static const char *IdHdr = ID_TRANSLATION;
{
Name = "FGTranslation";
qbar = 0;
+ qbarUW = 0.0;
+ qbarUV = 0.0;
Vt = 0.0;
Mach = 0.0;
alpha = beta = 0.0;
adot = bdot = 0.0;
+
+ vUVWdot.InitMatrix();
+ vUVWdot_prev[0].InitMatrix();
+ vUVWdot_prev[1].InitMatrix();
+ vUVWdot_prev[2].InitMatrix();
+ vUVWdot_prev[3].InitMatrix();
+
bind();
Debug(0);
}
bool FGTranslation::Run(void)
{
- double Tc = 0.5*State->Getdt()*rate;
-
if (!FGModel::Run()) {
mVel(1,1) = 0.0;
vUVWdot = mVel*Rotation->GetPQR() + Aircraft->GetBodyAccel();
- vUVW += Tc*(vUVWdot + vlastUVWdot);
+ vUVW += State->Integrate(FGState::TRAPZ, State->Getdt()*rate, vUVWdot, vUVWdot_prev);
vAeroUVW = vUVW + State->GetTl2b()*Atmosphere->GetWindNED();
qbarUW = 0.5*Atmosphere->GetDensity()*(vAeroUVW(eU)*vAeroUVW(eU) + vAeroUVW(eW)*vAeroUVW(eW));
qbarUV = 0.5*Atmosphere->GetDensity()*(vAeroUVW(eU)*vAeroUVW(eU) + vAeroUVW(eV)*vAeroUVW(eV));
Mach = Vt / State->Geta();
-
- vlastUVWdot = vUVWdot;
+ vMachUVW(eU) = vAeroUVW(eU) / State->Geta();
+ vMachUVW(eV) = vAeroUVW(eV) / State->Geta();
+ vMachUVW(eW) = vAeroUVW(eW) / State->Geta();
if (debug_lvl > 1) Debug(1);
PropertyManager->Untie("velocities/mach-norm");
PropertyManager->Untie("aero/alphadot-rad_sec");
PropertyManager->Untie("aero/betadot-rad_sec");
+ PropertyManager->Untie("aero/mag-beta-rad");
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
}
}
}
-
+}