Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
e5c400b
Add files via upload
szoppelt Jan 14, 2025
bf0331e
Merge pull request #1 from szoppelt/szoppelt-examples-typos
szoppelt Jan 14, 2025
f5403a2
Merge branch 'main' into main
jkirk5 Jan 16, 2025
1b09ca1
Merge branch 'main' into main
jkirk5 Jan 16, 2025
3a07d3d
Merge branch 'szoppelt-examples-typos' into examples-typos
Jan 16, 2025
6874eb8
removed jupyter output cells
Jan 16, 2025
bc14ba6
Merge pull request #2 from jkirk5/examples-typos
szoppelt Jan 16, 2025
28386bd
Add files via upload
szoppelt Jan 21, 2025
ed26f0c
Add files via upload
szoppelt Jan 21, 2025
a8cb4a4
Add files via upload
szoppelt Jan 21, 2025
03ee664
Add files via upload
szoppelt Jan 21, 2025
afa6928
Merge pull request #3 from szoppelt/fixing-files
szoppelt Jan 21, 2025
98ce55a
Rename additional_flight_phases.ipynb to aviary/docs/examples/additio…
szoppelt Jan 21, 2025
f255033
Create .gitattributes
szoppelt Jan 21, 2025
ad19bb0
Delete aviary/docs/examples/additional_flight_phases.ipynb
szoppelt Jan 21, 2025
d8f6667
Delete aviary/docs/examples/additional_flight_phases_2.ipynb
szoppelt Jan 21, 2025
74049aa
Add files via upload
szoppelt Jan 21, 2025
b579a38
Delete coupled_aircraft_mission_optimization.ipynb
szoppelt Jan 21, 2025
544306b
Delete aviary/docs/examples/coupled_aircraft_mission_optimization.ipynb
szoppelt Jan 21, 2025
1a586cd
Add files via upload
szoppelt Jan 21, 2025
92700d7
Delete aviary/docs/examples/additional_flight_phases.ipynb
szoppelt Jan 21, 2025
e342df6
Add files via upload
szoppelt Jan 21, 2025
6e0e6b8
Add files via upload
szoppelt Jan 22, 2025
ec9ee45
Delete aviary/docs/examples/additional_flight_phases.ipynb
szoppelt Jan 22, 2025
0304988
Rename additional_flight_phases-2.ipynb to additional_flight_phases.i…
szoppelt Jan 22, 2025
f6ac6d2
Add files via upload
szoppelt Jan 22, 2025
b8185c1
Delete aviary/docs/examples/coupled_aircraft_mission_optimization.ipynb
szoppelt Jan 22, 2025
19332cc
Rename coupled_aircraft_mission_optimization-3.ipynb to coupled_aircr…
szoppelt Jan 22, 2025
8ef6163
removed local-only filters
Jan 22, 2025
6d7468a
Merge branch 'main' into main
jkirk5 Jan 22, 2025
31406d3
Testing adding this file for later use.
szoppelt Mar 4, 2025
98ce522
Another test.
szoppelt Mar 4, 2025
381f662
Test.
szoppelt Mar 4, 2025
3164009
Test
szoppelt Mar 4, 2025
9a67145
Test.
szoppelt Mar 4, 2025
11bf0e0
Merge pull request #4 from szoppelt/new-mass-branch
szoppelt Mar 4, 2025
dbdee9a
test
szoppelt Mar 4, 2025
93dc6ae
Merge pull request #5 from szoppelt/new-mass-branch
szoppelt Mar 4, 2025
5080065
Create __init__.py
szoppelt Mar 4, 2025
a6fe374
new file: aviary/subsystems/mass/simple_mass/__init__.py
szoppelt Mar 4, 2025
133de7b
new file: aviary/subsystems/mass/simple_mass/test_fuselage.py
szoppelt Mar 5, 2025
d079930
test
szoppelt Mar 5, 2025
4bb9b25
Merge pull request #6 from szoppelt/new-mass-branch
szoppelt Mar 5, 2025
823228d
renamed: aviary/subsystems/mass/simple_mass/test_fuselage.py -> a…
szoppelt Mar 5, 2025
5dac1cd
Merge pull request #7 from szoppelt/new-mass-branch
szoppelt Mar 5, 2025
5b54053
new file: aviary/subsystems/mass/simple_mass/test/__init__.py
szoppelt Mar 5, 2025
ffb0e92
Merge pull request #8 from szoppelt/new-mass-branch
szoppelt Mar 5, 2025
a25a59f
Commit.
szoppelt Apr 1, 2025
254547a
Merge pull request #9 from szoppelt/new-mass-branch
szoppelt Apr 1, 2025
0f2bf51
Delete aviary/subsystems/mass/simple_mass/C:UsersszoppeltDesktopwingN2
szoppelt Apr 1, 2025
f694d35
Delete aviary/subsystems/mass/simple_mass/# New lump sum payments: $1…
szoppelt Apr 1, 2025
3bcfdf0
Delete aviary/subsystems/mass/simple_mass/import numpy as np.py
szoppelt Apr 1, 2025
f89307c
Delete aviary/subsystems/mass/simple_mass/test_quad.py
szoppelt Apr 1, 2025
ca8d07d
Delete aviary/subsystems/mass/simple_mass/wingN2
szoppelt Apr 1, 2025
2fb633e
Merge branch 'OpenMDAO:main' into new-mass-branch
szoppelt May 12, 2025
476aea3
Merge branch 'main' into new-mass-branch
szoppelt May 12, 2025
5d1c940
Merge pull request #10 from szoppelt/new-mass-branch
szoppelt May 12, 2025
ab07ae7
Merge remote-tracking branch 'upstream/main' into new-mass-branch
szoppelt May 12, 2025
fabc45b
commit.
szoppelt May 12, 2025
3a28290
Merge branch 'main' of https://github.com/szoppelt/Aviary into new-ma…
szoppelt May 12, 2025
0f54a13
Merge pull request #11 from szoppelt/new-mass-branch
szoppelt May 12, 2025
5b08b4f
Delete aviary/subsystems/mass/simple_mass/test/import os.py
szoppelt May 12, 2025
a752575
Delete aviary/docs/examples/wingN2.html
szoppelt May 12, 2025
8d5d6c7
Delete aviary/docs/examples/wing.py
szoppelt May 12, 2025
3a95cf0
Delete aviary/docs/examples/test_wing.py
szoppelt May 12, 2025
d988607
Delete aviary/docs/examples/tail.py
szoppelt May 12, 2025
018d8de
Delete aviary/docs/examples/test_mass_summation.py
szoppelt May 12, 2025
c9fa3f4
Delete aviary/docs/examples/materials_database.py
szoppelt May 12, 2025
53d3016
Delete aviary/docs/examples/Clark_Y.dat
szoppelt May 12, 2025
bf165f8
Delete aviary/docs/examples/Clark_Y.yaml
szoppelt May 12, 2025
2bca1b9
Delete aviary/docs/examples/C:UsersszoppeltDesktop
szoppelt May 12, 2025
07004e7
Delete aviary/docs/examples/C:UsersszoppeltDesktoptest.py
szoppelt May 12, 2025
3ce8adf
Delete aviary/docs/examples/Custom_Fuselage.dat
szoppelt May 12, 2025
a0d2e41
Delete aviary/docs/examples/airfoil_data_test.dat
szoppelt May 12, 2025
6dfd2d2
Delete aviary/docs/examples/mass_builder.py
szoppelt May 12, 2025
860756a
Delete aviary/docs/examples/mass_premission.py
szoppelt May 12, 2025
da228e4
Delete aviary/docs/examples/fuselage.py
szoppelt May 12, 2025
41962bd
Delete aviary/docs/examples/mass_summation.py
szoppelt May 12, 2025
33484ad
commit.
szoppelt May 12, 2025
a13ef2e
Commit.
szoppelt May 13, 2025
d2ca94c
commit
szoppelt May 13, 2025
1b40693
First draft of force resolver.
szoppelt May 13, 2025
dac43c3
Updates.
szoppelt May 14, 2025
2966467
updates.
szoppelt May 14, 2025
58eeee6
updates
szoppelt May 14, 2025
efb7b3c
updates
szoppelt May 14, 2025
cf33f82
updates.
szoppelt May 15, 2025
66d9313
updates.
szoppelt May 19, 2025
5cd215d
updates.
szoppelt May 21, 2025
6b12740
updates.
szoppelt Jun 9, 2025
886a1ab
Merge remote-tracking branch 'upstream/main' into new-mass-branch
szoppelt Jun 12, 2025
27ae9e7
updates.
szoppelt Jun 16, 2025
c663c34
Merge pull request #22 from szoppelt/new-mass-branch
szoppelt Jun 16, 2025
b514fec
updates.
szoppelt Jun 18, 2025
e3814e5
Merge pull request #23 from szoppelt/new-mass-branch
szoppelt Jun 18, 2025
86a07c4
updates.
szoppelt Jun 18, 2025
6acdcde
updates.
szoppelt Jun 18, 2025
01b1f79
Merge pull request #24 from szoppelt/new-mass-branch
szoppelt Jun 18, 2025
63097e4
updates. test
szoppelt Jun 23, 2025
b3e6745
Merge pull request #25 from szoppelt/new-mass-branch
szoppelt Jun 23, 2025
bd62739
test
szoppelt Jun 23, 2025
7f86169
Merge pull request #27 from szoppelt/new-mass-branch
szoppelt Jun 23, 2025
ff491ad
Final updates.
szoppelt Jul 2, 2025
8bf0650
Merge pull request #28 from szoppelt/new-mass-branch
szoppelt Jul 2, 2025
1e44c6a
Final updates.
szoppelt Jul 3, 2025
24ae045
Merge pull request #29 from szoppelt/new-mass-branch
szoppelt Jul 3, 2025
807a229
Final Updates.
szoppelt Jul 3, 2025
d6bda84
Delete aviary/docs/examples/six_dof_ODE.py
szoppelt Jul 3, 2025
1a61320
Delete aviary/docs/examples/fuselage_out directory
szoppelt Jul 3, 2025
4f28b37
Delete aviary/docs/examples/tail_out directory
szoppelt Jul 3, 2025
2dba3a3
Delete aviary/docs/examples/test_fuselage2_out directory
szoppelt Jul 3, 2025
96c8dea
Delete aviary/docs/examples/test_fuselage_dbf_out directory
szoppelt Jul 3, 2025
ee64116
Delete aviary/docs/examples/test_fuselage_out directory
szoppelt Jul 3, 2025
677df37
Delete aviary/docs/examples/wing_out directory
szoppelt Jul 3, 2025
6a7c59d
Delete aviary/docs/examples/test_wing_out directory
szoppelt Jul 3, 2025
6956666
Delete aviary/docs/examples/test_wing2_out directory
szoppelt Jul 3, 2025
065f092
Delete aviary/docs/examples/test_tail_out directory
szoppelt Jul 3, 2025
da45dab
Delete aviary/docs/examples/test_tail2_out directory
szoppelt Jul 3, 2025
21c4a55
Delete aviary/docs/examples/test_out directory
szoppelt Jul 3, 2025
6efef10
Updates.
szoppelt Jul 8, 2025
8bb0417
Merge pull request #32 from szoppelt/new-mass-branch
szoppelt Jul 8, 2025
6fbe730
Updates and unittest draft added.
szoppelt Jul 11, 2025
3e85588
Merge pull request #33 from szoppelt/new-mass-branch
szoppelt Jul 11, 2025
07d7877
Delete aviary/subsystems/mass/simple_mass directory
szoppelt Aug 21, 2025
e38f3a8
Delete aviary/mission/sixdof/plottest.py
szoppelt Aug 21, 2025
235fc70
Delete aviary/mission/sixdof/test_mission_6dof.py
szoppelt Aug 21, 2025
5d0a069
Delete pyproject_renamed
szoppelt Aug 21, 2025
fcdc575
Delete out.txt
szoppelt Aug 21, 2025
9c405ff
Updating thrust to allow for all x,y,z directions. Still updating.
szoppelt Aug 27, 2025
c60bb9e
More updates to force_component_calc
szoppelt Aug 28, 2025
17e41cf
Updates to derivatives for force_component_calc.
szoppelt Sep 4, 2025
3e3ed06
Updating force_component_calc derivatives.
szoppelt Sep 11, 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
37 changes: 34 additions & 3 deletions aviary/docs/examples/additional_flight_phases.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
" 'duration_bounds': ((25.5, 76.5), 'min'),\n",
" },\n",
" 'initial_guesses': {'time': ([0, 51], 'min')},\n",
" \"initial_guesses\": {\"times\": ([0, 51], \"min\")},\n",
" },\n",
" 'cruise_1': {\n",
" 'subsystem_options': {'core_aerodynamics': {'method': 'computed'}},\n",
Expand All @@ -96,6 +97,9 @@
" 'duration_bounds': ((23.5, 70.5), 'min'),\n",
" },\n",
" 'initial_guesses': {'time': ([51, 47], 'min')},\n",

" \"initial_guesses\": {\"times\": ([51, 47], \"min\")},\n",

" },\n",
" 'climb_2': {\n",
" 'subsystem_options': {'core_aerodynamics': {'method': 'computed'}},\n",
Expand All @@ -119,7 +123,11 @@
" 'initial_bounds': ((49.0, 147.0), 'min'),\n",
" 'duration_bounds': ((5.0, 15.0), 'min'),\n",
" },\n",

" 'initial_guesses': {'time': ([98, 10], 'min')},\n",

" \"initial_guesses\": {\"times\": ([98, 10], \"min\")},\n",

" },\n",
" 'cruise_2': {\n",
" 'subsystem_options': {'core_aerodynamics': {'method': 'computed'}},\n",
Expand All @@ -143,7 +151,11 @@
" 'initial_bounds': ((54.0, 162.0), 'min'),\n",
" 'duration_bounds': ((24.0, 72.0), 'min'),\n",
" },\n",

" 'initial_guesses': {'time': ([108, 48], 'min')},\n",

" \"initial_guesses\": {\"times\": ([108, 48], \"min\")},\n",

" },\n",
" 'climb_3': {\n",
" 'subsystem_options': {'core_aerodynamics': {'method': 'computed'}},\n",
Expand All @@ -167,7 +179,11 @@
" 'initial_bounds': ((78.0, 234.0), 'min'),\n",
" 'duration_bounds': ((7.0, 21.0), 'min'),\n",
" },\n",

" 'initial_guesses': {'time': ([156, 14], 'min')},\n",

" \"initial_guesses\": {\"times\": ([156, 14], \"min\")},\n",

" },\n",
" 'climb_4': {\n",
" 'subsystem_options': {'core_aerodynamics': {'method': 'computed'}},\n",
Expand All @@ -191,7 +207,11 @@
" 'initial_bounds': ((85.0, 255.0), 'min'),\n",
" 'duration_bounds': ((43.0, 129.0), 'min'),\n",
" },\n",

" 'initial_guesses': {'time': ([170, 86], 'min')},\n",

" \"initial_guesses\": {\"times\": ([170, 86], \"min\")},\n",

" },\n",
" 'descent_1': {\n",
" 'subsystem_options': {'core_aerodynamics': {'method': 'computed'}},\n",
Expand All @@ -215,7 +235,11 @@
" 'initial_bounds': ((128.0, 384.0), 'min'),\n",
" 'duration_bounds': ((41.0, 123.0), 'min'),\n",
" },\n",

" 'initial_guesses': {'time': ([256, 82], 'min')},\n",

" \"initial_guesses\": {\"times\": ([256, 82], \"min\")},\n",

" },\n",
" 'post_mission': {\n",
" 'include_landing': False,\n",
Expand Down Expand Up @@ -298,11 +322,18 @@
"\n",
"Playing around with a model and seeing how different settings affect the optimization and resulting aircraft design is always an enlightening experience."
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "base",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
Expand All @@ -316,9 +347,9 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.13"
"version": "3.12.2"
}
},
"nbformat": 4,
"nbformat_minor": 2
"nbformat_minor": 4
}
14 changes: 13 additions & 1 deletion aviary/docs/examples/coupled_aircraft_mission_optimization.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@
" 'initial_bounds': ((0.0, 0.0), 'min'),\n",
" 'duration_bounds': ((35.0, 105.0), 'min'),\n",
" },\n",

" 'initial_guesses': {'time': ([0, 70], 'min')},\n",

" \"initial_guesses\": {\"times\": ([0, 70], \"min\")},\n",

" },\n",
" 'cruise': {\n",
" 'subsystem_options': {'core_aerodynamics': {'method': 'computed'}},\n",
Expand All @@ -92,7 +96,11 @@
" 'initial_bounds': ((35.0, 105.0), 'min'),\n",
" 'duration_bounds': ((91.5, 274.5), 'min'),\n",
" },\n",

" 'initial_guesses': {'time': ([70, 183], 'min')},\n",

" \"initial_guesses\": {\"times\": ([70, 183], \"min\")},\n",

" },\n",
" 'descent_1': {\n",
" 'subsystem_options': {'core_aerodynamics': {'method': 'computed'}},\n",
Expand All @@ -116,7 +124,11 @@
" 'initial_bounds': ((126.5, 379.5), 'min'),\n",
" 'duration_bounds': ((25.0, 75.0), 'min'),\n",
" },\n",

" 'initial_guesses': {'time': ([253, 50], 'min')},\n",

" \"initial_guesses\": {\"times\": ([253, 50], \"min\")},\n",

" },\n",
" 'post_mission': {\n",
" 'include_landing': False,\n",
Expand Down Expand Up @@ -588,7 +600,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.12.3"
"version": "3.12.2"
}
},
"nbformat": 4,
Expand Down
14 changes: 13 additions & 1 deletion aviary/docs/examples/more_advanced_example.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,11 @@
" 'initial_bounds': ((0.0, 0.0), 'min'),\n",
" 'duration_bounds': ((27.0, 81.0), 'min'),\n",
" },\n",

" 'initial_guesses': {'time': ([0, 54], 'min')},\n",

" \"initial_guesses\": {\"times\": ([0, 54], \"min\")},\n",

" },\n",
" 'cruise': {\n",
" 'subsystem_options': {'core_aerodynamics': {'method': 'computed'}},\n",
Expand All @@ -91,7 +95,11 @@
" 'initial_bounds': ((27.0, 81.0), 'min'),\n",
" 'duration_bounds': ((85.5, 256.5), 'min'),\n",
" },\n",

" 'initial_guesses': {'time': ([54, 171], 'min')},\n",

" \"initial_guesses\": {\"times\": ([54, 171], \"min\")},\n",

" },\n",
" 'descent_1': {\n",
" 'subsystem_options': {'core_aerodynamics': {'method': 'computed'}},\n",
Expand All @@ -115,7 +123,11 @@
" 'initial_bounds': ((112.5, 337.5), 'min'),\n",
" 'duration_bounds': ((26.5, 79.5), 'min'),\n",
" },\n",

" 'initial_guesses': {'time': ([225, 53], 'min')},\n",

" \"initial_guesses\": {\"times\": ([225, 53], \"min\")},\n",

" },\n",
" 'post_mission': {\n",
" 'include_landing': False,\n",
Expand Down Expand Up @@ -468,7 +480,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.13"
"version": "3.8.19"
}
},
"nbformat": 4,
Expand Down
14 changes: 13 additions & 1 deletion aviary/docs/examples/simple_mission_example.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,11 @@
" 'initial_bounds': ((0.0, 0.0), 'min'),\n",
" 'duration_bounds': ((27.0, 81.0), 'min'),\n",
" },\n",

" 'initial_guesses': {'time': ([0, 54], 'min')},\n",

" \"initial_guesses\": {\"times\": ([0, 54], \"min\")},\n",

" },\n",
" 'cruise': {\n",
" 'subsystem_options': {'core_aerodynamics': {'method': 'computed'}},\n",
Expand All @@ -214,7 +218,11 @@
" 'initial_bounds': ((27.0, 81.0), 'min'),\n",
" 'duration_bounds': ((85.5, 256.5), 'min'),\n",
" },\n",

" 'initial_guesses': {'time': ([54, 171], 'min')},\n",

" \"initial_guesses\": {\"times\": ([54, 171], \"min\")},\n",

" },\n",
" 'descent_1': {\n",
" 'subsystem_options': {'core_aerodynamics': {'method': 'computed'}},\n",
Expand All @@ -238,7 +246,11 @@
" 'initial_bounds': ((112.5, 337.5), 'min'),\n",
" 'duration_bounds': ((26.5, 79.5), 'min'),\n",
" },\n",

" 'initial_guesses': {'time': ([225, 53], 'min')},\n",

" \"initial_guesses\": {\"times\": ([225, 53], \"min\")},\n",

" },\n",
" 'post_mission': {\n",
" 'include_landing': False,\n",
Expand Down Expand Up @@ -418,7 +430,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.13"
"version": "3.8.19"
}
},
"nbformat": 4,
Expand Down
Loading