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.

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

Develop #89

Merged
merged 2 commits into from
Mar 10, 2021
Merged

Develop #89

merged 2 commits into from
Mar 10, 2021

Conversation

ptrbortolotti
Copy link
Collaborator

Delete the text explanations below these headers and replace them with information about your PR.
Please first consult the developer guide to make sure your PR follows all code, testing, and documentation conventions.

Purpose

Explain the goal of this pull request. If it addresses an existing issue be sure to link to it. Describe the big picture of your changes here, perhaps using a bullet list if multiple changes are done to accomplish a single goal. If it accomplishes multiple goals, it may be best to create separate PR's for each.

Type of change

What types of change is it?
Select the appropriate type(s) that describe this PR

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (non-backwards-compatible fix or feature)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no API changes)
  • Documentation update
  • Maintenance update
  • Other (please describe)

Testing

Explain the steps needed to test the new code to verify that it does indeed address the issue and produce the expected behavior.

Checklist

Put an x in the boxes that apply.

  • I have run existing tests which pass locally with my changes
  • I have added new tests or examples that prove my fix is effective or that my feature works
  • I have added necessary documentation

@ptrbortolotti ptrbortolotti merged commit 38a504a into update_wisdem Mar 10, 2021
dzalkind added a commit to nikhar-abbas/WEIS that referenced this pull request Dec 20, 2021
50f686dd2 Open Loop Control (WISDEM#98)
f57ee4553 Merge pull request WISDEM#97 from nikhar-abbas/b/listcheck
6f16a9da6 update listcheck method for numpy arrays
aa888a1fc FOCAL Updates (WISDEM#64)
de1a7f8e3 another typo!
9650a58e8 fix install typo
08a8c9f67 Merge pull request WISDEM#89 from nikhar-abbas/develop
feb50489a Merge remote-tracking branch 'upstream/main' into develop
a402e1652 bump version number
2821f729e RAAW Controller (WISDEM#84)
277b637a6 Fix Docs and Minimum Rotor/Generator Speed (WISDEM#83)
6f254299b Update CMakeLsits for VS and ifort compilation (WISDEM#85)
52418867f Merge pull request WISDEM#87 from nikhar-abbas/fix_tests
4d5adb1d9 cleanup, use setuptools
b7f2592bc Combine ROSCO and the ROSCO_toolbox (WISDEM#54)

git-subtree-dir: ROSCO
git-subtree-split: 50f686dd2661756c057f98ade0db1ee5b6e9ece3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants