Merge branch 'initialSizing-Payload-fix' into 'develop'

initialSizing: corrected Payload definition without crew mass

See merge request !85

initial_sizing/initial_sizing_conf.xml

@@ -57,7 +57,7 @@
 			</approach_selection>
             <analytical_approach>
                 <General>
-                     <OswaldFactor description="Oswald factor in clean configuration" Unit="-">
+                     <OswaldFactor description="Oswald efficency factor in clean configuration" Unit="-">
 					 	 <value>0.85</value>
 	                     <default>0.85</default>
 					 </OswaldFactor>
@@ -73,13 +73,13 @@
 	                     <value>2</value>
 	                     <default>2</default>
                      </n_engines>
-                     <Cf description="friction coefficient" Unit="count">
+                     <Cf description="equivalent friction coefficient" Unit="count">
 	                     <value>0.002</value>
 	                     <default>0.002</default>
                      </Cf>      
                 </General>
                 <Constants>
-                    <SFC_kerosene description="Specific Fuel Consumption Factor for Kerosene">
+                    <SFC_kerosene description="Specific Fuel Consumption factor for Kerosene">
 					    <value>0.0001389</value>
 			            <default>0.0001389</default>
 					</SFC_kerosene>
@@ -111,7 +111,7 @@
 					     <value>0.956</value>
 			             <default>0.956</default>
 					 </mcr_mto>
-					 <optimalCL description="maximum CL at initial cruise">
+					 <optimalCL description="design CL for initial cruise">
 					     <value>0.57</value>
 			             <default>0.57</default>
 					 </optimalCL>
@@ -127,16 +127,16 @@
                     </LD_initial_loiter>
                 </LiftToDragRatios>
                 <Masses description="mass estimation methodology">
-                    <Fractions description="mass fractions">
+                    <Fractions description="fuel mass fractions">
                        <mf_warmup description="Warmup (according to Raymer: 0.97(A340)-0.99(A320))" Unit="-" Default="0.99">
                            <value>0.99</value>
                            <default>0.99</default>
                        </mf_warmup>
-                       <mf_taxi description="Warmup (according to Raymer: 0.97(A340)-0.99(A320))" Unit="-" Default="0.99">
+                       <mf_taxi description="Taxi (according to Raymer: 0.97(A340)-0.99(A320))" Unit="-" Default="0.99">
                            <value>0.99</value>
                            <default>0.99</default>
                        </mf_taxi>
-                       <mf_to description="Taxi and Takeoff (according to Raymer: 0.97(A340)-0.99(A320))" Unit="-" Default="0.995">
+                       <mf_to description="Takeoff (according to Raymer: 0.97(A340)-0.99(A320))" Unit="-" Default="0.995">
                            <value>0.995</value>
                            <default>0.995</default>
                        </mf_to>
@@ -148,11 +148,11 @@
                            <value>0.99</value>
                            <default>0.99</default>
                        </mf_descent>
-                       <mf_missedandclimb description="Landing and Taxi Back (according to Raymer: 0.992(A340)-0.997(A320))" Unit="-" Default="0.988">
+                       <mf_missedandclimb description="missed approach and climb to alternate airport (according to Raymer: 0.992(A340)-0.997(A320))" Unit="-" Default="0.988">
                            <value>0.988</value>
                            <default>0.988</default>
                        </mf_missedandclimb>
-                       <mf_land description="Landing and Taxi Back (according to Raymer: 0.992(A340)-0.997(A320))" Unit="-" Default="0.995">
+                       <mf_land description="Landing and Taxi out (according to Raymer: 0.992(A340)-0.997(A320))" Unit="-" Default="0.995">
                            <value>0.995</value>
                            <default>0.995</default>
                        </mf_land>

initial_sizing/src/main.cpp

@@ -15,11 +15,6 @@
     along with UNICADO.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/** \mainpage initialSizing
-* The program sizes the aircraft and estimates a required wing loading and thrust-to-weight ratio.
-*
-*/
-
 /* The following statements import necessary libraries */
 #include <cstdlib> //system()/exit()                                           // Import c++ standard library for using cstdlib
 #include <exception>                                                           // Import c++ standard library for using exception

initial_sizing/src/taw/analytical/TawAnalytical.cpp

@@ -157,8 +157,8 @@ void TawAnalytical::calculatePayloadAndCrew() {
     // Calculate crew weight
     crewWeight = (data_->data.Accommodation.massPassenger + data_->data.Accommodation.massLuggage) * numCrew;
 
-    // Calculate total payload and crew weight
-    Payload = passengerWeight + cargoWeight + crewWeight;
+    // Calculate total payload
+    Payload = passengerWeight + cargoWeight;
     
     std::cout << "Passenger Weight: " << passengerWeight << std::endl;
     std::cout << "Crew Number: " << numCrew << std::endl;
@@ -232,7 +232,7 @@ void TawAnalytical::calculateFuelFraction() {
 
 void TawAnalytical::calculateMassEstimation() {
     // Constants
-    mo_iteration = 5.5 *(passengerWeight + cargoWeight);
+    mo_iteration = 5.5 * Payload;
     c_kerosine = 0.55;
     c_LH2 = 0.44;
     mo_iteration = mo_initial;
@@ -249,7 +249,7 @@ void TawAnalytical::calculateMassEstimation() {
         me_mo = c_fuel * cos(0.0000012 * mo_iteration);
 
         // Calculate new mo_iteration
-        mo_iteration = (passengerWeight + cargoWeight) / (1 - (FuelFraction) - (me_mo));
+        mo_iteration = (Payload + crewWeight) / (1 - (FuelFraction) - (me_mo));
 
         // Debug new mo_iteration
     } while (!checkConvergence(mo_iteration, mo_iteration_previous));  // Loop until convergence is achieved