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

Updates in preparation for ROSCO 2.6.0 #161

Merged
merged 8 commits into from
Jul 26, 2022
Merged

Updates in preparation for ROSCO 2.6.0 #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9646dbd
Merge pull request #90 from NREL/develop
nikhar-abbas Nov 10, 2021
ad15bcd
ROSCO 2.5.0 (#115)
dzalkind Apr 1, 2022
5d20185
Fixed wrong formatting of list items (#122)
ghylander Apr 5, 2022
77278f5
Flip Ct and Cq table allocation (#129)
dzalkind Apr 27, 2022
c903037
Merge remote-tracking branch 'upstream/main' into develop
dzalkind Jul 22, 2022
6a6a1fd
Clean up merge and regen discons
dzalkind Jul 22, 2022
3923991
Merge remote-tracking branch 'upstream/develop' into develop
dzalkind Jul 22, 2022
570dc4d
Merge remote-tracking branch 'upstream/develop' into rosco_260_prep
dzalkind Jul 22, 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
2 changes: 1 addition & 1 deletion ROSCO/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,4 @@ install(TARGETS discon
)
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install")
endif()
endif()
1 change: 1 addition & 0 deletions ROSCO/rosco_registry/rosco_types.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,7 @@ DebugVariables:
axisYaw_2P:
<<: *real
description: Yaw component of coleman transformation, 2P

YawRateCom:
<<: *real
description: Commanded yaw rate [rad/s].
Expand Down
2 changes: 1 addition & 1 deletion Test_Cases/BAR_10/BAR_10_DISCON.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
! Controller parameter input file for the BAR_10 wind turbine
! - File written using ROSCO version 2.5.0 controller tuning logic on 07/01/22
! - File written using ROSCO version 2.5.0 controller tuning logic on 07/22/22

!------- DEBUG ------------------------------------------------------------
1 ! LoggingLevel - {0: write no debug files, 1: write standard output .dbg-file, 2: LoggingLevel 1 + ROSCO LocalVars (.dbg2) 3: LoggingLevel 2 + complete avrSWAP-array (.dbg3)}
Expand Down
2 changes: 1 addition & 1 deletion Test_Cases/IEA-15-240-RWT-UMaineSemi/DISCON-UMaineSemi.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
! Controller parameter input file for the IEA-15-240-RWT-UMaineSemi wind turbine
! - File written using ROSCO version 2.5.0 controller tuning logic on 07/01/22
! - File written using ROSCO version 2.5.0 controller tuning logic on 07/22/22

!------- DEBUG ------------------------------------------------------------
2 ! LoggingLevel - {0: write no debug files, 1: write standard output .dbg-file, 2: LoggingLevel 1 + ROSCO LocalVars (.dbg2) 3: LoggingLevel 2 + complete avrSWAP-array (.dbg3)}
Expand Down
2 changes: 1 addition & 1 deletion Test_Cases/NREL-5MW/DISCON.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
! Controller parameter input file for the NREL-5MW wind turbine
! - File written using ROSCO version 2.5.0 controller tuning logic on 07/01/22
! - File written using ROSCO version 2.5.0 controller tuning logic on 07/22/22

!------- DEBUG ------------------------------------------------------------
1 ! LoggingLevel - {0: write no debug files, 1: write standard output .dbg-file, 2: LoggingLevel 1 + ROSCO LocalVars (.dbg2) 3: LoggingLevel 2 + complete avrSWAP-array (.dbg3)}
Expand Down