]> git.mxchange.org Git - flightgear.git/blobdiff - src/FDM/JSBSim/models/FGOutput.cpp
Merge branch 'master' of git://gitorious.org/fg/flightgear into next
[flightgear.git] / src / FDM / JSBSim / models / FGOutput.cpp
index b3c54658cabba6ec52bb6294ae1b6274661f52be..a974915f4cfd72106cdd10f8810ae7dca7810d07 100644 (file)
@@ -6,7 +6,7 @@
  Purpose:      Manage output of sim parameters to file or stdout
  Called by:    FGSimExec
 
- ------------- Copyright (C) 1999  Jon S. Berndt (jsb@hal-pc.org) -------------
+ ------------- Copyright (C) 1999  Jon S. Berndt (jon@jsbsim.org) -------------
 
  This program is free software; you can redistribute it and/or modify it under
  the terms of the GNU Lesser General Public License as published by the Free Software
@@ -40,24 +40,29 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGOutput.h"
-#include "FGState.h"
 #include "FGFDMExec.h"
 #include "FGAtmosphere.h"
 #include "FGFCS.h"
 #include "FGAerodynamics.h"
 #include "FGGroundReactions.h"
+#include "FGExternalReactions.h"
+#include "FGBuoyantForces.h"
 #include "FGAircraft.h"
 #include "FGMassBalance.h"
 #include "FGPropagate.h"
 #include "FGAuxiliary.h"
 #include "FGInertial.h"
-#include "FGPropulsion.h"   //access to FGEngine, FGTank
+#include "FGPropulsion.h"
+#include "models/propulsion/FGEngine.h"
+#include "models/propulsion/FGTank.h"
 #include "models/propulsion/FGPiston.h"
-#include <fstream>
+#include <sstream>
 #include <iomanip>
 #include <cstring>
+#include <cstdlib>
 
 #include "input_output/net_fdm.hxx"
+#include "input_output/FGfdmSocket.h"
 
 #if defined(WIN32) && !defined(__CYGWIN__)
 #  include <windows.h>
@@ -68,10 +73,11 @@ INCLUDES
 static const int endianTest = 1;
 #define isLittleEndian (*((char *) &endianTest ) != 0)
 
+using namespace std;
 
 namespace JSBSim {
 
-static const char *IdSrc = "$Id$";
+static const char *IdSrc = "$Id: FGOutput.cpp,v 1.48 2010/04/12 12:25:19 jberndt Exp $";
 static const char *IdHdr = ID_OUTPUT;
 
 // (stolen from FGFS native_fdm.cxx)
@@ -127,11 +133,13 @@ FGOutput::FGOutput(FGFDMExec* fdmex) : FGModel(fdmex)
   sFirstPass = dFirstPass = true;
   socket = 0;
   flightGearSocket = 0;
+  runID_postfix = 0;
   Type = otNone;
   SubSystems = 0;
   enabled = true;
+  StartNewFile = false;
   delimeter = ", ";
-  Filename = "";
+  BaseFilename = Filename = "";
   DirectivesFile = "";
   output_file_name = "";
 
@@ -156,6 +164,20 @@ bool FGOutput::InitModel(void)
 {
   if (!FGModel::InitModel()) return false;
 
+  if (Filename.size() > 0 && StartNewFile) {
+    ostringstream buf;
+    string::size_type dot = BaseFilename.find_last_of('.');
+    if (dot != string::npos) {
+      buf << BaseFilename.substr(0, dot) << '_' << runID_postfix++ << BaseFilename.substr(dot);
+    } else {
+      buf << BaseFilename << '_' << runID_postfix++;
+    }
+    Filename = buf.str();
+    datafile.close();
+    StartNewFile = false;
+    dFirstPass = true;
+  }
+
   return true;
 }
 
@@ -165,7 +187,8 @@ bool FGOutput::Run(void)
 {
   if (FGModel::Run()) return true;
 
-  if (enabled && !State->IntegrationSuspended()&& !FDMExec->Holding()) {
+  if (enabled && !FDMExec->IntegrationSuspended()&& !FDMExec->Holding()) {
+    RunPreFunctions();
     if (Type == otSocket) {
       SocketOutput();
     } else if (Type == otFlightGear) {
@@ -179,13 +202,14 @@ bool FGOutput::Run(void)
     } else {
       // Not a valid type of output
     }
+    RunPostFunctions();
   }
   return false;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-void FGOutput::SetType(string type)
+void FGOutput::SetType(const string& type)
 {
   if (type == "CSV") {
     Type = otCSV;
@@ -207,7 +231,7 @@ void FGOutput::SetType(string type)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-void FGOutput::DelimitedOutput(string fname)
+void FGOutput::DelimitedOutput(const string& fname)
 {
   streambuf* buffer;
   string scratch = "";
@@ -215,7 +239,7 @@ void FGOutput::DelimitedOutput(string fname)
   if (fname == "COUT" || fname == "cout") {
     buffer = cout.rdbuf();
   } else {
-    datafile.open(fname.c_str());
+    if (!datafile.is_open()) datafile.open(fname.c_str());
     buffer = datafile.rdbuf();
   }
 
@@ -243,30 +267,46 @@ void FGOutput::DelimitedOutput(string fname)
     if (SubSystems & ssRates) {
       outstream << delimeter;
       outstream << "P (deg/s)" + delimeter + "Q (deg/s)" + delimeter + "R (deg/s)" + delimeter;
-      outstream << "P dot (deg/s^2)" + delimeter + "Q dot (deg/s^2)" + delimeter + "R dot (deg/s^2)";
+      outstream << "P dot (deg/s^2)" + delimeter + "Q dot (deg/s^2)" + delimeter + "R dot (deg/s^2)" + delimeter;
+      outstream << "P_{inertial} (deg/s)" + delimeter + "Q_{inertial} (deg/s)" + delimeter + "R_{inertial} (deg/s)";
     }
     if (SubSystems & ssVelocities) {
       outstream << delimeter;
       outstream << "q bar (psf)" + delimeter;
+      outstream << "Reynolds Number" + delimeter;
       outstream << "V_{Total} (ft/s)" + delimeter;
       outstream << "V_{Inertial} (ft/s)" + delimeter;
       outstream << "UBody" + delimeter + "VBody" + delimeter + "WBody" + delimeter;
       outstream << "Aero V_{X Body} (ft/s)" + delimeter + "Aero V_{Y Body} (ft/s)" + delimeter + "Aero V_{Z Body} (ft/s)" + delimeter;
+      outstream << "V_{X_{inertial}} (ft/s)" + delimeter + "V_{Y_{inertial}} (ft/s)" + delimeter + "V_{Z_{inertial}} (ft/s)" + delimeter;
       outstream << "V_{North} (ft/s)" + delimeter + "V_{East} (ft/s)" + delimeter + "V_{Down} (ft/s)";
     }
     if (SubSystems & ssForces) {
       outstream << delimeter;
       outstream << "F_{Drag} (lbs)" + delimeter + "F_{Side} (lbs)" + delimeter + "F_{Lift} (lbs)" + delimeter;
       outstream << "L/D" + delimeter;
-      outstream << "F_X (lbs)" + delimeter + "F_Y (lbs)" + delimeter + "F_Z (lbs)";
+      outstream << "F_{Aero x} (lbs)" + delimeter + "F_{Aero y} (lbs)" + delimeter + "F_{Aero z} (lbs)" + delimeter;
+      outstream << "F_{Prop x} (lbs)" + delimeter + "F_{Prop y} (lbs)" + delimeter + "F_{Prop z} (lbs)" + delimeter;
+      outstream << "F_{Gear x} (lbs)" + delimeter + "F_{Gear y} (lbs)" + delimeter + "F_{Gear z} (lbs)" + delimeter;
+      outstream << "F_{Ext x} (lbs)" + delimeter + "F_{Ext y} (lbs)" + delimeter + "F_{Ext z} (lbs)" + delimeter;
+      outstream << "F_{Buoyant x} (lbs)" + delimeter + "F_{Buoyant y} (lbs)" + delimeter + "F_{Buoyant z} (lbs)" + delimeter;
+      outstream << "F_{Total x} (lbs)" + delimeter + "F_{Total y} (lbs)" + delimeter + "F_{Total z} (lbs)";
     }
     if (SubSystems & ssMoments) {
       outstream << delimeter;
-      outstream << "L (ft-lbs)" + delimeter + "M (ft-lbs)" + delimeter + "N (ft-lbs)";
+      outstream << "L_{Aero} (ft-lbs)" + delimeter + "M_{Aero} ( ft-lbs)" + delimeter + "N_{Aero} (ft-lbs)" + delimeter;
+      outstream << "L_{Prop} (ft-lbs)" + delimeter + "M_{Prop} (ft-lbs)" + delimeter + "N_{Prop} (ft-lbs)" + delimeter;
+      outstream << "L_{Gear} (ft-lbs)" + delimeter + "M_{Gear} (ft-lbs)" + delimeter + "N_{Gear} (ft-lbs)" + delimeter;
+      outstream << "L_{ext} (ft-lbs)" + delimeter + "M_{ext} (ft-lbs)" + delimeter + "N_{ext} (ft-lbs)" + delimeter;
+      outstream << "L_{Buoyant} (ft-lbs)" + delimeter + "M_{Buoyant} (ft-lbs)" + delimeter + "N_{Buoyant} (ft-lbs)" + delimeter;
+      outstream << "L_{Total} (ft-lbs)" + delimeter + "M_{Total} (ft-lbs)" + delimeter + "N_{Total} (ft-lbs)";
     }
     if (SubSystems & ssAtmosphere) {
       outstream << delimeter;
       outstream << "Rho (slugs/ft^3)" + delimeter;
+      outstream << "Absolute Viscosity" + delimeter;
+      outstream << "Kinematic Viscosity" + delimeter;
+      outstream << "Temperature (R)" + delimeter;
       outstream << "P_{SL} (psf)" + delimeter;
       outstream << "P_{Ambient} (psf)" + delimeter;
       outstream << "Turbulence Magnitude (ft/sec)" + delimeter;
@@ -275,30 +315,32 @@ void FGOutput::DelimitedOutput(string fname)
     }
     if (SubSystems & ssMassProps) {
       outstream << delimeter;
-      outstream << "I_xx" + delimeter;
-      outstream << "I_xy" + delimeter;
-      outstream << "I_xz" + delimeter;
-      outstream << "I_yx" + delimeter;
-      outstream << "I_yy" + delimeter;
-      outstream << "I_yz" + delimeter;
-      outstream << "I_zx" + delimeter;
-      outstream << "I_zy" + delimeter;
-      outstream << "I_zz" + delimeter;
+      outstream << "I_{xx}" + delimeter;
+      outstream << "I_{xy}" + delimeter;
+      outstream << "I_{xz}" + delimeter;
+      outstream << "I_{yx}" + delimeter;
+      outstream << "I_{yy}" + delimeter;
+      outstream << "I_{yz}" + delimeter;
+      outstream << "I_{zx}" + delimeter;
+      outstream << "I_{zy}" + delimeter;
+      outstream << "I_{zz}" + delimeter;
       outstream << "Mass" + delimeter;
-      outstream << "X_cg" + delimeter + "Y_cg" + delimeter + "Z_cg";
+      outstream << "X_{cg}" + delimeter + "Y_{cg}" + delimeter + "Z_{cg}";
     }
     if (SubSystems & ssPropagate) {
       outstream << delimeter;
-      outstream << "Altitude (ft)" + delimeter;
+      outstream << "Altitude ASL (ft)" + delimeter;
+      outstream << "Altitude AGL (ft)" + delimeter;
       outstream << "Phi (deg)" + delimeter + "Theta (deg)" + delimeter + "Psi (deg)" + delimeter;
       outstream << "Alpha (deg)" + delimeter;
       outstream << "Beta (deg)" + delimeter;
       outstream << "Latitude (deg)" + delimeter;
       outstream << "Longitude (deg)" + delimeter;
-      outstream << "ECEF X (ft)" + delimeter + "ECEF Y (ft)" + delimeter + "ECEF Z (ft)" + delimeter;
-      outstream << "EPA (deg)" + delimeter;
+      outstream << "X_{ECI} (ft)" + delimeter + "Y_{ECI} (ft)" + delimeter + "Z_{ECI} (ft)" + delimeter;
+      outstream << "X_{ECEF} (ft)" + delimeter + "Y_{ECEF} (ft)" + delimeter + "Z_{ECEF} (ft)" + delimeter;
+      outstream << "Earth Position Angle (deg)" + delimeter;
       outstream << "Distance AGL (ft)" + delimeter;
-      outstream << "Runway Radius (ft)";
+      outstream << "Terrain Elevation (ft)";
     }
     if (SubSystems & ssCoefficients) {
       scratch = Aerodynamics->GetCoefficientStrings(delimeter);
@@ -326,7 +368,7 @@ void FGOutput::DelimitedOutput(string fname)
     dFirstPass = false;
   }
 
-  outstream << State->Getsim_time();
+  outstream << FDMExec->GetSimTime();
   if (SubSystems & ssSimulation) {
   }
   if (SubSystems & ssAerosurfaces) {
@@ -344,54 +386,77 @@ void FGOutput::DelimitedOutput(string fname)
   if (SubSystems & ssRates) {
     outstream << delimeter;
     outstream << (radtodeg*Propagate->GetPQR()).Dump(delimeter) << delimeter;
-    outstream << (radtodeg*Propagate->GetPQRdot()).Dump(delimeter);
+    outstream << (radtodeg*Propagate->GetPQRdot()).Dump(delimeter) << delimeter;
+    outstream << (radtodeg*Propagate->GetPQRi()).Dump(delimeter);
   }
   if (SubSystems & ssVelocities) {
     outstream << delimeter;
     outstream << Auxiliary->Getqbar() << delimeter;
+    outstream << Auxiliary->GetReynoldsNumber() << delimeter;
     outstream << setprecision(12) << Auxiliary->GetVt() << delimeter;
     outstream << Propagate->GetInertialVelocityMagnitude() << delimeter;
     outstream << setprecision(12) << Propagate->GetUVW().Dump(delimeter) << delimeter;
     outstream << Auxiliary->GetAeroUVW().Dump(delimeter) << delimeter;
+    outstream << Propagate->GetInertialVelocity().Dump(delimeter) << delimeter;
     outstream << Propagate->GetVel().Dump(delimeter);
+    outstream.precision(10);
   }
   if (SubSystems & ssForces) {
     outstream << delimeter;
-    outstream << Aerodynamics->GetvFw() << delimeter;
+    outstream << Aerodynamics->GetvFw().Dump(delimeter) << delimeter;
     outstream << Aerodynamics->GetLoD() << delimeter;
+    outstream << Aerodynamics->GetForces().Dump(delimeter) << delimeter;
+    outstream << Propulsion->GetForces().Dump(delimeter) << delimeter;
+    outstream << GroundReactions->GetForces().Dump(delimeter) << delimeter;
+    outstream << ExternalReactions->GetForces().Dump(delimeter) << delimeter;
+    outstream << BuoyantForces->GetForces().Dump(delimeter) << delimeter;
     outstream << Aircraft->GetForces().Dump(delimeter);
   }
   if (SubSystems & ssMoments) {
     outstream << delimeter;
+    outstream << Aerodynamics->GetMoments().Dump(delimeter) << delimeter;
+    outstream << Propulsion->GetMoments().Dump(delimeter) << delimeter;
+    outstream << GroundReactions->GetMoments().Dump(delimeter) << delimeter;
+    outstream << ExternalReactions->GetMoments().Dump(delimeter) << delimeter;
+    outstream << BuoyantForces->GetMoments().Dump(delimeter) << delimeter;
     outstream << Aircraft->GetMoments().Dump(delimeter);
   }
   if (SubSystems & ssAtmosphere) {
     outstream << delimeter;
     outstream << Atmosphere->GetDensity() << delimeter;
+    outstream << Atmosphere->GetAbsoluteViscosity() << delimeter;
+    outstream << Atmosphere->GetKinematicViscosity() << delimeter;
+    outstream << Atmosphere->GetTemperature() << delimeter;
     outstream << Atmosphere->GetPressureSL() << delimeter;
     outstream << Atmosphere->GetPressure() << delimeter;
     outstream << Atmosphere->GetTurbMagnitude() << delimeter;
     outstream << Atmosphere->GetTurbDirection().Dump(delimeter) << delimeter;
-    outstream << Atmosphere->GetWindNED().Dump(delimeter);
+    outstream << Atmosphere->GetTotalWindNED().Dump(delimeter);
   }
   if (SubSystems & ssMassProps) {
     outstream << delimeter;
-    outstream << MassBalance->GetJ() << delimeter;
+    outstream << MassBalance->GetJ().Dump(delimeter) << delimeter;
     outstream << MassBalance->GetMass() << delimeter;
-    outstream << MassBalance->GetXYZcg();
+    outstream << MassBalance->GetXYZcg().Dump(delimeter);
   }
   if (SubSystems & ssPropagate) {
+    outstream.precision(14);
     outstream << delimeter;
-    outstream << Propagate->Geth() << delimeter;
+    outstream << Propagate->GetAltitudeASL() << delimeter;
+    outstream << Propagate->GetDistanceAGL() << delimeter;
     outstream << (radtodeg*Propagate->GetEuler()).Dump(delimeter) << delimeter;
     outstream << Auxiliary->Getalpha(inDegrees) << delimeter;
     outstream << Auxiliary->Getbeta(inDegrees) << delimeter;
     outstream << Propagate->GetLocation().GetLatitudeDeg() << delimeter;
     outstream << Propagate->GetLocation().GetLongitudeDeg() << delimeter;
+    outstream.precision(18);
+    outstream << ((FGColumnVector3)Propagate->GetInertialPosition()).Dump(delimeter) << delimeter;
     outstream << ((FGColumnVector3)Propagate->GetLocation()).Dump(delimeter) << delimeter;
+    outstream.precision(14);
     outstream << Inertial->GetEarthPositionAngleDeg() << delimeter;
     outstream << Propagate->GetDistanceAGL() << delimeter;
-    outstream << Propagate->GetRunwayRadius();
+    outstream << Propagate->GetTerrainElevation();
+    outstream.precision(10);
   }
   if (SubSystems & ssCoefficients) {
     scratch = Aerodynamics->GetCoefficientValues(delimeter);
@@ -410,9 +475,11 @@ void FGOutput::DelimitedOutput(string fname)
     outstream << Propulsion->GetPropulsionValues(delimeter);
   }
 
+  outstream.precision(18);
   for (unsigned int i=0;i<OutputProperties.size();i++) {
     outstream << delimeter << OutputProperties[i]->getDoubleValue();
   }
+  outstream.precision(10);
 
   outstream << endl;
   outstream.flush();
@@ -430,7 +497,7 @@ void FGOutput::SocketDataFill(FGNetFDM* net)
     // Positions
     net->longitude = Propagate->GetLocation().GetLongitude(); // geodetic (radians)
     net->latitude  = Propagate->GetLocation().GetLatitude(); // geodetic (radians)
-    net->altitude  = Propagate->Geth()*0.3048; // altitude, above sea level (meters)
+    net->altitude  = Propagate->GetAltitudeASL()*0.3048; // altitude, above sea level (meters)
     net->agl       = (float)(Propagate->GetDistanceAGL()*0.3048); // altitude, above ground level (meters)
 
     net->phi       = (float)(Propagate->GetEuler(ePhi)); // roll (radians)
@@ -756,7 +823,7 @@ void FGOutput::SocketOutput(void)
   }
 
   socket->Clear();
-  socket->Append(State->Getsim_time());
+  socket->Append(FDMExec->GetSimTime());
 
   if (SubSystems & ssAerosurfaces) {
     socket->Append(FCS->GetDaCmd());
@@ -810,7 +877,7 @@ void FGOutput::SocketOutput(void)
     socket->Append(Atmosphere->GetPressure());
     socket->Append(Atmosphere->GetTurbMagnitude());
     socket->Append(Atmosphere->GetTurbDirection().Dump(","));
-    socket->Append(Atmosphere->GetWindNED().Dump(","));
+    socket->Append(Atmosphere->GetTotalWindNED().Dump(","));
   }
   if (SubSystems & ssMassProps) {
     socket->Append(MassBalance->GetJ()(1,1));
@@ -828,7 +895,7 @@ void FGOutput::SocketOutput(void)
     socket->Append(MassBalance->GetXYZcg()(eZ));
   }
   if (SubSystems & ssPropagate) {
-    socket->Append(Propagate->Geth());
+    socket->Append(Propagate->GetAltitudeASL());
     socket->Append(radtodeg*Propagate->GetEuler(ePhi));
     socket->Append(radtodeg*Propagate->GetEuler(eTht));
     socket->Append(radtodeg*Propagate->GetEuler(ePsi));
@@ -861,7 +928,7 @@ void FGOutput::SocketOutput(void)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-void FGOutput::SocketStatusOutput(string out_str)
+void FGOutput::SocketStatusOutput(const string& out_str)
 {
   string asciiData;
 
@@ -886,21 +953,20 @@ bool FGOutput::Load(Element* element)
   Element *property_element;
 
   string separator = "/";
-# ifdef macintosh
-  separator = ";";
-# endif
 
   if (!DirectivesFile.empty()) { // A directives filename from the command line overrides
     output_file_name = DirectivesFile;      // one found in the config file.
     document = LoadXMLDocument(output_file_name);
   } else if (!element->GetAttributeValue("file").empty()) {
-    output_file_name = element->GetAttributeValue("file");
+    output_file_name = FDMExec->GetRootDir() + element->GetAttributeValue("file");
     document = LoadXMLDocument(output_file_name);
   } else {
     document = element;
   }
 
-  name = document->GetAttributeValue("name");
+  if (!document) return false;
+
+  name = FDMExec->GetRootDir() + document->GetAttributeValue("name");
   type = document->GetAttributeValue("type");
   SetType(type);
   if (!document->GetAttributeValue("port").empty() && type == string("SOCKET")) {
@@ -915,7 +981,7 @@ bool FGOutput::Load(Element* element)
     else
        flightGearSocket = new FGfdmSocket(name, port, FGfdmSocket::ptTCP);  // create tcp socket (default)
   } else {
-    Filename = name;
+    BaseFilename = Filename = name;
   }
   if (!document->GetAttributeValue("rate").empty()) {
     OutRate = (int)document->GetAttributeValueAsNumber("rate");
@@ -964,14 +1030,27 @@ bool FGOutput::Load(Element* element)
     property_element = document->FindNextElement("property");
   }
 
-  OutRate = OutRate>1000?1000:(OutRate<0?0:OutRate);
-  rate = (int)(0.5 + 1.0/(State->Getdt()*OutRate));
+  SetRate(OutRate);
 
   Debug(2);
 
   return true;
 }
 
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGOutput::SetRate(int rtHz)
+{
+  rtHz = rtHz>1000?1000:(rtHz<0?0:rtHz);
+  if (rtHz > 0) {
+    rate = (int)(0.5 + 1.0/(FDMExec->GetDeltaT()*rtHz));
+    Enable();
+  } else {
+    rate = 1;
+    Disable();
+  }
+}
+
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 //    The bitmasked value choices are as follows:
 //    unset: In this case (the default) JSBSim would only print
@@ -1014,9 +1093,10 @@ void FGOutput::Debug(int from)
       }
       switch (Type) {
       case otCSV:
-        cout << scratch << " in CSV format output at rate " << 1/(State->Getdt()*rate) << " Hz" << endl;
+        cout << scratch << " in CSV format output at rate " << 1/(FDMExec->GetDeltaT()*rate) << " Hz" << endl;
         break;
       case otNone:
+      default:
         cout << "  No log output" << endl;
         break;
       }