[Jsbsim-cvslogs] CVS: JSBSim/src/input_output FGOutputTextFile.cpp, 1.11, 1.12

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

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

Modified Files:
	FGOutputTextFile.cpp 
Log Message:
Fixed the forces and moments output to include the friction with the ground. Also added the output of the weight components in the body frame.

Index: FGOutputTextFile.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/input_output/FGOutputTextFile.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** FGOutputTextFile.cpp	17 Feb 2014 05:02:38 -0000	1.11
--- FGOutputTextFile.cpp	22 May 2016 10:28:23 -0000	1.12
***************
*** 159,162 ****
--- 159,163 ----
      outstream << "F_{Ext x} (lbs)" + delimeter + "F_{Ext y} (lbs)" + delimeter + "F_{Ext z} (lbs)" + delimeter;
      outstream << "F_{Buoyant x} (lbs)" + delimeter + "F_{Buoyant y} (lbs)" + delimeter + "F_{Buoyant z} (lbs)" + delimeter;
+     outstream << "F_{Weight x} (lbs)" + delimeter + "F_{Weight y} (lbs)" + delimeter + "F_{Weight z} (lbs)" + delimeter;
      outstream << "F_{Total x} (lbs)" + delimeter + "F_{Total y} (lbs)" + delimeter + "F_{Total z} (lbs)";
    }
***************
*** 316,323 ****
      outstream << Aerodynamics->GetForces().Dump(delimeter) << delimeter;
      outstream << Propulsion->GetForces().Dump(delimeter) << delimeter;
!     outstream << GroundReactions->GetForces().Dump(delimeter) << delimeter;
      outstream << ExternalReactions->GetForces().Dump(delimeter) << delimeter;
      outstream << BuoyantForces->GetForces().Dump(delimeter) << delimeter;
!     outstream << Aircraft->GetForces().Dump(delimeter);
    }
    if (SubSystems & ssMoments) {
--- 317,325 ----
      outstream << Aerodynamics->GetForces().Dump(delimeter) << delimeter;
      outstream << Propulsion->GetForces().Dump(delimeter) << delimeter;
!     outstream << Accelerations->GetGroundForces().Dump(delimeter) << delimeter;
      outstream << ExternalReactions->GetForces().Dump(delimeter) << delimeter;
      outstream << BuoyantForces->GetForces().Dump(delimeter) << delimeter;
!     outstream << Accelerations->GetWeight().Dump(delimeter) << delimeter;
!     outstream << Accelerations->GetForces().Dump(delimeter);
    }
    if (SubSystems & ssMoments) {
***************
*** 326,333 ****
      outstream << Aerodynamics->GetMomentsMRC().Dump(delimeter) << delimeter;
      outstream << Propulsion->GetMoments().Dump(delimeter) << delimeter;
!     outstream << GroundReactions->GetMoments().Dump(delimeter) << delimeter;
      outstream << ExternalReactions->GetMoments().Dump(delimeter) << delimeter;
      outstream << BuoyantForces->GetMoments().Dump(delimeter) << delimeter;
!     outstream << Aircraft->GetMoments().Dump(delimeter);
    }
    if (SubSystems & ssAtmosphere) {
--- 328,335 ----
      outstream << Aerodynamics->GetMomentsMRC().Dump(delimeter) << delimeter;
      outstream << Propulsion->GetMoments().Dump(delimeter) << delimeter;
!     outstream << Accelerations->GetGroundMoments().Dump(delimeter) << delimeter;
      outstream << ExternalReactions->GetMoments().Dump(delimeter) << delimeter;
      outstream << BuoyantForces->GetMoments().Dump(delimeter) << delimeter;
!     outstream << Accelerations->GetMoments().Dump(delimeter);
    }
    if (SubSystems & ssAtmosphere) {