Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions aviary/subsystems/geometry/flops_based/fuselage.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ class DetailedCabinLayout(om.ExplicitComponent):
def initialize(self):
add_aviary_option(self, Aircraft.Fuselage.SEAT_WIDTH_BUSINESS)
add_aviary_option(self, Aircraft.Fuselage.SEAT_WIDTH_FIRST)
add_aviary_option(self, Aircraft.Fuselage.SEAT_WIDTH_ECONOMY)
add_aviary_option(self, Aircraft.CrewPayload.Design.NUM_BUSINESS_CLASS)
add_aviary_option(self, Aircraft.CrewPayload.Design.NUM_FIRST_CLASS)
add_aviary_option(self, Aircraft.CrewPayload.Design.NUM_ECONOMY_CLASS)
Expand All @@ -208,6 +207,7 @@ def initialize(self):

def setup(self):
add_aviary_input(self, Aircraft.Design.RANGE, units='NM')
add_aviary_input(self, Aircraft.Fuselage.SEAT_WIDTH_ECONOMY)

add_aviary_output(self, Aircraft.Fuselage.LENGTH, units='ft')
add_aviary_output(self, Aircraft.Fuselage.PASSENGER_COMPARTMENT_LENGTH, units='ft')
Expand Down Expand Up @@ -457,7 +457,7 @@ def compute(self, inputs, outputs):
# Calculate the fuselage width of the passenger seats
seat_width_first = self.options[Aircraft.Fuselage.SEAT_WIDTH_FIRST][0]
seat_width_business = self.options[Aircraft.Fuselage.SEAT_WIDTH_BUSINESS][0]
seat_width_economy = self.options[Aircraft.Fuselage.SEAT_WIDTH_ECONOMY][0]
seat_width_economy = inputs[Aircraft.Fuselage.SEAT_WIDTH_ECONOMY][0]
if num_first_class_pax > 0:
width_first_class = (
num_aisles * aisle_width_first_class + num_seat_abreast_first * seat_width_first
Expand Down
4 changes: 2 additions & 2 deletions aviary/subsystems/geometry/flops_based/test/test_fuselage.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ def test_case1(self):
# options.set_val(Aircraft.CrewPayload.Design.SEAT_PITCH_ECONOMY, units='unitless')
options.set_val(Aircraft.Engine.NUM_ENGINES, [2], units='unitless')
options.set_val(Aircraft.Fuselage.SEAT_WIDTH_FIRST, 25, units='inch')
options.set_val(Aircraft.Fuselage.SEAT_WIDTH_ECONOMY, 20, units='inch')

prob.model.add_subsystem(
'layout', DetailedCabinLayout(), promotes_outputs=['*'], promotes_inputs=['*']
)
self.prob.model.set_input_defaults(Aircraft.Fuselage.SEAT_WIDTH_ECONOMY, 20, units='inch')
setup_model_options(self.prob, options)
prob.setup(check=False, force_alloc_complex=True)
prob.run_model()
Expand Down Expand Up @@ -96,11 +96,11 @@ def test_case2(self):
options.set_val(Aircraft.Engine.NUM_ENGINES, [2], units='unitless')
options.set_val(Aircraft.Fuselage.SEAT_WIDTH_FIRST, 22, units='inch')
options.set_val(Aircraft.Fuselage.SEAT_WIDTH_BUSINESS, 21, units='inch')
options.set_val(Aircraft.Fuselage.SEAT_WIDTH_ECONOMY, 18, units='inch')

prob.model.add_subsystem(
'layout', DetailedCabinLayout(), promotes_outputs=['*'], promotes_inputs=['*']
)
self.prob.model.set_input_defaults(Aircraft.Fuselage.SEAT_WIDTH_ECONOMY, 18, units='inch')
setup_model_options(self.prob, options)
prob.setup(check=False, force_alloc_complex=True)
prob.set_val(Aircraft.Design.RANGE, val=7370.0, units='NM')
Expand Down
98 changes: 80 additions & 18 deletions aviary/subsystems/geometry/gasp_based/fuselage.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,41 +12,54 @@ class FuselageParameters(om.ExplicitComponent):

def initialize(self):
add_aviary_option(self, Aircraft.CrewPayload.Design.NUM_PASSENGERS)
add_aviary_option(self, Aircraft.Fuselage.AISLE_WIDTH, units='inch')
add_aviary_option(self, Aircraft.Fuselage.NUM_AISLES)
add_aviary_option(self, Aircraft.CrewPayload.Design.NUM_SEATS_ABREAST_ECONOMY)
add_aviary_option(self, Aircraft.CrewPayload.Design.SEAT_PITCH_ECONOMY, units='inch')
add_aviary_option(self, Aircraft.Fuselage.SEAT_WIDTH_ECONOMY, units='inch')
add_aviary_option(self, Settings.VERBOSITY)

def setup(self):
add_aviary_input(self, Aircraft.Fuselage.DELTA_DIAMETER, units='ft')
add_aviary_input(self, Aircraft.Fuselage.AISLE_WIDTH, units='inch')
add_aviary_input(self, Aircraft.Fuselage.SEAT_WIDTH_ECONOMY, units='inch')

add_aviary_output(self, Aircraft.Fuselage.AVG_DIAMETER, units='inch')
self.add_output('cabin_height', val=0, units='ft', desc='HC: height of cabin')
self.add_output('cabin_len', val=0, units='ft', desc='LC: length of cabin')
self.add_output('nose_height', val=0, units='ft', desc='HN: height of nose')

def setup_partials(self):
self.declare_partials(
Aircraft.Fuselage.AVG_DIAMETER,
[
Aircraft.Fuselage.AISLE_WIDTH,
Aircraft.Fuselage.SEAT_WIDTH_ECONOMY,
],
)

self.declare_partials(
'cabin_height',
[
Aircraft.Fuselage.DELTA_DIAMETER,
Aircraft.Fuselage.AISLE_WIDTH,
Aircraft.Fuselage.SEAT_WIDTH_ECONOMY,
],
)
self.declare_partials(
'nose_height',
[
Aircraft.Fuselage.DELTA_DIAMETER,
Aircraft.Fuselage.AISLE_WIDTH,
Aircraft.Fuselage.SEAT_WIDTH_ECONOMY,
],
)

def compute(self, inputs, outputs):
options = self.options
verbosity = options[Settings.VERBOSITY]
seats_abreast = options[Aircraft.CrewPayload.Design.NUM_SEATS_ABREAST_ECONOMY]
seat_width, _ = options[Aircraft.Fuselage.SEAT_WIDTH_ECONOMY]
seat_width = inputs[Aircraft.Fuselage.SEAT_WIDTH_ECONOMY]
num_aisle = options[Aircraft.Fuselage.NUM_AISLES]
aisle_width, _ = options[Aircraft.Fuselage.AISLE_WIDTH]
aisle_width = inputs[Aircraft.Fuselage.AISLE_WIDTH]
PAX = options[Aircraft.CrewPayload.Design.NUM_PASSENGERS]
seat_pitch, _ = options[Aircraft.CrewPayload.Design.SEAT_PITCH_ECONOMY]

Expand Down Expand Up @@ -82,9 +95,28 @@ def compute(self, inputs, outputs):
def compute_partials(self, inputs, J):
options = self.options
seats_abreast = options[Aircraft.CrewPayload.Design.NUM_SEATS_ABREAST_ECONOMY]
num_aisle = options[Aircraft.Fuselage.NUM_AISLES]
sig1 = sigmoidX(seats_abreast, 1.5, -0.01)
sig2 = sigmoidX(seats_abreast, 1.5, 0.01)

J['nose_height', Aircraft.Fuselage.DELTA_DIAMETER] = -sigmoidX(seats_abreast, 1.5, 0.01)
J['cabin_height', Aircraft.Fuselage.DELTA_DIAMETER] = sigmoidX(seats_abreast, 1.5, -0.01)
J[Aircraft.Fuselage.AVG_DIAMETER, Aircraft.Fuselage.AISLE_WIDTH] = num_aisle
J[Aircraft.Fuselage.AVG_DIAMETER, Aircraft.Fuselage.SEAT_WIDTH_ECONOMY] = seats_abreast

J['nose_height', Aircraft.Fuselage.DELTA_DIAMETER] = -sig2
J['nose_height', Aircraft.Fuselage.AISLE_WIDTH] = (
num_aisle / 12 * sig1 + num_aisle / 12 * sig2
)
J['nose_height', Aircraft.Fuselage.SEAT_WIDTH_ECONOMY] = (
seats_abreast / 12 * sig1 + seats_abreast / 12 * sig2
)

J['cabin_height', Aircraft.Fuselage.DELTA_DIAMETER] = sig1
J['cabin_height', Aircraft.Fuselage.AISLE_WIDTH] = (
num_aisle / 12 * sig1 + num_aisle / 12 * sig2
)
J['cabin_height', Aircraft.Fuselage.SEAT_WIDTH_ECONOMY] = (
seats_abreast / 12 * sig1 + seats_abreast / 12 * sig2
)


class FuselageSize(om.ExplicitComponent):
Expand Down Expand Up @@ -259,17 +291,17 @@ class BWBFuselageParameters1(om.ExplicitComponent):

def initialize(self):
add_aviary_option(self, Aircraft.CrewPayload.Design.NUM_PASSENGERS)
add_aviary_option(self, Aircraft.Fuselage.AISLE_WIDTH, units='inch')
add_aviary_option(self, Aircraft.Fuselage.NUM_AISLES)
add_aviary_option(self, Aircraft.CrewPayload.Design.NUM_SEATS_ABREAST_ECONOMY)
add_aviary_option(self, Aircraft.Fuselage.SEAT_WIDTH_ECONOMY, units='inch')
add_aviary_option(self, Settings.VERBOSITY)

def setup(self):
add_aviary_input(self, Aircraft.Fuselage.DELTA_DIAMETER, units='ft')
add_aviary_input(self, Aircraft.Fuselage.HEIGHT_TO_WIDTH_RATIO, units='unitless')
add_aviary_input(self, Aircraft.Fuselage.PRESSURIZED_WIDTH_ADDITIONAL, units='ft')
add_aviary_input(self, Aircraft.Fuselage.NOSE_FINENESS, units='unitless')
add_aviary_input(self, Aircraft.Fuselage.AISLE_WIDTH, units='inch')
add_aviary_input(self, Aircraft.Fuselage.SEAT_WIDTH_ECONOMY, units='inch')

add_aviary_output(self, Aircraft.Fuselage.AVG_DIAMETER, units='ft')
add_aviary_output(self, Aircraft.Fuselage.HYDRAULIC_DIAMETER, units='ft', desc='DHYDRAL')
Expand All @@ -282,26 +314,34 @@ def setup_partials(self):
Aircraft.Fuselage.AVG_DIAMETER,
[
Aircraft.Fuselage.PRESSURIZED_WIDTH_ADDITIONAL,
Aircraft.Fuselage.AISLE_WIDTH,
Aircraft.Fuselage.SEAT_WIDTH_ECONOMY,
],
)
self.declare_partials(
Aircraft.Fuselage.HYDRAULIC_DIAMETER,
[
Aircraft.Fuselage.PRESSURIZED_WIDTH_ADDITIONAL,
Aircraft.Fuselage.HEIGHT_TO_WIDTH_RATIO,
Aircraft.Fuselage.AISLE_WIDTH,
Aircraft.Fuselage.SEAT_WIDTH_ECONOMY,
],
)
self.declare_partials(
'cabin_height',
[
Aircraft.Fuselage.HEIGHT_TO_WIDTH_RATIO,
Aircraft.Fuselage.AISLE_WIDTH,
Aircraft.Fuselage.SEAT_WIDTH_ECONOMY,
],
)
self.declare_partials(
'nose_height',
[
Aircraft.Fuselage.HEIGHT_TO_WIDTH_RATIO,
Aircraft.Fuselage.DELTA_DIAMETER,
Aircraft.Fuselage.AISLE_WIDTH,
Aircraft.Fuselage.SEAT_WIDTH_ECONOMY,
],
)
self.declare_partials(
Expand All @@ -310,6 +350,8 @@ def setup_partials(self):
Aircraft.Fuselage.HEIGHT_TO_WIDTH_RATIO,
Aircraft.Fuselage.DELTA_DIAMETER,
Aircraft.Fuselage.NOSE_FINENESS,
Aircraft.Fuselage.AISLE_WIDTH,
Aircraft.Fuselage.SEAT_WIDTH_ECONOMY,
],
)

Expand All @@ -318,9 +360,9 @@ def compute(self, inputs, outputs):
verbosity = options[Settings.VERBOSITY]

seats_abreast = options[Aircraft.CrewPayload.Design.NUM_SEATS_ABREAST_ECONOMY]
seat_width, _ = options[Aircraft.Fuselage.SEAT_WIDTH_ECONOMY]
seat_width = inputs[Aircraft.Fuselage.SEAT_WIDTH_ECONOMY]
num_aisle = options[Aircraft.Fuselage.NUM_AISLES]
aisle_width, _ = options[Aircraft.Fuselage.AISLE_WIDTH]
aisle_width = inputs[Aircraft.Fuselage.AISLE_WIDTH]
PAX = options[Aircraft.CrewPayload.Design.NUM_PASSENGERS]
additional_width = inputs[Aircraft.Fuselage.PRESSURIZED_WIDTH_ADDITIONAL]
cabin_width = (seats_abreast * seat_width + num_aisle * aisle_width) / 12.0 + 1.0
Expand All @@ -347,9 +389,9 @@ def compute_partials(self, inputs, J):
options = self.options

seats_abreast = options[Aircraft.CrewPayload.Design.NUM_SEATS_ABREAST_ECONOMY]
seat_width, _ = options[Aircraft.Fuselage.SEAT_WIDTH_ECONOMY]
seat_width = inputs[Aircraft.Fuselage.SEAT_WIDTH_ECONOMY]
num_aisle = options[Aircraft.Fuselage.NUM_AISLES]
aisle_width, _ = options[Aircraft.Fuselage.AISLE_WIDTH]
aisle_width = inputs[Aircraft.Fuselage.AISLE_WIDTH]
additional_width = inputs[Aircraft.Fuselage.PRESSURIZED_WIDTH_ADDITIONAL]
cabin_width = (seats_abreast * seat_width + num_aisle * aisle_width) / 12.0 + 1.0
body_width = cabin_width + additional_width
Expand All @@ -360,24 +402,46 @@ def compute_partials(self, inputs, J):
hydraulic_diameter = np.sqrt(body_width * cabin_width * nose_height_to_length)

J[Aircraft.Fuselage.AVG_DIAMETER, Aircraft.Fuselage.PRESSURIZED_WIDTH_ADDITIONAL] = 1.0
J[Aircraft.Fuselage.AVG_DIAMETER, Aircraft.Fuselage.AISLE_WIDTH] = num_aisle / 12
J[Aircraft.Fuselage.AVG_DIAMETER, Aircraft.Fuselage.SEAT_WIDTH_ECONOMY] = seats_abreast / 12

J[Aircraft.Fuselage.HYDRAULIC_DIAMETER, Aircraft.Fuselage.PRESSURIZED_WIDTH_ADDITIONAL] = (
0.5 * cabin_width * nose_height_to_length / hydraulic_diameter
)
J[Aircraft.Fuselage.HYDRAULIC_DIAMETER, Aircraft.Fuselage.HEIGHT_TO_WIDTH_RATIO] = (
0.5 * body_width * cabin_width / hydraulic_diameter
)
J[Aircraft.Fuselage.HYDRAULIC_DIAMETER, Aircraft.Fuselage.AISLE_WIDTH] = (
cabin_width * num_aisle * nose_height_to_length / hydraulic_diameter / 12
)
J[Aircraft.Fuselage.HYDRAULIC_DIAMETER, Aircraft.Fuselage.SEAT_WIDTH_ECONOMY] = (
0.5 * seats_abreast / 12 * (cabin_width + body_width) * nose_height_to_length
) / hydraulic_diameter

J['cabin_height', Aircraft.Fuselage.HEIGHT_TO_WIDTH_RATIO] = cabin_width
J['cabin_height', Aircraft.Fuselage.AISLE_WIDTH] = num_aisle / 12 * nose_height_to_length
J['cabin_height', Aircraft.Fuselage.SEAT_WIDTH_ECONOMY] = (
seats_abreast / 12 * nose_height_to_length
)

J['nose_height', Aircraft.Fuselage.HEIGHT_TO_WIDTH_RATIO] = cabin_width
J['nose_height', Aircraft.Fuselage.DELTA_DIAMETER] = -1.0
J['nose_height', Aircraft.Fuselage.AISLE_WIDTH] = num_aisle / 12 * nose_height_to_length
J['nose_height', Aircraft.Fuselage.SEAT_WIDTH_ECONOMY] = (
seats_abreast / 12 * nose_height_to_length
)

J['nose_length', Aircraft.Fuselage.HEIGHT_TO_WIDTH_RATIO] = cabin_width * nose_fineness
J['nose_length', Aircraft.Fuselage.DELTA_DIAMETER] = -nose_fineness
J['nose_length', Aircraft.Fuselage.NOSE_FINENESS] = (
cabin_width * nose_height_to_length - delta_diameter
)
J['nose_length', Aircraft.Fuselage.AISLE_WIDTH] = (
num_aisle / 12 * nose_height_to_length * nose_fineness
)
J['nose_length', Aircraft.Fuselage.SEAT_WIDTH_ECONOMY] = (
seats_abreast / 12 * nose_height_to_length * nose_fineness
)


class BWBCabinLayout(om.ExplicitComponent):
Expand All @@ -386,11 +450,7 @@ class BWBCabinLayout(om.ExplicitComponent):
def initialize(self):
add_aviary_option(self, Aircraft.Fuselage.SEAT_WIDTH_FIRST, units='inch', desc='WS_FC')
add_aviary_option(self, Aircraft.Fuselage.SEAT_WIDTH_BUSINESS, units='inch')
add_aviary_option(
self, Aircraft.Fuselage.SEAT_WIDTH_ECONOMY, units='inch', desc='INGASP.WS'
)
add_aviary_option(self, Aircraft.Fuselage.NUM_AISLES, units='unitless', desc='INGASP.AS')
add_aviary_option(self, Aircraft.Fuselage.AISLE_WIDTH, units='inch', desc='INGASP.WAS')
add_aviary_option(
self, Aircraft.CrewPayload.Design.SEAT_PITCH_FIRST, units='inch', desc='PS_FC'
)
Expand All @@ -409,6 +469,8 @@ def setup(self):
add_aviary_input(self, Aircraft.Fuselage.AVG_DIAMETER, units='ft')
add_aviary_input(self, Aircraft.Fuselage.PRESSURIZED_WIDTH_ADDITIONAL, units='ft')
self.add_input('nose_length', units='ft', desc='L_NOSE: nose length')
add_aviary_input(self, Aircraft.Fuselage.AISLE_WIDTH, units='inch')
add_aviary_input(self, Aircraft.Fuselage.SEAT_WIDTH_ECONOMY, units='inch')

self.add_output(
'fuselage_station_aft',
Expand Down Expand Up @@ -440,10 +502,10 @@ def compute(self, inputs, outputs):
# If there is no first class cabin, please set NUM_FIRST_CLASS = 0.

TC_seat_pitch, _ = options[Aircraft.CrewPayload.Design.SEAT_PITCH_ECONOMY]
TC_seat_width, _ = options[Aircraft.Fuselage.SEAT_WIDTH_ECONOMY]
TC_seat_width = inputs[Aircraft.Fuselage.SEAT_WIDTH_ECONOMY][0]
if TC_seat_width <= 0.0:
raise ValueError(f'fuselage seat width must be positive, but it is {TC_seat_width}.')
aisle_width, _ = options[Aircraft.Fuselage.AISLE_WIDTH]
aisle_width = inputs[Aircraft.Fuselage.AISLE_WIDTH][0]
num_aisles = options[Aircraft.Fuselage.NUM_AISLES]

body_width = inputs[Aircraft.Fuselage.AVG_DIAMETER][0]
Expand Down
Loading
Loading