← Back to branch summary

~ubuntu-branches/ubuntu/precise/flightgear/precise

« back to all changes in this revision

Viewing changes to src/FDM/JSBSim/models/FGExternalReactions.cpp

  • Committer: Package Import Robot
  • Author(s): Ove Kaaven
  • Date: 2011-09-03 22:16:12 UTC
  • mfrom: (3.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20110903221612-2cjy0z7ztj5nkln5
Tags: 2.4.0-1
http://bugs.debian.org/638588
* New upstream release. Closes: #638588.
* Build-Depend on OpenSceneGraph 3.0, and the Subversion library.
* Recommend fgfs-scenery-base.
* Enable parallel builds (shorter compile times on multicore CPUs).
* Removed hack that tried to build without optimizations if
  building with optimizations fails.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/FDM/JSBSim/models/FGExternalReactions.cpp
53
53
GLOBAL DATA
54
54
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
55
55
 
56
 
static const char *IdSrc = "$Id$";
 
56
static const char *IdSrc = "$Id: FGExternalReactions.cpp,v 1.10 2011/05/20 03:18:36 jberndt Exp $";
57
57
static const char *IdHdr = ID_EXTERNALREACTIONS;
58
58
 
59
59
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
85
85
    force_element = el->FindNextElement("force");
86
86
  }
87
87
 
88
 
  FGModel::PostLoad(el);
 
88
  PostLoad(el, PropertyManager);
89
89
 
90
90
  return true;
91
91
}
104
104
 
105
105
bool FGExternalReactions::InitModel(void)
106
106
{
107
 
  if (!FGModel::InitModel()) return false;
108
 
 
109
107
  return true;
110
108
}
111
109
 
112
110
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
113
111
 
114
 
bool FGExternalReactions::Run()
 
112
bool FGExternalReactions::Run(bool Holding)
115
113
{
116
 
  if (FGModel::Run()) return true;
117
 
  if (FDMExec->Holding()) return false; // if paused don't execute
 
114
  if (FGModel::Run(Holding)) return true;
 
115
  if (Holding) return false; // if paused don't execute
118
116
  if (NoneDefined) return true;
119
117
 
120
118
  RunPreFunctions();