Merge remote-tracking branch 'upstream/main' into gradient-optimizer

example/cryo_input.toml

@@ -87,15 +87,19 @@ name = "TASOPT Model with cryo fuel and HX"
 [Mission]
     N_missions = 1 # Number of missions to be modeled (first mission is the design mission)
     pax = 180            # Number of passengers in each mission
-    max_pax = 189               # Maximum number of passengers for aircarft
-                                # defines the maximum payload carrying capacity of the aircraft
 
     range = "3000.0 nmi" # Design Range 
 
     weight_per_pax = "215.0 lbf" # Specify weight per passenger - 
                             # includes luggage [lbm or lbf or kg or N] 
                             # judging you if you use imperial units but wtvs
 
+    exit_limit = 189            # Maximum number of passengers that can sit in the cabin
+
+    max_payload_in_pax_equivalent = 189         # Defines the maximum payload carrying capacity of the aircraft
+                                                # It is the maximum payload that the aircraft can carry (including cargo),
+                                                # as an equivalent number of passengers
+
     fuel_reserves = 0.20 # W_reserveFuel / W_fuelburned
 
     Nlift = 3.0 # Max vertical load factor for wing bending loads

example/example_regional.toml

@@ -53,15 +53,19 @@
 [Mission]
     N_missions = 1 # Number of missions to be modeled (first mission is the design mission)
     pax = 118       # Number of passengers in each mission
-    max_pax = 122               # Maximum number of passengers for aircarft 
-                                # defines the maximum payload carrying capacity of the aircraft
 
     range = "2200.0 nmi"
     # Design Range + second mission range           
     weight_per_pax = "215.0 lbf" # Specify weight per passenger - 
                             # includes luggage [lbm or lbf or kg or N] 
                             # judging you if you use imperial units but wtvs
 
+    exit_limit = 122            # Maximum number of passengers that can sit in the cabin
+
+    max_payload_in_pax_equivalent = 122         # Defines the maximum payload carrying capacity of the aircraft
+                                                # It is the maximum payload that the aircraft can carry (including cargo),
+                                                # as an equivalent number of passengers
+
     fuel_reserves = 0.05 # W_reserveFuel / W_fuelburned
 
     Nlift = 3.0 # Max vertical load factor for wing bending loads

example/example_widebody.toml

@@ -55,15 +55,19 @@
 [Mission]
     N_missions = 1 # Number of missions to be modeled (first mission is the design mission)
     pax = 370            # Number of passengers in each mission
-    max_pax = 450               # Maximum number of passengers for aircarft
-                                # defines the maximum payload carrying capacity of the aircraft
 
     range = "7800.0 nmi" # Design Range 
 
     weight_per_pax = "230.0 lbf" # Specify weight per passenger - 
                             # includes luggage [lbm or lbf or kg or N] 
                             # judging you if you use imperial units but wtvs
 
+    exit_limit = 450            # Maximum number of passengers that can sit in the cabin
+
+    max_payload_in_pax_equivalent = 450         # Defines the maximum payload carrying capacity of the aircraft
+                                                # It is the maximum payload that the aircraft can carry (including cargo),
+                                                # as an equivalent number of passengers
+
     fuel_reserves = 0.07 # W_reserveFuel / W_fuelburned
 
     Nlift = 3.0 # Max vertical load factor for wing bending loads

src/IO/default_input.toml

@@ -93,8 +93,6 @@
 
 [Mission]
     N_missions = 2 # Number of missions to be modeled (first mission is the design mission)
-    max_pax = 230               # Maximum number of passengers for aircarft
-                                # defines the maximum payload carrying capacity of the aircraft
 
     range = ["3000.0 nmi", "2000.0 nmi"] # Design Range + second mission range
 
@@ -105,6 +103,12 @@
                                     # includes luggage [lbm or lbf or kg or N] 
                                     # judging you if you use imperial units but wtvs
 
+    exit_limit = 189            # Maximum number of passengers that can sit in the cabin
+
+    max_payload_in_pax_equivalent = 230         # Defines the maximum payload carrying capacity of the aircraft
+                                                # It is the maximum payload that the aircraft can carry (including cargo),
+                                                # as an equivalent number of passengers in an off-design mission
+
     fuel_reserves = 0.20 # W_reserveFuel / W_fuelburned
 
     Nlift = 3.0 # Max vertical load factor for wing bending loads

src/IO/read_input.jl

@@ -141,11 +141,14 @@ if !ac_type_fixed
     ac_type_fixed = true
 end
 
-maxpax = readmis("max_pax")
+maxpax = readmis("max_payload_in_pax_equivalent") #This represents the maximum aircraft payload in equivalent number of pax
 pax = readmis("pax")
+exitlimit = readmis("exit_limit")
 despax = pax[1] #Design number of passengers
 if despax > maxpax
-    error("Design mission has higher # of passengers than max passengers for aircraft!")
+    error("Design mission has higher payload weight than maximum aircraft payload!")
+elseif despax > exitlimit
+    error("Design mission has higher # of passengers than the exit limit!")
 end
 
 Wpax =  Force(readmis("weight_per_pax"))
@@ -155,6 +158,8 @@ parg[igWpaymax] = maxpax * Wpax
 parg[igfreserve] = readmis("fuel_reserves")
 parg[igVne] = Speed(readmis("Vne"))
 parg[igNlift] = readmis("Nlift")
+fuselage.cabin.design_pax = despax
+fuselage.cabin.exit_limit = exitlimit
 
 # Setup option variables
 options = read_input("Options", data, default)
@@ -693,7 +698,7 @@ readvtail(x) = read_input(x, vtail, dvtail)
 if calculate_cabin #Resize the cabin if desired, keeping deltas
     @info "Fuselage and stabilizer layouts have been overwritten; deltas will be maintained."
 
-    update_fuse_for_pax!(pari, parg, parm, fuselage, fuse_tank) #update fuselage dimensions
+    update_fuse_for_pax!(pari, parg, fuselage, fuse_tank) #update fuselage dimensions
 end
 # ---------------------------------
 

src/IO/save_model.jl

@@ -752,6 +752,8 @@ function reset_regression_test(fname, ac)
         @printf(io,"fuse.HPE_sys.W = %20.20f \n", ac.fuselage.HPE_sys.W)
         @printf(io,"fuse.added_payload.W = %20.20f \n", ac.fuselage.added_payload.W)
 
+        @printf(io, "fuse.cabin.design_pax = %20.20f \n", ac.fuselage.cabin.design_pax)
+        @printf(io, "fuse.cabin.exit_limit = %20.20f \n", ac.fuselage.cabin.exit_limit)
         @printf(io, "fuse.cabin.seat_pitch = %20.20f \n", ac.fuselage.cabin.seat_pitch)
         @printf(io, "fuse.cabin.seat_width = %20.20f \n", ac.fuselage.cabin.seat_width)
         @printf(io, "fuse.cabin.seat_height = %20.20f \n", ac.fuselage.cabin.seat_height)

src/misc/fuselage.jl

@@ -57,7 +57,7 @@ $TYPEDFIELDS
 
     # Misc properties
     """Number of decks in fuselage"""
-    n_decks::Float64 = 0
+    n_decks::Int64 = 0
     """Fuselage Weight fraction of stringers """
     weight_frac_stringers::Float64 = 0
     """Fuselage Weight fraction of frame """

src/misc/layout.jl

@@ -210,16 +210,20 @@ Contains dimensions, heights, etc. to design a fuselage
 $TYPEDFIELDS
 """
 @kwdef mutable struct Cabin <: AbstractCabin
+    """Design number of passengers"""
+    design_pax::Int64 = 0
+    """Maximum number of passengers"""
+    exit_limit::Int64 = 0
     """Longitudinal seat pitch [m]"""
-    seat_pitch = 0.0
+    seat_pitch::Float64 = 0.0
     """Transverse seat width [m]"""
-    seat_width = 0.0
+    seat_width::Float64 = 0.0
     """Seat height [m]"""
-    seat_height = 0.0
+    seat_height::Float64 = 0.0
     """Aisle half-width [m]"""
-    aisle_halfwidth = 0.0
+    aisle_halfwidth::Float64 = 0.0
     """Distance between double decker floors [m]"""
-    floor_distance = 0.0
+    floor_distance::Float64 = 0.0
     """Main cabin width [m]"""
     cabin_width_main::Float64 = 0.0
     """Top cabin width [m]"""

src/sizing/wsize.jl

@@ -113,7 +113,7 @@ function wsize(ac; itermax=35,
     #Typical payload
     Wpay = parm[imWpay]
 
-    Wpaymax = parg[igWpaymax] # Max payload
+    Wpaymax = parg[igWpaymax] # Max payload in offdesign mission (used to size structures)
     # if Wpay or Wpaymax is unset
     if (Wpaymax == 0)
         println("Max payload weight was not set, setting Wpaymax = Wpay")
@@ -631,7 +631,7 @@ function wsize(ac; itermax=35,
             xftank_fuse = 0.0
             Wftank_single = 0.0
         end
-
+        #Note that fuselage is sized for a maximum payload weight in off-design missions
         parg[igcabVol] = fusew!(fuse, Nland, Wpaymax, Wengtail, 
              nftanks,
             Waftfuel,  Wftank_single, ltank, xftank_fuse, tank_placement,

src/structures/size_cabin.jl

@@ -190,7 +190,7 @@ function find_floor_angles(fdoubledecker::Bool, Rfuse::Float64, dRfuse::Float64;
 end
 
 """
-    find_double_decker_cabin_length(x::Vector{Float64}, parg, fuse, parm)
+    find_double_decker_cabin_length(x::Vector{Float64}, parg, fuse)
 
 This function can be used to calculate the length of a double decker cabin with different number of 
 passengers on each deck.
@@ -199,12 +199,11 @@ passengers on each deck.
     - `x::Vector{Float64}`: vector with optimization variables
     - `parg::Vector{Float64}`: vector with aircraft geometric and mass parameters
     - `fuse::Fuselage`: structure with fuselage parameters
-    - `parm::Array{Float64}`: array with mission parameters
 
     **Outputs:**
     - `maxl::Float64`: required cabin length (m)
 """
-function find_double_decker_cabin_length(x::Vector{Float64}, parg, fuse, parm)
+function find_double_decker_cabin_length(x::Vector{Float64}, fuse)
     seat_pitch = fuse.cabin.seat_pitch
     seat_width = fuse.cabin.seat_width 
     aisle_halfwidth = fuse.cabin.aisle_halfwidth
@@ -214,9 +213,9 @@ function find_double_decker_cabin_length(x::Vector{Float64}, parg, fuse, parm)
     dRfuse = fuse.layout.bubble_lower_downward_shift
     wfb = fuse.layout.bubble_center_y_offset
     nfweb = fuse.layout.n_webs
-    d_floor = parg[igfloordist]
+    d_floor = fuse.cabin.floor_distance
 
-    paxsize = parg[igWpaymax]/parm[imWperpax,1] #maximum number of passengers #TODO replace with better measure
+    paxsize = fuse.cabin.exit_limit #maximum number of passengers
 
     paxmain = x[1]
     paxtop = paxsize - paxmain
@@ -281,29 +280,28 @@ function EvaluateCabinProps!(fuse)
 end
 
 """
-    optimize_double_decker_cabin(parg, fuse, parm)
+    optimize_double_decker_cabin(fuse)
 
 This function can be used to optimize the passenger distribution across two decks in a double decker aircraft. 
 If the cross-section is circular, it also optimizes the deck layouts.
 !!! details "🔃 Inputs and Outputs"
     **Inputs:**
     - `parg::Vector{Float64}`: vector with aircraft geometric and mass parameters
     - `fuse::Fuselage`: structure with fuselage parameters
-    - `parm::Array{Float64}`: array with mission parameters
 
     **Outputs:**
     - `xopt::Vector{Float64}`: vector with optimization results
 """
-function optimize_double_decker_cabin(parg, fuse, parm)
+function optimize_double_decker_cabin(fuse)
     dRfuse = fuse.layout.bubble_lower_downward_shift
 
-    paxsize = parg[igWpaymax]/parm[imWperpax,1] #maximum number of passengers #TODO replace with better measure
+    paxsize = fuse.cabin.exit_limit #maximum number of passengers
 
     initial_x = [paxsize/2, -pi/4]
     lower = [1.0, -pi/2]
     upper = [paxsize - 1.0, pi/2]
 
-    obj(x, grad) = find_double_decker_cabin_length(x, parg, fuse, parm)[1] #Objective function is cabin length
+    obj(x, grad) = find_double_decker_cabin_length(x, fuse)[1] #Objective function is cabin length
 
     opt = Opt(:GN_AGS, length(initial_x)) #Use a global optimizer as it is only 1 or 2 variables
     opt.lower_bounds = lower
@@ -312,15 +310,13 @@ function optimize_double_decker_cabin(parg, fuse, parm)
 
     opt.min_objective = obj
 
-    if dRfuse ≈ 0.0 #Apply constraints on lower floor if it can be moved around
-        inequality_constraint!(opt, (x, grad) -> MinCargoHeightConst(x, fuse), 1e-5) #Minimum height of cargo hold
-        inequality_constraint!(opt, (x, grad) -> MinCabinHeightConst(x, fuse), 1e-5) #Minimum height of upper cabin
-    end
+    inequality_constraint!(opt, (x, grad) -> MinCargoHeightConst(x, fuse), 1e-5) #Minimum height of cargo hold
+    inequality_constraint!(opt, (x, grad) -> MinCabinHeightConst(x, fuse), 1e-5) #Minimum height of upper cabin
 
     (minf,xopt,ret) = NLopt.optimize(opt, initial_x) #Solve optimization problem
 
     #Evaluate number of passengers per row in main cabin
-    _, seats_per_row_main = find_double_decker_cabin_length(xopt, parg, fuse, parm)
+    _, seats_per_row_main = find_double_decker_cabin_length(xopt, fuse)
 
     return xopt, seats_per_row_main
 end

src/structures/update_fuse.jl

@@ -53,7 +53,7 @@ function update_fuse!(fuselage, pari, parg)
 end
 
 """
-    update_fuse_for_pax!(pari, parg, parm, fuse, fuse_tank)
+    update_fuse_for_pax!(pari, parg, fuse, fuse_tank)
 
 Function to update the fuselage layout when the cabin length is not known a priori, for example if the radius is changed. 
 It sizes the cabin for the design number of passengers.
@@ -62,15 +62,14 @@ It sizes the cabin for the design number of passengers.
     **Inputs:**
     - `pari::Vector{Int64}`: vector with aircraft integer parameters
     - `parg::Vector{Float64}`: vector with aircraft geometric and mass parameters
-    - `parm::Array{Float64}`: array with mission parameters
     - `fuse::Fuselage`: structure with fuselage parameters
     - `fuse_tank::fuselage_tank`: structure with cryogenic fuel tank parameters
 
     **Outputs:**
     Parameters in `parg` are modified. It also outputs:
     - `seats_per_row::Float64`: number of seats per row in main cabin (lower deck if double decker)
 """
-function update_fuse_for_pax!(pari, parg, parm, fuse, fuse_tank)
+function update_fuse_for_pax!(pari, parg, fuse, fuse_tank)
 
     seat_pitch = fuse.cabin.seat_pitch
     seat_width = fuse.cabin.seat_width 
@@ -84,13 +83,13 @@ function update_fuse_for_pax!(pari, parg, parm, fuse, fuse_tank)
 
     #Find cabin length by placing seats
     if fuse.n_decks == 2 #if the aircraft is a double decker
-        xopt, seats_per_row = optimize_double_decker_cabin(parg, fuse, parm) #Optimize the floor layout and passenger distributions
+        xopt, seats_per_row = optimize_double_decker_cabin(fuse) #Optimize the floor layout and passenger distributions
 
-        lcyl, _ = find_double_decker_cabin_length(xopt, parg, fuse, parm) #Total length is maximum of the two
+        lcyl, _ = find_double_decker_cabin_length(xopt, fuse) #Total length is maximum of the two
 
     else
         θ = find_floor_angles(false, Rfuse, dRfuse, h_seat = h_seat) #Find the floor angle
-        paxsize = parg[igWpaymax]/parm[imWperpax,1] #maximum number of passengers
+        paxsize = fuse.cabin.exit_limit #maximum number of passengers
         w = find_cabin_width(Rfuse, wfb, nfweb, θ, h_seat) #Cabin width
         lcyl, _, seats_per_row = place_cabin_seats(paxsize, w, seat_pitch, seat_width, aisle_halfwidth) #Cabin length
     end
@@ -183,7 +182,13 @@ function find_minimum_radius_for_seats_per_row(seats_per_row, ac_base)
     (minf,xopt,ret) = NLopt.optimize(opt, xopt) #Solve optimization problem starting from global solution
 
     R = xopt[1]
-    return R
+    #Check if constraint is met
+    diff = check_seats_per_row_diff(seats_per_row, xopt, ac)
+    if diff ≈ 0.0
+        return R
+    else
+        error("Optimizer failed to find a fuselage radius for the desired pax per row")
+    end
 end
 
 """
@@ -205,12 +210,11 @@ function check_seats_per_row_diff(seats_per_row, x, ac)
     Rfuse = x[1]
     ac.fuselage.layout.cross_section.radius = Rfuse
     try #Sometimes update_fuse_for_pax may fail
-        seats_per_row_rad = update_fuse_for_pax!(ac.pari, ac.parg, ac.parm, ac.fuselage, ac.fuse_tank)
+        seats_per_row_rad = update_fuse_for_pax!(ac.pari, ac.parg, ac.fuselage, ac.fuse_tank)
         diff = seats_per_row_rad - seats_per_row
         #println("R = $Rfuse, s = $seats_per_row_rad")
         return diff
     catch
-        #println("failed")
         return 1.0
     end
 end

test/default_sized.jl

@@ -68,6 +68,8 @@ fuse.fixed.r = [2.13359999999999994102,0.0,0.0]
 fuse.HPE_sys.r = [18.89760000000000061959,0.0,0.0] 
 fuse.HPE_sys.W = 0.01000000000000000021 
 fuse.added_payload.W = 76987.60226500000862870365 
+fuse.cabin.design_pax = 180
+fuse.cabin.exit_limit = 189
 fuse.cabin.seat_pitch = 0.76200000000000001066 
 fuse.cabin.seat_width = 0.48259999999999997344 
 fuse.cabin.seat_height = 1.14300000000000001599 

test/hydrogen_sized.jl

@@ -67,7 +67,9 @@ fuse.fixed.W = 13344.66600000000107684173
 fuse.fixed.r = [2.13359999999999994102,0.0,0.0] 
 fuse.HPE_sys.r = [23.98379686567373525463,0.0,0.0] 
 fuse.HPE_sys.W = 0.01000000000000000021 
-fuse.added_payload.W = 63263.72533949999342439696 
+fuse.added_payload.W = 63263.72533949999342439696
+fuse.cabin.design_pax = 180
+fuse.cabin.exit_limit = 189 
 fuse.cabin.seat_pitch = 0.76200000000000001066 
 fuse.cabin.seat_width = 0.48259999999999997344 
 fuse.cabin.seat_height = 1.14300000000000001599 

test/regional_sized.jl

@@ -67,7 +67,9 @@ fuse.fixed.W = 13344.66600000000107684173
 fuse.fixed.r = [2.13359999999999994102,0.0,0.0] 
 fuse.HPE_sys.r = [18.28800000000000025580,0.0,0.0] 
 fuse.HPE_sys.W = 0.01000000000000000021 
-fuse.added_payload.W = 40836.90207099999679485336 
+fuse.added_payload.W = 40836.90207099999679485336
+fuse.cabin.design_pax = 118
+fuse.cabin.exit_limit = 122 
 fuse.cabin.seat_pitch = 0.76200000000000001066 
 fuse.cabin.seat_width = 0.48259999999999997344 
 fuse.cabin.seat_height = 1.14300000000000001599 

test/unit_test_structures.jl

@@ -325,7 +325,7 @@ update_fuse_out_test = [29.5656, 31.0896, 18.716634144, 36.57600000000001, 37.79
 
 # fuse_tank = TASOPT.fuselage_tank()
 
-# TASOPT.update_fuse_for_pax!(pari, parg, parm, fuselage, fuse_tank)
+# TASOPT.update_fuse_for_pax!(pari, parg, fuselage, fuse_tank)
 
 # parg_check = [47.091600000000014, 6.096, 38.86200000000001, 40.38600000000001, 44.95800000000001, 18.460895740194808, 19.98489574019481, 44.19600000000001, 42.82440000000001, 45.87240000000001, 23.595756720000004, 1.9558, 219964.5779, 32.76600000000001, 1.5239999999999991, 0.762, 0.4826, 0.254]
 # parg_nz = deepcopy(parg)

test/wide_sized.jl

@@ -68,6 +68,8 @@ fuse.fixed.r = [3.04800000000000004263,0.0,0.0]
 fuse.HPE_sys.r = [38.10000000000000142109,0.0,0.0] 
 fuse.HPE_sys.W = 0.01000000000000000021 
 fuse.added_payload.W = 161136.84195000000181607902 
+fuse.cabin.design_pax = 370
+fuse.cabin.exit_limit = 450 
 fuse.cabin.seat_pitch = 0.76200000000000001066 
 fuse.cabin.seat_width = 0.48259999999999997344 
 fuse.cabin.seat_height = 1.14300000000000001599