[Jsbsim-cvslogs] CVS: JSBSim/src/initialization FGTrim.cpp, 1.34, 1.35

[Bertrand <bco...@us...>]

Update of /cvsroot/jsbsim/JSBSim/src/initialization
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18048/src/initialization

Modified Files:
	FGTrim.cpp 
Log Message:
Fixes to the trim on ground feature.

* Skip the gears when located over water. They will be skipped by the ground reactions anyway making the trim irrelevant.
* Ignore the ground bumpiness during the trim. The trim algorithm seems not to be robust enough to handle that. This does not make much difference to the converged solution anyway since the bumpiness is generally low.
* Fixed the WOW status for contacts over water (was 'false' is now 'true').
* All the gear/contact data are now properly reset when WOW==false. The reset code is now common to all the case where WOW is false.

Index: FGTrim.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/initialization/FGTrim.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** FGTrim.cpp	12 Jun 2016 09:09:02 -0000	1.34
--- FGTrim.cpp	3 Jun 2017 12:06:14 -0000	1.35
***************
*** 403,408 ****
      FGLocation lDummy;
      double height = gearLoc.GetContactPoint(lDummy, normal, vDummy, vDummy);
-     c.normal = Tec2b * normal;
  
      contacts.push_back(c);
  
--- 403,411 ----
      FGLocation lDummy;
      double height = gearLoc.GetContactPoint(lDummy, normal, vDummy, vDummy);
  
+     if (gear->IsBogey() && !GroundReactions->GetSolid())
+       continue;
+ 
+     c.normal = Tec2b * normal;
      contacts.push_back(c);