Clean up and align Turbine and TurbineMultiDim class architectures#762
Merged
rafmudaf merged 17 commits intoNatLabRockies:developfrom Dec 13, 2023
Merged
Clean up and align Turbine and TurbineMultiDim class architectures#762rafmudaf merged 17 commits intoNatLabRockies:developfrom
rafmudaf merged 17 commits intoNatLabRockies:developfrom
Conversation
It’s not clear why both exist, but they seem to be redundant so I’ve removed fTilt_interp in favor of tilt_interp
Ultimately, it wasn’t used aside from validating the input data. That has been included through the attrs validator.
All other keys use the singular version rather than the plural version, so this keeps it consistent
# Conflicts: # floris/simulation/farm.py # floris/simulation/turbine.py
rafmudaf
added
enhancement
Collaborator
Author
|
@bayc The nrel_5MW_fixed example input file has the Cp/Ct tilt correction flag on, but it does not provide a tilt table. What is the expected behavior in this case? |
misi9170
reviewed
Dec 13, 2023
| ) | ||
| p += power_interp[turb_type](rotor_effective_velocities) * (turbine_type_map == turb_type) | ||
|
|
||
| return p * ref_density_cp_ct |
Collaborator
There was a problem hiding this comment.
Not for this PR, but for future reference, I think we'll need to change this according to @paulf81 's concept of "sliding" along the power curve.
misi9170
approved these changes
Dec 13, 2023
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Clean up Turbine and TurbineMultiDim class architectures
This pull request contains a variety of improvements to the Turbine and TurbineMultiDim classes:
fTilt_interpandtilt_interpattributes since they were redundantfCp_interpin favor ofpower_interpsince the former was not usedPowerThrustTableclass and it ultimately wasn’t used aside from validating the input dataTiltTableclass for the same reason as abovecorrect_cp_ct_for_tiltandfloating_correct_cp_ct_for_tiltAs a small add on, this pull request updates the plots on the Code Quality page with commits up to v3.5.
Impacted areas of the software
The list of changed files is much larger than the impact of this pull request. It doesn't change any functionality, but it does reduce some complexity and ambiguity in the architecture of the Turbine class. Because of these changes, there are some impacts to the
Farm,Grid-subclasses, solvers, and examples.Note minor change to turbine yaml keys for floating turbines to bring into better alignment with fixed turbines. This may be a breaking change for some users interesting in floating turbines.
floating_correct_cp_ct_for_tiltis renamedcorrect_cp_ct_for_tilt, andwind_speedsin thefloating_tilt_tableis changed towind_speed.Additional supporting information
Simplifying and cleaning up the Turbine classes sets up upcoming work to expand the turbine level controls capabilities.