FG_HAVE_STD_INCLUDES -> SG_HAVE_STD_INCLUDES

[flightgear.git] / src / FDM / JSBSim / FGFDMExec.cpp

diff --git a/src/FDM/JSBSim/FGFDMExec.cpp b/src/FDM/JSBSim/FGFDMExec.cpp
index 6c936cf448b948511b927eb5b6f7f84c93417a7f..caf4b9d146d536db458105de57b1100a07593b65 100644 (file)
--- a/src/FDM/JSBSim/FGFDMExec.cpp
+++ b/src/FDM/JSBSim/FGFDMExec.cpp
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
  Module:       FGFDMExec.cpp
  Author:       Jon S. Berndt
@@ -34,13 +34,13 @@ HISTORY
 --------------------------------------------------------------------------------
 11/17/98   JSB   Created
 
-********************************************************************************
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 INCLUDES
-*******************************************************************************/
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #ifdef FGFS
 #  include <simgear/compiler.h>
-#  ifdef FG_HAVE_STD_INCLUDES
+#  ifdef SG_HAVE_STD_INCLUDES
 #    include <iostream>
 #    include <ctime>
 #  else
@@ -63,9 +63,12 @@ INCLUDES
 #include "FGAuxiliary.h"
 #include "FGOutput.h"
 
-/*******************************************************************************
-************************************ CODE **************************************
-*******************************************************************************/
+static const char *IdSrc = "$Header$";
+static const char *IdHdr = "ID_FDMEXEC";
+
+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+CLASS IMPLEMENTATION
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 
 // Constructor
@@ -100,7 +103,6 @@ FGFDMExec::~FGFDMExec(void){
 
 bool FGFDMExec::Allocate(void) {
   
-  cout << "FGFDMExec::Allocate ... ";
   bool result=true;
   
   Atmosphere  = new FGAtmosphere(this);
@@ -141,13 +143,11 @@ bool FGFDMExec::Allocate(void) {
   Schedule(Output,     1);
   
   modelLoaded = false;
-  cout << "done." << endl;
   return result;
 
 }
 
 bool FGFDMExec::DeAllocate(void) {
-  cout << "FGFDMExec::DeAllocate ... ";
  
   if ( Atmosphere != 0 )  delete Atmosphere;
   if ( FCS != 0 )         delete FCS;
@@ -174,7 +174,6 @@ bool FGFDMExec::DeAllocate(void) {
 
   modelLoaded = false;
   
-  cout << "done" << endl;
 }
 
 
@@ -237,7 +236,6 @@ bool FGFDMExec::RunIC(FGInitialCondition *fgic)
 bool FGFDMExec::LoadModel(string APath, string EPath, string model)
 {
        bool result=false;
-  cout << "FGFDMExec::LoadModel ..." << endl;
   if(modelLoaded) {
      DeAllocate();
      Allocate();
@@ -245,12 +243,13 @@ bool FGFDMExec::LoadModel(string APath, string EPath, string model)
   AircraftPath = APath;
        EnginePath = EPath;
   result = Aircraft->LoadAircraft(AircraftPath, EnginePath, model);
-  if(result) {
-    modelLoaded=true;
+
+  if (result) {
+    modelLoaded = true;
   } else {
     cerr << "FGFDMExec: Failed to load aircraft and/or engine model" << endl;
-  }  
-  cout << "FGFDMExec::LoadModel complete." << endl;;
+  }
+
   return result;
 }