|
From: Erik H. <eh...@us...> - 2015-10-26 18:05:16
|
Update of /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29023/Systems Modified Files: Propulsion.cpp Speedbrake.cpp Log Message: Fix CD for Speedbrake Add the option to write to separate System files Index: Propulsion.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Propulsion.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** Propulsion.cpp 26 Oct 2015 11:50:41 -0000 1.20 --- Propulsion.cpp 26 Oct 2015 18:05:13 -0000 1.21 *************** *** 697,701 **** file << " Outputs:" << std::endl; file << " psfc: " << std::setprecision(3) << psfc << std::setprecision(1) << " lbs/hr/hp" << std::endl; ! file << " engine mass: " << (0.246f * _power * KG_TO_LBS) << " lbs" << std::endl; file << " engine length: " << (0.1068f * powf(_power, 0.4094f) * METER_TO_FEET) << " ft" << std::endl; file << " engine diameter: " << (0.1159f * powf(_power, 0.2483f) * METER_TO_FEET) << " ft" <<std::endl; --- 697,701 ---- file << " Outputs:" << std::endl; file << " psfc: " << std::setprecision(3) << psfc << std::setprecision(1) << " lbs/hr/hp" << std::endl; ! file << " engine weight: " << (0.246f * _power * KG_TO_LBS) << " lbs" << std::endl; file << " engine length: " << (0.1068f * powf(_power, 0.4094f) * METER_TO_FEET) << " ft" << std::endl; file << " engine diameter: " << (0.1159f * powf(_power, 0.2483f) * METER_TO_FEET) << " ft" <<std::endl; Index: Speedbrake.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Speedbrake.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Speedbrake.cpp 20 Oct 2015 14:20:37 -0000 1.3 --- Speedbrake.cpp 26 Oct 2015 18:05:13 -0000 1.4 *************** *** 81,85 **** { 0.00f, 0.00f, 0.00f, 0.00f, 0.00f }, // LIGHT { 0.00f, 0.00f, 0.00f, 0.00f, 0.00f }, // PERFORMANCE ! { 0.60f, 0.60f, 0.80f, 0.80f, 0.80f }, // FIGHTER { 0.12f, 0.12f, 0.12f, 0.12f, 0.12f }, // JET_TRANSPORT { 0.00f, 0.00f, 0.00f, 0.00f, 0.00f } // PROP_TRANSPORT --- 81,85 ---- { 0.00f, 0.00f, 0.00f, 0.00f, 0.00f }, // LIGHT { 0.00f, 0.00f, 0.00f, 0.00f, 0.00f }, // PERFORMANCE ! { 0.06f, 0.06f, 0.08f, 0.08f, 0.08f }, // FIGHTER { 0.12f, 0.12f, 0.12f, 0.12f, 0.12f }, // JET_TRANSPORT { 0.00f, 0.00f, 0.00f, 0.00f, 0.00f } // PROP_TRANSPORT |