*/
+#include <iostream>
+#include <cstdlib>
+
#include "FGForce.h"
#include "FGFDMExec.h"
-#include "models/FGAircraft.h"
#include "models/FGPropagate.h"
#include "models/FGMassBalance.h"
-#include "models/FGAerodynamics.h"
-#include <iostream>
-#include <cstdlib>
+#include "models/FGAuxiliary.h"
using namespace std;
namespace JSBSim {
-static const char *IdSrc = "$Id$";
+static const char *IdSrc = "$Id: FGForce.cpp,v 1.17 2011/10/31 14:54:41 bcoconni Exp $";
static const char *IdHdr = ID_FORCE;
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
fdmex(FDMExec),
ttype(tNone)
{
- mT(1,1) = 1; //identity matrix
- mT(2,2) = 1;
- mT(3,3) = 1;
+ vFn.InitMatrix();
+ vMn.InitMatrix();
+ vH.InitMatrix();
+ vOrient.InitMatrix();
+ vXYZn.InitMatrix();
+ vActingXYZn.InitMatrix();
+
+ vFb.InitMatrix();
+ vM.InitMatrix();
+ vDXYZ.InitMatrix();
+
+ mT.InitMatrix(1., 0., 0.,
+ 0., 1., 0.,
+ 0., 0., 1.);
Debug(0);
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-FGColumnVector3& FGForce::GetBodyForces(void)
+const FGColumnVector3& FGForce::GetBodyForces(void)
{
vFb = Transform()*vFn;
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-FGMatrix33 FGForce::Transform(void)
+const FGMatrix33& FGForce::Transform(void) const
{
switch(ttype) {
case tWindBody:
- return fdmex->GetAerodynamics()->GetTw2b();
+ return fdmex->GetAuxiliary()->GetTw2b();
case tLocalBody:
return fdmex->GetPropagate()->GetTl2b();
case tCustom: