Menu
▾
▴
[Jsbsim-cvslogs] CVS: JSBSim/src/models/propulsion FGTurboProp.h, 1.23, 1.24 FGTurboProp.cpp, 1.34, 1.35
|
From: Bertrand <bco...@us...> - 2016-07-10 12:39:31
|
Update of /cvsroot/jsbsim/JSBSim/src/models/propulsion In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2539/src/models/propulsion Modified Files: FGTurboProp.h FGTurboProp.cpp Log Message: Removed lots of no-op members Index: FGTurboProp.h =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGTurboProp.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** FGTurboProp.h 10 Jul 2016 09:16:37 -0000 1.23 --- FGTurboProp.h 10 Jul 2016 12:39:28 -0000 1.24 *************** *** 103,107 **** ~FGTurboProp(); ! enum phaseType { tpOff, tpRun, tpSpinUp, tpStart, tpStall, tpSeize, tpTrim }; void Calculate(void); --- 103,107 ---- ~FGTurboProp(); ! enum phaseType { tpOff, tpRun, tpSpinUp, tpStart, tpTrim }; void Calculate(void); *************** *** 109,113 **** double GetPowerAvailable(void) const { return (HP * hptoftlbssec); } ! double GetRPM(void) const { return (RPM); } double GetIeluThrottle(void) const { return (ThrottlePos); } bool GetIeluIntervent(void) const { return Ielu_intervent; } --- 109,113 ---- double GetPowerAvailable(void) const { return (HP * hptoftlbssec); } ! double GetRPM(void) const { return RPM; } double GetIeluThrottle(void) const { return (ThrottlePos); } bool GetIeluIntervent(void) const { return Ielu_intervent; } *************** *** 118,131 **** phaseType GetPhase(void) const { return phase; } - bool GetOvertemp(void) const {return Overtemp; } - bool GetFire(void) const { return Fire; } bool GetReversed(void) const { return Reversed; } bool GetCutoff(void) const { return Cutoff; } - int GetIgnition(void) const {return Ignition;} - double GetInlet(void) const { return InletPosition; } - double GetNozzle(void) const { return NozzlePosition; } double GetN1(void) const {return N1;} - double GetN2(void) const {return N2;} double GetEPR(void) const {return EPR;} double GetITT(void) const {return Eng_ITT_degC;} --- 118,125 ---- *************** *** 138,142 **** inline int GetCondition(void) const { return Condition; } - void SetIgnition(int ignition) {Ignition = ignition;} void SetPhase( phaseType p ) { phase = p; } void SetEPR(double epr) {EPR = epr;} --- 132,135 ---- *************** *** 155,180 **** double MilThrust; ///< Maximum Unaugmented Thrust, static @ S.L. (lbf) double IdleN1; ///< Idle N1 - double IdleN2; ///< Idle N2 double N1; ///< N1 - double N2; ///< N2 double MaxN1; ///< N1 at 100% throttle - double MaxN2; ///< N2 at 100% throttle double delay; ///< Inverse spool-up time from idle to 100% (seconds) double N1_factor; ///< factor to tie N1 and throttle - double N2_factor; ///< factor to tie N2 and throttle double ThrottlePos; ///< FCS-supplied throttle position, modified locally - bool Stalled; ///< true if engine is compressor-stalled - bool Seized; ///< true if inner spool is seized - bool Overtemp; ///< true if EGT exceeds limits - bool Fire; ///< true if engine fire detected bool Reversed; bool Cutoff; - int Ignition; double EPR; double OilPressure_psi; double OilTemp_degK; - double InletPosition; - double NozzlePosition; double Ielu_max_torque; // max propeller torque (before ielu intervent) --- 148,162 ---- Index: FGTurboProp.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGTurboProp.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -r1.34 -r1.35 *** FGTurboProp.cpp 10 Jul 2016 09:16:37 -0000 1.34 --- FGTurboProp.cpp 10 Jul 2016 12:39:28 -0000 1.35 *************** *** 116,125 **** if (el->FindElement("idlen1")) IdleN1 = el->FindElementValueAsNumber("idlen1"); - if (el->FindElement("idlen2")) - IdleN2 = el->FindElementValueAsNumber("idlen2"); if (el->FindElement("maxn1")) MaxN1 = el->FindElementValueAsNumber("maxn1"); - if (el->FindElement("maxn2")) - MaxN2 = el->FindElementValueAsNumber("maxn2"); if (el->FindElement("betarangeend")) BetaRangeThrottleEnd = el->FindElementValueAsNumber("betarangeend")/100.0; --- 116,121 ---- *************** *** 174,178 **** delay=1; N1_factor = MaxN1 - IdleN1; - N2_factor = MaxN2 - IdleN2; OilTemp_degK = in.TAT_c + 273.0; --- 170,173 ---- *************** *** 229,233 **** if (Running && !Starved) { phase = tpRun; - N2 = IdleN2; N1 = IdleN1; OilTemp_degK = 366.0; --- 224,227 ---- *************** *** 383,387 **** OilPressure_psi = (N1/100.0*0.25+(0.1-(OilTemp_degK-273.15)*0.1/80.0)*N1/100.0) / 7692.0e-6; //from MPa to psi - NozzlePosition = 1.0; EngPower_HP = EnginePowerRPM_N1->GetValue(RPM,N1); --- 377,380 ---- *************** *** 405,409 **** EngStarting = false; ! if ((N1 > 15.0) && !Starved) { // minimum 15% N2 needed for start double old_N1 = N1; Cranking = true; // provided for sound effects signal --- 398,402 ---- EngStarting = false; ! if ((N1 > 15.0) && !Starved) { // minimum 15% N1 needed for start double old_N1 = N1; Cranking = true; // provided for sound effects signal *************** *** 429,433 **** FuelFlow_pph = 0; } ! } else { // no start if N2 < 15% or Starved phase = tpOff; Starter = false; --- 422,426 ---- FuelFlow_pph = 0; } ! } else { // no start if N1 < 15% or Starved phase = tpOff; Starter = false; *************** *** 482,502 **** { // Name = "Not defined"; ! N1 = N2 = 0.0; HP = 0.0; Type = etTurboprop; MilThrust = 10000.0; IdleN1 = 30.0; - IdleN2 = 60.0; MaxN1 = 100.0; - MaxN2 = 100.0; - InletPosition = 1.0; - NozzlePosition = 1.0; Reversed = false; Cutoff = true; phase = tpOff; - Stalled = false; - Seized = false; - Overtemp = false; - Fire = false; Eng_ITT_degC = 0.0; --- 475,487 ---- { // Name = "Not defined"; ! N1 = 0.0; HP = 0.0; Type = etTurboprop; MilThrust = 10000.0; IdleN1 = 30.0; MaxN1 = 100.0; Reversed = false; Cutoff = true; phase = tpOff; Eng_ITT_degC = 0.0; *************** *** 522,526 **** buf << Name << "_N1[" << EngineNumber << "]" << delimiter - << Name << "_N2[" << EngineNumber << "]" << delimiter << Name << "_PwrAvail[" << EngineNumber << "]" << delimiter << Thruster->GetThrusterLabels(EngineNumber, delimiter); --- 507,510 ---- *************** *** 536,540 **** buf << N1 << delimiter - << N2 << delimiter << HP << delimiter << Thruster->GetThrusterValues(EngineNumber,delimiter); --- 520,523 ---- *************** *** 551,555 **** Cutoff=false; Running=true; - N2=16.0; Calculate(); in.TotalDeltaT = dt; --- 534,537 ---- *************** *** 565,570 **** property_name = base_property_name + "/n1"; PropertyManager->Tie( property_name.c_str(), &N1); - // property_name = base_property_name + "/n2"; - // PropertyManager->Tie( property_name.c_str(), &N2); property_name = base_property_name + "/reverser"; PropertyManager->Tie( property_name.c_str(), &Reversed); --- 547,550 ---- |
