%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#include "FGAerodynamics.h"
+#include "FGPropagate.h"
+#include "FGAircraft.h"
+#include "FGState.h"
+#include "FGMassBalance.h"
#include "FGFactorGroup.h"
-#include "FGCoefficient.h"
#include "FGPropertyManager.h"
namespace JSBSim {
static const char *IdSrc = "$Id$";
static const char *IdHdr = ID_AERODYNAMICS;
-const unsigned NAxes=6;
+const unsigned NAxes=6;
const char* AxisNames[] = { "drag", "side-force", "lift", "rolling-moment",
- "pitching-moment","yawing-moment" };
+ "pitching-moment","yawing-moment" };
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CLASS IMPLEMENTATION
AxisIdx["YAW"] = 5;
Coeff = new CoeffArray[6];
-
+
impending_stall = stall_hyst = 0.0;
alphaclmin = alphaclmax = 0.0;
alphahystmin = alphahystmax = 0.0;
clsq = lod = 0.0;
- alphaw = 0.0;
+ alphaw = 0.0;
bi2vel = ci2vel = 0.0;
bind();
FGAerodynamics::~FGAerodynamics()
{
unsigned int i,j;
-
+
unbind();
-
+
for (i=0; i<6; i++) {
for (j=0; j<Coeff[i].size(); j++) {
delete Coeff[i][j];
}
}
delete[] Coeff;
-
+
Debug(1);
}
if (!FGModel::Run()) {
- twovel = 2*Translation->GetVt();
- if (twovel > 0) {
+ twovel = 2*Auxiliary->GetVt();
+ if (twovel != 0) {
bi2vel = Aircraft->GetWingSpan() / twovel;
ci2vel = Aircraft->Getcbar() / twovel;
- }
-
- alphaw = Translation->Getalpha() + Aircraft->GetWingIncidence();
-
- alpha = Translation->Getalpha();
-
+ }
+
+ alphaw = Auxiliary->Getalpha() + Aircraft->GetWingIncidence();
+
+ alpha = Auxiliary->Getalpha();
+
if (alphaclmax != 0) {
if (alpha > 0.85*alphaclmax) {
impending_stall = 10*(alpha/alphaclmax - 0.85);
impending_stall = 0;
}
}
-
+
if (alphahystmax != 0.0 && alphahystmin != 0.0) {
if (alpha > alphahystmax) {
stall_hyst = 1;
} else if (alpha < alphahystmin) {
stall_hyst = 0;
- }
+ }
}
-
+
vLastFs = vFs;
vFs.InitMatrix();
//correct signs of drag and lift to wind axes convention
//positive forward, right, down
- if ( Translation->Getqbar() > 0) {
- clsq = vFs(eLift) / (Aircraft->GetWingArea()*Translation->Getqbar());
+ if ( Auxiliary->Getqbar() > 0) {
+ clsq = vFs(eLift) / (Aircraft->GetWingArea()*Auxiliary->Getqbar());
clsq *= clsq;
}
if ( vFs(eDrag) > 0) {
lod = vFs(eLift) / vFs(eDrag);
- }
-
+ }
+
//correct signs of drag and lift to wind axes convention
//positive forward, right, down
vFs(eDrag)*=-1; vFs(eLift)*=-1;
vForces = State->GetTs2b()*vFs;
- vDXYZcg(eX) = -(Aircraft->GetXYZrp(eX)
- - MassBalance->GetXYZcg(eX))*inchtoft;
- vDXYZcg(eY) = (Aircraft->GetXYZrp(eY)
- - MassBalance->GetXYZcg(eY))*inchtoft;
- vDXYZcg(eZ) = -(Aircraft->GetXYZrp(eZ)
- - MassBalance->GetXYZcg(eZ))*inchtoft;
+ vDXYZcg = MassBalance->StructuralToBody(Aircraft->GetXYZrp());
vMoments = vDXYZcg*vForces; // M = r X F
}
bindModel();
-
+
return true;
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-string FGAerodynamics::GetCoefficientStrings(void)
+string FGAerodynamics::GetCoefficientStrings(string delimeter)
{
string CoeffStrings = "";
bool firstime = true;
if (firstime) {
firstime = false;
} else {
- CoeffStrings += ", ";
+ CoeffStrings += delimeter;
}
CoeffStrings += Coeff[axis][sd]->GetCoefficientName();
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-string FGAerodynamics::GetCoefficientValues(void)
+string FGAerodynamics::GetCoefficientValues(string delimeter)
{
string SDValues = "";
bool firstime = true;
if (firstime) {
firstime = false;
} else {
- SDValues += ", ";
+ SDValues += delimeter;
}
SDValues += Coeff[axis][sd]->GetSDstring();
}
PropertyManager->Tie("forces/lod-norm", this,
&FGAerodynamics::GetLoD);
PropertyManager->Tie("aero/cl-squared-norm", this,
- &FGAerodynamics::GetClSquared);
+ &FGAerodynamics::GetClSquared);
PropertyManager->Tie("aero/alpha-max-deg", this,
&FGAerodynamics::GetAlphaCLMax,
&FGAerodynamics::SetAlphaCLMax,
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
void FGAerodynamics::bindModel(void)
-{
+{
unsigned i,j;
FGPropertyManager* node;
string axis_node_name;
node = node->GetNode( string(AxisNames[i]),true );
for (j=0; j < Coeff[i].size(); j++) {
Coeff[i][j]->bind(node);
- }
- node = (FGPropertyManager*)node->getParent();
+ }
+ node = (FGPropertyManager*)node->getParent();
}
}
PropertyManager->Untie("forces/fwy-aero-lbs");
PropertyManager->Untie("forces/fwz-aero-lbs");
PropertyManager->Untie("forces/lod-norm");
- PropertyManager->Untie("aero/cl-squared-norm");
+ PropertyManager->Untie("aero/cl-squared-norm");
PropertyManager->Untie("aero/alpha-max-deg");
PropertyManager->Untie("aero/alpha-min-deg");
PropertyManager->Untie("aero/bi2vel");
for ( i=0; i<NAxes; i++ ) {
for ( j=0; j < Coeff[i].size(); j++ ) {
Coeff[i][j]->unbind();
-
+
}
}
}