[Jsbsim-cvslogs] CVS: JSBSim/src/models/propulsion FGPiston.cpp, 1.60, 1.61

[Ron J. <je...@us...>]

Update of /cvsroot/jsbsim/JSBSim/src/models/propulsion
In directory vz-cvs-3.sog:/tmp/cvs-serv3181/JSBSimCVS-write/src/models/propulsion

Modified Files:
	FGPiston.cpp 
Log Message:
Allow loading of Mixture and Combustion tables from the engine configuration file.


Index: FGPiston.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGPiston.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** FGPiston.cpp	28 Jul 2011 12:48:19 -0000	1.60
--- FGPiston.cpp	28 Jul 2011 20:22:35 -0000	1.61
***************
*** 67,75 ****
--- 67,78 ----
    standard_pressure(101320.73)
  {
+   Element *table_element;
    string token;
+   string name="";
  
    // Defaults and initializations
  
    Type = etPiston;
+  
  
    // These items are read from the configuration file
***************
*** 101,104 ****
--- 104,109 ----
    // These are internal program variables
  
+   Lookup_Combustion_Efficiency = 0;
+   Mixture_Efficiency_Correlation = 0;
    crank_counter = 0;
    Magnetos = 0;
***************
*** 132,167 ****
    }
  
-   // First column is thi, second is neta (combustion efficiency)
-   Lookup_Combustion_Efficiency = new FGTable(12);
-   *Lookup_Combustion_Efficiency << 0.00 << 0.980;
-   *Lookup_Combustion_Efficiency << 0.90 << 0.980;
-   *Lookup_Combustion_Efficiency << 1.00 << 0.970;
-   *Lookup_Combustion_Efficiency << 1.05 << 0.950;
-   *Lookup_Combustion_Efficiency << 1.10 << 0.900;
-   *Lookup_Combustion_Efficiency << 1.15 << 0.850;
-   *Lookup_Combustion_Efficiency << 1.20 << 0.790;
-   *Lookup_Combustion_Efficiency << 1.30 << 0.700;
-   *Lookup_Combustion_Efficiency << 1.40 << 0.630;
-   *Lookup_Combustion_Efficiency << 1.50 << 0.570;
-   *Lookup_Combustion_Efficiency << 1.60 << 0.525;
-   *Lookup_Combustion_Efficiency << 2.00 << 0.345;
- 
-   Mixture_Efficiency_Correlation = new FGTable(15);
-   *Mixture_Efficiency_Correlation << 0.05000 << 0.00000;
-   *Mixture_Efficiency_Correlation << 0.05137 << 0.00862;
-   *Mixture_Efficiency_Correlation << 0.05179 << 0.21552;
-   *Mixture_Efficiency_Correlation << 0.05430 << 0.48276;
-   *Mixture_Efficiency_Correlation << 0.05842 << 0.70690;
-   *Mixture_Efficiency_Correlation << 0.06312 << 0.83621;
-   *Mixture_Efficiency_Correlation << 0.06942 << 0.93103;
-   *Mixture_Efficiency_Correlation << 0.07786 << 1.00000;
-   *Mixture_Efficiency_Correlation << 0.08845 << 1.00000;
-   *Mixture_Efficiency_Correlation << 0.09270 << 0.98276;
-   *Mixture_Efficiency_Correlation << 0.10120 << 0.93103;
-   *Mixture_Efficiency_Correlation << 0.11455 << 0.72414;
-   *Mixture_Efficiency_Correlation << 0.12158 << 0.45690;
-   *Mixture_Efficiency_Correlation << 0.12435 << 0.23276;
-   *Mixture_Efficiency_Correlation << 0.12500 << 0.00000;
- 
    // Read inputs from engine data file where present.
  
--- 137,140 ----
***************
*** 248,251 ****
--- 221,241 ----
    }
  
+   while(table_element = el->FindNextElement("table")) {
+     name = table_element->GetAttributeValue("name");
+     try {
+       if (name == "COMBUSTION") {
+         Lookup_Combustion_Efficiency = new FGTable(PropertyManager, table_element);
+       } else if (name == "MIXTURE") {
+     cerr << "fuckme: " << name << " in piston engine definition." << endl;
+         Mixture_Efficiency_Correlation = new FGTable(PropertyManager, table_element);
+     cerr << "fuckme: " << name << " in piston engine definition." << endl;
+       } else {
+         cerr << "Unknown table type: " << name << " in piston engine definition." << endl;
+       }
+     } catch (std::string str) {
+       throw("Error loading piston engine table:" + name + ". " + str);
+     }
+   }
+ 
    StarterHP = sqrt(MaxHP) * 0.4;
    displacement_SI = Displacement * in3tom3;
***************
*** 282,286 ****
   *
   */
- 
    if(Z_airbox < 0.0){
      double Ze=PeakMeanPistonSpeed_fps/RatedMeanPistonSpeed_fps; // engine impedence
--- 272,275 ----
***************
*** 291,294 ****
--- 280,322 ----
    //  Z_throttle=(MaxRPM/IdleRPM )*(standard_pressure/minMAP+2); // Constant for Throttle impedence
  
+ // Default tables if not provided in the configuration file
+   if(Lookup_Combustion_Efficiency == 0) {
+     // First column is thi, second is neta (combustion efficiency)
+     Lookup_Combustion_Efficiency = new FGTable(12);
+     *Lookup_Combustion_Efficiency << 0.00 << 0.980;
+     *Lookup_Combustion_Efficiency << 0.90 << 0.980;
+     *Lookup_Combustion_Efficiency << 1.00 << 0.970;
+     *Lookup_Combustion_Efficiency << 1.05 << 0.950;
+     *Lookup_Combustion_Efficiency << 1.10 << 0.900;
+     *Lookup_Combustion_Efficiency << 1.15 << 0.850;
+     *Lookup_Combustion_Efficiency << 1.20 << 0.790;
+     *Lookup_Combustion_Efficiency << 1.30 << 0.700;
+     *Lookup_Combustion_Efficiency << 1.40 << 0.630;
+     *Lookup_Combustion_Efficiency << 1.50 << 0.570;
+     *Lookup_Combustion_Efficiency << 1.60 << 0.525;
+     *Lookup_Combustion_Efficiency << 2.00 << 0.345;
+   }
+ 
+     // First column is Fuel/Air Ratio, second is neta (mixture efficiency)
+   if( Mixture_Efficiency_Correlation == 0) {
+     Mixture_Efficiency_Correlation = new FGTable(15);
+     *Mixture_Efficiency_Correlation << 0.05000 << 0.00000;
+     *Mixture_Efficiency_Correlation << 0.05137 << 0.00862;
+     *Mixture_Efficiency_Correlation << 0.05179 << 0.21552;
+     *Mixture_Efficiency_Correlation << 0.05430 << 0.48276;
+     *Mixture_Efficiency_Correlation << 0.05842 << 0.70690;
+     *Mixture_Efficiency_Correlation << 0.06312 << 0.83621;
+     *Mixture_Efficiency_Correlation << 0.06942 << 0.93103;
+     *Mixture_Efficiency_Correlation << 0.07786 << 1.00000;
+     *Mixture_Efficiency_Correlation << 0.08845 << 1.00000;
+     *Mixture_Efficiency_Correlation << 0.09270 << 0.98276;
+     *Mixture_Efficiency_Correlation << 0.10120 << 0.93103;
+     *Mixture_Efficiency_Correlation << 0.11455 << 0.72414;
+     *Mixture_Efficiency_Correlation << 0.12158 << 0.45690;
+     *Mixture_Efficiency_Correlation << 0.12435 << 0.23276;
+     *Mixture_Efficiency_Correlation << 0.12500 << 0.00000;
+   }
+ 
+ 
    string property_name, base_property_name;
    base_property_name = CreateIndexedPropertyName("propulsion/engine", EngineNumber);