From 2b5174faa7f91663fc7179ee114a30137933cf75 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sat, 29 Dec 2018 17:26:48 -0500
Subject: [PATCH] Engine: New EPR Calculation Curves

---
 Systems/fadec-cfm.xml |   1 -
 Systems/fadec-iae.xml | 231 +++++++++++++++++-------------------------
 revision.txt          |   2 +-
 3 files changed, 92 insertions(+), 142 deletions(-)

diff --git a/Systems/fadec-cfm.xml b/Systems/fadec-cfm.xml
index 178f40c5..98c9cd8a 100644
--- a/Systems/fadec-cfm.xml
+++ b/Systems/fadec-cfm.xml
@@ -3,7 +3,6 @@
 <!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
 
 <!-- A3XX CFM56/CFM Leap/PW PurePower FADEC -->
-<!-- Joshua Davidson (it0uchpods) -->
 
 <PropertyList>
 
diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml
index ef83867a..16f3b6ad 100644
--- a/Systems/fadec-iae.xml
+++ b/Systems/fadec-iae.xml
@@ -3,7 +3,6 @@
 <!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
 
 <!-- A3XX IAE V2500 FADEC -->
-<!-- Joshua Davidson (it0uchpods) -->
 
 <PropertyList>
 
@@ -184,8 +183,8 @@
 			<expression>
 				<table>
 					<property>/fdm/jsbsim/atmosphere/density-altitude</property> 
-					<entry><ind>    0</ind><dep>0.576</dep></entry>
-					<entry><ind>42000</ind><dep>0.876</dep></entry>
+					<entry><ind>    0</ind><dep>0.681</dep></entry>
+					<entry><ind>42000</ind><dep>0.757</dep></entry>
 				</table>
 			</expression>
 		</input>
@@ -218,8 +217,8 @@
 				<difference>
 					<table>
 						<property>/fdm/jsbsim/atmosphere/density-altitude</property> 
-						<entry><ind>    0</ind><dep>0.988</dep></entry>
-						<entry><ind>43000</ind><dep>0.858</dep></entry>
+						<entry><ind>    0</ind><dep>0.9813</dep></entry>
+						<entry><ind>43000</ind><dep>0.8581</dep></entry>
 					</table>
 					<table>
 						<property>/fdm/jsbsim/velocities/mach</property>
@@ -231,9 +230,9 @@
 					</table>
 					<table>
 						<property>/fdm/jsbsim/aero/alpha-deg-norm</property>
-						<entry><ind>  0.0</ind><dep> 0.00</dep></entry>
-						<entry><ind>  7.5</ind><dep> 0.01</dep></entry>
-						<entry><ind> 17.0</ind><dep> 0.03</dep></entry>
+						<entry><ind> 0.0</ind><dep>0.00</dep></entry>
+						<entry><ind> 7.5</ind><dep>0.01</dep></entry>
+						<entry><ind>17.0</ind><dep>0.03</dep></entry>
 					</table>
 				</difference>
 			</expression>
@@ -252,44 +251,6 @@
 	
 	<!-- -->
 	
-	<filter>
-		<name>EPR N1 Input Engine 1</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<expression>
-				<product>
-					<property>/engines/engine[0]/n1-actual</property> 
-					<table>
-						<property>/engines/engine[0]/n1-actual</property> 
-						<entry><ind> 22.4</ind><dep> 1</dep></entry>
-						<entry><ind>103.8</ind><dep>50</dep></entry>
-					</table>
-				</product>
-			</expression>
-		</input>
-		<output>/engines/engine[0]/epr-n1-input</output>
-	</filter>
-	
-	<filter>
-		<name>EPR N1 Input Engine 2</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<expression>
-				<product>
-					<property>/engines/engine[1]/n1-actual</property> 
-					<table>
-						<property>/engines/engine[1]/n1-actual</property> 
-						<entry><ind> 22.4</ind><dep> 1</dep></entry>
-						<entry><ind>103.8</ind><dep>50</dep></entry>
-					</table>
-				</product>
-			</expression>
-		</input>
-		<output>/engines/engine[1]/epr-n1-input</output>
-	</filter>
-	
 	<filter>
 		<name>EPR THR Input Engine 1</name>
 		<type>gain</type>
@@ -386,10 +347,13 @@
 		<input>
 			<expression>
 				<table>
-					<property>/engines/engine[0]/epr-n1-input</property>
-					<entry><ind>  18.0</ind><dep>0.00</dep></entry>
-					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
-					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+					<pow>
+						<property>/engines/engine[0]/n1-actual</property> 
+						<value>3.5</value>
+					</pow>
+					<entry><ind>      18.0</ind><dep>0.00</dep></entry>
+					<entry><ind>      22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
 				</table>
 			</expression>
 			<scale>/engines/epr-scale</scale>
@@ -398,7 +362,7 @@
 	</filter>
 	
 	<filter>
-		<name>EPR 1</name>
+		<name>EPR 1 B</name>
 		<type>gain</type>
 		<gain>1.0</gain>
 		<input>
@@ -416,7 +380,6 @@
 		<name>EPR CMD 1</name>
 		<type>gain</type>
 		<gain>1.0</gain>
-		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<condition>
 				<and>
@@ -432,9 +395,19 @@
 			</condition>
 			<expression>
 				<table>
-					<property>/engines/epr-flex-input</property>
-					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
-					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+					<pow>
+						<table>
+							<product>
+								<value>0.99</value>
+								<property>/engines/flx-throttle</property>
+							</product>
+							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+							<entry><ind>1.0</ind><dep>103.8</dep></entry>
+						</table>
+						<value>3.5</value>
+					</pow>
+					<entry><ind>      22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
 				</table>
 			</expression>
 			<scale>/engines/epr-scale</scale>
@@ -442,9 +415,16 @@
 		<input>
 			<expression>
 				<table>
-					<property>/engines/engine[0]/epr-thr-input</property>
-					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
-					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+					<pow>
+						<table>
+							<property>/controls/engines/engine[0]/throttle-cmd-man</property> 
+							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+							<entry><ind>1.0</ind><dep>103.8</dep></entry>
+						</table>
+						<value>3.5</value>
+					</pow>
+					<entry><ind>      22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
 				</table>
 			</expression>
 			<scale>/engines/epr-scale</scale>
@@ -453,10 +433,9 @@
 	</filter>
 	
 	<filter>
-		<name>EPR CMD 1</name>
+		<name>EPR CMD 1 B</name>
 		<type>gain</type>
 		<gain>1.0</gain>
-		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
 				<sum>
@@ -475,10 +454,13 @@
 		<input>
 			<expression>
 				<table>
-					<property>/engines/engine[1]/epr-n1-input</property>
-					<entry><ind>  18.0</ind><dep>0.00</dep></entry>
-					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
-					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+					<pow>
+						<property>/engines/engine[1]/n1-actual</property> 
+						<value>3.5</value>
+					</pow>
+					<entry><ind>      18.0</ind><dep>0.00</dep></entry>
+					<entry><ind>      22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
 				</table>
 			</expression>
 			<scale>/engines/epr-scale</scale>
@@ -487,7 +469,7 @@
 	</filter>
 	
 	<filter>
-		<name>EPR 2</name>
+		<name>EPR 2 B</name>
 		<type>gain</type>
 		<gain>1.0</gain>
 		<input>
@@ -505,7 +487,6 @@
 		<name>EPR CMD 2</name>
 		<type>gain</type>
 		<gain>1.0</gain>
-		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<condition>
 				<and>
@@ -521,9 +502,19 @@
 			</condition>
 			<expression>
 				<table>
-					<property>/engines/epr-flex-input</property>
-					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
-					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+					<pow>
+						<table>
+							<product>
+								<value>0.99</value>
+								<property>/engines/flx-throttle</property>
+							</product>
+							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+							<entry><ind>1.0</ind><dep>103.8</dep></entry>
+						</table>
+						<value>3.5</value>
+					</pow>
+					<entry><ind>      22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
 				</table>
 			</expression>
 			<scale>/engines/epr-scale</scale>
@@ -531,9 +522,16 @@
 		<input>
 			<expression>
 				<table>
-					<property>/engines/engine[1]/epr-thr-input</property>
-					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
-					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+					<pow>
+						<table>
+							<property>/controls/engines/engine[1]/throttle-cmd-man</property> 
+							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
+							<entry><ind>1.0</ind><dep>103.8</dep></entry>
+						</table>
+						<value>3.5</value>
+					</pow>
+					<entry><ind>      22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
 				</table>
 			</expression>
 			<scale>/engines/epr-scale</scale>
@@ -542,10 +540,9 @@
 	</filter>
 	
 	<filter>
-		<name>EPR CMD 2</name>
+		<name>EPR CMD 2 B</name>
 		<type>gain</type>
 		<gain>1.0</gain>
-		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
 				<sum>
@@ -561,7 +558,6 @@
 		<name>N1 CMD 1</name>
 		<type>gain</type>
 		<gain>1.0</gain>
-		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<condition>
 				<and>
@@ -602,7 +598,6 @@
 		<name>N1 CMD 2</name>
 		<type>gain</type>
 		<gain>1.0</gain>
-		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<condition>
 				<and>
@@ -1431,7 +1426,7 @@
 		<input>
 			<expression>
 				<table>
-					<product>
+					<pow>
 						<table>
 							<product>
 								<value>0.99</value>
@@ -1440,21 +1435,10 @@
 							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
 							<entry><ind>1.0</ind><dep>103.8</dep></entry>
 						</table>
-						<table>
-							<table>
-								<product>
-									<value>0.99</value>
-									<property>/controls/engines/throttle-scale</property>
-								</product>
-								<entry><ind>0.0</ind><dep> 22.4</dep></entry>
-								<entry><ind>1.0</ind><dep>103.8</dep></entry>
-							</table>
-							<entry><ind> 22.4</ind><dep> 1</dep></entry>
-							<entry><ind>103.8</ind><dep>50</dep></entry>
-						</table>
-					</product>
-					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
-					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+						<value>3.5</value>
+					</pow>
+					<entry><ind>      22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
 				</table>
 			</expression>
 			<scale>/engines/epr-scale</scale>
@@ -1486,7 +1470,7 @@
 		<input>
 			<expression>
 				<table>
-					<product>
+					<pow>
 						<table>
 							<product>
 								<value>0.95</value>
@@ -1495,21 +1479,10 @@
 							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
 							<entry><ind>1.0</ind><dep>103.8</dep></entry>
 						</table>
-						<table>
-							<table>
-								<product>
-									<value>0.95</value>
-									<property>/controls/engines/throttle-scale</property>
-								</product>
-								<entry><ind>0.0</ind><dep> 22.4</dep></entry>
-								<entry><ind>1.0</ind><dep>103.8</dep></entry>
-							</table>
-							<entry><ind> 22.4</ind><dep> 1</dep></entry>
-							<entry><ind>103.8</ind><dep>50</dep></entry>
-						</table>
-					</product>
-					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
-					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+						<value>3.5</value>
+					</pow>
+					<entry><ind>      22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
 				</table>
 			</expression>
 			<scale>/engines/epr-scale</scale>
@@ -1541,7 +1514,7 @@
 		<input>
 			<expression>
 				<table>
-					<product>
+					<pow>
 						<table>
 							<product>
 								<value>0.99</value>
@@ -1550,21 +1523,10 @@
 							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
 							<entry><ind>1.0</ind><dep>103.8</dep></entry>
 						</table>
-						<table>
-							<table>
-								<product>
-									<value>0.99</value>
-									<property>/engines/flx-throttle</property>
-								</product>
-								<entry><ind>0.0</ind><dep> 22.4</dep></entry>
-								<entry><ind>1.0</ind><dep>103.8</dep></entry>
-							</table>
-							<entry><ind> 22.4</ind><dep> 1</dep></entry>
-							<entry><ind>103.8</ind><dep>50</dep></entry>
-						</table>
-					</product>
-					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
-					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+						<value>3.5</value>
+					</pow>
+					<entry><ind>      22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
 				</table>
 			</expression>
 			<scale>/engines/epr-scale</scale>
@@ -1596,7 +1558,7 @@
 		<input>
 			<expression>
 				<table>
-					<product>
+					<pow>
 						<table>
 							<product>
 								<value>0.91</value>
@@ -1605,21 +1567,10 @@
 							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
 							<entry><ind>1.0</ind><dep>103.8</dep></entry>
 						</table>
-						<table>
-							<table>
-								<product>
-									<value>0.91</value>
-									<property>/controls/engines/throttle-scale</property>
-								</product>
-								<entry><ind>0.0</ind><dep> 22.4</dep></entry>
-								<entry><ind>1.0</ind><dep>103.8</dep></entry>
-							</table>
-							<entry><ind> 22.4</ind><dep> 1</dep></entry>
-							<entry><ind>103.8</ind><dep>50</dep></entry>
-						</table>
-					</product>
-					<entry><ind>  22.4</ind><dep>0.03</dep></entry>
-					<entry><ind>5190.0</ind><dep>1.00</dep></entry>
+						<value>3.5</value>
+					</pow>
+					<entry><ind>      22.4</ind><dep>0.03</dep></entry>
+					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
 				</table>
 			</expression>
 			<scale>/engines/epr-scale</scale>
diff --git a/revision.txt b/revision.txt
index c3a4e75b..3a5f22c3 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4720
\ No newline at end of file
+4722
\ No newline at end of file