Back merge develop into offshore-development#92
Merged
jaredthomas68 merged 18 commits intoNLRWindSystems:offshore-developmentfrom Jun 2, 2025
Merged
Conversation
* (prep to) liberate python 3.13 (NLRWindSystems#69) * liberate python 3.13 * actually liberate python * update testing * version number inequality fix * walkback python for backdated wisdem * propogate to tests * liberate python 3.13 * remove extraneous whitespace
…ng the detailed mooring design work that is still under development
… offshore-dev-early-merge-2
…early-merge-2 Brings in multiple features developed on the offshore-development branch. These include, but are not limited to: - Fixed and floating farm examples - Simplistic stand-in modules for AEP and mooring design - Boundary constraints - Mooring constraints
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR performs a back merge from the develop branch into offshore-development to integrate upstream changes while preserving ongoing work on detailed mooring design. Key changes include:
- Updating the floris dependency in pyproject.toml from a git-based install to a versioned release.
- Removing an extraneous blank line in the mooring design detailed module.
- Cleaning up duplicate and inconsistent method definitions in the Placeholder component and tidying up commented code in the optiwindnet_wrap module.
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| pyproject.toml | Changed floris dependency from git reference to a stable version. |
| ard/offshore/mooring_design_detailed.py | Minor cleanup with removal of an unnecessary blank line. |
| ard/farm_aero/placeholder.py | Removed duplicate method implementations and updated partials setup. |
| ard/collection/optiwindnet_wrap.py | Removed commented-out code to improve readability. |
Comments suppressed due to low confidence (2)
ard/collection/optiwindnet_wrap.py:272
- [nitpick] Removal of commented-out code improves clarity; consider cleaning up any remaining legacy comments if they are no longer required.
J["total_length_cables", "x_turbines"][0, e0] -= dLdx0
pyproject.toml:37
- Ensure that changing the floris dependency from the git develop branch to a versioned release 'floris>=4.3' is intentional and that it remains compatible with the mooring design work.
"floris>=4.3",
|
|
||
| def setup_partials(self): | ||
| super().setup_partials() | ||
| self.declare_partials("*", "*", method="exact") |
There was a problem hiding this comment.
[nitpick] Consider updating the docstring or adding inline comments to clarify the switch from super().setup_partials() to self.declare_partials for future maintainability.
Contributor
Author
There was a problem hiding this comment.
I don't think we need to do this.
cfrontin
approved these changes
Jun 2, 2025
jaredthomas68
merged commit 415b53f
into
NLRWindSystems:offshore-development
12 checks passed
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.
This PR does a careful back merge from the
developbranch into theoffshore-developmentbranch being careful not to remove any files that are under development for the detailed mooring design.