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

ROSCO & Toolbox Update #82

Merged
merged 15 commits into from
Mar 12, 2021
Merged

ROSCO & Toolbox Update #82

merged 15 commits into from
Mar 12, 2021

Conversation

dzalkind
Copy link
Collaborator

@dzalkind dzalkind commented Feb 10, 2021

Purpose

Update the ROSCO and ROSCO_toolbox subtrees, new stuff includes:

  • Updated documentation, printing version with simulations and outputs
  • Constant power torque control
  • Refactoring of examples for running automatically
  • Updated Simulink version of ROSCO
  • Fixed indexing of above rated pitch angles
  • Fixed floating feedback gain

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

Should be covered in WEIS examples. examples/01_aeroelasticse/run_PC_sweep.py is a good demo

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

git-subtree-dir: ROSCO_toolbox
git-subtree-split: 25ef7a7
7d28a6f Get rid of annoying spectral warning

git-subtree-dir: ROSCO_toolbox
git-subtree-split: 7d28a6f
8eb65d9 Set install directory only if not previously defined (WISDEM#37)
e8beb58 Docs (WISDEM#36)
f98e887 Update print message, output file header (WISDEM#35)
b64ba17 Merge pull request WISDEM#30 from nikhar-abbas/compiler_updates
4e3752b Merge pull request WISDEM#34 from nikhar-abbas/f/constant_power
3b19c29 Filtered wind speed estimate for pitch saturation
77989b1 re-order pitcomT saturation
f07ef66 Don't use filtered pitcom for Cp calc
289dcec Add commanded pitch from PI controller to debug variablees
3e33fea Use filtered collective pitch for gain schedule
8ac68e5 Second order LPF for collective pitch feedback
6f80ad5 Use rated pwr instead of max tq for setpoint smoothing
467f52e filter blade pitch angle for gain scheduling
f4e946a Merge branch 'f/constant_power' of https://github.com/nikhar-abbas/ROSCO into f/constant_power
dbf0c3b Initialize max torque
f8c57b4 Use direct WSE for pitch saturation
2c94dd7 Revert "Reduce WSE filter to 10s time constant"
6f052fa Use max tq instead of rated tq for setpoint smoother
1efed1d Ignore more temp files
4cc00bc Add MaxTq to LocalVar
1030f5c Reduce WSE filter to 10s time constant
d61e275 Change upper limit to max torque
9b6392e Add initial constant power control with TSR tracking
8f8a4e3 Update install and compile instructions
c953a5f set install directory
1695348 ignore install folder

git-subtree-dir: ROSCO
git-subtree-split: 8eb65d9
Copy link
Collaborator

@nikhar-abbas nikhar-abbas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@johnjasa
Copy link
Collaborator

johnjasa commented Mar 8, 2021

@dzalkind, I see this is fully approved -- do you want me to merge it in?

c010d71 Merge pull request WISDEM#40 from nikhar-abbas/develop
062a3b9 Fix object instance bug in commanded pitch  filter
cfb0a93 Merge pull request WISDEM#38 from nikhar-abbas/f/docs
91584f4 Update README.md
b79f362 Iterate version
e8564fc Update for readthedocs, new version

git-subtree-dir: ROSCO
git-subtree-split: c010d71
git-subtree-dir: ROSCO_toolbox
git-subtree-split: 9b123f1
@johnjasa johnjasa merged commit 6a8861f into WISDEM:develop Mar 12, 2021
@dzalkind dzalkind deleted the rosco_update branch March 12, 2021 20:55
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.

3 participants