]> git.mxchange.org Git - flightgear.git/blobdiff - src/FDM/JSBSim/FGFDMExec.cpp
Typo
[flightgear.git] / src / FDM / JSBSim / FGFDMExec.cpp
index f6e10e0ff2a4f75b8e31e74482ca8e6816394faa..536baeee84c9690ae019d303e0d991ec7db326fd 100644 (file)
@@ -4,7 +4,6 @@
  Author:       Jon S. Berndt
  Date started: 11/17/98
  Purpose:      Schedules and runs the model routines.
- Called by:    The GUI.
 
  ------------- Copyright (C) 1999  Jon S. Berndt (jsb@hal-pc.org) -------------
 
@@ -43,37 +42,38 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #ifdef FGFS
-#  include <time.h>
 #  include <simgear/compiler.h>
 #  include STL_IOSTREAM
 #  include STL_ITERATOR
 #else
-#  if defined(sgi) && !defined(__GNUC__)
+#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
 #    include <iostream.h>
-#    include <time.h>
 #  else
 #    include <iostream>
-#    include <ctime>
 #  endif
 #  include <iterator>
 #endif
 
 #include "FGFDMExec.h"
 #include "FGState.h"
-#include "FGAtmosphere.h"
-#include "FGFCS.h"
-#include "FGPropulsion.h"
-#include "FGMassBalance.h"
-#include "FGGroundReactions.h"
-#include "FGAerodynamics.h"
-#include "FGInertial.h"
-#include "FGAircraft.h"
-#include "FGTranslation.h"
-#include "FGRotation.h"
-#include "FGPosition.h"
-#include "FGAuxiliary.h"
-#include "FGOutput.h"
-#include "FGConfigFile.h"
+#include <models/FGAtmosphere.h>
+#include <models/atmosphere/FGMSIS.h>
+#include <models/atmosphere/FGMars.h>
+#include <models/FGFCS.h>
+#include <models/FGPropulsion.h>
+#include <models/FGMassBalance.h>
+#include <models/FGGroundReactions.h>
+#include <models/FGAerodynamics.h>
+#include <models/FGInertial.h>
+#include <models/FGAircraft.h>
+#include <models/FGPropagate.h>
+#include <models/FGAuxiliary.h>
+#include <models/FGInput.h>
+#include <models/FGOutput.h>
+#include <initialization/FGInitialCondition.h>
+#include <input_output/FGPropertyManager.h>
+
+namespace JSBSim {
 
 static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_FDMEXEC;
@@ -82,39 +82,38 @@ static const char *IdHdr = ID_FDMEXEC;
 GLOBAL DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-short debug_lvl;  // This describes to any interested entity the debug level
-                  // requested by setting the JSBSIM_DEBUG environment variable.
-                  // The bitmasked value choices are as follows:
-                  // a) unset: In this case (the default) JSBSim would only print
-                  //    out the normally expected messages, essentially echoing
-                  //    the config files as they are read. If the environment
-                  //    variable is not set, debug_lvl is set to 1 internally
-                  // b) 0: This requests JSBSim not to output any messages
-                  //    whatsoever.
-                  // c) 1: This value explicity requests the normal JSBSim
-                  //    startup messages
-                  // d) 2: This value asks for a message to be printed out when
-                  //    a class is instantiated
-                  // e) 4: When this value is set, a message is displayed when a
-                  //    FGModel object executes its Run() method
-                  // f) 8: When this value is set, various runtime state variables
-                  //    are printed out periodically
-                  // g) 16: When set various parameters are sanity checked and
-                  //    a message is printed out when they go out of bounds.
-
 unsigned int FGFDMExec::FDMctr = 0;
+FGPropertyManager* FGFDMExec::master=0;
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS IMPLEMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+void checkTied ( FGPropertyManager *node )
+{
+  int N = node->nChildren();
+  string name;
+
+  for (int i=0; i<N; i++) {
+    if (node->getChild(i)->nChildren() ) {
+      checkTied( (FGPropertyManager*)node->getChild(i) );
+    } else if ( node->getChild(i)->isTied() ) {
+      name = ((FGPropertyManager*)node->getChild(i))->GetFullyQualifiedName();
+      cerr << name << " is tied" << endl;
+    }
+  }
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 // Constructor
 
-FGFDMExec::FGFDMExec(void)
+FGFDMExec::FGFDMExec(FGPropertyManager* root) : Root(root)
 {
+
   Frame           = 0;
   FirstModel      = 0;
   Error           = 0;
+  GroundCallback  = 0;
   State           = 0;
   Atmosphere      = 0;
   FCS             = 0;
@@ -124,51 +123,78 @@ FGFDMExec::FGFDMExec(void)
   Inertial        = 0;
   GroundReactions = 0;
   Aircraft        = 0;
-  Translation     = 0;
-  Rotation        = 0;
-  Position        = 0;
+  Propagate       = 0;
   Auxiliary       = 0;
-  Output          = 0;
+  Input           = 0;
+  IC              = 0;
+  Trim            = 0;
 
   terminate = false;
-  frozen = false;
   modelLoaded = false;
-  Scripted = false;
+  IsSlave = false;
+  holding = false;
 
+
+  // Multiple FDM's are stopped for now.  We need to ensure that
+  // the "user" instance always gets the zeroeth instance number,
+  // because there may be instruments or scripts tied to properties
+  // in the jsbsim[0] node.
+  // ToDo: it could be that when JSBSim is reset and a new FDM is wanted, that
+  // process might try setting FDMctr = 0. Then the line below would not need
+  // to be commented out.
   IdFDM = FDMctr;
-  FDMctr++;
+  //FDMctr++;
 
   try {
     char* num = getenv("JSBSIM_DEBUG");
-    if (!num) debug_lvl = 1;
-    else debug_lvl = atoi(num); // set debug level
+    if (num) debug_lvl = atoi(num); // set debug level
   } catch (...) {               // if error set to 1
     debug_lvl = 1;
   }
 
-  if (debug_lvl > 0) {
-    cout << "\n\n     " << highint << underon << "JSBSim Flight Dynamics Model v"
-                                   << JSBSim_version << underoff << normint << endl;
-    cout << halfint << "            [cfg file spec v" << needed_cfg_version << "]\n\n";
-    cout << normint << "JSBSim startup beginning ...\n\n";
-  }
+  if (Root == 0)  master= new FGPropertyManager;
+  else            master = Root;
 
-  if (debug_lvl & 2) cout << "Instantiated: FGFDMExec" << endl;
+  instance = master->GetNode("/fdm/jsbsim",IdFDM,true);
+  Debug(0);
+  // this is to catch errors in binding member functions to the property tree.
+  try {
+    Allocate();
+  } catch ( string msg ) {
+    cout << "Caught error: " << msg << endl;
+    exit(1);
+  }
 
-  Allocate();
+  Constructing = true;
+  typedef int (FGFDMExec::*iPMF)(void) const;
+  instance->Tie("simulation/do_trim", this, (iPMF)0, &FGFDMExec::DoTrim);
+  Constructing = false;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-FGFDMExec::~FGFDMExec() {
-  DeAllocate();
-  if (debug_lvl & 2) cout << "Destroyed:    FGFDMExec" << endl;
+FGFDMExec::~FGFDMExec()
+{
+  instance->Untie("simulation/do_trim");
+
+  try {
+    DeAllocate();
+    checkTied( instance );
+    if (Root == 0)  delete master;
+  } catch ( string msg ) {
+    cout << "Caught error: " << msg << endl;
+  }
+
+  for (unsigned int i=1; i<SlaveFDMList.size(); i++) delete SlaveFDMList[i]->exec;
+  SlaveFDMList.clear();
+
+  Debug(1);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-bool FGFDMExec::Allocate(void) {
-
+bool FGFDMExec::Allocate(void)
+{
   bool result=true;
 
   Atmosphere      = new FGAtmosphere(this);
@@ -179,16 +205,15 @@ bool FGFDMExec::Allocate(void) {
   Inertial        = new FGInertial(this);
   GroundReactions = new FGGroundReactions(this);
   Aircraft        = new FGAircraft(this);
-  Translation     = new FGTranslation(this);
-  Rotation        = new FGRotation(this);
-  Position        = new FGPosition(this);
+  Propagate       = new FGPropagate(this);
   Auxiliary       = new FGAuxiliary(this);
-  Output          = new FGOutput(this);
+  Input           = new FGInput(this);
+
+  GroundCallback  = new FGGroundCallback();
+  State           = new FGState(this); // This must be done here, as the FGState
+                                       // class needs valid pointers to the above
+                                       // model classes
 
-  State        = new FGState(this); // This must be done here, as the FGState
-                                    // class needs valid pointers to the above
-                                    // model classes
-  
   // Initialize models so they can communicate with each other
 
   if (!Atmosphere->InitModel()) {
@@ -215,28 +240,25 @@ bool FGFDMExec::Allocate(void) {
   if (!Aircraft->InitModel())   {
     cerr << fgred << "Aircraft model init failed" << fgdef << endl;
     Error+=128;}
-  if (!Translation->InitModel()){
-    cerr << fgred << "Translation model init failed" << fgdef << endl;
+  if (!Propagate->InitModel())   {
+    cerr << fgred << "Propagate model init failed" << fgdef << endl;
     Error+=256;}
-  if (!Rotation->InitModel())   {
-    cerr << fgred << "Rotation model init failed" << fgdef << endl;
-    Error+=512;}
-  if (!Position->InitModel())   {
-    cerr << fgred << "Position model init failed" << fgdef << endl;
-    Error+=1024;}
   if (!Auxiliary->InitModel())  {
     cerr << fgred << "Auxiliary model init failed" << fgdef << endl;
-    Error+=2058;}
-  if (!Output->InitModel())     {
-    cerr << fgred << "Output model init failed" << fgdef << endl;
-    Error+=4096;}
+    Error+=512;}
+  if (!Input->InitModel())  {
+    cerr << fgred << "Input model init failed" << fgdef << endl;
+    Error+=1024;}
 
   if (Error > 0) result = false;
 
+  IC = new FGInitialCondition(this);
+
   // Schedule a model. The second arg (the integer) is the pass number. For
-  // instance, the atmosphere model gets executed every fifth pass it is called
-  // by the executive. Everything else here gets executed each pass.
+  // instance, the atmosphere model could get executed every fifth pass it is called
+  // by the executive. IC and Trim objects are NOT scheduled.
 
+  Schedule(Input,           1);
   Schedule(Atmosphere,      1);
   Schedule(FCS,             1);
   Schedule(Propulsion,      1);
@@ -245,11 +267,8 @@ bool FGFDMExec::Allocate(void) {
   Schedule(Inertial,        1);
   Schedule(GroundReactions, 1);
   Schedule(Aircraft,        1);
-  Schedule(Rotation,        1);
-  Schedule(Translation,     1);
-  Schedule(Position,        1);
+  Schedule(Propagate,       1);
   Schedule(Auxiliary,       1);
-  Schedule(Output,          1);
 
   modelLoaded = false;
 
@@ -258,27 +277,37 @@ bool FGFDMExec::Allocate(void) {
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-bool FGFDMExec::DeAllocate(void) {
-
-  if ( Atmosphere != 0 )     delete Atmosphere;
-  if ( FCS != 0 )            delete FCS;
-  if ( Propulsion != 0)      delete Propulsion;
-  if ( MassBalance != 0)     delete MassBalance;
-  if ( Aerodynamics != 0)    delete Aerodynamics;
-  if ( Inertial != 0)        delete Inertial;
-  if ( GroundReactions != 0) delete GroundReactions;
-  if ( Aircraft != 0 )       delete Aircraft;
-  if ( Translation != 0 )    delete Translation;
-  if ( Rotation != 0 )       delete Rotation;
-  if ( Position != 0 )       delete Position;
-  if ( Auxiliary != 0 )      delete Auxiliary;
-  if ( Output != 0 )         delete Output;
-  if ( State != 0 )          delete State;
+bool FGFDMExec::DeAllocate(void)
+{
+  delete Input;
+  delete Atmosphere;
+  delete FCS;
+  delete Propulsion;
+  delete MassBalance;
+  delete Aerodynamics;
+  delete Inertial;
+  delete GroundReactions;
+  delete Aircraft;
+  delete Propagate;
+  delete Auxiliary;
+  delete State;
+
+  for (int i=0; i<Outputs.size(); i++) {
+    if (Outputs[i]) delete Outputs[i];
+  }
+
+  Outputs.clear();
+
+  delete IC;
+  delete Trim;
+
+  delete GroundCallback;
 
   FirstModel  = 0L;
   Error       = 0;
 
   State           = 0;
+  Input           = 0;
   Atmosphere      = 0;
   FCS             = 0;
   Propulsion      = 0;
@@ -287,11 +316,8 @@ bool FGFDMExec::DeAllocate(void) {
   Inertial        = 0;
   GroundReactions = 0;
   Aircraft        = 0;
-  Translation     = 0;
-  Rotation        = 0;
-  Position        = 0;
+  Propagate       = 0;
   Auxiliary       = 0;
-  Output          = 0;
 
   modelLoaded = false;
   return modelLoaded;
@@ -320,7 +346,7 @@ int FGFDMExec::Schedule(FGModel* model, int rate)
     model_iterator->NextModel->SetRate(rate);
 
   }
-  
+
   return 0;
 }
 
@@ -330,358 +356,465 @@ bool FGFDMExec::Run(void)
 {
   FGModel* model_iterator;
 
-  if (frozen) return true;
-
   model_iterator = FirstModel;
   if (model_iterator == 0L) return false;
 
-  if (Scripted) {
-    RunScript();
-    if (State->Getsim_time() >= EndTime) return false;
-  }
+  Debug(2);
 
-  if (debug_lvl & 4)
-    cout << "================== Frame: " << Frame << "  Time: "
-         << State->Getsim_time() << endl;
+  for (unsigned int i=1; i<SlaveFDMList.size(); i++) {
+//    SlaveFDMList[i]->exec->State->Initialize(); // Transfer state to the slave FDM
+//    SlaveFDMList[i]->exec->Run();
+  }
 
-  while (!model_iterator->Run()) {
+  while (model_iterator != 0L) {
+    model_iterator->Run();
     model_iterator = model_iterator->NextModel;
-    if (model_iterator == 0L) break;
   }
 
-  Frame++;
-  State->IncrTime();
-
+  frame = Frame++;
+  if (!Holding()) State->IncrTime();
   return true;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+// This call will cause the sim time to reset to 0.0
 
-bool FGFDMExec::RunIC(FGInitialCondition *fgic)
+bool FGFDMExec::RunIC(void)
 {
-  State->Suspend();
-  State->Initialize(fgic);
+  State->SuspendIntegration();
+  State->Initialize(IC);
   Run();
-  State->Resume();
+  State->ResumeIntegration();
+
   return true;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-bool FGFDMExec::LoadModel(string APath, string EPath, string model)
+void FGFDMExec::SetGroundCallback(FGGroundCallback* p)
 {
-  bool result = false;
+  if (GroundCallback) delete GroundCallback;
 
-  string aircraftCfgFileName;
+  GroundCallback = p;
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+vector <string> FGFDMExec::EnumerateFDMs(void)
+{
+  vector <string> FDMList;
+
+  FDMList.push_back(Aircraft->GetAircraftName());
+
+  for (unsigned int i=1; i<SlaveFDMList.size(); i++) {
+    FDMList.push_back(SlaveFDMList[i]->exec->GetAircraft()->GetAircraftName());
+  }
+
+  return FDMList;
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+bool FGFDMExec::LoadModel(string AircraftPath, string EnginePath, string model,
+                bool addModelToPath)
+{
+  FGFDMExec::AircraftPath = AircraftPath;
+  FGFDMExec::EnginePath = EnginePath;
+
+  return LoadModel(model, addModelToPath);
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-  AircraftPath = APath;
-  EnginePath   = EPath;
+bool FGFDMExec::LoadModel(string model, bool addModelToPath)
+{
+  string token;
+  string aircraftCfgFileName;
+  string separator = "/";
 
-# ifndef macintosh
-  aircraftCfgFileName = AircraftPath + "/" + model + "/" + model + ".xml";
-# else
-  aircraftCfgFileName = AircraftPath + ";" + model + ";" + model + ".xml";
+# ifdef macintosh
+    separator = ";";
 # endif
 
-  FGConfigFile AC_cfg(aircraftCfgFileName);
-  if (!AC_cfg.IsOpen()) return false;
+  if( AircraftPath.empty() || EnginePath.empty() ) {
+    cerr << "Error: attempted to load aircraft with undefined ";
+    cerr << "aircraft and engine paths" << endl;
+    return false;
+  }
+
+  aircraftCfgFileName = AircraftPath;
+  if (addModelToPath) aircraftCfgFileName += separator + model;
+  aircraftCfgFileName += separator + model + ".xml";
+
+  FGXMLParse *XMLParse = new FGXMLParse();
+  Element* element = 0L;
+  Element* document;
+
+  ifstream input_file(aircraftCfgFileName.c_str());
+  readXML(input_file, *XMLParse);
+  document = XMLParse->GetDocument();
+
+  modelName = model;
 
   if (modelLoaded) {
     DeAllocate();
     Allocate();
   }
 
-  result = Aircraft->Load(&AC_cfg);
+  ReadPrologue(document);
+  element = document->GetElement();
+
+  bool result = true;
+  while (element && result) {
+    string element_name = element->GetName();
+    if (element_name == "fileheader" )           result = ReadFileHeader(element);
+    else if (element_name == "slave")            result = ReadSlave(element);
+    else if (element_name == "metrics")          result = Aircraft->Load(element);
+    else if (element_name == "mass_balance")     result = MassBalance->Load(element);
+    else if (element_name == "ground_reactions") result = GroundReactions->Load(element);
+    else if (element_name == "propulsion")       result = Propulsion->Load(element);
+    else if (element_name == "autopilot")        result = FCS->Load(element);
+    else if (element_name == "flight_control")   result = FCS->Load(element);
+    else if (element_name == "aerodynamics")     result = Aerodynamics->Load(element);
+    else if (element_name == "input")            result = Input->Load(element);
+    else if (element_name == "output")           {
+        FGOutput* Output = new FGOutput(this);
+        Output->InitModel();
+        Schedule(Output,       1);
+        Outputs.push_back(Output);
+        result = Output->Load(element);
+    }
+    else {
+      cerr << "Found unexpected subsystem: " << element_name << ", exiting." << endl;
+      result = false;
+      break;
+    }
+    element = document->GetNextElement();
+  }
 
   if (result) {
     modelLoaded = true;
+    Debug(3);
   } else {
     cerr << fgred
-         << "FGFDMExec: Failed to load aircraft and/or engine model"
+         << "  JSBSim failed to load aircraft and/or engine model"
          << fgdef << endl;
+    return false;
   }
 
-  if (debug_lvl > 0) cout << "\n\nJSBSim startup complete\n\n";
+  struct PropertyCatalogStructure masterPCS;
+  masterPCS.base_string = "";
+  masterPCS.node = (FGPropertyManager*)master;
+
+  BuildPropertyCatalog(&masterPCS);
+
   return result;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-bool FGFDMExec::LoadScript(string script)
+void FGFDMExec::BuildPropertyCatalog(struct PropertyCatalogStructure* pcs)
 {
-  FGConfigFile Script(script);
-  string token="";
-  string aircraft="";
-  string initialize="";
-  bool result=false;
-  double dt=0.0;
-  int i;
-  struct condition *newCondition;
-
-  if (!Script.IsOpen()) return false;
-
-  Script.GetNextConfigLine();
-  ScriptName = Script.GetValue("name");
-  Scripted = true;
-  if (debug_lvl > 0) cout << "Reading Script File " << ScriptName << endl;
-
-  while (Script.GetNextConfigLine() != string("EOF") && Script.GetValue() != string("/runscript")) {
-    token = Script.GetValue();
-    if (token == "use") {
-      if ((token = Script.GetValue("aircraft")) != string("")) {
-        aircraft = token;
-        if (debug_lvl > 0) cout << "  Use aircraft: " << token << endl;
-      } else if ((token = Script.GetValue("initialize")) != string("")) {
-        initialize = token;
-        if (debug_lvl > 0) cout << "  Use reset file: " << token << endl;
-      } else {
-        cerr << "Unknown 'use' keyword: \"" << token << "\"" << endl;
-      }
-    } else if (token == "run") {
-      StartTime = strtod(Script.GetValue("start").c_str(), NULL);
-      State->Setsim_time(StartTime);
-      EndTime   = strtod(Script.GetValue("end").c_str(), NULL);
-      dt        = strtod(Script.GetValue("dt").c_str(), NULL);
-      State->Setdt(dt);
-      Script.GetNextConfigLine();
-      token = Script.GetValue();
-      while (token != string("/run")) {
-
-        if (token == "when") {
-          Script.GetNextConfigLine();
-          token = Script.GetValue();
-          newCondition = new struct condition();
-          while (token != string("/when")) {
-            if (token == "parameter") {
-              newCondition->TestParam.push_back(State->GetParameterIndex(Script.GetValue("name")));
-              newCondition->TestValue.push_back(strtod(Script.GetValue("value").c_str(), NULL));
-              newCondition->Comparison.push_back(Script.GetValue("comparison"));
-            } else if (token == "set") {
-              newCondition->SetParam.push_back(State->GetParameterIndex(Script.GetValue("name")));
-              newCondition->SetValue.push_back(strtod(Script.GetValue("value").c_str(), NULL));
-              newCondition->Triggered.push_back(false);
-              newCondition->OriginalValue.push_back(0.0);
-              newCondition->newValue.push_back(0.0);
-              newCondition->StartTime.push_back(0.0);
-              newCondition->EndTime.push_back(0.0);
-              string tempCompare = Script.GetValue("type");
-              if      (tempCompare == "FG_DELTA") newCondition->Type.push_back(FG_DELTA);
-              else if (tempCompare == "FG_BOOL")  newCondition->Type.push_back(FG_BOOL);
-              else if (tempCompare == "FG_VALUE") newCondition->Type.push_back(FG_VALUE);
-              else                                newCondition->Type.push_back((eType)0);
-              tempCompare = Script.GetValue("action");
-              if      (tempCompare == "FG_RAMP") newCondition->Action.push_back(FG_RAMP);
-              else if (tempCompare == "FG_STEP") newCondition->Action.push_back(FG_STEP);
-              else if (tempCompare == "FG_EXP")  newCondition->Action.push_back(FG_EXP);
-              else                               newCondition->Action.push_back((eAction)0);
-              
-              if (Script.GetValue("persistent") == "true")
-                newCondition->Persistent.push_back(true);
-              else
-                newCondition->Persistent.push_back(false);
-               
-              newCondition->TC.push_back(strtod(Script.GetValue("tc").c_str(), NULL));
-             
-            } else {
-              cerr << "Unrecognized keyword in script file: \" [when] " << token << "\"" << endl;
-            }
-            Script.GetNextConfigLine();
-            token = Script.GetValue();
-          }
-          Conditions.push_back(*newCondition);
-          Script.GetNextConfigLine();
-          token = Script.GetValue();
-
-        } else {
-          cerr << "Error reading script file: expected \"when\", got \"" << token << "\"" << endl;
-        }
-
-      }
+  struct PropertyCatalogStructure* pcsNew = new struct PropertyCatalogStructure;
+  int node_idx = 0;
+  char int_buf[10];
+
+  for (int i=0; i<pcs->node->nChildren(); i++) {
+    pcsNew->base_string = pcs->base_string + "/" + pcs->node->getChild(i)->getName();
+    node_idx = pcs->node->getChild(i)->getIndex();
+    sprintf(int_buf, "[%d]", node_idx);
+    if (node_idx != 0) pcsNew->base_string += string(int_buf);
+    if (pcs->node->getChild(i)->nChildren() == 0) {
+      PropertyCatalog.push_back(pcsNew->base_string);
     } else {
-      cerr << "Unrecognized keyword in script file: \"" << token << "\" [runscript] " << endl;
+      pcsNew->node = (FGPropertyManager*)pcs->node->getChild(i);
+      BuildPropertyCatalog(pcsNew);
     }
   }
+  delete pcsNew;
+}
 
-  if (aircraft == "") {
-    cerr << "Aircraft file not loaded in script" << endl;
-    exit(-1);
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+string FGFDMExec::QueryPropertyCatalog(string in)
+{
+  string results="";
+  for (int i=0; i<PropertyCatalog.size(); i++) {
+    if (PropertyCatalog[i].find(in) != string::npos) results += PropertyCatalog[i] + "\n";
   }
+  if (results.empty()) return "No matches found\n";
+  return results;
+}
 
-  // print out conditions for double-checking if requested
-
-  if (debug_lvl > 0) {
-    vector <struct condition>::iterator iterConditions = Conditions.begin();
-    int count=0;
-
-    cout << "\n  Script goes from " << StartTime << " to " << EndTime
-         << " with dt = " << dt << endl << endl;
-
-    while (iterConditions < Conditions.end()) {
-      cout << "  Condition: " << count++ << endl;
-      cout << "    if (";
-
-      for (i=0; i<iterConditions->TestValue.size(); i++) {
-        if (i>0) cout << " and" << endl << "        ";
-        cout << "(" << State->paramdef[iterConditions->TestParam[i]]
-                    << iterConditions->Comparison[i] << " "
-                    << iterConditions->TestValue[i] << ")";
-      }
-      cout << ") then {";
-
-      for (i=0; i<iterConditions->SetValue.size(); i++) {
-        cout << endl << "      set" << State->paramdef[iterConditions->SetParam[i]]
-             << "to " << iterConditions->SetValue[i];
-
-        switch (iterConditions->Type[i]) {
-        case FG_VALUE:
-          cout << " (constant";
-          break;
-        case FG_DELTA:
-          cout << " (delta";
-          break;
-        case FG_BOOL:
-          cout << " (boolean";
-          break;
-        default:
-          cout << " (unspecified type";
-        }
-
-        switch (iterConditions->Action[i]) {
-        case FG_RAMP:
-          cout << " via ramp";
-          break;
-        case FG_STEP:
-          cout << " via step";
-          break;
-        case FG_EXP:
-          cout << " via exponential approach";
-          break;
-        default:
-          cout << " via unspecified action";
-        }
-
-        if (!iterConditions->Persistent[i]) cout << endl
-                           << "                              once";
-        else cout << endl
-                           << "                              repeatedly";
-
-        if (iterConditions->Action[i] == FG_RAMP ||
-            iterConditions->Action[i] == FG_EXP) cout << endl
-                           << "                              with time constant "
-                           << iterConditions->TC[i];
-      }
-      cout << ")" << endl << "    }" << endl << endl;
-
-      iterConditions++;
-    }
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+bool FGFDMExec::ReadFileHeader(Element* el)
+{
+  bool result = true; // true for success
+
+  if (debug_lvl & ~1) return result;
+
+  if (el->FindElement("author"))
+    cout << "  Model Author:  " << el->FindElement("author")->GetDataLine() << endl;
+  if (el->FindElement("filecreationdate"))
+    cout << "  Creation Date: " << el->FindElement("filecreationdate")->GetDataLine() << endl;
+  if (el->FindElement("version"))
+    cout << "  Version:       " << el->FindElement("version")->GetDataLine() << endl;
+  if (el->FindElement("description"))
+    cout << "  Description:   " << el->FindElement("description")->GetDataLine() << endl;
+
+  return result;
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-    cout << endl;
+bool FGFDMExec::ReadPrologue(Element* el) // el for ReadPrologue is the document element
+{
+  bool result = true; // true for success
+
+  if (!el) return false;
+
+  string AircraftName = el->GetAttributeValue("name");
+  Aircraft->SetAircraftName(AircraftName);
+
+  if (debug_lvl & 1) cout << underon << "Reading Aircraft Configuration File"
+            << underoff << ": " << highint << AircraftName << normint << endl;
+
+  CFGVersion = el->GetAttributeValue("version");
+  Release    = el->GetAttributeValue("release");
+
+  if (debug_lvl & 1)
+    cout << "                            Version: " << highint << CFGVersion
+                                                    << normint << endl;
+  if (CFGVersion != needed_cfg_version) {
+    cerr << endl << fgred << "YOU HAVE AN INCOMPATIBLE CFG FILE FOR THIS AIRCRAFT."
+            " RESULTS WILL BE UNPREDICTABLE !!" << endl;
+    cerr << "Current version needed is: " << needed_cfg_version << endl;
+    cerr << "         You have version: " << CFGVersion << endl << fgdef << endl;
+    return false;
+  }
+
+  if (Release == "ALPHA" && (debug_lvl & 1)) {
+    cout << endl << endl
+         << highint << "This aircraft model is an " << fgred << Release
+         << reset << highint << " release!!!" << endl << endl << reset
+         << "This aircraft model may not even properly load, and probably"
+         << " will not fly as expected." << endl << endl
+         << fgred << highint << "Use this model for development purposes ONLY!!!"
+         << normint << reset << endl << endl;
+  } else if (Release == "BETA" && (debug_lvl & 1)) {
+    cout << endl << endl
+         << highint << "This aircraft model is a " << fgred << Release
+         << reset << highint << " release!!!" << endl << endl << reset
+         << "This aircraft model probably will not fly as expected." << endl << endl
+         << fgblue << highint << "Use this model for development purposes ONLY!!!"
+         << normint << reset << endl << endl;
+  } else if (Release == "PRODUCTION" && (debug_lvl & 1)) {
+    cout << endl << endl
+         << highint << "This aircraft model is a " << fgblue << Release
+         << reset << highint << " release." << endl << endl << reset;
+  } else if (debug_lvl & 1) {
+    cout << endl << endl
+         << highint << "This aircraft model is an " << fgred << Release
+         << reset << highint << " release!!!" << endl << endl << reset
+         << "This aircraft model may not even properly load, and probably"
+         << " will not fly as expected." << endl << endl
+         << fgred << highint << "Use this model for development purposes ONLY!!!"
+         << normint << reset << endl << endl;
   }
 
-  result = LoadModel("aircraft", "engine", aircraft);
-  if (!result) {
-    cerr << "Aircraft file " << aircraft << " was not found" << endl;
-         exit(-1);
+  return result;
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+bool FGFDMExec::ReadSlave(Element* el)
+{
+  // Add a new slaveData object to the slave FDM list
+  // Populate that slaveData element with a new FDMExec object
+  // Set the IsSlave flag for that FDMExec object
+  // Get the aircraft name
+  // set debug level to print out no additional data for slave objects
+  // Load the model given the aircraft name
+  // reset debug level to prior setting
+
+  int saved_debug_lvl = debug_lvl;
+  string token;
+
+  SlaveFDMList.push_back(new slaveData);
+  SlaveFDMList.back()->exec = new FGFDMExec();
+  SlaveFDMList.back()->exec->SetSlave();
+/*
+  string AircraftName = AC_cfg->GetValue("file");
+
+  debug_lvl = 0;                 // turn off debug output for slave vehicle
+
+  SlaveFDMList.back()->exec->SetAircraftPath( AircraftPath );
+  SlaveFDMList.back()->exec->SetEnginePath( EnginePath );
+  SlaveFDMList.back()->exec->LoadModel(AircraftName);
+  debug_lvl = saved_debug_lvl;   // turn debug output back on for master vehicle
+
+  AC_cfg->GetNextConfigLine();
+  while ((token = AC_cfg->GetValue()) != string("/SLAVE")) {
+    *AC_cfg >> token;
+    if      (token == "xloc")  { *AC_cfg >> SlaveFDMList.back()->x;    }
+    else if (token == "yloc")  { *AC_cfg >> SlaveFDMList.back()->y;    }
+    else if (token == "zloc")  { *AC_cfg >> SlaveFDMList.back()->z;    }
+    else if (token == "pitch") { *AC_cfg >> SlaveFDMList.back()->pitch;}
+    else if (token == "yaw")   { *AC_cfg >> SlaveFDMList.back()->yaw;  }
+    else if (token == "roll")  { *AC_cfg >> SlaveFDMList.back()->roll;  }
+    else cerr << "Unknown identifier: " << token << " in slave vehicle definition" << endl;
+  }
+*/
+  if (debug_lvl > 0)  {
+    cout << "      X = " << SlaveFDMList.back()->x << endl;
+    cout << "      Y = " << SlaveFDMList.back()->y << endl;
+    cout << "      Z = " << SlaveFDMList.back()->z << endl;
+    cout << "      Pitch = " << SlaveFDMList.back()->pitch << endl;
+    cout << "      Yaw = " << SlaveFDMList.back()->yaw << endl;
+    cout << "      Roll = " << SlaveFDMList.back()->roll << endl;
   }
-  if ( ! State->Reset("aircraft", aircraft, initialize))
-                 State->Initialize(2000,0,0,0,0,0,0.5,0.5,40000,0,0,0);
 
   return true;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-void FGFDMExec::RunScript(void)
+FGPropertyManager* FGFDMExec::GetPropertyManager(void)
 {
-  vector <struct condition>::iterator iC = Conditions.begin();
-  bool truth;
-  bool WholeTruth;
-  int i;
-
-  int count=0;
-
-  double currentTime = State->Getsim_time();
-  double newSetValue;
-
-  while (iC < Conditions.end()) {
-    // determine whether the set of conditional tests for this condition equate
-    // to true
-    for (i=0; i<iC->TestValue.size(); i++) {
-           if (iC->Comparison[i] == "lt")
-              truth = State->GetParameter(iC->TestParam[i]) <  iC->TestValue[i];
-      else if (iC->Comparison[i] == "le")
-              truth = State->GetParameter(iC->TestParam[i]) <= iC->TestValue[i];
-      else if (iC->Comparison[i] == "eq")
-              truth = State->GetParameter(iC->TestParam[i]) == iC->TestValue[i];
-      else if (iC->Comparison[i] == "ge")
-              truth = State->GetParameter(iC->TestParam[i]) >= iC->TestValue[i];
-      else if (iC->Comparison[i] == "gt")
-              truth = State->GetParameter(iC->TestParam[i]) >  iC->TestValue[i];
-      else if (iC->Comparison[i] == "ne")
-              truth = State->GetParameter(iC->TestParam[i]) != iC->TestValue[i];
-      else
-              cerr << "Bad comparison" << endl;
-
-      if (i == 0) WholeTruth = truth;
-      else        WholeTruth = WholeTruth && truth;
-
-      if (!truth && iC->Persistent[i] && iC->Triggered[i]) iC->Triggered[i] = false;
-    }
+  return instance;
+}
 
-    // if the conditions are true, do the setting of the desired parameters
-
-    if (WholeTruth) {
-      for (i=0; i<iC->SetValue.size(); i++) {
-        if ( ! iC->Triggered[i]) {
-          iC->OriginalValue[i] = State->GetParameter(iC->SetParam[i]);
-          switch (iC->Type[i]) {
-          case FG_VALUE:
-            iC->newValue[i] = iC->SetValue[i];
-            break;
-          case FG_DELTA:
-            iC->newValue[i] = iC->OriginalValue[i] + iC->SetValue[i];
-            break;
-          case FG_BOOL:
-            break;
-          default:
-            cerr << "Invalid Type specified" << endl;
-            break;
-          }
-          iC->Triggered[i] = true;
-          iC->StartTime[i] = currentTime;
-        }
-
-        switch (iC->Action[i]) {
-        case FG_RAMP:
-          newSetValue = (currentTime - iC->StartTime[i])/(iC->TC[i])
-                      * (iC->newValue[i] - iC->OriginalValue[i]) + iC->OriginalValue[i];
-          if (newSetValue > iC->newValue[i]) newSetValue = iC->newValue[i];
-          break;
-        case FG_STEP:
-          newSetValue = iC->newValue[i];
-          break;
-        case FG_EXP:
-          newSetValue = (1 - exp(-(currentTime - iC->StartTime[i])/(iC->TC[i])))
-              * (iC->newValue[i] - iC->OriginalValue[i]) + iC->OriginalValue[i];
-          break;
-        default:
-          cerr << "Invalid Action specified" << endl;
-          break;
-        }
-        State->SetParameter(iC->SetParam[i], newSetValue);
-        if ((unsigned long int)Propulsion->GetTank(0) == 0) {
-          cout << "Param # getting set: " << iC->SetParam[i] << " Value: " << newSetValue << endl;
-        }
-      }
-    }
-    iC++;
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+FGTrim* FGFDMExec::GetTrim(void)
+{
+  delete Trim;
+  Trim = new FGTrim(this,tNone);
+  return Trim;
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGFDMExec::DisableOutput(void)
+{
+  for (int i=0; i<Outputs.size(); i++) {
+    Outputs[i]->Disable();
   }
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-void FGFDMExec::Debug(void)
+void FGFDMExec::EnableOutput(void)
 {
-    //TODO: Add your source code here
+  for (int i=0; i<Outputs.size(); i++) {
+    Outputs[i]->Enable();
+  }
 }
 
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGFDMExec::DoTrim(int mode)
+{
+  double saved_time;
+
+cout << "DoTrim called" << endl;
+
+  if (Constructing) return;
+
+  if (mode < 0 || mode > JSBSim::tNone) {
+    cerr << endl << "Illegal trimming mode!" << endl << endl;
+    return;
+  }
+  saved_time = State->Getsim_time();
+  FGTrim trim(this, (JSBSim::TrimMode)mode);
+  if ( !trim.DoTrim() ) cerr << endl << "Trim Failed" << endl << endl;
+  trim.Report();
+  State->Setsim_time(saved_time);
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGFDMExec::UseAtmosphereMSIS(void)
+{
+  FGAtmosphere *oldAtmosphere = Atmosphere;
+  Atmosphere = new MSIS(this);
+  if (!Atmosphere->InitModel()) {
+    cerr << fgred << "MSIS Atmosphere model init failed" << fgdef << endl;
+    Error+=1;
+  }
+  delete oldAtmosphere;
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGFDMExec::UseAtmosphereMars(void)
+{
+/*
+  FGAtmosphere *oldAtmosphere = Atmosphere;
+  Atmosphere = new FGMars(this);
+  if (!Atmosphere->InitModel()) {
+    cerr << fgred << "Mars Atmosphere model init failed" << fgdef << endl;
+    Error+=1;
+  }
+  delete oldAtmosphere;
+*/
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+//    The bitmasked value choices are as follows:
+//    unset: In this case (the default) JSBSim would only print
+//       out the normally expected messages, essentially echoing
+//       the config files as they are read. If the environment
+//       variable is not set, debug_lvl is set to 1 internally
+//    0: This requests JSBSim not to output any messages
+//       whatsoever.
+//    1: This value explicity requests the normal JSBSim
+//       startup messages
+//    2: This value asks for a message to be printed out when
+//       a class is instantiated
+//    4: When this value is set, a message is displayed when a
+//       FGModel object executes its Run() method
+//    8: When this value is set, various runtime state variables
+//       are printed out periodically
+//    16: When set various parameters are sanity checked and
+//       a message is printed out when they go out of bounds
+
+void FGFDMExec::Debug(int from)
+{
+  if (debug_lvl <= 0) return;
+
+  if (debug_lvl & 1 && IdFDM == 0) { // Standard console startup message output
+    if (from == 0) { // Constructor
+      cout << "\n\n     " << highint << underon << "JSBSim Flight Dynamics Model v"
+                                     << JSBSim_version << underoff << normint << endl;
+      cout << halfint << "            [cfg file spec v" << needed_cfg_version << "]\n\n";
+      cout << normint << "JSBSim startup beginning ...\n\n";
+    } else if (from == 3) {
+      cout << "\n\nJSBSim startup complete\n\n";
+    }
+  }
+  if (debug_lvl & 2 ) { // Instantiation/Destruction notification
+    if (from == 0) cout << "Instantiated: FGFDMExec" << endl;
+    if (from == 1) cout << "Destroyed:    FGFDMExec" << endl;
+  }
+  if (debug_lvl & 4 ) { // Run() method entry print for FGModel-derived objects
+    if (from == 2) {
+      cout << "================== Frame: " << Frame << "  Time: "
+           << State->Getsim_time() << " dt: " << State->Getdt() << endl;
+    }
+  }
+  if (debug_lvl & 8 ) { // Runtime state variables
+  }
+  if (debug_lvl & 16) { // Sanity checking
+  }
+  if (debug_lvl & 64) {
+    if (from == 0) { // Constructor
+      cout << IdSrc << endl;
+      cout << IdHdr << endl;
+    }
+  }
+}
+}
+
+