From 98cd4a9086740b2ff7779fa9502ef07554ffa9fa Mon Sep 17 00:00:00 2001 From: mfranz Date: Mon, 17 Jul 2006 18:14:31 +0000 Subject: [PATCH] only consider positive airspeed in longitudinal axis --- src/Systems/pitot.cxx | 14 ++++++++------ src/Systems/pitot.hxx | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Systems/pitot.cxx b/src/Systems/pitot.cxx index 78d1d2bd3..136533f1b 100644 --- a/src/Systems/pitot.cxx +++ b/src/Systems/pitot.cxx @@ -3,10 +3,12 @@ // // This file is in the Public Domain and comes with no warranty. -#include "pitot.hxx" +#include + #include
#include
+#include "pitot.hxx" PitotSystem::PitotSystem ( SGPropertyNode *node ) @@ -53,6 +55,7 @@ PitotSystem::init () _pressure_node = fgGetNode("/environment/pressure-inhg", true); _density_node = fgGetNode("/environment/density-slugft3", true); _velocity_node = fgGetNode("/velocities/airspeed-kt", true); + _slip_angle = fgGetNode("/orientation/side-slip-rad", true); _total_pressure_node = node->getChild("total-pressure-inhg", 0, true); } @@ -74,10 +77,6 @@ PitotSystem::unbind () # define PSFTOINHG (1/INHGTOPSF) #endif -#ifndef KTTOFPS -# define KTTOFPS 1.68781 -#endif - void PitotSystem::update (double dt) @@ -87,7 +86,10 @@ PitotSystem::update (double dt) // velocity in the body axis. double p = _pressure_node->getDoubleValue() * INHGTOPSF; double r = _density_node->getDoubleValue(); - double v = _velocity_node->getDoubleValue() * KTTOFPS; + double v = _velocity_node->getDoubleValue() * SG_KT_TO_FPS; + v *= cos(_slip_angle->getDoubleValue()); + if (v < 0.0) + v = 0.0; double q = 0.5 * r * v * v; // dynamic _total_pressure_node->setDoubleValue((p + q) * PSFTOINHG); } diff --git a/src/Systems/pitot.hxx b/src/Systems/pitot.hxx index e606fe4e6..b0c39b31c 100644 --- a/src/Systems/pitot.hxx +++ b/src/Systems/pitot.hxx @@ -59,8 +59,8 @@ private: SGPropertyNode_ptr _pressure_node; SGPropertyNode_ptr _density_node; SGPropertyNode_ptr _velocity_node; + SGPropertyNode_ptr _slip_angle; SGPropertyNode_ptr _total_pressure_node; - }; #endif // __SYSTEMS_PITOT_HXX