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

Update Main #37

Merged
merged 244 commits into from
Mar 10, 2021
Merged

Update Main #37

merged 244 commits into from
Mar 10, 2021

Conversation

dzalkind
Copy link
Collaborator

@dzalkind dzalkind commented Feb 26, 2021 •
edited
Loading

Merge develop changes into main to correspond with major ROSCO release.

Major Changes:

  • Automate examples and print outputs to figures by default for testing
  • Add ROSCO Simulink model and matlab helper functions
  • Updated documentation moved to readthedocs
  • Added ROSCO_testing/ features for quickly testing and comparing new controllers
  • Added ROSCO_toolbox/ofTools/ for running simulations and editing openfast inputs. Copy of weis/aeroelasticse
  • Add ability to compile ROSCO in setup.py

Minor Changes:

  • Fixed indexing issues in controller.py
  • Added BAR_10 turbine model
  • Added Simulink turbine model
  • Updated all turbine models to OpenFAST 2.5.0

TODO:

  • Document major, minor changes
  • Review, edit documentation
  • Update submodule to point main -> main. We can only do this when ROSCO PR is finished. Submodule needs to be committed.
  • Run all examples
  • Update version in __init__.py

nikhar-abbas and others added 30 commits July 9, 2020 22:48
@nikhar-abbas
Merge remote-tracking branch 'dzalkind/master' into f/testing
913482a
@nikhar-abbas
Update test cases
b94be5b
@nikhar-abbas
Create testing suite init
301a7a3
@nikhar-abbas
ROSCO testing as class, rename file
5e05be9
@nikhar-abbas
6 minute test time for lite testing
bf2a441
@nikhar-abbas
clean up filepaths
078e35f
@nikhar-abbas
properly pass desired output channels
6e6bb66
@nikhar-abbas
error handling bug fixes
edb341f
@nikhar-abbas
Run Testing - initial commit
52b2406
@nikhar-abbas
Move output variables to init
c635f7d
@nikhar-abbas
Typo
707e898
@ptrbortolotti
load binaries
2bf1888
@ptrbortolotti
fix previous commit
446186d
@ptrbortolotti
fix previous commit with channel names
4d43650
@ptrbortolotti
Merge branch 'develop' of https://github.com/NREL/ROSCO_toolbox into …
571baad 
…develop
@nikhar-abbas
Hardcode debug outname
8c86a3b
@nikhar-abbas
Rename license file
bb91651
@nikhar-abbas
Update submodule
8ff621f
@nikhar-abbas
Increment version
637c3a1
@dzalkind @nikhar-abbas
Update ROSCO test, add to gitignore
2866ebd
@dzalkind @nikhar-abbas
Add ROSCO Simulink Model and simple Matlab/Simulink run case
b29d62b
@dzalkind @nikhar-abbas
Update ROSCO pointer
4eb6466
@dzalkind @nikhar-abbas
Fix some Simulink initial condition issues
3da66f1
@dzalkind @nikhar-abbas
Create README.md
077b8d5
@dzalkind @nikhar-abbas
Revert examples 6 and 8
0a03336
@nikhar-abbas
Update Pl_FastPlots.m
4159ba5 
Turn off flag to plot floating
@nikhar-abbas
Add checks for optional input files
057de6d
@nikhar-abbas
Load times from input files
3eb2b90
@nikhar-abbas
formatting
f1de571
@nikhar-abbas
Dump outdata to structure and plot
b6d4324
nikhar-abbas and others added 21 commits February 26, 2021 10:53
@nikhar-abbas
Table formatting
667b2c1
@nikhar-abbas
Add ROSCO page
b70ca27
@nikhar-abbas
formatting
d1ba1f1
@nikhar-abbas
Merge remote-tracking branch 'upstream/develop' into f/docs
97b36e5
@nikhar-abbas
Merge pull request #33 from NREL/f/docs
bf3b3fd 
readthedocs
@dzalkind
Update simulink model input channel names, running
fb1a122
@dzalkind
Merge remote-tracking branch 'upstream/develop' into develop
764fae0
@dzalkind
Point submodule to main
0032cdc
@dzalkind
Update version and names in __init__.py
72bbaf8
@dzalkind
Point Test_Cases/ to ROSCO in install/lib
f466822
@dzalkind
Break lines up for readability, minor edits, re-organize TOC
08d6044
@dzalkind
Revise documentation
53ed6f0
@dzalkind
Revise documentation 2
d647d0a
@dzalkind
Update gitignore, DISCON example
b3ab9c6
@nikhar-abbas
ROSCO install path bug fix
bb5a8e2
@nikhar-abbas
Merge pull request #38 from nikhar-abbas/develop
d0d4165 
ROSCO install path bug fix
@dzalkind
Update IEA-15MW Tune and Test Cases
96ec34d
@dzalkind
Merge remote-tracking branch 'upstream/develop' into develop
5469f16
@dzalkind
Fix paths, print outputs to pdf, add submit script
8cd8388
@dzalkind
Merge branch 'develop' of https://github.com/NREL/ROSCO_toolbox into …
6d6fa78 
…develop
@dzalkind
Point submodule to main branch of ROSCO
1a5e9ae
nikhar-abbas
nikhar-abbas reviewed Mar 10, 2021
View reviewed changes
docs/conf.py Outdated
author = "ROSCO developers"

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
version = "2.1.1"
release = "2.1.1"
release = "2.3.0"
Copy link
Collaborator

Choose a reason for hiding this comment

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

This should be 2.2.0

nikhar-abbas
nikhar-abbas reviewed Mar 10, 2021
View reviewed changes
setup.py Outdated
@@ -31,7 +41,7 @@
EMAIL = 'nikhar.abbas@nrel.gov'
AUTHOR = 'NREL National Wind Technology Center'
REQUIRES_PYTHON = '>=3.4'
VERSION = '2.1.4'
VERSION = '2.1.0'
Copy link
Collaborator

Choose a reason for hiding this comment

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

This should be 2.2.0

nikhar-abbas
nikhar-abbas requested changes Mar 10, 2021
View reviewed changes
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.

Once the two version number problems are fixed I think this is good to go!

@nikhar-abbas nikhar-abbas merged commit 8ac261d into main Mar 10, 2021
nikhar-abbas pushed a commit to nikhar-abbas/ROSCO_toolbox that referenced this pull request Jun 29, 2021
@dzalkind
Set install directory only if not previously defined (NREL#37)
8eb65d9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikhar-abbas nikhar-abbas nikhar-abbas requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dzalkind @nikhar-abbas @ptrbortolotti