[Jsbsim-cvslogs] CVS: JSBSim/src FGFDMExec.cpp,1.103,1.104

[Jon S. B. <jb...@us...>]

Update of /cvsroot/jsbsim/JSBSim/src
In directory vz-cvs-3.sog:/tmp/cvs-serv15650/src

Modified Files:
	FGFDMExec.cpp 
Log Message:
Removed some syntax highlighting that is not controllable

Index: FGFDMExec.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/FGFDMExec.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -r1.103 -r1.104
*** FGFDMExec.cpp	20 Jul 2011 12:26:41 -0000	1.103
--- FGFDMExec.cpp	27 Jul 2011 03:56:47 -0000	1.104
***************
*** 416,420 ****
      break;
    case ePropulsion:
!     // Dynamic inputs come into the engines that propulsion manages through properties
      break;
    case eAerodynamics:
--- 416,441 ----
      break;
    case ePropulsion:
! //    Propulsion->in.Pressure = Atmosphere->GetPressure(h);
!     Propulsion->in.SLPressure       = Atmosphere->GetPressureSL();
!     Propulsion->in.Pressure         = Atmosphere->GetPressure();
!     Propulsion->in.Temperature      = Atmosphere->GetTemperature();
!     Propulsion->in.DensityRatio     = Atmosphere->GetDensityRatio();
!     Propulsion->in.Density          = Atmosphere->GetDensity();
!     Propulsion->in.Soundspeed       = Atmosphere->GetSoundSpeed();
!     Propulsion->in.TotalPressure    = Auxiliary->GetTotalPressure();
!     Propulsion->in.TotalTempearture = Auxiliary->GetTotalTemperature();
!     Propulsion->in.Vc               = Auxiliary->GetVcalibratedKTS();
!     Propulsion->in.Vt               = Auxiliary->GetVt();
!     Propulsion->in.qbar             = Auxiliary->Getqbar();
!     Propulsion->in.TAT_c            = Auxiliary->GetTAT_C();
!     Propulsion->in.AeroUVW          = Auxiliary->GetAeroUVW();
!     Propulsion->in.AeroPQR          = Auxiliary->GetAeroPQR();
!     Propulsion->in.alpha            = Auxiliary->Getalpha();
!     Propulsion->in.beta             = Auxiliary->Getbeta();
!     Propulsion->in.TotalDeltaT      = dT * Propulsion->GetRate();
!     Propulsion->in.ThrottlePos      = FCS->GetThrottlePos();
!     Propulsion->in.MixturePos       = FCS->GetMixturePos();
!     Propulsion->in.PropAdvance      = FCS->GetPropAdvance();
!     Propulsion->in.PropFeather      = FCS->GetPropFeather();
      break;
    case eAerodynamics:
***************
*** 742,745 ****
--- 763,767 ----
          return result;
        }
+       for (unsigned int i=0; i<Propulsion->GetNumEngines(); i++) FCS->AddThrottle();
      }
  
***************
*** 1167,1174 ****
    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 << "            [JSBSim-ML v" << needed_cfg_version << "]\n\n";
!       cout << normint << "JSBSim startup beginning ...\n\n";
      } else if (from == 3) {
        cout << "\n\nJSBSim startup complete\n\n";
--- 1189,1196 ----
    if (debug_lvl & 1 && IdFDM == 0) { // Standard console startup message output
      if (from == 0) { // Constructor
!       cout << "\n\n     " 
!            << "JSBSim Flight Dynamics Model v" << JSBSim_version << endl;
!       cout << "            [JSBSim-ML v" << needed_cfg_version << "]\n\n";
!       cout << "JSBSim startup beginning ...\n\n";
      } else if (from == 3) {
        cout << "\n\nJSBSim startup complete\n\n";