X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FJSBSim%2Fmodels%2FFGOutput.cpp;h=a974915f4cfd72106cdd10f8810ae7dca7810d07;hb=9da9364a98383bfb6c49cb7366def490ee7b0c7f;hp=cb48ab5542f33d342dcae1554323da95a7e29710;hpb=cf25f69d3639c2e4c821ff7f8ed62b80e8ff495b;p=flightgear.git diff --git a/src/FDM/JSBSim/models/FGOutput.cpp b/src/FDM/JSBSim/models/FGOutput.cpp index cb48ab554..a974915f4 100644 --- a/src/FDM/JSBSim/models/FGOutput.cpp +++ b/src/FDM/JSBSim/models/FGOutput.cpp @@ -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,7 +40,6 @@ INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #include "FGOutput.h" -#include "FGState.h" #include "FGFDMExec.h" #include "FGAtmosphere.h" #include "FGFCS.h" @@ -53,13 +52,17 @@ INCLUDES #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 +#include #include #include +#include #include "input_output/net_fdm.hxx" +#include "input_output/FGfdmSocket.h" #if defined(WIN32) && !defined(__CYGWIN__) # include @@ -70,9 +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) @@ -157,20 +162,17 @@ FGOutput::~FGOutput() bool FGOutput::InitModel(void) { - char fname[1000] = ""; - if (!FGModel::InitModel()) return false; if (Filename.size() > 0 && StartNewFile) { - int idx = BaseFilename.find_last_of("."); - int len = BaseFilename.length(); - string extension = ""; - if (idx != string::npos) { - extension = BaseFilename.substr(idx, len-idx); - len -= extension.length(); + 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++; } - sprintf(fname, "%s_%d%s", BaseFilename.substr(0,len).c_str(), runID_postfix++, extension.c_str()); - Filename = string(fname); + Filename = buf.str(); datafile.close(); StartNewFile = false; dFirstPass = true; @@ -185,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) { @@ -199,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; @@ -227,7 +231,7 @@ void FGOutput::SetType(string type) //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -void FGOutput::DelimitedOutput(string fname) +void FGOutput::DelimitedOutput(const string& fname) { streambuf* buffer; string scratch = ""; @@ -263,7 +267,8 @@ 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; @@ -273,6 +278,7 @@ void FGOutput::DelimitedOutput(string fname) 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) { @@ -330,10 +336,11 @@ void FGOutput::DelimitedOutput(string fname) 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 << "Terrain Radius (ft)"; + outstream << "Terrain Elevation (ft)"; } if (SubSystems & ssCoefficients) { scratch = Aerodynamics->GetCoefficientStrings(delimeter); @@ -361,7 +368,7 @@ void FGOutput::DelimitedOutput(string fname) dFirstPass = false; } - outstream << State->Getsim_time(); + outstream << FDMExec->GetSimTime(); if (SubSystems & ssSimulation) { } if (SubSystems & ssAerosurfaces) { @@ -379,7 +386,8 @@ 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; @@ -389,27 +397,28 @@ void FGOutput::DelimitedOutput(string fname) 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() << delimeter; - outstream << Propulsion->GetForces() << delimeter; - outstream << GroundReactions->GetForces() << delimeter; - outstream << ExternalReactions->GetForces() << delimeter; - outstream << BuoyantForces->GetForces() << 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() << delimeter; - outstream << Propulsion->GetMoments() << delimeter; - outstream << GroundReactions->GetMoments() << delimeter; - outstream << ExternalReactions->GetMoments() << delimeter; - outstream << BuoyantForces->GetMoments() << 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) { @@ -426,9 +435,9 @@ void FGOutput::DelimitedOutput(string fname) } 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); @@ -441,11 +450,12 @@ void FGOutput::DelimitedOutput(string fname) 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->GetLocalTerrainRadius(); + outstream << Propagate->GetTerrainElevation(); outstream.precision(10); } if (SubSystems & ssCoefficients) { @@ -813,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()); @@ -918,7 +928,7 @@ void FGOutput::SocketOutput(void) //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -void FGOutput::SocketStatusOutput(string out_str) +void FGOutput::SocketStatusOutput(const string& out_str) { string asciiData; @@ -948,13 +958,15 @@ bool FGOutput::Load(Element* element) 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")) { @@ -1031,7 +1043,7 @@ void FGOutput::SetRate(int rtHz) { rtHz = rtHz>1000?1000:(rtHz<0?0:rtHz); if (rtHz > 0) { - rate = (int)(0.5 + 1.0/(State->Getdt()*rtHz)); + rate = (int)(0.5 + 1.0/(FDMExec->GetDeltaT()*rtHz)); Enable(); } else { rate = 1; @@ -1081,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; }