From 8e49f066c936bdb267814f5830265884ce2d3ee2 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Thu, 25 Oct 2018 14:33:35 -0400
Subject: [PATCH] Sim: Corrections in mass/balence

---
 A320-100-CFM.xml                              |  2 +-
 A320-200-CFM.xml                              |  2 +-
 A320-200-IAE.xml                              |  2 +-
 A320neo-CFM.xml                               |  2 +-
 A320neo-PW.xml                                |  2 +-
 Systems/a320-mass-balance-iae.xml             | 62 -------------------
 ...-balance-cfm.xml => a320-mass-balance.xml} |  8 +--
 revision.txt                                  |  2 +-
 8 files changed, 10 insertions(+), 72 deletions(-)
 delete mode 100644 Systems/a320-mass-balance-iae.xml
 rename Systems/{a320-mass-balance-cfm.xml => a320-mass-balance.xml} (90%)

diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml
index ea51fa67..e68416c8 100644
--- a/A320-100-CFM.xml
+++ b/A320-100-CFM.xml
@@ -18,7 +18,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	</fileheader>
 	
 	<metrics file="Systems/a320-metrics"/>
-	<mass_balance file="Systems/a320-mass-balance-cfm"/>
+	<mass_balance file="Systems/a320-mass-balance"/>
 	<ground_reactions file="Systems/a320-ground-reactions"/>
 	
 	<propulsion>
diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml
index c1759075..cc5c783c 100644
--- a/A320-200-CFM.xml
+++ b/A320-200-CFM.xml
@@ -18,7 +18,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	</fileheader>
 	
 	<metrics file="Systems/a320-metrics"/>
-	<mass_balance file="Systems/a320-mass-balance-cfm"/>
+	<mass_balance file="Systems/a320-mass-balance"/>
 	<ground_reactions file="Systems/a320-ground-reactions"/>
 	
 	<propulsion>
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index d3973e1b..ddbdc62d 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -18,7 +18,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	</fileheader>
 	
 	<metrics file="Systems/a320-metrics"/>
-	<mass_balance file="Systems/a320-mass-balance-iae"/>
+	<mass_balance file="Systems/a320-mass-balance"/>
 	<ground_reactions file="Systems/a320-ground-reactions"/>
 	
 	<propulsion>
diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml
index 3943f649..828ec642 100644
--- a/A320neo-CFM.xml
+++ b/A320neo-CFM.xml
@@ -18,7 +18,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	</fileheader>
 	
 	<metrics file="Systems/a320-metrics"/>
-	<mass_balance file="Systems/a320-mass-balance-cfm"/>  <!--todo: make neo mass / balance -->
+	<mass_balance file="Systems/a320-mass-balance"/>
 	<ground_reactions file="Systems/a320-ground-reactions"/>
 	
 	<propulsion>
diff --git a/A320neo-PW.xml b/A320neo-PW.xml
index 3c21908d..0f7cdc24 100644
--- a/A320neo-PW.xml
+++ b/A320neo-PW.xml
@@ -18,7 +18,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 	</fileheader>
 	
 	<metrics file="Systems/a320-metrics"/>
-	<mass_balance file="Systems/a320-mass-balance-cfm"/> <!--todo: make neo mass / balance -->
+	<mass_balance file="Systems/a320-mass-balance"/>
 	<ground_reactions file="Systems/a320-ground-reactions"/>
 	
 	<propulsion>
diff --git a/Systems/a320-mass-balance-iae.xml b/Systems/a320-mass-balance-iae.xml
deleted file mode 100644
index 02dff495..00000000
--- a/Systems/a320-mass-balance-iae.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- Airbus A320 JSBsim -->
-<!-- Joshua Davidson (it0uchpods) -->
-
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
-
-<mass_balance>
-	<ixx unit="SLUG*FT2">  611903 </ixx>
-	<iyy unit="SLUG*FT2"> 1735389 </iyy>
-	<izz unit="SLUG*FT2"> 1401293 </izz>
-
-	<ixy unit="SLUG*FT2">       0 </ixy>
-	<ixz unit="SLUG*FT2">       0 </ixz>
-	<iyz unit="SLUG*FT2">       0 </iyz>
-	<emptywt unit="LBS" >   80431 </emptywt>
-	
-	<location name="CG" unit="M">
-		<x> 18.8231 </x>
-		<y> 0 </y>
-		<z> 0.19249 </z>
-	</location>
-	
-	<!-- average human weight 145 lbs, max 44000 lb -->
-	<pointmass name="Crew">
-		<weight unit="LBS">840</weight>
-		<location name="POINTMASS" unit="M">
-			<x> 5.29845 </x>
-			<y> 0 </y>
-			<z> -0.66384 </z>
-		</location>
-	</pointmass>
-	
-	<pointmass name="PAX">
-		<weight unit="LBS">24360</weight>
-		<location name="POINTMASS" unit="M">
-			<x> 18.8231 </x>
-			<y> 0 </y>
-			<z> 0.19249 </z>
-		</location>
-	</pointmass>
-	
-	<pointmass name="Fwd Cargo">
-		<weight unit="LBS">9400</weight>
-		<location name="POINTMASS" unit="M"> 
-			<x> 13.0849 </x>
-			<y> 0 </y>
-			<z> -1.18112 </z>
-		</location>
-	</pointmass>
-	
-	<pointmass name="Aft Cargo">
-		<weight unit="LBS">9400</weight>
-		<location name="POINTMASS" unit="M">
-			<x> 24.5565 </x>
-			<y> 0 </y>
-			<z> -1.18112 </z>
-		</location>
-	</pointmass>
-</mass_balance>
diff --git a/Systems/a320-mass-balance-cfm.xml b/Systems/a320-mass-balance.xml
similarity index 90%
rename from Systems/a320-mass-balance-cfm.xml
rename to Systems/a320-mass-balance.xml
index 02dff495..97ac8f2b 100644
--- a/Systems/a320-mass-balance-cfm.xml
+++ b/Systems/a320-mass-balance.xml
@@ -25,7 +25,7 @@
 	
 	<!-- average human weight 145 lbs, max 44000 lb -->
 	<pointmass name="Crew">
-		<weight unit="LBS">840</weight>
+		<weight unit="LBS">380</weight>
 		<location name="POINTMASS" unit="M">
 			<x> 5.29845 </x>
 			<y> 0 </y>
@@ -34,7 +34,7 @@
 	</pointmass>
 	
 	<pointmass name="PAX">
-		<weight unit="LBS">24360</weight>
+		<weight unit="LBS">23000</weight>
 		<location name="POINTMASS" unit="M">
 			<x> 18.8231 </x>
 			<y> 0 </y>
@@ -43,7 +43,7 @@
 	</pointmass>
 	
 	<pointmass name="Fwd Cargo">
-		<weight unit="LBS">9400</weight>
+		<weight unit="LBS">3000</weight>
 		<location name="POINTMASS" unit="M"> 
 			<x> 13.0849 </x>
 			<y> 0 </y>
@@ -52,7 +52,7 @@
 	</pointmass>
 	
 	<pointmass name="Aft Cargo">
-		<weight unit="LBS">9400</weight>
+		<weight unit="LBS">3000</weight>
 		<location name="POINTMASS" unit="M">
 			<x> 24.5565 </x>
 			<y> 0 </y>
diff --git a/revision.txt b/revision.txt
index 749138de..47f5014d 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4686
\ No newline at end of file
+4687
\ No newline at end of file