Skip to content

Commit

Permalink
Squashed 'ROSCO_toolbox/' changes from 3e8ce68..95218be
Browse files Browse the repository at this point in the history
95218be Merge pull request WISDEM#59 from NREL/develop
52c0b77 bump version to 2.3
5b43f01 Merge branch 'develop' of https://github.com/NREL/ROSCO_toolbox into develop
c15bbfd Increment Version, OF3.0 (WISDEM#57)
9030153 OF2.0 for ROSCO_testing
ec206d5 Update to ROSCO v2.3.0
b49231e add publish to pypi on release
cdc2075 update for OF v3.0.0
98ea9f9 Install OF3.0.0 for tests
ee51750 Update for OpenFAST v3.0.0
7d97af9 increment version
3a36b5e Update Testing (WISDEM#58)
779a392 Update to ROSCO v2.3.0
f24551d add publish to pypi on release
cad89a8 update for OF v3.0.0
6ca352e Install OF3.0.0 for tests
e0159ed Update for OpenFAST v3.0.0
e7d3f17 increment version
e0d001b Update turbine.py (WISDEM#56)
8ee78e5 Merge pull request WISDEM#54 from NREL/docs
209fd81 make uppercase
662b04b fix bullets
c72e805 Update headers
b13bc34 typo fix
f4116b3 add survey
5899ec1 add survey
08ef420 Merge remote-tracking branch 'upstream/develop' into docs
2e7aa6f Merge pull request WISDEM#53 from dzalkind/weis
e9247ee Revert controller to develop: TSR_at_minspeed
2cc92c9 Add peak shaving back to UMaine Semi example
db7b959 Update UMaine Semi test case input
691c157 Revert tune cases to develop
611d834 Revert examples and test cases to develop
279cb32 Read turbine variables using weis if available
8a05fea Merge remote-tracking branch 'upstream/develop' into weis
fd7b0b1 Merge commit '2d3c83c16cfd935bfd73f883e144e258fce4718c' into docs
71567be Remove italics in headers
6087eb1 move table of contents
a75b926 Point to WES preprint
c87da84 Merge commit '381ae2862ee58d9684ef5c69270eef4956ce1813' into weis
d748c9f Merge remote-tracking branch 'upstream/develop' into weis
9b123f1 Update examples to test in weis environment, working
8ac261d Merge pull request WISDEM#37 from NREL/develop
15976f5 Merge branch 'develop' into weis
7d28a6f Get rid of annoying spectral warning
25ef7a7 Update ROSCO install dir, other setup fun stuff
52465fe Merge remote-tracking branch 'upstream/develop' into weis
3454fc0 Merge remote-tracking branch 'upstream/develop' into weis
b730428 Merge pull request WISDEM#28 from nikhar-abbas/weis
71565e1 Revert "fix minpitch saturation bug"
34b427c Update submodule to track develop branch
f504b34 remove 0.7 from flpwise damping conversion
bc8c9c3 write kappa to self
38e956e Merge branch 'weis' of https://github.com/NREL/ROSCO_toolbox into weis
096f1e9 Merge branch 'develop' into weis
cf5b43b Fix another ofTools import
67731f8 Fix ofTools import
2256b0c Move ofTools into ROSCO_toolbox
e4a1c7f Revert setup.py to exclude ROSCO build, etc.
0e53372 Use weis.aeroelasticse for file reading
c8e9954 Make tuning yaml relative to main directory
f62653b Update InflowWind.dat templates in TuneCases/
3afe143 typo
92d6410 fix minpitch saturation bug
a7be52a Separate below and above rated windspeeds by 30 points each

git-subtree-dir: ROSCO_toolbox
git-subtree-split: 95218be
  • Loading branch information
ewquon committed Jul 1, 2021
1 parent e1fd991 commit 39529de
Show file tree
Hide file tree
Showing 25 changed files with 412 additions and 220 deletions.
53 changes: 52 additions & 1 deletion .github/workflows/CI_rosco-toolbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,62 @@ jobs:
# Install OpenFAST
- name: Install OpenFAST
run: |
conda install openfast==2.5.0
conda install openfast==3.0.0
# Run examples
- name: Run examples
run: |
cd Examples
python run_examples.py
run_testing:
name: Run Testing
runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
matrix:
os: ["ubuntu-latest"] #, "macOS-latest"]
python-version: ["3.8"]
defaults:
run:
shell: bash -l {0}

steps:
- name: Checkout repository and submodules
uses: actions/checkout@v2
with:
submodules: recursive

- name: Setup environment
uses: conda-incubator/setup-miniconda@v2
with:
miniconda-version: "latest"
channels: conda-forge, general
auto-update-conda: true
python-version: 3.8
environment-file: environment.yml


# Install dependencies of ROSCO toolbox
- name: Add dependencies ubuntu specific
if: false == contains( matrix.os, 'windows')
run: |
conda install -y compilers
conda install -y wisdem
# Install ROSCO toolbox
- name: Install ROSCO toolbox
run: |
python setup.py develop --compile-rosco
# Install OpenFAST
- name: Install OpenFAST
run: |
conda install openfast==3.0.0
# Run Testing
- name: Run testing
run: |
cd ROSCO_testing
python ROSCO_testing.py
27 changes: 27 additions & 0 deletions .github/workflows/publish_to_pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Upload to PyPi

on:
release:
types: [released]

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
- name: Build and publish
if: startsWith(github.ref, 'refs/tags')
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
run: |
python setup.py sdist bdist_wheel
twine upload dist/*
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "ROSCO"]
path = ROSCO
url = https://github.com/NREL/ROSCO
branch = main
branch = main
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,22 @@ The NREL Reference OpenSource Controller (ROSCO) provides an open, modular and f
## Documentation
All relevant documentation about the ROSCO toolbox and ROSCO controller can be found at through [ROSCO's readthedocs webpage](https://rosco-toolbox.readthedocs.io/en/latest/). Here, users can find the information on [installing the ROSCO toolbox](https://rosco-toolbox.readthedocs.io/en/latest/source/install.html#installing-the-rosco-toolbox) and [compiling ROSCO](https://rosco-toolbox.readthedocs.io/en/latest/source/install.html#compiling-rosco) for control purposes. Additionally, there is information on the standard workflow and uses cases for the ROSCO toolchain, and more.

## Survey
Please help us better understand the ROSCO user-base and how we can improve rosco through this brief survey:
[ROSCO toolchain survey](https://forms.office.com/Pages/ResponsePage.aspx?id=fp3yoM0oVE-EQniFrufAgGWnC45k8q5Kl90RBkHijqBUN0JTNzBJT1QwMjIzNDhCWDlDTUZPWDdMWC4u)

## Referencing
If the ROSCO Toolbox played a role in your research, please cite it. This software can be
cited as:

NREL: ROSCO Toolbox. Version 2.2.0, https://github.com/NREL/rosco_toolbox, 2021.
NREL: ROSCO Toolbox. Version 2.3.0, https://github.com/NREL/rosco_toolbox, 2021.

For LaTeX users:

```
@misc{ROSCO_toolbox_2021,
author = {NREL},
title = {{ROSCO Toolbox. Version 2.2.0}},
title = {{ROSCO Toolbox. Version 2.3.0}},
year = {2021},
publisher = {GitHub},
journal = {GitHub repository},
Expand Down
Loading

0 comments on commit 39529de

Please sign in to comment.