|
From: Erik H. <eh...@us...> - 2015-10-29 10:59:38
|
Update of /cvsroot/jsbsim/JSBSim/src/models/propulsion In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21532 Modified Files: FGPropeller.cpp Log Message: Fix a few possible devide-by-zero situations that could lead to a program crash. All propeller parameters can be set to 0.0 now Index: FGPropeller.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGPropeller.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -r1.54 -r1.55 *** FGPropeller.cpp 27 Sep 2015 09:29:41 -0000 1.54 --- FGPropeller.cpp 29 Oct 2015 10:59:35 -0000 1.55 *************** *** 78,82 **** if (prop_element->FindElement("ixx")) ! Ixx = prop_element->FindElementValueAsNumberConvertTo("ixx", "SLUG*FT2"); Sense_multiplier = 1.0; --- 78,82 ---- if (prop_element->FindElement("ixx")) ! Ixx = max(prop_element->FindElementValueAsNumberConvertTo("ixx", "SLUG*FT2"), 0.001); Sense_multiplier = 1.0; *************** *** 86,94 **** if (prop_element->FindElement("diameter")) ! Diameter = prop_element->FindElementValueAsNumberConvertTo("diameter", "FT"); if (prop_element->FindElement("numblades")) numBlades = (int)prop_element->FindElementValueAsNumber("numblades"); if (prop_element->FindElement("gearratio")) ! GearRatio = prop_element->FindElementValueAsNumber("gearratio"); if (prop_element->FindElement("minpitch")) MinPitch = prop_element->FindElementValueAsNumber("minpitch"); --- 86,94 ---- if (prop_element->FindElement("diameter")) ! Diameter = max(prop_element->FindElementValueAsNumberConvertTo("diameter", "FT"), 0.001); if (prop_element->FindElement("numblades")) numBlades = (int)prop_element->FindElementValueAsNumber("numblades"); if (prop_element->FindElement("gearratio")) ! GearRatio = max(prop_element->FindElementValueAsNumber("gearratio"), 0.001); if (prop_element->FindElement("minpitch")) MinPitch = prop_element->FindElementValueAsNumber("minpitch"); |