From 0e7dd5b62fba80df7a6ff16d97b65e65629b2a52 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sat, 9 Feb 2019 14:18:29 -0500
Subject: [PATCH] Sim: Fix weights to proper locations, Aero: Adjust drag

---
 A320-main.xml                 | 32 ++++++++++++++++++------
 Systems/a320-aerodynamics.xml |  6 ++---
 Systems/a320-mass-balance.xml | 47 +++++++++++++++++++++++++++--------
 revision.txt                  |  2 +-
 4 files changed, 66 insertions(+), 21 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 2e449987..e0a5dceb 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -405,7 +405,7 @@
 		
 		 <minimum-fg-version>2018.1.0</minimum-fg-version>
 	</sim>
-
+	
 	<consumables>
 		<fuel>
 			<tank n="0">
@@ -446,22 +446,40 @@
 			<max-lb type="double">440</max-lb>
 		</weight>
 		<weight n="1">
-			<name>Passengers</name>
+			<name>Forward Cabin</name>
 			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[1]"/>
 			<min-lb type="double">0</min-lb>
-			<max-lb type="double">24360</max-lb>
+			<max-lb type="double">4649</max-lb>
 		</weight>
 		<weight n="2">
-			<name>Forward Cargo</name>
+			<name>Center Cabin</name>
 			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[2]"/>
 			<min-lb type="double">0</min-lb>
-			<max-lb type="double">9400</max-lb>
+			<max-lb type="double">13949</max-lb>
 		</weight>
 		<weight n="3">
-			<name>Aft Cargo</name>
+			<name>Aft Cabin</name>
 			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[3]"/>
 			<min-lb type="double">0</min-lb>
-			<max-lb type="double">9400</max-lb>
+			<max-lb type="double">10462</max-lb>
+		</weight>
+		<weight n="4">
+			<name>Forward Cargo</name>
+			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[4]"/>
+			<min-lb type="double">0</min-lb>
+			<max-lb type="double">5000</max-lb>
+		</weight>
+		<weight n="5">
+			<name>Aft Cargo</name>
+			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[5]"/>
+			<min-lb type="double">0</min-lb>
+			<max-lb type="double">6662</max-lb>
+		</weight>
+		<weight n="6">
+			<name>Aft Bulk Cargo</name>
+			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[6]"/>
+			<min-lb type="double">0</min-lb>
+			<max-lb type="double">3285</max-lb>
 		</weight>
 	</payload>
 	
diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml
index 42720466..9d5f74ab 100644
--- a/Systems/a320-aerodynamics.xml
+++ b/Systems/a320-aerodynamics.xml
@@ -181,9 +181,9 @@
 					<independentVar lookup="row">aero/alpha-rad</independentVar>
 					<tableData>
 						-1.57  1.3083
-						-0.20  0.0331
+						-0.20  0.0301
 						 0.00  0.0000
-						 0.20  0.0331
+						 0.20  0.0301
 						 1.57  1.3083
 					</tableData>
 				</table>
@@ -210,7 +210,7 @@
 					<tableData>
 						0.00  0.000
 						0.20  0.000
-						0.79  0.002
+						0.82  0.002
 						1.10  0.023
 						1.80  0.015
 					</tableData>
diff --git a/Systems/a320-mass-balance.xml b/Systems/a320-mass-balance.xml
index e4178798..5c0aeba7 100644
--- a/Systems/a320-mass-balance.xml
+++ b/Systems/a320-mass-balance.xml
@@ -20,38 +20,65 @@
 	</location>
 	
 	<pointmass name="Crew">
-		<weight unit="LBS">380</weight>
+		<weight unit="LBS">320</weight>
 		<location name="POINTMASS" unit="M">
 			<x> 5.29845 </x>
 			<y> 0 </y>
-			<z> -0.66384 </z>
+			<z> 0.5 </z>
 		</location>
 	</pointmass>
 	
-	<pointmass name="PAX">
-		<weight unit="LBS">23000</weight>
+	<pointmass name="Forward Cabin">
+		<weight unit="LBS">3722</weight>
 		<location name="POINTMASS" unit="M">
-			<x> 18.8231 </x>
+			<x> 10 </x>
 			<y> 0 </y>
-			<z> 0.19249 </z>
+			<z> 0.5 </z>
+		</location>
+	</pointmass>
+	
+	<pointmass name="Center Cabin">
+		<weight unit="LBS">11361</weight>
+		<location name="POINTMASS" unit="M">
+			<x> 16.5 </x>
+			<y> 0 </y>
+			<z> 0.5 </z>
+		</location>
+	</pointmass>
+	
+	<pointmass name="Aft Cabin">
+		<weight unit="LBS">8422</weight>
+		<location name="POINTMASS" unit="M">
+			<x> 26 </x>
+			<y> 0 </y>
+			<z> 0.5 </z>
 		</location>
 	</pointmass>
 	
 	<pointmass name="Fwd Cargo">
 		<weight unit="LBS">3000</weight>
 		<location name="POINTMASS" unit="M"> 
-			<x> 13.0849 </x>
+			<x> 14.0 </x>
 			<y> 0 </y>
-			<z> -1.18112 </z>
+			<z> -1.1 </z>
 		</location>
 	</pointmass>
 	
 	<pointmass name="Aft Cargo">
 		<weight unit="LBS">3000</weight>
 		<location name="POINTMASS" unit="M">
-			<x> 24.5565 </x>
+			<x> 24.0 </x>
 			<y> 0 </y>
-			<z> -1.18112 </z>
+			<z> -1.1 </z>
+		</location>
+	</pointmass>
+	
+	<pointmass name="Aft Bulk Cargo">
+		<weight unit="LBS">0</weight>
+		<location name="POINTMASS" unit="M">
+			<x> 29.0 </x>
+			<y> 0 </y>
+			<z> -1.1 </z>
 		</location>
 	</pointmass>
 </mass_balance>
diff --git a/revision.txt b/revision.txt
index acfcd180..61497da7 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4753
\ No newline at end of file
+4754
\ No newline at end of file