X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FJSBSim%2Fmodels%2FFGAtmosphere.cpp;h=7113fc3ca45df8d7d6a1c6043c597bc1b1fa4f0c;hb=642735ab18421db87a07d6841dd720fd4615bfff;hp=23d96f00da06f02385f3d7256c935aafc87f8061;hpb=31e3caa4f6ba19dd05f582870e719fc5dbe0950a;p=flightgear.git diff --git a/src/FDM/JSBSim/models/FGAtmosphere.cpp b/src/FDM/JSBSim/models/FGAtmosphere.cpp index 23d96f00d..7113fc3ca 100644 --- a/src/FDM/JSBSim/models/FGAtmosphere.cpp +++ b/src/FDM/JSBSim/models/FGAtmosphere.cpp @@ -1,94 +1,69 @@ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Module: FGAtmosphere.cpp - Author: Jon Berndt - Implementation of 1959 Standard Atmosphere added by Tony Peden - Date started: 11/24/98 - Purpose: Models the atmosphere - Called by: FGSimExec + Author: Jon Berndt, Tony Peden + Date started: 6/2011 + Purpose: Models an atmosphere interface class + Called by: FGFDMExec - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2011 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 General Public License as published by the Free Software + the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU General Public License along with + You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - Further information about the GNU General Public License can also be found on + Further information about the GNU Lesser General Public License can also be found on the world wide web at http://www.gnu.org. FUNCTIONAL DESCRIPTION -------------------------------------------------------------------------------- -Models the atmosphere. The equation used below was determined by a third order -curve fit using Excel. The data is from the ICAO atmosphere model. +This models a base atmosphere class to serve as a common interface to any derived +atmosphere models. HISTORY -------------------------------------------------------------------------------- -11/24/98 JSB Created -07/23/99 TP Added implementation of 1959 Standard Atmosphere - Moved calculation of Mach number to FGPropagate - Later updated to '76 model +6/18/2011 Started Jon S. Berndt + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% COMMENTS, REFERENCES, and NOTES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -[1] Anderson, John D. "Introduction to Flight, Third Edition", McGraw-Hill, - 1989, ISBN 0-07-001641-0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ +#include +#include +#include +#include "FGFDMExec.h" #include "FGAtmosphere.h" -#include -#include -#include "FGAircraft.h" -#include "FGPropagate.h" -#include "FGInertial.h" -#include namespace JSBSim { -static const char *IdSrc = "$Id$"; +static const char *IdSrc = "$Id: FGAtmosphere.cpp,v 1.51 2012/04/13 13:18:28 jberndt Exp $"; static const char *IdHdr = ID_ATMOSPHERE; /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% CLASS IMPLEMENTATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ - -FGAtmosphere::FGAtmosphere(FGFDMExec* fdmex) : FGModel(fdmex) +FGAtmosphere::FGAtmosphere(FGFDMExec* fdmex) : FGModel(fdmex), + PressureAltitude(0.0), // ft + DensityAltitude(0.0), // ft + SutherlandConstant(198.72), // deg Rankine + Beta(2.269690E-08) // slug/(sec ft R^0.5) { Name = "FGAtmosphere"; - lastIndex = 0; - h = 0.0; - psiw = 0.0; - htab[0]=0; - htab[1]=36089.239; - htab[2]=65616.798; - htab[3]=104986.878; - htab[4]=154199.475; - htab[5]=170603.675; - htab[6]=200131.234; - htab[7]=259186.352; //ft. - - MagnitudedAccelDt = MagnitudeAccel = Magnitude = 0.0; -// turbType = ttNone; - turbType = ttStandard; -// turbType = ttBerndt; - TurbGain = 0.0; - TurbRate = 1.0; - - T_dev_sl = T_dev = delta_T = 0.0; - StandardTempOnly = false; bind(); Debug(0); @@ -98,7 +73,6 @@ FGAtmosphere::FGAtmosphere(FGFDMExec* fdmex) : FGModel(fdmex) FGAtmosphere::~FGAtmosphere() { - unbind(); Debug(1); } @@ -106,403 +80,149 @@ FGAtmosphere::~FGAtmosphere() bool FGAtmosphere::InitModel(void) { - FGModel::InitModel(); - - UseInternal(); // this is the default + Calculate(0.0); + SLtemperature = Temperature = 518.67; + SLpressure = Pressure = 2116.22; + SLdensity = Density = Pressure/(Reng*Temperature); + SLsoundspeed = Soundspeed = sqrt(SHRatio*Reng*(Temperature)); - Calculate(h); - StdSLtemperature = SLtemperature = 518.67; - StdSLpressure = SLpressure = 2116.22; - StdSLdensity = SLdensity = 0.00237767; - StdSLsoundspeed = SLsoundspeed = sqrt(SHRatio*Reng*StdSLtemperature); - rSLtemperature = 1.0/StdSLtemperature; - rSLpressure = 1.0/StdSLpressure; - rSLdensity = 1.0/StdSLdensity; - rSLsoundspeed = 1.0/StdSLsoundspeed; + rSLtemperature = 1/SLtemperature ; + rSLpressure = 1/SLpressure ; + rSLdensity = 1/SLdensity ; + rSLsoundspeed = 1/SLsoundspeed ; return true; } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -bool FGAtmosphere::Run(void) +bool FGAtmosphere::Run(bool Holding) { - if (FGModel::Run()) return true; - if (FDMExec->Holding()) return false; + if (FGModel::Run(Holding)) return true; + if (Holding) return false; - T_dev = 0.0; - h = Propagate->Geth(); - - if (!useExternal) { - Calculate(h); - CalculateDerived(); - } else { - CalculateDerived(); - } + Calculate(in.altitudeASL); Debug(2); return false; } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -// -// See reference 1 void FGAtmosphere::Calculate(double altitude) { - double slope, reftemp, refpress; - int i = 0; - - i = lastIndex; - if (altitude < htab[lastIndex]) { - if (altitude <= 0) { - i = 0; - altitude=0; - } else { - i = lastIndex-1; - while (htab[i] > altitude) i--; - } - } else if (altitude > htab[lastIndex+1]) { - if (altitude >= htab[7]) { - i = 7; - altitude = htab[7]; - } else { - i = lastIndex+1; - while (htab[i+1] < altitude) i++; - } - } - - switch(i) { - case 1: // 36089 ft. - slope = 0; - reftemp = 389.97; - refpress = 472.452; - //refdens = 0.000706032; - break; - case 2: // 65616 ft. - slope = 0.00054864; - reftemp = 389.97; - refpress = 114.636; - //refdens = 0.000171306; - break; - case 3: // 104986 ft. - slope = 0.00153619; - reftemp = 411.57; - refpress = 8.36364; - //refdens = 1.18422e-05; - break; - case 4: // 154199 ft. - slope = 0; - reftemp = 487.17; - refpress = 0.334882; - //refdens = 4.00585e-7; - break; - case 5: // 170603 ft. - slope = -0.00109728; - reftemp = 487.17; - refpress = 0.683084; - //refdens = 8.17102e-7; - break; - case 6: // 200131 ft. - slope = -0.00219456; - reftemp = 454.17; - refpress = 0.00684986; - //refdens = 8.77702e-9; - break; - case 7: // 259186 ft. - slope = 0; - reftemp = 325.17; - refpress = 0.000122276; - //refdens = 2.19541e-10; - break; - case 0: - default: // sea level - slope = -0.00356616; // R/ft. - reftemp = 518.67; // R - refpress = 2116.22; // psf - //refdens = 0.00237767; // slugs/cubic ft. - break; - - } - - // If delta_T is set, then that is our temperature deviation at any altitude. - // If not, then we'll estimate a deviation based on the sea level deviation (if set). - - if(!StandardTempOnly) { - T_dev = 0.0; - if (delta_T != 0.0) { - T_dev = delta_T; - } else { - if ((altitude < 36089.239) && (T_dev_sl != 0.0)) { - T_dev = T_dev_sl * ( 1.0 - (altitude/36089.239)); - } - } - reftemp+=T_dev; - } - - if (slope == 0) { - intTemperature = reftemp; - intPressure = refpress*exp(-Inertial->SLgravity()/(reftemp*Reng)*(altitude-htab[i])); - intDensity = intPressure/(Reng*intTemperature); - } else { - intTemperature = reftemp+slope*(altitude-htab[i]); - intPressure = refpress*pow(intTemperature/reftemp,-Inertial->SLgravity()/(slope*Reng)); - intDensity = intPressure/(Reng*intTemperature); - } - - lastIndex=i; + Temperature = GetTemperature(altitude); + Pressure = GetPressure(altitude); + Density = Pressure/(Reng*Temperature); + Soundspeed = sqrt(SHRatio*Reng*(Temperature)); + PressureAltitude = altitude; + DensityAltitude = altitude; + + Viscosity = Beta * pow(Temperature, 1.5) / (SutherlandConstant + Temperature); + KinematicViscosity = Viscosity / Density; } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -// Calculate parameters derived from T, P and rho -void FGAtmosphere::CalculateDerived(void) +void FGAtmosphere::SetPressureSL(ePressure unit, double pressure) { - T_dev = (*temperature) - GetTemperature(h); - density_altitude = h + T_dev * 66.7; - - if (turbType != ttStandard) { - Turbulence(); - vWindNED += vTurbulence; - } - if (vWindNED(1) != 0.0) psiw = atan2( vWindNED(2), vWindNED(1) ); - if (psiw < 0) psiw += 2*M_PI; + double press = ConvertToPSF(pressure, unit); - soundspeed = sqrt(SHRatio*Reng*(*temperature)); + SLpressure = press; } - //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -// Get the standard atmospheric properties at a specified altitude - -void FGAtmosphere::GetStdAtmosphere(double altitude) { - StandardTempOnly = true; - Calculate(altitude); - StandardTempOnly = false; - atmosphere.Temperature = intTemperature; - atmosphere.Pressure = intPressure; - atmosphere.Density = intDensity; - - // Reset the internal atmospheric state - Calculate(h); -} +// Get the modeled density at a specified altitude -//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -// Get the standard pressure at a specified altitude - -double FGAtmosphere::GetPressure(double altitude) { - GetStdAtmosphere(altitude); - return atmosphere.Pressure; -} - -//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -// Get the standard temperature at a specified altitude - -double FGAtmosphere::GetTemperature(double altitude) { - GetStdAtmosphere(altitude); - return atmosphere.Temperature; -} - -//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -// Get the standard density at a specified altitude - -double FGAtmosphere::GetDensity(double altitude) { - GetStdAtmosphere(altitude); - return atmosphere.Density; +double FGAtmosphere::GetDensity(double altitude) const +{ + return GetPressure(altitude)/(Reng * GetTemperature(altitude)); } - //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -// square a value, but preserve the original sign +// This function sets the sea level temperature. +// Internally, the Rankine scale is used for calculations, so any temperature +// supplied must be converted to that unit. -static inline double square_signed (double value) +void FGAtmosphere::SetTemperatureSL(double t, eTemperature unit) { - if (value < 0) - return value * value * -1; - else - return value * value; + SLtemperature = ConvertToRankine(t, unit); } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -void FGAtmosphere::Turbulence(void) +double FGAtmosphere::ConvertToRankine(double t, eTemperature unit) const { - switch (turbType) { - case ttStandard: { - vDirectiondAccelDt(eX) = 1 - 2.0*(double(rand())/double(RAND_MAX)); - vDirectiondAccelDt(eY) = 1 - 2.0*(double(rand())/double(RAND_MAX)); - vDirectiondAccelDt(eZ) = 1 - 2.0*(double(rand())/double(RAND_MAX)); - - MagnitudedAccelDt = 1 - 2.0*(double(rand())/double(RAND_MAX)) - Magnitude; - // Scale the magnitude so that it moves - // away from the peaks - MagnitudedAccelDt = ((MagnitudedAccelDt - Magnitude) / - (1 + fabs(Magnitude))); - MagnitudeAccel += MagnitudedAccelDt*rate*TurbRate*State->Getdt(); - Magnitude += MagnitudeAccel*rate*State->Getdt(); - - vDirectiondAccelDt.Normalize(); - - // deemphasise non-vertical forces - vDirectiondAccelDt(eX) = square_signed(vDirectiondAccelDt(eX)); - vDirectiondAccelDt(eY) = square_signed(vDirectiondAccelDt(eY)); - - vDirectionAccel += vDirectiondAccelDt*rate*TurbRate*State->Getdt(); - vDirectionAccel.Normalize(); - vDirection += vDirectionAccel*rate*State->Getdt(); - - vDirection.Normalize(); - - // Diminish turbulence within three wingspans - // of the ground - vTurbulence = TurbGain * Magnitude * vDirection; - double HOverBMAC = Auxiliary->GetHOverBMAC(); - if (HOverBMAC < 3.0) - vTurbulence *= (HOverBMAC / 3.0) * (HOverBMAC / 3.0); - - vTurbulenceGrad = TurbGain*MagnitudeAccel * vDirection; - - vBodyTurbGrad = Propagate->GetTl2b()*vTurbulenceGrad; - - if (Aircraft->GetWingSpan() > 0) { - vTurbPQR(eP) = vBodyTurbGrad(eY)/Aircraft->GetWingSpan(); - } else { - vTurbPQR(eP) = vBodyTurbGrad(eY)/30.0; - } -// if (Aircraft->GetHTailArm() != 0.0) -// vTurbPQR(eQ) = vBodyTurbGrad(eZ)/Aircraft->GetHTailArm(); -// else -// vTurbPQR(eQ) = vBodyTurbGrad(eZ)/10.0; - - if (Aircraft->GetVTailArm() > 0) - vTurbPQR(eR) = vBodyTurbGrad(eX)/Aircraft->GetVTailArm(); - else - vTurbPQR(eR) = vBodyTurbGrad(eX)/10.0; - - // Clear the horizontal forces - // actually felt by the plane, now - // that we've used them to calculate - // moments. - vTurbulence(eX) = 0.0; - vTurbulence(eY) = 0.0; + double targetTemp=0; // in degrees Rankine + switch(unit) { + case eFahrenheit: + targetTemp = t + 459.67; break; - } - case ttBerndt: { - vDirectiondAccelDt(eX) = 1 - 2.0*(double(rand())/double(RAND_MAX)); - vDirectiondAccelDt(eY) = 1 - 2.0*(double(rand())/double(RAND_MAX)); - vDirectiondAccelDt(eZ) = 1 - 2.0*(double(rand())/double(RAND_MAX)); - - - MagnitudedAccelDt = 1 - 2.0*(double(rand())/double(RAND_MAX)) - Magnitude; - MagnitudeAccel += MagnitudedAccelDt*rate*State->Getdt(); - Magnitude += MagnitudeAccel*rate*State->Getdt(); - - vDirectiondAccelDt.Normalize(); - vDirectionAccel += vDirectiondAccelDt*rate*State->Getdt(); - vDirectionAccel.Normalize(); - vDirection += vDirectionAccel*rate*State->Getdt(); - - // Diminish z-vector within two wingspans - // of the ground - double HOverBMAC = Auxiliary->GetHOverBMAC(); - if (HOverBMAC < 2.0) - vDirection(eZ) *= HOverBMAC / 2.0; - - vDirection.Normalize(); - - vTurbulence = TurbGain*Magnitude * vDirection; - vTurbulenceGrad = TurbGain*MagnitudeAccel * vDirection; - - vBodyTurbGrad = Propagate->GetTl2b()*vTurbulenceGrad; - vTurbPQR(eP) = vBodyTurbGrad(eY)/Aircraft->GetWingSpan(); - if (Aircraft->GetHTailArm() > 0) - vTurbPQR(eQ) = vBodyTurbGrad(eZ)/Aircraft->GetHTailArm(); - else - vTurbPQR(eQ) = vBodyTurbGrad(eZ)/10.0; - - if (Aircraft->GetVTailArm() > 0) - vTurbPQR(eR) = vBodyTurbGrad(eX)/Aircraft->GetVTailArm(); - else - vTurbPQR(eR) = vBodyTurbGrad(eX)/10.0; - + case eCelsius: + targetTemp = t*9.0/5.0 + 32.0 + 459.67; + break; + case eRankine: + targetTemp = t; + break; + case eKelvin: + targetTemp = t*9.0/5.0; break; - } default: break; } + + return targetTemp; } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -void FGAtmosphere::UseExternal(void) +double FGAtmosphere::ConvertToPSF(double p, ePressure unit) const { - temperature=&exTemperature; - pressure=&exPressure; - density=&exDensity; - useExternal=true; -} + double targetPressure=0; // Pressure in PSF -//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + switch(unit) { + case ePSF: + targetPressure = p; + break; + case eMillibars: + targetPressure = p*2.08854342; + break; + case ePascals: + targetPressure = p*0.0208854342; + break; + case eInchesHg: + targetPressure = p*70.7180803; + break; + default: + throw("Undefined pressure unit given"); + } -void FGAtmosphere::UseInternal(void) -{ - temperature=&intTemperature; - pressure=&intPressure; - density=&intDensity; - useExternal=false; + return targetPressure; } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% void FGAtmosphere::bind(void) { - typedef double (FGAtmosphere::*PMF)(int) const; - typedef double (FGAtmosphere::*PMFv)(void) const; - PropertyManager->Tie("atmosphere/T-R", this, (PMFv)&FGAtmosphere::GetTemperature); - PropertyManager->Tie("atmosphere/rho-slugs_ft3", this, (PMFv)&FGAtmosphere::GetDensity); - PropertyManager->Tie("atmosphere/P-psf", this, (PMFv)&FGAtmosphere::GetPressure); + typedef double (FGAtmosphere::*PMFi)(int) const; + typedef void (FGAtmosphere::*PMF)(int, double); + PropertyManager->Tie("atmosphere/T-R", this, &FGAtmosphere::GetTemperature); + PropertyManager->Tie("atmosphere/rho-slugs_ft3", this, &FGAtmosphere::GetDensity); + PropertyManager->Tie("atmosphere/P-psf", this, &FGAtmosphere::GetPressure); PropertyManager->Tie("atmosphere/a-fps", this, &FGAtmosphere::GetSoundSpeed); PropertyManager->Tie("atmosphere/T-sl-R", this, &FGAtmosphere::GetTemperatureSL); PropertyManager->Tie("atmosphere/rho-sl-slugs_ft3", this, &FGAtmosphere::GetDensitySL); - PropertyManager->Tie("atmosphere/P-sl-psf", this, &FGAtmosphere::GetPressureSL); +// PropertyManager->Tie("atmosphere/P-sl-psf", this, ePSF, +// (PMFi)&FGAtmosphere::GetPressureSL, +// (PMF)&FGAtmosphere::SetPressureSL); PropertyManager->Tie("atmosphere/a-sl-fps", this, &FGAtmosphere::GetSoundSpeedSL); PropertyManager->Tie("atmosphere/theta", this, &FGAtmosphere::GetTemperatureRatio); PropertyManager->Tie("atmosphere/sigma", this, &FGAtmosphere::GetDensityRatio); PropertyManager->Tie("atmosphere/delta", this, &FGAtmosphere::GetPressureRatio); PropertyManager->Tie("atmosphere/a-ratio", this, &FGAtmosphere::GetSoundSpeedRatio); - PropertyManager->Tie("atmosphere/psiw-rad", this, &FGAtmosphere::GetWindPsi); - PropertyManager->Tie("atmosphere/delta-T", this, &FGAtmosphere::GetDeltaT, &FGAtmosphere::SetDeltaT); - PropertyManager->Tie("atmosphere/T-sl-dev-F", this, &FGAtmosphere::GetSLTempDev, &FGAtmosphere::SetSLTempDev); PropertyManager->Tie("atmosphere/density-altitude", this, &FGAtmosphere::GetDensityAltitude); - PropertyManager->Tie("atmosphere/p-turb-rad_sec", this,1, (PMF)&FGAtmosphere::GetTurbPQR); - PropertyManager->Tie("atmosphere/q-turb-rad_sec", this,2, (PMF)&FGAtmosphere::GetTurbPQR); - PropertyManager->Tie("atmosphere/r-turb-rad_sec", this,3, (PMF)&FGAtmosphere::GetTurbPQR); -} - -//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -void FGAtmosphere::unbind(void) -{ - PropertyManager->Untie("atmosphere/T-R"); - PropertyManager->Untie("atmosphere/rho-slugs_ft3"); - PropertyManager->Untie("atmosphere/P-psf"); - PropertyManager->Untie("atmosphere/a-fps"); - PropertyManager->Untie("atmosphere/T-sl-R"); - PropertyManager->Untie("atmosphere/rho-sl-slugs_ft3"); - PropertyManager->Untie("atmosphere/P-sl-psf"); - PropertyManager->Untie("atmosphere/a-sl-fps"); - PropertyManager->Untie("atmosphere/delta-T"); - PropertyManager->Untie("atmosphere/T-sl-dev-F"); - PropertyManager->Untie("atmosphere/density-altitude"); - PropertyManager->Untie("atmosphere/theta"); - PropertyManager->Untie("atmosphere/sigma"); - PropertyManager->Untie("atmosphere/delta"); - PropertyManager->Untie("atmosphere/a-ratio"); - PropertyManager->Untie("atmosphere/psiw-rad"); - PropertyManager->Untie("atmosphere/p-turb-rad_sec"); - PropertyManager->Untie("atmosphere/q-turb-rad_sec"); - PropertyManager->Untie("atmosphere/r-turb-rad_sec"); + PropertyManager->Tie("atmosphere/pressure-altitude", this, &FGAtmosphere::GetPressureAltitude); } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -533,8 +253,8 @@ void FGAtmosphere::Debug(int from) } } if (debug_lvl & 2 ) { // Instantiation/Destruction notification - if (from == 0) cout << "Instantiated: FGAtmosphere" << endl; - if (from == 1) cout << "Destroyed: FGAtmosphere" << endl; + if (from == 0) std::cout << "Instantiated: FGAtmosphere" << std::endl; + if (from == 1) std::cout << "Destroyed: FGAtmosphere" << std::endl; } if (debug_lvl & 4 ) { // Run() method entry print for FGModel-derived objects } @@ -542,21 +262,12 @@ void FGAtmosphere::Debug(int from) } if (debug_lvl & 16) { // Sanity checking } - if (debug_lvl & 128) { // Turbulence - if (frame == 0 && from == 2) { - cout << "vTurbulence(X), vTurbulence(Y), vTurbulence(Z), " - << "vTurbulenceGrad(X), vTurbulenceGrad(Y), vTurbulenceGrad(Z), " - << "vDirection(X), vDirection(Y), vDirection(Z), " - << "Magnitude, " - << "vTurbPQR(P), vTurbPQR(Q), vTurbPQR(R), " << endl; - } else if (from == 2) { - cout << vTurbulence << ", " << vTurbulenceGrad << ", " << vDirection << ", " << Magnitude << ", " << vTurbPQR << endl; - } + if (debug_lvl & 128) { // } if (debug_lvl & 64) { if (from == 0) { // Constructor - cout << IdSrc << endl; - cout << IdHdr << endl; + std::cout << IdSrc << std::endl; + std::cout << IdHdr << std::endl; } } }