Skip to content

Make Aircraft.Nacelle.TOTAL_WETTED_AREA a scalar #1295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkirk5 merged 10 commits into from
Sep 11, 2026
Merged

Make Aircraft.Nacelle.TOTAL_WETTED_AREA a scalar #1295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
58840ad
made Aircraft.Nacelle.TOTAL_WETTED_AREA a scalar
xjjiang Sep 3, 2026
14c0e10
made Aircraft.Nacelle.TOTAL_WETTED_AREA a scalar
xjjiang Sep 3, 2026
a6eeb0f
excluded Aircraft.Nacelle.TOTAL_WETTED_AREA as an engine_variable.
xjjiang Sep 3, 2026
71341ac
minor change
xjjiang Sep 3, 2026
d13000f
added use_tempdirs
xjjiang Sep 3, 2026
5fe856a
Merge branch 'OpenMDAO:main' into Nacelle_Total_WA
xjjiang Sep 4, 2026
7bae107
Merge branch 'OpenMDAO:main' into Nacelle_Total_WA
xjjiang Sep 8, 2026
28aac9e
removed Aircraft.Nacelle.PYLON_DRAG_FACTOR and Aircraft.Nacelle.DRAG_…
xjjiang Sep 8, 2026
36e90e0
Merge branch 'Nacelle_Total_WA' of github.com:xjjiang/om-Aviary into …
xjjiang Sep 8, 2026
35040b1
Merge branch 'main' into Nacelle_Total_WA
xjjiang Sep 8, 2026
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: 4 additions & 0 deletions aviary/subsystems/aerodynamics/gasp_based/test/test_gasp_aero_coeffs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import openmdao.api as om
from openmdao.utils.assert_utils import assert_check_partials, assert_near_equal
from openmdao.utils.testing_utils import use_tempdirs

from aviary.subsystems.aerodynamics.gasp_based.gasp_aero_coeffs import (
AeroFormfactors,
Expand All @@ -15,6 +16,7 @@
tol = 1e-8


@use_tempdirs
class TestAeroCoeffs(unittest.TestCase):
def test_aero_coeffs(self):
aero_coeffs = AeroFormfactors()
Expand Down Expand Up @@ -87,6 +89,7 @@ def test_multiengine(self):
assert_check_partials(partial_data, atol=1e-12, rtol=1e-14)


@use_tempdirs
class FormFactorTest(unittest.TestCase):
"""Test fuselage form factor computation and SIWB computation."""

Expand All @@ -112,6 +115,7 @@ def test_case1(self):
assert_check_partials(partial_data, atol=1e-11, rtol=1e-11)


@use_tempdirs
class BWBFormFactorTest(unittest.TestCase):
"""Test fuselage form factor computation and SIWB computation"""

Expand Down
3 changes: 0 additions & 3 deletions aviary/subsystems/aerodynamics/gasp_based/test/test_gaspaero.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1969,6 +1969,3 @@ def test_case1(self):

if __name__ == '__main__':
unittest.main()
test = AeroGeomTest()
# test.test_case1()
test.test_case_multiengine()
6 changes: 5 additions & 1 deletion aviary/utils/preprocessors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1199,5 +1199,9 @@ def _get_engine_variables():
for item in get_names_from_hierarchy(Aircraft.Engine):
yield item

excluded_names = [
Aircraft.Nacelle.TOTAL_WETTED_AREA,
]
for item in get_names_from_hierarchy(Aircraft.Nacelle):
yield item
if item not in excluded_names:
yield item
2 changes: 1 addition & 1 deletion aviary/validation_cases/validation_data/test_data/bwb300_baseline_FLOPS_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@
outputs.set_val(Aircraft.Nacelle.MASS, 0.0, 'lbm') # WNAC
nacelle_wetted_area = np.array([613.74211034217353]) # SWET(5)
outputs.set_val(Aircraft.Nacelle.WETTED_AREA, nacelle_wetted_area, 'ft**2')
outputs.set_val(Aircraft.Nacelle.TOTAL_WETTED_AREA, 2 * nacelle_wetted_area, 'ft**2')
outputs.set_val(Aircraft.Nacelle.TOTAL_WETTED_AREA, 2 * nacelle_wetted_area[0], 'ft**2')

outputs.set_val(Aircraft.Paint.MASS, 0.0, 'lbm') # WPAINT, WTPNT

Expand Down
2 changes: 1 addition & 1 deletion aviary/validation_cases/validation_data/test_data/bwb_detailed_FLOPS_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@
outputs.set_val(Aircraft.Nacelle.MASS, 0.0, 'lbm') # WNAC
nacelle_wetted_area = np.array([498.26822066]) # SWET(5)
outputs.set_val(Aircraft.Nacelle.WETTED_AREA, nacelle_wetted_area, 'ft**2')
outputs.set_val(Aircraft.Nacelle.TOTAL_WETTED_AREA, 3 * nacelle_wetted_area, 'ft**2')
outputs.set_val(Aircraft.Nacelle.TOTAL_WETTED_AREA, 3 * nacelle_wetted_area[0], 'ft**2')

outputs.set_val(Aircraft.Paint.MASS, 0.0, 'lbm') # WPAINT, WTPNT

Expand Down
2 changes: 1 addition & 1 deletion aviary/validation_cases/validation_data/test_data/bwb_simple_FLOPS_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@
outputs.set_val(Aircraft.Nacelle.MASS, 0.0, 'lbm') # WNAC
nacelle_wetted_area = np.array([498.26822066]) # SWET(5)
outputs.set_val(Aircraft.Nacelle.WETTED_AREA, nacelle_wetted_area, 'ft**2')
outputs.set_val(Aircraft.Nacelle.TOTAL_WETTED_AREA, 3 * nacelle_wetted_area, 'ft**2')
outputs.set_val(Aircraft.Nacelle.TOTAL_WETTED_AREA, 3 * nacelle_wetted_area[0], 'ft**2')

outputs.set_val(Aircraft.Paint.MASS, 0.0, 'lbm') # WPAINT, WTPNT

Expand Down
2 changes: 1 addition & 1 deletion aviary/validation_cases/validation_data/test_data/large_single_aisle_1_FLOPS_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
outputs.set_val(Aircraft.Nacelle.WETTED_AREA, nacelle_wetted_area, nacelle_wetted_area_units)

outputs.set_val(
Aircraft.Nacelle.TOTAL_WETTED_AREA, 2 * nacelle_wetted_area, nacelle_wetted_area_units
Aircraft.Nacelle.TOTAL_WETTED_AREA, 2 * nacelle_wetted_area[0], nacelle_wetted_area_units
)

outputs.set_val(Aircraft.Paint.MASS, 306.2, 'lbm')
Expand Down
2 changes: 1 addition & 1 deletion .../validation_cases/validation_data/test_data/large_single_aisle_2_detailwing_FLOPS_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@
nacelle_wetted_area_units = 'ft**2'
outputs.set_val(Aircraft.Nacelle.WETTED_AREA, nacelle_wetted_area, nacelle_wetted_area_units)
outputs.set_val(
Aircraft.Nacelle.TOTAL_WETTED_AREA, 2 * nacelle_wetted_area, nacelle_wetted_area_units
Aircraft.Nacelle.TOTAL_WETTED_AREA, 2 * nacelle_wetted_area[0], nacelle_wetted_area_units
)

outputs.set_val(Aircraft.Paint.MASS, 582.3, 'lbm')
Expand Down
2 changes: 1 addition & 1 deletion aviary/validation_cases/validation_data/test_data/multi_engine_single_aisle_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@

outputs.set_val(
Aircraft.Nacelle.TOTAL_WETTED_AREA,
2 * nacelle_wetted_area,
2 * nacelle_wetted_area[0],
nacelle_wetted_area_units,
)

Expand Down
1 change: 0 additions & 1 deletion aviary/variable_info/variable_meta_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4423,7 +4423,6 @@
units='ft**2',
desc='total nacelles wetted area',
default_value=0.0,
multivalue=True,
)

add_meta_data(
Expand Down
Loading