} else {
// Not a valid type of output
}
-
+ return false;
} else {
+ return true;
}
}
return false;
Type = otSocket;
} else if (type == "TERMINAL") {
Type = otTerminal;
- } else if (type != string("NONE")){
+ } else if (type != string("NONE")) {
Type = otUnknown;
cerr << "Unknown type of output specified in config file" << endl;
}
outstream << ", ";
outstream << "Drag, Side, Lift, ";
outstream << "L/D, ";
- outstream << "Xforce, Yforce, Zforce";
+ outstream << "Xforce, Yforce, Zforce, ";
+ outstream << "xGravity, yGravity, zGravity, ";
+ outstream << "xCoriolis, yCoriolis, zCoriolis, ";
+ outstream << "xCentrifugal, yCentrifugal, zCentrifugal";
}
if (SubSystems & ssMoments) {
outstream << ", ";
outstream << ", ";
outstream << Aerodynamics->GetCoefficientStrings();
}
+ if (SubSystems & ssFCS) {
+ outstream << ", ";
+ outstream << FCS->GetComponentStrings();
+ }
if (SubSystems & ssGroundReactions) {
outstream << ", ";
outstream << GroundReactions->GetGroundReactionStrings();
outstream << ", ";
outstream << Aerodynamics->GetvFs() << ", ";
outstream << Aerodynamics->GetLoD() << ", ";
- outstream << Aircraft->GetForces();
+ outstream << Aircraft->GetForces() << ", ";
+ outstream << Inertial->GetGravity() << ", ";
+ outstream << Inertial->GetCoriolis() << ", ";
+ outstream << Inertial->GetCentrifugal();
}
if (SubSystems & ssMoments) {
outstream << ", ";
outstream << ", ";
outstream << Aerodynamics->GetCoefficientValues();
}
+ if (SubSystems & ssFCS) {
+ outstream << ", ";
+ outstream << FCS->GetComponentValues();
+ }
if (SubSystems & ssGroundReactions) {
outstream << ", ";
outstream << GroundReactions->GetGroundReactionValues();