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

Main #2

Merged
merged 43 commits into from
Oct 16, 2020
Merged

Main #2

merged 43 commits into from
Oct 16, 2020

Conversation

RHammond2
Copy link
Owner

@RHammond2 RHammond2 commented Oct 16, 2020

Rename master as main

rafmudaf and others added 30 commits May 8, 2020 12:59
Avoids a Python package namespace conflict
Its still imported when `import floris` since modules in `simulation` and `tools` use it. This also initializes it on import.
Better handling of empty bins
-- This was only an issue for small data sets but good to fix
Passes through the bootstrap size (was forcing default)
Correct bin weighting to be uniform in non-overlapped bins and gaussian when overlapped
This is only used to access the Wind Tool Kit, so only require it there.
Doing this enables installing FLORIS via conda since the h5pyd package is not available on conda.
* fixed typo in refs file

* updated error messages in input file converter
* small fix to energy ratio

* small fix energy ratio

* Add jsons for jensen and multizone

* New example to show model comparisons

* Additional comments
* fixed typo in refs file

* updated error messages in input file converter

* fixed ccblade example to use dict output for rotor.evalutate (ccblade update)
Clean up some import statements and comments
* adding requirements for docs

* Update version number to 2.0.1

* Removing logger prop from get/set_params functions

* Update gauss.py

* Update interface_utilities.py
* modifies added TI to be based on max upstream turbine

* add a function to pass out TI

Co-authored-by: Paul <paul.fleming@nrel.gov>
This request has updated the following:
- Updated vortex equations: V and W coordinates were flipped and W was missing a minus sign.
- Updated the yaw added wake recovery.
- Removed "yaw_recovery_alpha" parameter.
- Slightly modified how the effective yaw is computed: take the average of the spanwise velocity across the rotor disk and compute the yaw angle that would have produced that average spanwise velocity across the disk (previously relied on rotation, but now relies on V).
- Updated the TI tuning.
- Change the wake combination method for V and W components to use linear superposition.
- Updated and added examples.
Adds `flake8`, `black`, and `isort` packages. Also configured git-hooks through `pre-commit`.
* Create python-publish.yml

Adds the GitHub Actions configuration for automatic publishing to PyPI

* remove unused auto publish functionality

Co-authored-by: Rob <robert.hammond@nrel.gov>
Co-authored-by: Rafael M Mudafort <rafmudaf@gmail.com>
RHammond2 and others added 13 commits July 27, 2020 11:53
* update README with developer install instructions (#1)

Co-authored-by: Rob <robert.hammond@nrel.gov>

* Add placeholder for new installation docs

* update the installation instructions

* update the installation instructions in README

* fix typos

* fix typos

* fix typos

* fix typos

* fix typos

* typos

* fixing typo

* embarrassing typos

* rst formatting

* rst formatting

* Add basic and advanced installation instructions

* Align the README with the docs

* Bug fix in README link

* Use  to refer to rtfd branches

* Update installation.rst

Making it slightly more clear what's meant. It's not as obvious on the docs site.

* clarify documentation instructions

* update docs with clarifications to docs installation

* remove docs installation from installation instructions.

Co-authored-by: Rob <robert.hammond@nrel.gov>
Co-authored-by: Rafael M Mudafort <rafmudaf@gmail.com>
Co-authored-by: bayc <christopher.j.bay@gmail.com>
Moves the interpolation in the power curve from cp, to power itself to avoid issues if wind speed points are spaced out above rated in input JSON

Co-authored-by: ejsimley <eric.simley@nrel.gov>
…o_weights

Correcting balanced energy ratio weights
* Added normalization to yaw_optimization

* Adding normalization to wind rose and parallel opts

* Fixed yaw optimization wind rose parallel super init

* Made calculate initial power optional in yaw wind rose

* Adding uncertainty to initial power calc in YawOptimization class

* Modifying yaw and yaw_wind_rose classes to set and normalize bounds correctly

* Adding calc_init_power boolean for yaw.py

Co-authored-by: ejsimley <eric.simley@nrel.gov>
* Add get_turbine_layout() to FlorisInterface

* Return np.ndarray from get_turbine_layout

* Add get_turbine_layout() to FlorisInterface
…th (NREL#67)

* adds check for layout_array x/y to be same length
* reduce the number of calculate_swept_area_velocities call

* vectorize effective yaw

* Moving some for loops to list generators

* Add saved flow field indices option

* Add AEP parallel

* Add wind speed limit

Performance improvements including saved flow field indices, limiting points, vectorization and wind speed limitations, but excluding larger function refactoring and any compiling

NGRID and RLOC default to values consistent with current version

A small subset of examples is included

Co-authored-by: Rafael M Mudafort <rafmudaf@gmail.com>
Co-authored-by: bayc <christopher.j.bay@gmail.com>
* Updates to the gch model: TKE and TI mixing

* Adding example

* Updated tuning

* Updated mask for V and W

* Bug fix

* Update models

* bugfix in energy ratio example

* Update models

* Apparantly no more writeline function

* Changing opt settings for examples

* change default ti to 6%

* Updating default crespo turbulence values

* Minor cleanup

Co-authored-by: King <jennifer.king@nrel.gov>
Co-authored-by: Paul <paul.fleming@nrel.gov>
Co-authored-by: Rafael M Mudafort <rafmudaf@gmail.com>
@codecov-io
Copy link

codecov-io commented Oct 16, 2020

Codecov Report

❗ No coverage uploaded for pull request base (master@66cdf1c). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master       #2   +/-   ##
=========================================
  Coverage          ?   28.09%           
=========================================
  Files             ?       66           
  Lines             ?     6326           
  Branches          ?        0           
=========================================
  Hits              ?     1777           
  Misses            ?     4549           
  Partials          ?        0           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 66cdf1c...5f7e6b0. Read the comment docs.

@RHammond2 RHammond2 merged commit 7e95003 into master Oct 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
9 participants