Andreas Gaeb: fix #222 (JSBSIm reset problems)

[flightgear.git] / src / FDM / JSBSim / models / FGModel.cpp

diff --git a/src/FDM/JSBSim/models/FGModel.cpp b/src/FDM/JSBSim/models/FGModel.cpp
index 3a16f493a4d47448ea86fe2cc1bc9dbfbf4f6772..71f6cb3ed3d468e5cadb0bd3b7035ff751e161a6 100644 (file)
--- a/src/FDM/JSBSim/models/FGModel.cpp
+++ b/src/FDM/JSBSim/models/FGModel.cpp
@@ -39,7 +39,6 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGModel.h"
-#include "FGState.h"
 #include "FGFDMExec.h"
 #include "FGAtmosphere.h"
 #include "FGFCS.h"
@@ -58,7 +57,7 @@ using namespace std;
 
 namespace JSBSim {
 
-static const char *IdSrc = "$Id$";
+static const char *IdSrc = "$Id: FGModel.cpp,v 1.16 2010/11/18 12:38:06 jberndt Exp $";
 static const char *IdHdr = ID_MODEL;
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -72,20 +71,6 @@ CLASS IMPLEMENTATION
 FGModel::FGModel(FGFDMExec* fdmex)
 {
   FDMExec     = fdmex;
-  NextModel   = 0L;
-
-  State           = 0;
-  Atmosphere      = 0;
-  FCS             = 0;
-  Propulsion      = 0;
-  MassBalance     = 0;
-  Aerodynamics    = 0;
-  Inertial        = 0;
-  GroundReactions = 0;
-  ExternalReactions = 0;
-  Aircraft        = 0;
-  Propagate       = 0;
-  Auxiliary       = 0;
 
   //in order for FGModel derived classes to self-bind (that is, call
   //their bind function in the constructor, the PropertyManager pointer
@@ -102,9 +87,6 @@ FGModel::FGModel(FGFDMExec* fdmex)
 
 FGModel::~FGModel()
 {
-  for (unsigned int i=0; i<interface_properties.size(); i++) delete interface_properties[i];
-  interface_properties.clear();
-
   if (debug_lvl & 2) cout << "Destroyed:    FGModel" << endl;
 }
 
@@ -112,61 +94,6 @@ FGModel::~FGModel()
 
 bool FGModel::InitModel(void)
 {
-  State           = FDMExec->GetState();
-  Atmosphere      = FDMExec->GetAtmosphere();
-  FCS             = FDMExec->GetFCS();
-  Propulsion      = FDMExec->GetPropulsion();
-  MassBalance     = FDMExec->GetMassBalance();
-  Aerodynamics    = FDMExec->GetAerodynamics();
-  Inertial        = FDMExec->GetInertial();
-  GroundReactions = FDMExec->GetGroundReactions();
-  ExternalReactions = FDMExec->GetExternalReactions();
-  BuoyantForces   = FDMExec->GetBuoyantForces();
-  Aircraft        = FDMExec->GetAircraft();
-  Propagate       = FDMExec->GetPropagate();
-  Auxiliary       = FDMExec->GetAuxiliary();
-
-  if (!State ||
-      !Atmosphere ||
-      !FCS ||
-      !Propulsion ||
-      !MassBalance ||
-      !Aerodynamics ||
-      !Inertial ||
-      !GroundReactions ||
-      !ExternalReactions ||
-      !Aircraft ||
-      !Propagate ||
-      !Auxiliary) return(false);
-  else return(true);
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-bool FGModel::Load(Element* el)
-{
-  // Interface properties are all stored in the interface properties array.
-
-  string interface_property_string = "";
-
-  Element *property_element = el->FindElement("property");
-  if (property_element && debug_lvl > 0) cout << endl << "    Declared properties" << endl << endl;
-  while (property_element) {
-    interface_property_string = property_element->GetDataLine();
-    if (PropertyManager->HasNode(interface_property_string)) {
-      cerr << "      Property " << interface_property_string << " is already defined." << endl;
-    } else {
-      double value=0.0;
-      if ( ! property_element->GetAttributeValue("value").empty())
-        value = property_element->GetAttributeValueAsNumber("value");
-      interface_properties.push_back(new double(value));
-      PropertyManager->Tie(interface_property_string, interface_properties.back());
-      if (debug_lvl > 0)
-        cout << "      " << interface_property_string << " (initial value: " << value << ")" << endl;
-    }
-    property_element = el->FindNextElement("property");
-  }
-  
   return true;
 }
 
@@ -176,9 +103,11 @@ bool FGModel::Run()
 {
   if (debug_lvl & 4) cout << "Entering Run() for model " << Name << endl;
 
-  if (exe_ctr++ >= rate) exe_ctr = 1;
+  if (rate == 1) return false; // Fast exit if nothing to do
+
+  if (exe_ctr >= rate) exe_ctr = 1;
 
-  if (exe_ctr == 1) return false;
+  if (exe_ctr++ == 1) return false;
   else              return true;
 }