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

Robust control #156

Merged
merged 69 commits into from
Jan 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
58719e5
Squashed 'ROSCO/' changes from c010d715..2a847f72
nikhar-abbas Jun 25, 2021
ff5bec3
Update to ROSCO v2.3
nikhar-abbas Jun 25, 2021
98ad375
Squashed 'ROSCO_toolbox/' changes from 3e8ce684..c15bbfde
nikhar-abbas Jun 25, 2021
d365b88
Update to ROSCO_toolbox v2.3.0
nikhar-abbas Jun 25, 2021
446bade
Merge remote-tracking branch 'dzalkind/control_opt' into control_opt
nikhar-abbas Sep 15, 2021
ec81a6c
Merge branch 'control_opt' of https://github.com/dzalkind/WEIS into c…
nikhar-abbas Sep 15, 2021
ecded63
Merge remote-tracking branch 'dzalkind/control_opt' into control_opt
nikhar-abbas Sep 16, 2021
5a013bf
Merge remote-tracking branch 'upstream/develop' into control_opt
nikhar-abbas Sep 30, 2021
43c9c30
Updating to the most recent oneROSCO2 update
nikhar-abbas Sep 30, 2021
ab167b0
Squashed 'ROSCO/' changes from d0e7173bf..32df1724f
nikhar-abbas Sep 30, 2021
37d0065
add robust scheduling capabilities
nikhar-abbas Oct 25, 2021
3b00583
include stability margin scheduling example
nikhar-abbas Oct 25, 2021
d2b8f80
Squashed 'ROSCO/' changes from 32df1724f..ecef7ae52
nikhar-abbas Oct 25, 2021
e39d595
Updating to ROSCO v2.4.0
nikhar-abbas Oct 25, 2021
e95cc23
Merge remote-tracking branch 'upstream/develop' into control_opt
nikhar-abbas Oct 25, 2021
ca3f0f7
Merge remote-tracking branch 'upstream/develop' into control_opt
nikhar-abbas Nov 2, 2021
7fc59b5
Fix anchor locations and undo hack
dzalkind Oct 14, 2021
bda14b3
Get floating measures for Level3 w/ mooring
nikhar-abbas Dec 7, 2021
4c0ca2b
list_check rosco init options inputs
nikhar-abbas Dec 7, 2021
c82bd8f
add max ptfm pitch as merit figurre
nikhar-abbas Dec 7, 2021
d27890b
mergeg linmodel tuning from ROSCO schema
nikhar-abbas Dec 7, 2021
948d1f7
Merge remote-tracking branch 'upstream/develop' into control_opt
nikhar-abbas Dec 8, 2021
11b2070
shorten analysis time for example
nikhar-abbas Dec 8, 2021
1bb11be
single iteration for example
nikhar-abbas Dec 8, 2021
3054e31
fix file path
nikhar-abbas Dec 17, 2021
2bf8177
Run DOE instead of optimization
nikhar-abbas Dec 17, 2021
d446b4d
fix pot and lin file paths
nikhar-abbas Dec 17, 2021
8e50788
properly change inputs to list, remove print statements
nikhar-abbas Dec 17, 2021
31356eb
add floating memebers, remove doe flags
nikhar-abbas Dec 17, 2021
1bdc9a6
fix paths
nikhar-abbas Dec 17, 2021
596ab58
update for 12 m/s case
nikhar-abbas Dec 17, 2021
41d7c92
use setuptools instead of distutils
nikhar-abbas Dec 17, 2021
9cdc82a
Merge remote-tracking branch 'upstream/develop' into control_opt
nikhar-abbas Dec 20, 2021
11fd51e
simplify sm example, add to skinny examples
nikhar-abbas Dec 20, 2021
9ee9a08
cleanup
nikhar-abbas Dec 20, 2021
60ec3f2
Merge remote-tracking branch 'upstream/develop' into control_opt
dzalkind Dec 20, 2021
a8c9679
Fix original example 02
dzalkind Dec 20, 2021
e4a66c7
Subtree latest ROSCO develop
dzalkind Dec 20, 2021
0acc709
Squashed 'ROSCO/' changes from ecef7ae52..50f686dd2
dzalkind Dec 20, 2021
bf25da1
Integrate latest ROSCO:
dzalkind Dec 20, 2021
a1d3b6f
Revert TurbineName
dzalkind Dec 20, 2021
ab21bdf
Update DISCONs in WEIS
dzalkind Dec 20, 2021
ce65372
Fix DISCON typo
dzalkind Dec 20, 2021
ecdc5a1
Tidy up example 12
dzalkind Dec 21, 2021
4559de9
Revert "use setuptools instead of distutils"
nikhar-abbas Dec 22, 2021
911a6a4
Squashed 'ROSCO/' changes from 50f686dd..7cb1151c
nikhar-abbas Dec 22, 2021
ce020d9
Update with ROSCO+restart
nikhar-abbas Dec 22, 2021
7c5f3d7
remove old ROSCO
nikhar-abbas Dec 22, 2021
fa243a7
Re-add ROSCO subtree
nikhar-abbas Dec 22, 2021
6f7a939
Squashed 'ROSCO/' content from commit 50f686dd
nikhar-abbas Dec 22, 2021
2d6c6b8
Pull latest ROSCO - PR#99
dzalkind Jan 3, 2022
7db7b82
Squashed 'ROSCO/' changes from 50f686dd2..6c1e4dbf1
dzalkind Jan 3, 2022
bb418c3
Debugging: disable ROSCO in a few tests
dzalkind Jan 3, 2022
496b1e9
Revert "Debugging: disable ROSCO in a few tests"
dzalkind Jan 3, 2022
48237a5
Debugging: trying a few things in the CI set up
dzalkind Jan 3, 2022
e72d4d0
Debugging: Revert gfortran
dzalkind Jan 3, 2022
c2f5bea
specify gfortran, don't install compilers
nikhar-abbas Jan 4, 2022
7dcca9d
try gfortran-10
nikhar-abbas Jan 4, 2022
83659c5
Pull latest ROSCO: OL fix
dzalkind Jan 5, 2022
3cfa3ee
Squashed 'ROSCO/' changes from 6c1e4dbf1..93dceb7ed
dzalkind Jan 5, 2022
edb0311
Revert CI fortran comipler set up
dzalkind Jan 5, 2022
087305a
install pyoptsparse using pip and setuptools
nikhar-abbas Jan 5, 2022
1840965
import subprocess
nikhar-abbas Jan 5, 2022
b25e67f
Squashed 'WISDEM/' changes from 1da50d4e..77e6ce29
nikhar-abbas Jan 6, 2022
134d1a4
Update WISDEM with install fixesa
nikhar-abbas Jan 6, 2022
4b32351
Squashed 'ROSCO/' changes from 93dceb7e..aad73965
nikhar-abbas Jan 6, 2022
a25d211
Merge ROSCO robust tuning fix
nikhar-abbas Jan 6, 2022
82d86c8
add min/max for omega_pc
nikhar-abbas Jan 6, 2022
2343801
run example w/o any optimization
nikhar-abbas Jan 6, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions ROSCO/.github/workflows/CI_rosco-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: true
matrix:
os: ["ubuntu-latest", "macOS-latest", "windows-latest"]
python-version: ["3.8"]
python-version: ["3.8"]

steps:
- name: Checkout repository
Expand All @@ -28,8 +28,21 @@ jobs:
miniconda-version: "latest"
channels: conda-forge, general
auto-update-conda: true
python-version: 3.8
environment-file: environment.yml


# Install ROSCO toolbox
- name: Install ROSCO toolbox
shell: bash -l {0}
run: |
python setup.py install

# Re-generate registry
- name: Generate Registry
shell: bash -l {0}
run: python ROSCO/rosco_registry/write_registry.py


- name: Add dependencies windows
if: true == contains( matrix.os, 'windows')
shell: bash -l {0}
Expand Down Expand Up @@ -59,15 +72,3 @@ jobs:
-G "MinGW Makefiles" \
..
cmake --build . --target install

# # Install ROSCO linux
# - name: Compile ROSCO linux
# if: false == contains( matrix.os, 'windows')
# working-directory: ${{runner.workspace}}/ROSCO/ROSCO/build

# # Install ROSCO windows
# - name: Compile ROSCO windows
# if: true == contains( matrix.os, 'windows')
# working-directory: ${{runner.workspace}}/ROSCO/ROSCO/build
# run: cmake --build . --target install -G "MinGW Makefiles"

17 changes: 11 additions & 6 deletions ROSCO/.github/workflows/CI_rosco-pytools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push, pull_request]

# Specify FORTRAN compiler
env:
FORTRAN_COMPILER: gfortran-10
FC: gfortran

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down Expand Up @@ -47,7 +47,6 @@ jobs:
if: true == contains( matrix.os, 'macOS')
run: |
conda install compilers


# Install ROSCO toolbox
- name: Install ROSCO toolbox
Expand Down Expand Up @@ -98,7 +97,7 @@ jobs:
# Install ROSCO toolbox
- name: Install ROSCO toolbox
run: |
python setup.py develop --compile-rosco
python setup.py install --compile-rosco

# Install OpenFAST
- name: Install OpenFAST
Expand Down Expand Up @@ -156,8 +155,14 @@ jobs:
run: |
conda install openfast==3.0.0

# Run Testing
- name: Run testing
# Run ROSCO Testing
- name: Run ROSCO testing
run: |
cd ROSCO_testing
python ROSCO_testing.py

# Regression testing
- name: Run regression testing
run: |
cd ROSCO_testing
python ROSCO_testing.py
python regtest.py
27 changes: 0 additions & 27 deletions ROSCO/.github/workflows/publish_to_pypi.yml

This file was deleted.

2 changes: 2 additions & 0 deletions ROSCO/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Source/Release/
*build*
Makefile
*/install/*
*test_out*

# Archive
Scripts/CompileDISCONHereCopyRun\.cmd
Expand Down Expand Up @@ -59,6 +60,7 @@ _build
*.85
*.i90
*local*
*build*

# Binaries
*.dylib
Expand Down
Loading