Update of /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv318/Systems
Modified Files:
Controls.cpp Flaps.cpp LandingGear.cpp
Log Message:
Set the unit of wing_incidence to DEG, Fix the naming of wing root chord and always add fcs/gear-no-wow
Index: Controls.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Controls.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** Controls.cpp 3 Sep 2016 09:45:56 -0000 1.49
--- Controls.cpp 24 Nov 2016 09:59:34 -0000 1.50
***************
*** 339,342 ****
--- 339,343 ----
float dcgx = -(cg_loc[X] - _aircraft->_aero_rp[X])*INCH_TO_FEET;
+ // fuselage component: L = fuselage length, D = fuselage max. diameter.
float dwf = L/_aircraft->_aero_rp[X];
float Kf = 0.033f + 0.538f*dwf + 1.5f*dwf*dwf;
Index: Flaps.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Flaps.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Flaps.cpp 27 Nov 2015 10:23:53 -0000 1.8
--- Flaps.cpp 24 Nov 2016 09:59:34 -0000 1.9
***************
*** 123,126 ****
--- 123,148 ----
return file.str();
}
+
+ #if 0
+ std::string Flaps:pitch()
+ {
+ float dCLflaps = _dCLflaps_t[_aircraft->_atype][_aircraft->_engines];
+
+ file.precision(4);
+ file << std::fixed << std::showpoint;
+ file << " <function name=\"aero/moment/Pitch_flap\">" << std::endl;
+ file << " <description>Pitch moment due to flaps</description>" << std::endl;
+ file << " <product>" << std::endl;
+ file << " <property>aero/qbar-psf</property>" << std::endl;
+ file << " <property>metrics/Sw-sqft</property>" << std::endl;
+ file << " <property>metrics/cbarw-ft</property>" << std::endl;
+ file << " <property>fcs/flap-pos-deg</property>" << std::endl;
+ file << " <value> " << -0.327f*(_K*dCLflaps/30.0f) << " </value>" << std::endl;
+ file << " </product>" << std::endl;
+ file << " </function>\n" << std::endl;
+
+ return file.str();
+ }
+ #endif
// ----------------------------------------------------------------------------
Index: LandingGear.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/LandingGear.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** LandingGear.cpp 6 Jul 2016 08:00:40 -0000 1.14
--- LandingGear.cpp 24 Nov 2016 09:59:34 -0000 1.15
***************
*** 226,239 ****
std::stringstream file;
if (_retractable)
{
- file << " <channel name=\"" + _description[_subtype] + "\">" << std::endl;
- file << " <switch name=\"fcs/gear-no-wow\">" << std::endl;
- file << " <default value=\"1\"/>" << std::endl;
- file << " <test logic=\"AND\" value=\"0\">" << std::endl;
- file << " gear/unit[1]/WOW eq 1" << std::endl;
- file << " gear/unit[2]/WOW eq 1" << std::endl;
- file << " </test>" << std::endl;
- file << " </switch>" << std::endl;
file << std::endl;
file << " <kinematic name=\"" + _description[_subtype] + " Control\">" << std::endl;
--- 226,240 ----
std::stringstream file;
+ file << " <channel name=\"" + _description[_subtype] + "\">" << std::endl;
+ file << " <switch name=\"fcs/gear-no-wow\">" << std::endl;
+ file << " <default value=\"1\"/>" << std::endl;
+ file << " <test logic=\"AND\" value=\"0\">" << std::endl;
+ file << " gear/unit[1]/WOW eq 1" << std::endl;
+ file << " gear/unit[2]/WOW eq 1" << std::endl;
+ file << " </test>" << std::endl;
+ file << " </switch>" << std::endl;
+
if (_retractable)
{
file << std::endl;
file << " <kinematic name=\"" + _description[_subtype] + " Control\">" << std::endl;
***************
*** 251,256 ****
file << " <output>gear/gear-pos-norm</output>" << std::endl;
file << " </kinematic>" << std::endl;
- file << " </channel>" << std::endl;
}
return file.str();
--- 252,257 ----
file << " <output>gear/gear-pos-norm</output>" << std::endl;
file << " </kinematic>" << std::endl;
}
+ file << " </channel>" << std::endl;
return file.str();
|
