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

Jump to bottom

Big Merge for 2.2 #368

Merged
merged 376 commits into from
Aug 11, 2020
Merged

Big Merge for 2.2 #368

merged 376 commits into from
Aug 11, 2020

Conversation

planes
Copy link
Member

@planes planes commented Aug 10, 2020

Pull Request Checklist

  • Merge in the latest Develop branch changes to your branch
  • Remove .pyc files from your repository:
    • Linux/Mac
      • find . -name *.pyc -delete
    • Windows
      • del /S *.pyc
  • Run automatic regression and makes sure everything is passing
  • Did you make a new regression test that covers your new code?
  • Did you update your docstrings?
  • Did you update your headers to include your name and date?
  • Do a final compare with the Develop branch to be sure what you're changing

planes and others added 30 commits May 13, 2019 19:53
@planes
speed boosts
4400dc4
@planes
fantastic VLMs
6d57b55
@planes
nice and clean vortex lattice analyses
93ca514
@mclarke2
updating VLM and weissinger with PGM material
b0f3f5f
@mclarke2
correcting diverged branches
65bb56d
@mclarke2
upgrade to plots unfinished
96f97f4
@mclarke2
updates to weissinger vlm
21c6f57
@mclarke2
updated to VLM
2e1d694
@mclarke2
preparation for pull request
4fafad0
@mclarke2
debugging vlm branch for pull request
d37bdad
@planes
small fixes to handle nans and consistency
6687fd3
@mclarke2
vlm drag still in progress
782e97d
@mclarke2
corrections to vlm scripts
c63275b
@mclarke2
corrections to vlm scripts 2
2dd3714
@planes
little things to check
fd6bb8f
@mclarke2
fuselage correction
9741bcf
@mclarke2
viscous induced drag correction
af3dbec
@planes
updates for latest vlm
2b6d880
@mclarke2
preparation for vlm aero pull request
11962f1
@mclarke2
preparation for pull request of vlm
c3bccef
@mclarke2
updates to pull request
f1f107f
@mclarke2
updates to the vlm aero except the mach correction and regression (wo…
6da3528 
…rking on them tonight)
@planes
lots of little fixes
39f2920
@mclarke2
VLM Updates:
f687fa3
@mclarke2
VLM panelization! ...finally
baa7f64
@mclarke2
supersonic VLM in beta testing
e6cb33b
@mclarke2
updates to scripts for plotting
f641ca6
@mclarke2
VLM temporary fix - removed mach effect for plotting
3a44ceb
@mclarke2
supersonic VLM
d6c10eb
@planes
little changes
4295f0a
mclarke2 and others added 26 commits July 6, 2020 15:35
@mclarke2
Merge pull request #358 from suavecode/feature-diff_evo_with_bounds
db8b683 
diff evo with constraints
@planes
non scientific axes
b6c0f7a
@planes
Merge pull request #360 from suavecode/feature-plot_non_scientific
376a901 
non scientific axes
@planes
fixed data ordered behavior
cd92c68
@planes
missing openvsp data vals
974f1a7
@planes
fixing max lift coefficient in correlative methods
f027bdc
@planes
fixing ground segments
f3d66c9
@planes
Merge branch 'feature-PGM' into feature-twotwobugs
b5fd557
@planes
new matplotlib syntax, dont use show(true)
2e519b4
@planes
formatting changes
a5e42d1
@planes
import for sys
5eb621e
@planes
tabulating
b1d1717
@planes
Merge pull request #363 from suavecode/feature-twotwobugs
9ae2c4b 
Feature twotwobugs
@planes
fuselage reading is now automatic, wings next
4776caa
@planes
reading now automatically, small dihedral issue still
9806923
@planes
two discrepancies between openvsp and vlm, vtail dihedral and last wi…
dde9692 
…ng tip length
@planes
fixing origins in AVL and dihedral in write
68b2e0d
@planes
uncommenting code
ab8c858
@planes
Merge pull request #364 from suavecode/feature-vsp_read2
1ebb9b3 
Feature vsp read2
Update README.md
8bb1bca
Merge branch 'develop' into Github-Readme-Citation
5322878
Merge pull request #354 from suavecode/Github-Readme-Citation
639bbc8 
Update README.md
@planes
various bug fixes for tutorials
2db2755
@planes
pi/2 now to break out of propeller script
560e428
@planes
deleting mistaken print
92f0b1d
@planes
Merge pull request #367 from suavecode/feature_twotwo
c7f69a3 
Feature twotwo
@coveralls
Copy link

Coverage Status

Coverage increased (+1.7%) to 86.837% when pulling c7f69a3 on develop into 99e4864 on master.

@mclarke2 mclarke2 self-assigned this Aug 11, 2020
@planes planes merged commit a4123c9 into master Aug 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mclarke2 mclarke2 mclarke2 approved these changes

Assignees

@mclarke2 mclarke2

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@planes @coveralls @mclarke2 @timdmacdo @rachealerhard @bdalman @SJ2050cn