forked from WISDEM/WEIS
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
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
- Loading branch information
Showing
11 changed files
with
398 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| # - Returns a version string from Git | ||
| # | ||
| # These functions force a re-configure on each git commit so that you can | ||
| # trust the values of the variables in your build system. | ||
| # | ||
| # get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...]) | ||
| # | ||
| # Returns the refspec and sha hash of the current head revision | ||
| # | ||
| # git_describe(<var> [<additional arguments to git describe> ...]) | ||
| # | ||
| # Returns the results of git describe on the source tree, and adjusting | ||
| # the output so that it tests false if an error occurs. | ||
| # | ||
| # git_get_exact_tag(<var> [<additional arguments to git describe> ...]) | ||
| # | ||
| # Returns the results of git describe --exact-match on the source tree, | ||
| # and adjusting the output so that it tests false if there was no exact | ||
| # matching tag. | ||
| # | ||
| # git_local_changes(<var>) | ||
| # | ||
| # Returns either "CLEAN" or "DIRTY" with respect to uncommitted changes. | ||
| # Uses the return code of "git diff-index --quiet HEAD --". | ||
| # Does not regard untracked files. | ||
| # | ||
| # Requires CMake 2.6 or newer (uses the 'function' command) | ||
| # | ||
| # Obtained from https://github.com/rpavlik/cmake-modules/blob/master/GetGitRevisionDescription.cmake | ||
| # on August 29 2017 | ||
| # | ||
| # Original Author: | ||
| # 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> | ||
| # http://academic.cleardefinition.com | ||
| # Iowa State University HCI Graduate Program/VRAC | ||
| # | ||
| # Copyright Iowa State University 2009-2010. | ||
| # Distributed under the Boost Software License, Version 1.0. | ||
| # (See accompanying file LICENSE_1_0.txt or copy at | ||
| # http://www.boost.org/LICENSE_1_0.txt) | ||
|
|
||
| if(__get_git_revision_description) | ||
| return() | ||
| endif() | ||
| set(__get_git_revision_description YES) | ||
|
|
||
| # We must run the following at "include" time, not at function call time, | ||
| # to find the path to this module rather than the path to a calling list file | ||
| get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH) | ||
|
|
||
| function(get_git_head_revision _refspecvar _hashvar) | ||
| set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}") | ||
| set(GIT_DIR "${GIT_PARENT_DIR}/.git") | ||
| while(NOT EXISTS "${GIT_DIR}") # .git dir not found, search parent directories | ||
| set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}") | ||
| get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH) | ||
| if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT) | ||
| # We have reached the root directory, we are not in git | ||
| set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE) | ||
| set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE) | ||
| return() | ||
| endif() | ||
| set(GIT_DIR "${GIT_PARENT_DIR}/.git") | ||
| endwhile() | ||
| # check if this is a submodule | ||
| if(NOT IS_DIRECTORY ${GIT_DIR}) | ||
| file(READ ${GIT_DIR} submodule) | ||
| string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule}) | ||
| get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH) | ||
| get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE) | ||
| endif() | ||
| set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data") | ||
| if(NOT EXISTS "${GIT_DATA}") | ||
| file(MAKE_DIRECTORY "${GIT_DATA}") | ||
| endif() | ||
|
|
||
| if(NOT EXISTS "${GIT_DIR}/HEAD") | ||
| return() | ||
| endif() | ||
| set(HEAD_FILE "${GIT_DATA}/HEAD") | ||
| configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY) | ||
|
|
||
| configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in" | ||
| "${GIT_DATA}/grabRef.cmake" | ||
| @ONLY) | ||
| include("${GIT_DATA}/grabRef.cmake") | ||
|
|
||
| set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE) | ||
| set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE) | ||
| endfunction() | ||
|
|
||
| function(git_describe _var) | ||
| if(NOT GIT_FOUND) | ||
| find_package(Git QUIET) | ||
| endif() | ||
| get_git_head_revision(refspec hash) | ||
| if(NOT GIT_FOUND) | ||
| set(${_var} "GIT-NOTFOUND" PARENT_SCOPE) | ||
| return() | ||
| endif() | ||
| if(NOT hash) | ||
| set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE) | ||
| return() | ||
| endif() | ||
|
|
||
| execute_process(COMMAND | ||
| "${GIT_EXECUTABLE}" | ||
| describe --abbrev=8 --tags --dirty | ||
| # ${hash} | ||
| WORKING_DIRECTORY | ||
| "${CMAKE_CURRENT_SOURCE_DIR}" | ||
| RESULT_VARIABLE | ||
| res | ||
| OUTPUT_VARIABLE | ||
| out | ||
| ERROR_QUIET | ||
| OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
| if(NOT res EQUAL 0) | ||
| set(out "${out}-${res}-NOTFOUND") | ||
| endif() | ||
|
|
||
| set(${_var} "${out}" PARENT_SCOPE) | ||
| endfunction() | ||
|
|
||
| function(git_get_exact_tag _var) | ||
| git_describe(out --exact-match ${ARGN}) | ||
| set(${_var} "${out}" PARENT_SCOPE) | ||
| endfunction() | ||
|
|
||
| function(git_local_changes _var) | ||
| if(NOT GIT_FOUND) | ||
| find_package(Git QUIET) | ||
| endif() | ||
| get_git_head_revision(refspec hash) | ||
| if(NOT GIT_FOUND) | ||
| set(${_var} "GIT-NOTFOUND" PARENT_SCOPE) | ||
| return() | ||
| endif() | ||
| if(NOT hash) | ||
| set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE) | ||
| return() | ||
| endif() | ||
|
|
||
| execute_process(COMMAND | ||
| "${GIT_EXECUTABLE}" | ||
| diff-index --quiet HEAD -- | ||
| WORKING_DIRECTORY | ||
| "${CMAKE_CURRENT_SOURCE_DIR}" | ||
| RESULT_VARIABLE | ||
| res | ||
| OUTPUT_VARIABLE | ||
| out | ||
| ERROR_QUIET | ||
| OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
| if(res EQUAL 0) | ||
| set(${_var} "CLEAN" PARENT_SCOPE) | ||
| else() | ||
| set(${_var} "DIRTY" PARENT_SCOPE) | ||
| endif() | ||
| endfunction() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| # | ||
| # Internal file for GetGitRevisionDescription.cmake | ||
| # | ||
| # Requires CMake 2.6 or newer (uses the 'function' command) | ||
| # | ||
| # Obtained from https://github.com/rpavlik/cmake-modules/blob/master/GetGitRevisionDescription.cmake.in | ||
| # on August 29 2017 | ||
| # | ||
| # Original Author: | ||
| # 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> | ||
| # http://academic.cleardefinition.com | ||
| # Iowa State University HCI Graduate Program/VRAC | ||
| # | ||
| # Copyright Iowa State University 2009-2010. | ||
| # Distributed under the Boost Software License, Version 1.0. | ||
| # (See accompanying file LICENSE_1_0.txt or copy at | ||
| # http://www.boost.org/LICENSE_1_0.txt) | ||
|
|
||
| set(HEAD_HASH) | ||
|
|
||
| file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024) | ||
|
|
||
| string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS) | ||
| if(HEAD_CONTENTS MATCHES "ref") | ||
| # named branch | ||
| string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}") | ||
| if(EXISTS "@GIT_DIR@/${HEAD_REF}") | ||
| configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY) | ||
| else() | ||
| configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY) | ||
| file(READ "@GIT_DATA@/packed-refs" PACKED_REFS) | ||
| if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}") | ||
| set(HEAD_HASH "${CMAKE_MATCH_1}") | ||
| endif() | ||
| endif() | ||
| else() | ||
| # detached HEAD | ||
| configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY) | ||
| endif() | ||
|
|
||
| if(NOT HEAD_HASH) | ||
| file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 8) | ||
| string(STRIP "${HEAD_HASH}" HEAD_HASH) | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.