Skip to content
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

Set aero default again #653

Closed
wants to merge 16 commits into from
Closed

Set aero default again #653

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
401610f
work in progress: convert add_input/add_output to add_aviary_input/ad…
xjjiang Jan 24, 2025
eb3b301
work in progress: convert add_input/add_output to add_aviary_input/ad…
xjjiang Jan 24, 2025
1626334
work in progress. done with aero_common.py
xjjiang Jan 24, 2025
ffb3e33
work in progress.
xjjiang Jan 24, 2025
5cf258c
work in progress
xjjiang Jan 25, 2025
6603fc2
work in progress.
xjjiang Jan 25, 2025
b1713fd
work in progress
xjjiang Jan 25, 2025
7d0c45f
finished setting default.
xjjiang Jan 25, 2025
caa747a
Merge branch 'main' into set_aero_default
xjjiang Jan 25, 2025
2fe9584
autopep8
xjjiang Jan 25, 2025
c1e9766
autopep8 on variable_meta_data.py
xjjiang Jan 25, 2025
3e011f7
Merge branch 'OpenMDAO:main' into set_aero_default_again
xjjiang Jan 29, 2025
aaf9a3b
Merge branch 'OpenMDAO:main' into set_aero_default_again
xjjiang Jan 29, 2025
3ad3b04
Merge branch 'OpenMDAO:main' into set_aero_default_again
xjjiang Jan 29, 2025
7ce9c91
Merge branch 'OpenMDAO:main' into set_aero_default_again
xjjiang Jan 31, 2025
af8f470
Merge branch 'OpenMDAO:main' into set_aero_default_again
xjjiang Feb 5, 2025
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
Prev Previous commit
Next Next commit
work in progress.
  • Loading branch information
@xjjiang
xjjiang committed Jan 25, 2025
commit 6603fc23937566bf048ff7f0bf921c32e6ace973
14 changes: 4 additions & 10 deletions aviary/subsystems/aerodynamics/gasp_based/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np
import openmdao.api as om

from aviary.variable_info.functions import add_aviary_input
from aviary.variable_info.functions import add_aviary_input, add_aviary_output
from aviary.variable_info.variables import Aircraft, Dynamic


Expand All @@ -26,8 +26,8 @@ def setup(self):

add_aviary_input(self, Aircraft.Wing.AREA, val=1370.3)

self.add_output(Dynamic.Vehicle.LIFT, units="lbf", shape=nn, desc="Lift force")
self.add_output(Dynamic.Vehicle.DRAG, units="lbf", shape=nn, desc="Drag force")
add_aviary_output(self, Dynamic.Vehicle.LIFT, units="lbf", shape=nn)
add_aviary_output(self, Dynamic.Vehicle.DRAG, units="lbf", shape=nn)

def setup_partials(self):
nn = self.options["num_nodes"]
Expand Down Expand Up @@ -73,13 +73,7 @@ def initialize(self):
def setup(self):
nn = self.options["num_nodes"]
self.add_input("lift_req", 1, units="lbf", shape=nn, desc="Lift force")
self.add_input(
Dynamic.Atmosphere.DYNAMIC_PRESSURE,
1.0,
units="psf",
shape=nn,
desc="Dynamic pressure",
)
add_aviary_input(self, Dynamic.Atmosphere.DYNAMIC_PRESSURE, units="psf", shape=nn)

add_aviary_input(self, Aircraft.Wing.AREA, val=1370.3)

Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/aerodynamics/gasp_based/flaps_model/Cl_max.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def setup(self):

add_aviary_input(self, Dynamic.Atmosphere.STATIC_PRESSURE)

add_aviary_input(self, Aircraft.Wing.AVERAGE_CHORD, val=12.61)
add_aviary_input(self, Aircraft.Wing.AVERAGE_CHORD)

add_aviary_input(self, Aircraft.Wing.MAX_LIFT_REF, val=1.15)
add_aviary_input(self, Aircraft.Wing.SLAT_LIFT_INCREMENT_OPTIMUM, val=0.93)
Expand Down
20 changes: 10 additions & 10 deletions aviary/subsystems/aerodynamics/gasp_based/flaps_model/basic_calculations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ def setup(self):

# inputs

add_aviary_input(self, Aircraft.Wing.SWEEP, val=25.0)
add_aviary_input(self, Aircraft.Wing.ASPECT_RATIO, val=10.13)
add_aviary_input(self, Aircraft.Wing.FLAP_CHORD_RATIO, val=0.3)
add_aviary_input(self, Aircraft.Wing.TAPER_RATIO, val=0.33)
add_aviary_input(self, Aircraft.Wing.CENTER_CHORD, val=17.48974)
add_aviary_input(self, Aircraft.Fuselage.AVG_DIAMETER, val=13.1)
add_aviary_input(self, Aircraft.Wing.THICKNESS_TO_CHORD_ROOT, val=0.15)
add_aviary_input(self, Aircraft.Wing.SPAN, val=117.8)
add_aviary_input(self, Aircraft.Wing.SLAT_CHORD_RATIO, val=0.15)
add_aviary_input(self, Aircraft.Wing.SWEEP)
add_aviary_input(self, Aircraft.Wing.ASPECT_RATIO)
add_aviary_input(self, Aircraft.Wing.FLAP_CHORD_RATIO)
add_aviary_input(self, Aircraft.Wing.TAPER_RATIO)
add_aviary_input(self, Aircraft.Wing.CENTER_CHORD)
add_aviary_input(self, Aircraft.Fuselage.AVG_DIAMETER)
add_aviary_input(self, Aircraft.Wing.THICKNESS_TO_CHORD_ROOT)
add_aviary_input(self, Aircraft.Wing.SPAN)
add_aviary_input(self, Aircraft.Wing.SLAT_CHORD_RATIO)
self.add_input(
"slat_defl",
val=10.0,
units="deg",
desc="DELLED: leading edge slat deflection",
)
add_aviary_input(self, Aircraft.Wing.OPTIMUM_SLAT_DEFLECTION, val=20.0)
add_aviary_input(self, Aircraft.Wing.OPTIMUM_SLAT_DEFLECTION)
self.add_input(
"flap_defl",
val=10.0,
Expand Down
10 changes: 5 additions & 5 deletions aviary/subsystems/aerodynamics/gasp_based/flaps_model/meta_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def setup(self):

VDEL1_interp.add_input(
Aircraft.Wing.FLAP_CHORD_RATIO,
0.3,
0.0,
training_data=[0.0, 0.1, 0.2, 0.3, 0.4, 0.5],
units="unitless",
desc="ratio of flap chord to wing chord",
Expand Down Expand Up @@ -120,7 +120,7 @@ def setup(self):

VDEL3_interp.add_input(
Aircraft.Wing.TAPER_RATIO,
0.33,
0.0,
training_data=[0.0, 0.33, 1.0],
units="unitless",
desc="taper ratio of wing",
Expand Down Expand Up @@ -161,7 +161,7 @@ def setup(self):

VLAM1_interp.add_input(
Aircraft.Wing.ASPECT_RATIO,
10.13,
0.0,
training_data=[
0.0,
0.2,
Expand Down Expand Up @@ -285,7 +285,7 @@ def setup(self):

VLAM3_interp.add_input(
Aircraft.Wing.ASPECT_RATIO,
10.13,
0.0,
training_data=[
0.0,
0.2,
Expand Down Expand Up @@ -440,7 +440,7 @@ def setup(self):

VLAM5_interp.add_input(
Aircraft.Wing.FLAP_CHORD_RATIO,
0.3,
0.0,
training_data=[0.0, 0.1, 0.2, 0.3, 0.4, 0.5],
units="unitless",
desc="ratio of flap chord to wing chord",
Expand Down
Loading