Update of /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5651/Systems
Modified Files:
Propulsion.cpp
Log Message:
Extend the turbine thurst table to 60000ft and fade to zero thrust at 90000ft
Index: Propulsion.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Propulsion.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** Propulsion.cpp 7 Apr 2017 07:26:19 -0000 1.39
--- Propulsion.cpp 2 May 2017 11:28:07 -0000 1.40
***************
*** 630,634 ****
file << " <independentVar lookup=\"column\">atmosphere/density-altitude</independentVar>" << std::endl;
file << " <tableData>" << std::endl;
! file << " -10000 0 10000 20000 30000 40000 50000 60000" << std::endl;
file << " 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 0" << std::endl;
file << " 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 0" << std::endl;
--- 630,634 ----
file << " <independentVar lookup=\"column\">atmosphere/density-altitude</independentVar>" << std::endl;
file << " <tableData>" << std::endl;
! file << " -10000 0 10000 20000 30000 40000 50000 90000" << std::endl;
file << " 0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 0" << std::endl;
file << " 0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 0" << std::endl;
***************
*** 646,650 ****
file << " <independentVar lookup=\"column\">atmosphere/density-altitude</independentVar>" << std::endl;
file << " <tableData>" << std::endl;
! file << " -10000 0 10000 20000 30000 40000 50000 60000" << std::endl;
for (unsigned i=0; i<8; ++i)
--- 646,650 ----
file << " <independentVar lookup=\"column\">atmosphere/density-altitude</independentVar>" << std::endl;
file << " <tableData>" << std::endl;
! file << " -10000 0 10000 20000 30000 40000 50000 60000 90000" << std::endl;
for (unsigned i=0; i<8; ++i)
***************
*** 657,660 ****
--- 657,661 ----
file << (1.0f - 0.11*M*_bypass_ratio)*_milthrust_t[i][j];
}
+ file << std::fixed << std::setw(3) << "0";
file << std::endl;
}
***************
*** 941,952 ****
float const TurbineEngine::_milthrust_t[8][8] =
{
! { 1.2600f, 1.0000f, 0.7400f, 0.5340f, 0.3720f, 0.2410f, 0.1490f, 0.0f, },
! { 1.1710f, 0.9340f, 0.6970f, 0.5060f, 0.3550f, 0.2310f, 0.1430f, 0.0f, },
! { 1.1500f, 0.9210f, 0.6920f, 0.5060f, 0.3570f, 0.2330f, 0.1450f, 0.0f, },
! { 1.1810f, 0.9510f, 0.7210f, 0.5320f, 0.3780f, 0.2480f, 0.1540f, 0.0f, },
! { 1.2580f, 1.0200f, 0.7820f, 0.5820f, 0.4170f, 0.2750f, 0.1700f, 0.0f, },
! { 1.3690f, 1.1200f, 0.8710f, 0.6510f, 0.4750f, 0.3150f, 0.1950f, 0.0f, },
! { 1.4850f, 1.2300f, 0.9750f, 0.7440f, 0.5450f, 0.3640f, 0.2250f, 0.0f, },
! { 1.5941f, 1.3400f, 1.0860f, 0.8450f, 0.6280f, 0.4240f, 0.2630f, 0.0f, }
};
--- 942,953 ----
float const TurbineEngine::_milthrust_t[8][8] =
{
! { 1.2600f, 1.0000f, 0.7400f, 0.5340f, 0.3720f, 0.2410f, 0.1490f, 0.058f },
! { 1.1710f, 0.9340f, 0.6970f, 0.5060f, 0.3550f, 0.2310f, 0.1430f, 0.040f },
! { 1.1500f, 0.9210f, 0.6920f, 0.5060f, 0.3570f, 0.2330f, 0.1450f, 0.043f },
! { 1.1810f, 0.9510f, 0.7210f, 0.5320f, 0.3780f, 0.2480f, 0.1540f, 0.047f },
! { 1.2580f, 1.0200f, 0.7820f, 0.5820f, 0.4170f, 0.2750f, 0.1700f, 0.053f },
! { 1.3690f, 1.1200f, 0.8710f, 0.6510f, 0.4750f, 0.3150f, 0.1950f, 0.063f },
! { 1.4850f, 1.2300f, 0.9750f, 0.7440f, 0.5450f, 0.3640f, 0.2250f, 0.074f },
! { 1.5941f, 1.3400f, 1.0860f, 0.8450f, 0.6280f, 0.4240f, 0.2630f, 0.090f }
};
|
