fly/flightgear
1
0
Fork 0
Code Activity

YASim: convert local variables alpha and stallAlpha to members of Surface.

Browse source
This commit is contained in:
Henning Stahlke 2017-02-24 20:47:08 +01:00
parent 5f78545961
commit 4cbe540bec
2 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/FDM/YASim/Surface.cpp
View file

@ -224,12 +224,6 @@ void Surface::calcForce(float* v, float rho, float* out, float* torque)
// Diddle the Z force according to our configuration // Diddle the Z force according to our configuration
float stallMul = stallFunc(out); float stallMul = stallFunc(out);
if (_surfN != 0) {
_surfN->getNode("wind-loc-x", true)->setFloatValue(lwind[0]);
_surfN->getNode("wind-loc-y", true)->setFloatValue(lwind[1]);
_surfN->getNode("wind-loc-z", true)->setFloatValue(lwind[2]);
_surfN->getNode("stall-base-factor", true)->setFloatValue(stallMul);
}
stallMul *= 1 + _spoilerPos * (_spoilerLift - 1); stallMul *= 1 + _spoilerPos * (_spoilerLift - 1);
float stallLift = (stallMul - 1) * _cz * out[2]; float stallLift = (stallMul - 1) * _cz * out[2];
float flaplift = flapLift(out[2]); float flaplift = flapLift(out[2]);
@ -310,43 +304,40 @@ float Surface::stallFunc(float* v)
// Sanity check to treat FPU psychopathology // Sanity check to treat FPU psychopathology
if(v[0] == 0) return 1; if(v[0] == 0) return 1;
float alpha = Math::abs(v[2]/v[0]); _alpha = Math::abs(v[2]/v[0]);
if (_surfN != 0)
_surfN->getNode("alpha-deg", true)->setFloatValue(alpha*57.295779513);
// Wacky use of indexing, see setStall*() methods. // Wacky use of indexing, see setStall*() methods.
int fwdBak = v[0] > 0; // set if this is "backward motion" int fwdBak = v[0] > 0; // set if this is "backward motion"
int posNeg = v[2] < 0; // set if the airflow is toward -z int posNeg = v[2] < 0; // set if the airflow is toward -z
int i = (fwdBak<<1) | posNeg; int i = (fwdBak<<1) | posNeg;
if (_surfN != 0)
_surfN->getNode("mode", true)->setValue(i);
float stallAlpha = _stalls[i]; _stallAlpha = _stalls[i];
if(stallAlpha == 0) if(_stallAlpha == 0)
return 1; return 1;
// consider slat position, moves the stall aoa some degrees
if(i == 0) { if(i == 0) {
if( _version->isVersionOrNewer( Version::YASIM_VERSION_32 )) { if( _version->isVersionOrNewer( Version::YASIM_VERSION_32 )) {
stallAlpha += _slatPos * _slatAlpha; _stallAlpha += _slatPos * _slatAlpha;
} else { } else {
stallAlpha += _slatAlpha; _stallAlpha += _slatAlpha;
} }
} }
// Beyond the stall // Beyond the stall
if(alpha > stallAlpha+_widths[i]) if(_alpha > _stallAlpha+_widths[i])
return 1; return 1;
// (note mask: we want to use the "positive" stall angle here) // (note mask: we want to use the "positive" stall angle here)
float scale = 0.5f*_peaks[fwdBak]/_stalls[i&2]; float scale = 0.5f*_peaks[fwdBak]/_stalls[i&2];
// Before the stall // Before the stall
if(alpha <= stallAlpha) if(_alpha <= _stallAlpha)
return scale; return scale;
// Inside the stall. Compute a cubic interpolation between the // Inside the stall. Compute a cubic interpolation between the
// pre-stall "scale" value and the post-stall unity. // pre-stall "scale" value and the post-stall unity.
float frac = (alpha - stallAlpha) / _widths[i]; float frac = (_alpha - _stallAlpha) / _widths[i];
frac = frac*frac*(3-2*frac); frac = frac*frac*(3-2*frac);
return scale*(1-frac) + frac; return scale*(1-frac) + frac;

4
src/FDM/YASim/Surface.hpp
View file

@ -115,6 +115,10 @@ private:
float _twist; float _twist;
float _inducedDrag; float _inducedDrag;
// used during calculations
float _stallAlpha;
float _alpha;
Version * _version; Version * _version;
}; };