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

Adding super controller #22

Open
wants to merge 77 commits into
base: master
Choose a base branch
from
Open

Adding super controller #22

wants to merge 77 commits into from

Commits on May 1, 2018

  1. Added two example cases, ssc and ssc.base, which will be used to test…

    … the new ssc functionality and check backward compatability
    paulf81 committed May 1, 2018
    Configuration menu
    Copy the full SHA
    acc8013 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2018

  1. Configuration menu
    Copy the full SHA
    8c541a3 View commit details
    Browse the repository at this point in the history
  2. _SSC_ is the search term for new code

    Paul Fleming committed May 2, 2018
    Configuration menu
    Copy the full SHA
    c51204e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    487c50c View commit details
    Browse the repository at this point in the history
  4. Fix backwards compatibility for when sscProperties is not defined ins…

    …ide turbineArrayProperties.
    Bart Doekemeijer authored and Bart Doekemeijer committed May 2, 2018
    Configuration menu
    Copy the full SHA
    d927475 View commit details
    Browse the repository at this point in the history
  5. Only print SSC enabled/disabled message for processor0 to avoid clutt…

    …er in the ADM log file.
    Bart Doekemeijer authored and Bart Doekemeijer committed May 2, 2018
    Configuration menu
    Copy the full SHA
    56928ce View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    516438d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    100ec85 View commit details
    Browse the repository at this point in the history
  8. Initializing the dynamic arrays used in message passing

    Paul Fleming committed May 2, 2018
    Configuration menu
    Copy the full SHA
    7f48e7a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    ecc2227 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2018

  1. Added yaw super controller

    paulf81 committed May 3, 2018
    Configuration menu
    Copy the full SHA
    9cbce60 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6f0895c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d375fec View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1557aac View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9e5919c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    219cfcb View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f6fbf0a View commit details
    Browse the repository at this point in the history
  8. Fix sscControllerType read function from the turbineArrayProperties file

    Bart Doekemeijer authored and Bart Doekemeijer committed May 3, 2018
    Configuration menu
    Copy the full SHA
    a5698a8 View commit details
    Browse the repository at this point in the history
  9. Add example SC_INPUT.txt file to the .ssc case, and update the NREL 5…

    …MW turbine controller settings to PIDSC and yawSC.
    Bart Doekemeijer authored and Bart Doekemeijer committed May 3, 2018
    Configuration menu
    Copy the full SHA
    c4d36b5 View commit details
    Browse the repository at this point in the history
  10. Clarify some comments in the horizontalAxisWindTurbinesADM.C file

    Bart Doekemeijer authored and Bart Doekemeijer committed May 3, 2018
    Configuration menu
    Copy the full SHA
    b997352 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2018

  1. Implement improved timeTableSSC look-up. More modular, more checks fo…

    …r correctness of inputs, more generic.
    Bart Doekemeijer authored and Bart Doekemeijer committed May 4, 2018
    Configuration menu
    Copy the full SHA
    19647b0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6448d61 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1 from paulf81/devBart

    Implement timeTableSSC as an improvement to SCSimple
    paulf81 authored May 4, 2018
    Configuration menu
    Copy the full SHA
    2536906 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ee2dc9e View commit details
    Browse the repository at this point in the history
  5. Write turbine measurements to the superInfoToSSC variable in the YawS…

    …C turbine controller. (This could have also been done in PIDSC)
    Bart Doekemeijer authored and Bart Doekemeijer committed May 4, 2018
    Configuration menu
    Copy the full SHA
    974f22c View commit details
    Browse the repository at this point in the history
  6. Add zeromq to the required libraries and includes in preparation of t…

    …he zeroMQ superController implementation. This is currently hardcoded for Peregrine, and works if you have loaded the module through: module load zeromq/4.2.2/gcc.
    Bart Doekemeijer authored and Bart Doekemeijer committed May 4, 2018
    Configuration menu
    Copy the full SHA
    b3a747a View commit details
    Browse the repository at this point in the history
  7. Upload initial implementation of the zeroMQ superController. Currentl…

    …y still in development phase.
    Bart Doekemeijer authored and Bart Doekemeijer committed May 4, 2018
    Configuration menu
    Copy the full SHA
    506bef2 View commit details
    Browse the repository at this point in the history
  8. Increase buffer dimensions. Now allows messages of up to 9900 charact…

    …ers. This should facilitate for about 1k+ floats to be sent around. This should suffice for SC inputs and outputs.
    Bart Doekemeijer authored and Bart Doekemeijer committed May 4, 2018
    Configuration menu
    Copy the full SHA
    569bb74 View commit details
    Browse the repository at this point in the history
  9. Update nOutputsFromSC to nOutputsFromSSC for consistency. Also, add s…

    …ome comments to the zeroMQ superController.
    Bart Doekemeijer authored and Bart Doekemeijer committed May 4, 2018
    Configuration menu
    Copy the full SHA
    f03e653 View commit details
    Browse the repository at this point in the history
  10. Upload example SC files for Python, C and MATLAB. MATLAB still requir…

    …es some debugging, but works well overall.
    Bart Doekemeijer authored and Bart Doekemeijer committed May 4, 2018
    Configuration menu
    Copy the full SHA
    e8f6584 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2018

  1. Fix the matlabSSC code. Proper formatting from received message to an…

    … array of data. It appears that MATLAB does not properly filter the non-set message data, so it will come up as a bunch of random symbols. Added manual manipulations to fix it. Tested on one-turbine case successfully.
    Bart Doekemeijer authored and Bart Doekemeijer committed May 5, 2018
    Configuration menu
    Copy the full SHA
    dd84eb9 View commit details
    Browse the repository at this point in the history
  2. Remove the workspace.mat that was accidentally added during debugging

    Bart Doekemeijer authored and Bart Doekemeijer committed May 5, 2018
    Configuration menu
    Copy the full SHA
    e458933 View commit details
    Browse the repository at this point in the history
  3. Update readme.txt

    Bart Doekemeijer authored May 5, 2018
    Configuration menu
    Copy the full SHA
    b93fae7 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2018

  1. Merge pull request #2 from paulf81/devBart

    Add a SSC option for communication with external software (MATLAB/Python) using zeroMQ
    paulf81 authored May 7, 2018
    Configuration menu
    Copy the full SHA
    7e60b03 View commit details
    Browse the repository at this point in the history
  2. Update cSSC.c

    Match the TCP address with that of the SOWFA SSC code
    Bart Doekemeijer authored May 7, 2018
    Configuration menu
    Copy the full SHA
    fa54638 View commit details
    Browse the repository at this point in the history
  3. Update the ADM flags for compilation to be compatible with a generic …

    …zeroMQ installation, defined by variables ZEROMQ_INCLUDE and ZEROMQ_LIB
    Bart Doekemeijer authored and Bart Doekemeijer committed May 7, 2018
    Configuration menu
    Copy the full SHA
    0f9f343 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    353bbb5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    66fe0f9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b216d38 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    8e2a701 View commit details
    Browse the repository at this point in the history
  8. Merge branch 'master' of github.com:paulf81/SOWFA into devBart

    Bart Doekemeijer authored and Bart Doekemeijer committed May 7, 2018
    Configuration menu
    Copy the full SHA
    9117eec View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2018

  1. Update zeromqSSC.H

    Fix print option
    Bart Doekemeijer authored Jul 11, 2018
    Configuration menu
    Copy the full SHA
    578509e View commit details
    Browse the repository at this point in the history
  2. Merge changes from NREL master repository

    Bart Doekemeijer authored and Bart Doekemeijer committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    e71ecd3 View commit details
    Browse the repository at this point in the history
  3. Make ZeroMQ compilation optional with backwards compatibility. Defaul…

    …t option is no compilation. Only compiles when COMPILEZEROMQ=1 is defined in the Bash environment.
    Bart Doekemeijer authored and Bart Doekemeijer committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    cf13d92 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. Add error message when attempting to run ZeroMQ SSC when it has not b…

    …een installed.
    Bart Doekemeijer authored and Bart Doekemeijer committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    1b1ef75 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2018

  1. Merge pull request #4 from paulf81/devBart

    Pulling dev_bart back into the forked master
    paulf81 authored Jul 17, 2018
    Configuration menu
    Copy the full SHA
    272dab3 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2018

  1. Bug fix for writing and collecting the measurements for the zeroMQ in…

    …terface. Currently, the measurements were written for every core, and then summed at the end. This leads to the measuement vector being nCores times larger than it is supposed to be. This is corrected for. Furthermore, some debugging print statements are ommitted for a cleaner output log.
    Bart Doekemeijer authored and Bart Doekemeijer committed Sep 4, 2018
    Configuration menu
    Copy the full SHA
    8184ac1 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #5 from paulf81/devBart

    Bug fix for writing and collecting the measurements for the zeroMQ interface
    Bart Doekemeijer authored Sep 4, 2018
    Configuration menu
    Copy the full SHA
    766f7ef View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2018

  1. Update zeromqSSC implementation to a more general implementation. Mov…

    …ed the case-specific settings to the yawSC and PIDSC controllers, respectively. This makes a lot more sense, and makes it much more generic for other SSC implementations.
    Bart Doekemeijer authored and Bart Doekemeijer committed Sep 18, 2018
    Configuration menu
    Copy the full SHA
    f416655 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #6 from paulf81/devBart

    Update zeromqSSC implementation to a more general implementation. Mov…
    Bart Doekemeijer authored Sep 18, 2018
    Configuration menu
    Copy the full SHA
    50224f4 View commit details
    Browse the repository at this point in the history
  3. Update options compilation file to remove warning message for backsla…

    …sh at end of file during SOWFA compilation. Furthermore, replace all tabs with spaces for consistency and readability.
    Bart Doekemeijer authored and Bart Doekemeijer committed Sep 18, 2018
    Configuration menu
    Copy the full SHA
    98246e3 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #7 from paulf81/devBart

    Update options compilation file to remove warning message for backsla…
    Bart Doekemeijer authored Sep 18, 2018
    Configuration menu
    Copy the full SHA
    c28ecb0 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2018

  1. Add separate option to define the zeroMQ address for connection. This…

    … will allow multiple connections on the same node/network.
    Bart Doekemeijer authored and Bart Doekemeijer committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    607794f View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2018

  1. Update horizontalAxisWindTurbinesADM.C

    Add torqueSC option (directly specifying generator torque through the ZMQ interface)
    Bart Doekemeijer authored Oct 29, 2018
    Configuration menu
    Copy the full SHA
    e345aee View commit details
    Browse the repository at this point in the history
  2. Add files via upload

    Add the torqueSC controller module, in which the generator torque is directly specified from the ZMQ interface (e.g., MATLAB or Python). Basically, this means the turbine controller can now be programmed in MATLAB or Python.
    Bart Doekemeijer authored Oct 29, 2018
    Configuration menu
    Copy the full SHA
    2a82cf4 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2018

  1. Add .gitignore file that will ignore any compiled files and any prepr…

    …ocessed case files
    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    d6f4293 View commit details
    Browse the repository at this point in the history
  2. Update .bash_profile to include a SSC option, depending on whether or…

    … not one wants to compile SOWFA with the ZeroMQ module.
    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    74fe070 View commit details
    Browse the repository at this point in the history
  3. Remove old example cases and create two new example cases

    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    9683043 View commit details
    Browse the repository at this point in the history
  4. Remove old example cases for the SSC

    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    e7a8b9b View commit details
    Browse the repository at this point in the history
  5. Remove outdated zeroMQ example case

    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    ec31a13 View commit details
    Browse the repository at this point in the history
  6. Bug fix and simplify TimeTableSSC

    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    5ad61c9 View commit details
    Browse the repository at this point in the history
  7. Set-up a working zeroMQ example case

    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    6d8d881 View commit details
    Browse the repository at this point in the history
  8. Remove SCSimple case. This has been replaced by the TimeTableSSC code.

    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    d61fc08 View commit details
    Browse the repository at this point in the history
  9. Add a separate function that defines which measurements are used. Thi…

    …s makes the solution more modular
    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    5fd13ec View commit details
    Browse the repository at this point in the history
  10. Update gitignore file

    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    ff84f14 View commit details
    Browse the repository at this point in the history
  11. move superController functions separate from the ADM code, since they…

    … are general and can be used also with ALM and ALMAdvanced. This is in preparation for the ALMAdvanced SSC implementation
    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    2b28753 View commit details
    Browse the repository at this point in the history
  12. Update ADM code and make SSC code ADM-specific

    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    9d817c4 View commit details
    Browse the repository at this point in the history
  13. Add SSC for the ALMAdvanced code. Still needs two example cases for t…

    …esting
    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    54e0a9b View commit details
    Browse the repository at this point in the history
  14. Add example case for ALMAdvanced with timeTable SSC

    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    b0423e5 View commit details
    Browse the repository at this point in the history
  15. Add example case for ALMAdvanced with zeroMQ SSC

    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    3d8f7c0 View commit details
    Browse the repository at this point in the history
  16. Upload a simple MATLAB SSC file

    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    54e3ea5 View commit details
    Browse the repository at this point in the history
  17. Upload simple MATLAB zeroMQ example

    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    c6d3574 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2018

  1. Merge pull request #8 from NREL/master

    Merge changes from master
    Bart Doekemeijer authored Nov 14, 2018
    Configuration menu
    Copy the full SHA
    452ce6a View commit details
    Browse the repository at this point in the history
  2. Bug fix for addition of measurementFunction

    Bart Doekemeijer authored and Bart Doekemeijer committed Nov 14, 2018
    Configuration menu
    Copy the full SHA
    220a6f1 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2018

  1. Merge pull request #9 from NREL/master

    Merge changes from master branch
    Bart Doekemeijer authored Dec 21, 2018
    Configuration menu
    Copy the full SHA
    41be0c8 View commit details
    Browse the repository at this point in the history
  2. Update horizontalAxisWindTurbinesALMAdvanced.C

    Bug fix for yaw actions in ALMAdvanced
    Bart Doekemeijer authored Dec 21, 2018
    Configuration menu
    Copy the full SHA
    3e3c264 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2019

  1. Update horizontalAxisWindTurbinesALMAdvanced.C

    Bug fixes to avoid turbines from rotating a full circle to reach a small (but negative) deltaNacYaw setpoint.
    Bart Doekemeijer authored Jun 3, 2019
    Configuration menu
    Copy the full SHA
    618c867 View commit details
    Browse the repository at this point in the history