[Jsbsim-cvslogs] CVS: JSBSim/src/models/propulsion FGPiston.cpp, 1.82, 1.83 FGPiston.h, 1.38, 1.39

[Erik H. <eh...@us...>]

Update of /cvsroot/jsbsim/JSBSim/src/models/propulsion
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv498/src/models/propulsion

Modified Files:
	FGPiston.cpp FGPiston.h 
Log Message:
Add the option to define the oil-pressure-relief-valve-psi, design-oil-temp-degK, oil-pressure-rpm-max and oil-viscosity-index for piston engines

Index: FGPiston.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGPiston.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -r1.82 -r1.83
*** FGPiston.cpp	2 Jan 2016 17:42:53 -0000	1.82
--- FGPiston.cpp	29 Apr 2017 11:16:46 -0000	1.83
***************
*** 235,238 ****
--- 235,251 ----
    }
  
+   Design_Oil_Temp = 358;                // degK;
+   Oil_Viscosity_Index = 0.25;
+   Oil_Press_Relief_Valve = 60;          // psi
+   Oil_Press_RPM_Max = MaxRPM*0.75;
+   if (el->FindElement("oil-pressure-relief-valve-psi"))
+     Oil_Press_Relief_Valve = el->FindElementValueAsNumberConvertTo("oil-pressure-relief-valve-psi", "PSI");
+   if (el->FindElement("design-oil-temp-degK"))
+     Design_Oil_Temp = el->FindElementValueAsNumberConvertTo("design-oil-temp-degK", "DEGK");
+   if (el->FindElement("oil-pressure-rpm-max"))
+     Oil_Press_RPM_Max = el->FindElementValueAsNumber("oil-pressure-rpm-max");
+   if (el->FindElement("oil-viscosity-index"))
+     Oil_Viscosity_Index = el->FindElementValueAsNumber("oil-viscosity-index");
+ 
    while((table_element = el->FindNextElement("table")) != 0) {
      string name = table_element->GetAttributeValue("name");
***************
*** 921,929 ****
  void FGPiston::doOilPressure(void)
  {
-   double Oil_Press_Relief_Valve = 60; // FIXME: may vary by engine
-   double Oil_Press_RPM_Max = MaxRPM * 0.75;    // 75% of max rpm FIXME: may vary by engine
-   double Design_Oil_Temp = 358;          // degK; FIXME: may vary by engine
-   double Oil_Viscosity_Index = 0.25;
- 
    OilPressure_psi = (Oil_Press_Relief_Valve / Oil_Press_RPM_Max) * RPM;
  
--- 934,937 ----

Index: FGPiston.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGPiston.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** FGPiston.h	2 Jan 2016 17:42:53 -0000	1.38
--- FGPiston.h	29 Apr 2017 11:16:46 -0000	1.39
***************
*** 107,110 ****
--- 107,114 ----
    <ratedaltitude3 unit="{FT | M}"> {number} </ratedaltitude3>
    <takeoffboost unit="{INHG | PA | ATM}"> {number} </takeoffboost>
+   <oil-pressure-relief-valve-psi> {number} </oil-pressure-relief-valve=psi>
+   <design-oil-temp-degK>  {number} </design-oil-temp-degK>
+   <oil-pressure-rpm-max> {number} </oil-pressure-rpm-max>
+   <oil-viscosity-index> {number} </oil-viscosity-index>
  </piston_engine>
  @endcode
***************
*** 362,365 ****
--- 366,374 ----
    int Magnetos;
  
+   double Oil_Press_Relief_Valve;
+   double Oil_Press_RPM_Max;
+   double Design_Oil_Temp;         // degK
+   double Oil_Viscosity_Index;
+ 
    //
    // Outputs (in addition to those in FGEngine).