Skip to content

Conversation

@cfrontin
Copy link
Collaborator

@cfrontin cfrontin commented Sep 4, 2025

Moving progress back into the develop branch.

jaredthomas68 and others added 30 commits June 2, 2025 16:19
Back merge `develop` into `offshore-development`
* rename mooring design to create space for detailed mooring design

* updated geomorphology/material data storage objects

* added detailed mooring design example

* forgot example script

* reorganize example

* add soil datafile

* added a bunch of soil/bed material stuff

* added improved material handling, testing of it

* black reformat and a little more testing

* removed assertions per @jaredthomas68's suggestion
* (prep to) liberate python 3.13 (WISDEM#69)

* liberate python 3.13

* actually liberate python

* update testing

* version number inequality fix

* walkback python for backdated wisdem

* propogate to tests

* rename mooring design to create space for detailed mooring design

* updated geomorphology/material data storage objects

* added detailed mooring design example

* forgot example script

* reorganize example

* remove spacing connection to landbosse in favor of approximation from optiwindnet

* update wisdem wrap and onshore and offshore examples to accomodate more generic latent variable set up

* correct logic and which landbosse components are used

* remove unneeded group and adjust calls from group to component

* run black

* more comments, and break out duplicate code into its own function

* add test for set_values

* try turning off numba jit to see if that solves the numba problem

* remove disable numba jit

* address circular import

* pin numpy

* only install ard once for each test suite

* pin numpy to 1.24.3

* pin numpy to 2.0

* pin numpy < 2.3

* cap numpy at 2.3 for numba compatibility

* restrict python version to less than 3.13

* remove comments

* use test dependencies for optiwindnet

* pin optiwindnet version

* Develop (WISDEM#99)

* (prep to) liberate python 3.13 (WISDEM#69)

* liberate python 3.13

* actually liberate python

* update testing

* version number inequality fix

* walkback python for backdated wisdem

* propogate to tests

* remove comments

* Improve feature/system tests (WISDEM#100)

* (prep to) liberate python 3.13 (WISDEM#69)

* liberate python 3.13

* actually liberate python

* update testing

* version number inequality fix

* walkback python for backdated wisdem

* propogate to tests

* remove comments

* constraint testing added

* black reformatting

* added updated pyrite

* system test added but not complete for mooring packing

* add forgotten file

* Black reformat

* switch to using OM derivative checks, clean up

* black reformat

* Update test/system/ard/geometry/test_constraints.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update test/system/ard/geometry/test_constraints.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update test/system/ard/offshore/test_mooring_packing.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update test/system/ard/offshore/test_mooring_packing.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update test/system/ard/geometry/test_constraints.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* tidy comments

* fix the problem discovered by the not problem that jared pointed out hahahaha

* barely avoided ragequitting due to black reformat

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Feature/wisdem upgrade (WISDEM#102)

* (prep to) liberate python 3.13 (WISDEM#69)

* liberate python 3.13

* actually liberate python

* update testing

* version number inequality fix

* walkback python for backdated wisdem

* propogate to tests

* remove comments

* update pyrite values

* fixes to 3.21 rather than 3.20

* update test utils for clarity

* a little more improvement to the test utils

* black reformat...

---------

Co-authored-by: Jared Thomas <jaredthomas68@gmail.com>
Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* (prep to) liberate python 3.13 (WISDEM#69)

* liberate python 3.13

* actually liberate python

* update testing

* version number inequality fix

* walkback python for backdated wisdem

* propogate to tests

* rename mooring design to create space for detailed mooring design

* updated geomorphology/material data storage objects

* added detailed mooring design example

* forgot example script

* reorganize example

* Add in FAModel initialization function, put in adjustment function in compute
- buildFAModel() will initialize a floating array model from either an ontology file or a set of inputs
- saves property called FAM to store FAModel project object
- call FAM.repositionArray() in compute function

* edits to mooring_design_detailed
- buildFAModel is now part of the detailedMooringDesign class
- for the ontology option, buildFAModel duplicates turbine 1 to reach desired number of turbines
- repositionArray requires turbine positions in m, convert for that
- created outputs dictionary to store anchor positions in km
- analysis_demo example is updated with ontology filename stored for working example

* edits towards mooring_design_detailed without ontology file inputed
-for now, passing settings through [modeling_options][mooring_setup]
-"mooring_info" passes just the mooring and anchor sections of the ontology
-edits to Leah's automatic adding of platforms, moorings, anchors to resolve errors
-updated analysis_demo example for working example without ontology file

* small changes to analysis_demo and mooring_design_detailed
-- Added adjuster_settings dictionary to analysis_demo in mooring_setup dictionary
-- Adjusted buildFAModel() to take in adjuster_settings and add to ontology file option as well as add to mooring objects with the FAModel project.addMooring()
-- streamline a few things in buildFAModel()

* small updates
-- remove cables from example ontology file
-- streamline a few things in buildFAModel method

* Update dependencies in pyproject.toml
-- add dependencies for MoorPy dev branch and FAModel

* Formatting changes for mooring_design_detailed.py

* typo fix mooring_design_detailed.py

* Small updates from C Frontin

* remove spacing connection to landbosse in favor of approximation from optiwindnet

* update wisdem wrap and onshore and offshore examples to accomodate more generic latent variable set up

* correct logic and which landbosse components are used

* FAModel remove full ontology option
-- removed option to use a full ontology file to initialize FAModel,
	- now only the mooring information will come from FAModel, the rest must be passed information
-- pared down sample ontology input file to only include mooring sections
-- removed sample soil and bathymetry files (unneeded)

* start to DetailedMooringDesign unit tests
-pulls inputs from the example files (offshore-detailed/OntologySample200m)
-setup method passes neccessary inputs for DetailedMooringDesign
-test_FAModel_turbine_positions checks that the DetailedMooringDesign turbine positions match a list of inputted turbine positions
-test_FAModel_anchor_positions checks that the DetailedMooringDesign anchor positions match the inputs for a transposed turbine

* remove unneeded group and adjust calls from group to component

* run black

* more comments, and break out duplicate code into its own function

* add test for set_values

* try turning off numba jit to see if that solves the numba problem

* remove disable numba jit

* address circular import

* pin numpy

* only install ard once for each test suite

* pin numpy to 1.24.3

* pin numpy to 2.0

* pin numpy < 2.3

* cap numpy at 2.3 for numba compatibility

* restrict python version to less than 3.13

* remove comments

* use test dependencies for optiwindnet

* pin optiwindnet version

* Develop (WISDEM#99)

* (prep to) liberate python 3.13 (WISDEM#69)

* liberate python 3.13

* actually liberate python

* update testing

* version number inequality fix

* walkback python for backdated wisdem

* propogate to tests

* remove comments

* Improve feature/system tests (WISDEM#100)

* (prep to) liberate python 3.13 (WISDEM#69)

* liberate python 3.13

* actually liberate python

* update testing

* version number inequality fix

* walkback python for backdated wisdem

* propogate to tests

* remove comments

* constraint testing added

* black reformatting

* added updated pyrite

* system test added but not complete for mooring packing

* add forgotten file

* Black reformat

* switch to using OM derivative checks, clean up

* black reformat

* Update test/system/ard/geometry/test_constraints.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update test/system/ard/geometry/test_constraints.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update test/system/ard/offshore/test_mooring_packing.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update test/system/ard/offshore/test_mooring_packing.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update test/system/ard/geometry/test_constraints.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* tidy comments

* fix the problem discovered by the not problem that jared pointed out hahahaha

* barely avoided ragequitting due to black reformat

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Cory Frontin <cory.frontin@nrel.gov>
Co-authored-by: erickaloz <elozon@nrel.gov>
Co-authored-by: Jared Thomas <jaredthomas68@gmail.com>
Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…shore-detailed example with 04_offshore_floating_detailed_mooring
This PR brings the current state of `develop` into the branch `offshore_development` along with some required changes to the everything working well together again. The primary changes involve the new glue code.
* Update README.md with new badge order

* ORBIT BOS upgrade for detailed farms, redux (WISDEM#106)

* re-try the bos-layout-improvement branch

* Update ard/cost/orbit_wrap.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* black reformat

* update collection stuff after PRs, address some of jareds comments

* black reformat

* addressing more of jareds commentary

* fixed jareds concerns

* black reformat...

* remove some deprecated debugging statements while i'm at it

* missed one, comment touch-up

* switch to radial for examples, add outputs

* address error message

* add radial branching testing

* updated cable length availability list, modified to used dynamic w/ floating and not otherwise

* black reformat

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update README.md badge

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants