Update of /cvsroot/jsbsim/JSBSim/src/models/propulsion
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13271/src/models/propulsion
Modified Files:
FGTurboProp.h FGTurboProp.cpp
Log Message:
Removed dead code
Index: FGTurboProp.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGTurboProp.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** FGTurboProp.h 10 Jul 2016 12:39:28 -0000 1.24
--- FGTurboProp.h 26 Feb 2017 11:41:28 -0000 1.25
***************
*** 122,126 ****
double GetN1(void) const {return N1;}
- double GetEPR(void) const {return EPR;}
double GetITT(void) const {return Eng_ITT_degC;}
double GetEngStarting(void) const { return EngStarting; }
--- 122,125 ----
***************
*** 133,137 ****
void SetPhase( phaseType p ) { phase = p; }
- void SetEPR(double epr) {EPR = epr;}
void SetReverse(bool reversed) { Reversed = reversed; }
void SetCutoff(bool cutoff) { Cutoff = cutoff; }
--- 132,135 ----
***************
*** 146,150 ****
phaseType phase; ///< Operating mode, or "phase"
- double MilThrust; ///< Maximum Unaugmented Thrust, static @ S.L. (lbf)
double IdleN1; ///< Idle N1
double N1; ///< N1
--- 144,147 ----
***************
*** 156,160 ****
bool Cutoff;
- double EPR;
double OilPressure_psi;
double OilTemp_degK;
--- 153,156 ----
Index: FGTurboProp.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGTurboProp.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** FGTurboProp.cpp 10 Jul 2016 12:39:28 -0000 1.35
--- FGTurboProp.cpp 26 Feb 2017 11:41:28 -0000 1.36
***************
*** 112,117 ****
// ToDo: Need to make sure units are properly accounted for below.
- if (el->FindElement("milthrust"))
- MilThrust = el->FindElementValueAsNumberConvertTo("milthrust","LBS");
if (el->FindElement("idlen1"))
IdleN1 = el->FindElementValueAsNumber("idlen1");
--- 112,115 ----
***************
*** 198,202 ****
ThrottlePos = in.ThrottlePos[EngineNumber];
! /* The thruster controls the engine RPM because it encapsulates the gear ratio and other transmission variables */
RPM = Thruster->GetEngineRPM();
if (thrusterType == FGThruster::ttPropeller) {
--- 196,201 ----
ThrottlePos = in.ThrottlePos[EngineNumber];
! /* The thruster controls the engine RPM because it encapsulates the gear ratio
! and other transmission variables */
RPM = Thruster->GetEngineRPM();
if (thrusterType == FGThruster::ttPropeller) {
***************
*** 321,325 ****
double FGTurboProp::Run(void)
{
- double thrust = 0.0;
double EngPower_HP;
--- 320,323 ----
***************
*** 343,347 ****
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
//---
- EPR = 1.0 + thrust/MilThrust;
OilTemp_degK = Seek(&OilTemp_degK, 353.15, 0.4-N1*0.001, 0.04);
--- 341,344 ----
***************
*** 478,482 ****
HP = 0.0;
Type = etTurboprop;
- MilThrust = 10000.0;
IdleN1 = 30.0;
MaxN1 = 100.0;
--- 475,478 ----
***************
*** 591,595 ****
cout << "\n ****MUJ MOTOR TURBOPROP****\n";
cout << "\n Engine Name: " << Name << endl;
- cout << " MilThrust: " << MilThrust << endl;
cout << " IdleN1: " << IdleN1 << endl;
cout << " MaxN1: " << MaxN1 << endl;
--- 587,590 ----
|
