Skip to content

Commit

Permalink
A hotfix branch that squashes v1.0.0's packaging bug.
Browse files Browse the repository at this point in the history
In addition to the packaging bug, this branch added to-dos to the README, and fixed an esoteric bug caused by incorrect interpretation of spanwise panel numbers in meshing.py.


Former-commit-id: 0367809 [formerly 3fe8c12f903d25d7515780a4bd02750570a7cedb] [formerly 6bc01ea8c29e3e870a893a454b41b6122dc53fce [formerly 8f34cc24e364970cd48b76a764b202257b17ec99]] [formerly 407384e3131766284e5adbb6aff024e9db410578 [formerly b5966feb6bed637346d2e7797e4e091e271241a6] [formerly 1ad9380e861487ba6e599f3e4ecd6f47b6ebbd0b [formerly df55ec2]]]
Former-commit-id: cc2108b9719a90e1ea355179e21f89662b8095c6 [formerly bfcd564034dfdc35ebf07bf179b85feb1eb90a57] [formerly 58a4bbfda2f0059d8391e6517bddc3b9f69b6b5e [formerly 8038b27]]
Former-commit-id: 5aa8700cd8e63a7ce1a27be443a9cf45e55b81ae [formerly 27ff0e82dc4a20e6b7411177672083b389258ffb]
Former-commit-id: c32686d012a6cfd3f8adefccdd9362c436b9121b
  • Loading branch information
camUrban committed Mar 3, 2021
1 parent 919a5dc commit 261da58
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 261da58

Please sign in to comment.