Skip to content

Commit

Permalink
Merge branch 'hotfix-1.0.1'
Browse files Browse the repository at this point in the history
Former-commit-id: 81e9024 [formerly d3d1222b842fb8586ccf2e862950baccc2b6d27e] [formerly 632173c63ec9d194f0a97d3b7c7a715708462fdf [formerly ed7f14a32e7be3fac79d15af5bb2abe0980053de]] [formerly 5de651e96195278513566d4279991a6227d90810 [formerly a8bdcfa0a1de25f2640ec389db766abaeb234a98] [formerly 89dffc57f13d911769576d05d3c1de2314a3fc68 [formerly c863208]]]
Former-commit-id: 7244dabf1b08642ebe92cf0bc27fd12657b66d77 [formerly 30a79b98c9150dae3db4006b997951ac01e8b238] [formerly 6f1af501913291d9b0f55ebe4404dfe01552d7ec [formerly aff1024]]
Former-commit-id: 6c5ff18c581809d6502bff7eb8da632535114ef0 [formerly 3003e6928ae7b8a25286b9c38dfc0b805d1f758a]
Former-commit-id: c8b873fe738fd376027794c585aad7c76cfe0769
  • Loading branch information
camUrban committed Mar 3, 2021
2 parents 919a5dc + 261da58 commit cca7f0c
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 8 deletions.
1 change: 1 addition & 0 deletions .idea/dictionaries/camer.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ start, this is for you!
* Ideally, we should fix up the style so that the entire repository has an A+ CodeFactor Rating.
* We should fill in any of the "Properly document this..." TODO statements.
* We should ensure that all files have between 30% and 70% comment lines.
* We should continue to ensure that all source code is formatted using Black.

### Features

Expand All @@ -170,6 +171,9 @@ start, this is for you!
Vortex-Lattice Method to Study Flapping Wings in Hover Flight." by Bruno Roccia, Sergio Preidikman, Julio Massa, and
Dean Mook for details.
* We should create a command-line interface or GUI.
* We should try to implement aeroelastic effects in Ptera Software's solvers.
* Flapping wing controls is both fascinating and complicated. We should try to create a workflow in Ptera Software for
controls systems identification for flapping wing vehicles.

## Credits

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

13 changes: 7 additions & 6 deletions pterasoftware/meshing.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ def mesh_wing(wing):
hinge_point=inner_cross_section.control_surface_hinge_point,
)
outer_airfoil = outer_cross_section.airfoil.add_control_surface(
deflection=inner_cross_section.control_surface_deflection,
# The inner cross section dictates control surface deflections.
deflection=inner_cross_section.control_surface_deflection,
hinge_point=inner_cross_section.control_surface_hinge_point,
)

Expand Down Expand Up @@ -297,16 +297,17 @@ def mesh_wing(wing):
+ outer_cross_section_mcl_local_up
)

# Define number of spanwise points and panels.
num_spanwise_panels = wing_cross_section.num_spanwise_panels
# Define number of spanwise points and panels. This is based on the inner
# cross section.
num_spanwise_panels = inner_cross_section.num_spanwise_panels
num_spanwise_coordinates = num_spanwise_panels + 1

# Get the spanwise coordinates.
if wing_cross_section.spanwise_spacing == "uniform":
# Get the spanwise coordinates. This is based on the inner cross section.
if inner_cross_section.spanwise_spacing == "uniform":
nondim_spanwise_coordinates = np.linspace(
0, 1, num_spanwise_coordinates, endpoint=True,
)
elif wing_cross_section.spanwise_spacing == "cosine":
elif inner_cross_section.spanwise_spacing == "cosine":
nondim_spanwise_coordinates = ps.geometry.cosspace(
n_points=num_spanwise_coordinates, endpoint=True,
)
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = PteraSoftware
version = 1.0.0
version = 1.0.1
author = Cameron Urban
author_email = camerongurban@gmail.com
description = This is an open-source, unsteady aerodynamics solver for analyzing flapping-wing flight.
Expand Down Expand Up @@ -39,6 +39,7 @@ keywords =
[options]
packages =
pterasoftware
pterasoftware.airfoils
python_requires = >= 3.7.6, < 3.8
install_requires =
matplotlib >= 3.2.2, < 4.0.0
Expand Down

0 comments on commit cca7f0c

Please sign in to comment.