From 636b6ca76755df7faa7e61be6300b47f4c00f769 Mon Sep 17 00:00:00 2001 From: janodesbois Date: Thu, 31 Oct 2013 22:29:47 +0100 Subject: [PATCH] pitot adapted to /velocities/mach being the mach norm --- src/Systems/pitot.cxx | 7 ++++++- src/Systems/pitot.hxx | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Systems/pitot.cxx b/src/Systems/pitot.cxx index 4f18431cd..7658f41a0 100644 --- a/src/Systems/pitot.cxx +++ b/src/Systems/pitot.cxx @@ -37,6 +37,8 @@ PitotSystem::init () _serviceable_node = node->getChild("serviceable", 0, true); _pressure_node = fgGetNode("/environment/pressure-inhg", true); _mach_node = fgGetNode("/velocities/mach", true); + _alpha_deg_node = fgGetNode("/orientation/alpha-deg", true); + _beta_deg_node = fgGetNode("/orientation/side-slip-deg", true); _total_pressure_node = node->getChild("total-pressure-inhg", 0, true); _measured_total_pressure_node = node->getChild("measured-total-pressure-inhg", 0, true); } @@ -57,7 +59,10 @@ PitotSystem::update (double dt) if (_serviceable_node->getBoolValue()) { double p = _pressure_node->getDoubleValue(); double mach = _mach_node->getDoubleValue(); - mach = std::max( mach , 0.0 ); + double alpha = _alpha_deg_node->getDoubleValue() * SGD_DEGREES_TO_RADIANS; + double beta = _beta_deg_node->getDoubleValue() * SGD_DEGREES_TO_RADIANS; + mach = mach * fabs(cos(alpha)) * cos(beta); + mach = std::max( mach , 0.0 ); // we want a mach=0 if the airflow comes from behind double p_t = p * pow(1 + 0.2 * mach*mach, 3.5 ); // true total pressure around aircraft _total_pressure_node->setDoubleValue(p_t); double p_t_meas = p_t; diff --git a/src/Systems/pitot.hxx b/src/Systems/pitot.hxx index 7f1e48787..cad000f22 100644 --- a/src/Systems/pitot.hxx +++ b/src/Systems/pitot.hxx @@ -60,6 +60,8 @@ private: SGPropertyNode_ptr _mach_node; SGPropertyNode_ptr _total_pressure_node; SGPropertyNode_ptr _measured_total_pressure_node; + SGPropertyNode_ptr _alpha_deg_node; + SGPropertyNode_ptr _beta_deg_node; }; #endif // __SYSTEMS_PITOT_HXX -- 2.39.5