Skip to content

Conversation

@jaredthomas68
Copy link
Contributor

Merging develop branch in offshore_development in preparation for bringing offshore_development into develop

cfrontin and others added 30 commits May 12, 2025 10:26
* liberate python 3.13

* actually liberate python

* update testing

* version number inequality fix

* walkback python for backdated wisdem

* propogate to tests
jaredthomas68 and others added 6 commits July 17, 2025 09:11
New glue code. Refactor for simpler, more modular, and more automatic system construction.
* hotfix

* add the actual hotfix

* update all examples

* added example testing routine to test

* adjust cwd command

* reorganize some examples

* attempt fix

* black reformat, pip statsmodels again after their hotfix

* ok think i fixed it

* cleanup runner

* try system-agnostic runner

* try system-agnostic runner again

* indent fix

* turn off n2 diagrams

* test consolidated CI/CD workflow

* attempt improved consolidated script

* direct parallel example runner test

* complete runner code

* a new test that should maybe actually work

* add missing file and quotation marks

* switch to consolidated with parallel examples

* rectify author attribution in pyproject.toml

* remove commented dependency

* cleaner gui interaction

* modified consolidated tests

* faster consolidated ci/cd

* rollback action

* take 2 on caching

* update dependency

* slight bugfix mod

* try cache again

* iterating on cicd cache

* reorder

* rename
 test

* address some of jareds comments and remove commented code

* black reformat
@jaredthomas68 jaredthomas68 changed the base branch from main to offshore-development July 22, 2025 16:54
@jaredthomas68 jaredthomas68 requested a review from Copilot July 22, 2025 18:39

This comment was marked as outdated.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can get deleted, no?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can get deleted, no?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can get deleted, no?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and so on for the other entries in test/data...

Copy link
Collaborator

@cfrontin cfrontin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This pull request merges the develop branch into the offshore_development branch in preparation for bringing offshore development features into the main develop branch. The PR focuses on integrating offshore functionality, improving test infrastructure, and updating configuration handling.

Key changes include:

  • Addition of comprehensive offshore mooring system test data and configuration files
  • Implementation of utility functions for nested dictionary key-value replacement
  • Refactoring of test files to use improved assertion patterns with subtests and updated modeling options

Reviewed Changes

Copilot reviewed 102 out of 115 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
test/unit/utils/test_io.py Adds tests for replace_key_value utility function with nested dictionary handling
test/unit/ard/offshore/test_mooringdesigndetailed.py Updates test configuration with new file paths and adds data_path parameter
test/unit/ard/offshore/inputs/OntologySample200m.yaml Adds mooring system configuration data for offshore tests
test/unit/ard/offshore/inputs/GulfOfMaine_bathymetry_100x99.txt Adds bathymetry data file for offshore mooring tests
test/unit/ard/layout/test_spacing.py Removes unused JAX imports to clean up dependencies
test/unit/ard/layout/test_gridfarm.py Adds default modeling options for farm spacing parameters
test/unit/ard/farm_aero/test_templates.py Moves wind query initialization and updates parameter passing
test/unit/ard/farm_aero/test_floris.py Refactors test assertions to use subtests and improves pyrite validation
test/unit/ard/cost/test_wisdem_wrap.py Updates test structure with subtests and adds required modeling options
test/unit/ard/collection/test_templates.py Adds missing farm configuration parameters and updates expected outputs
Comments suppressed due to low confidence (1)

test/unit/ard/farm_aero/test_templates.py:95

  • Removed wind_query parameter but the modeling_options may not contain the wind_rose yet. Ensure wind_rose is properly set in modeling_options before removing the explicit parameter.
            ),

@jaredthomas68 jaredthomas68 merged commit 48e48b7 into NLRWindSystems:offshore-development Jul 30, 2025
22 checks passed
@jaredthomas68 jaredthomas68 deleted the offshore-merge branch July 30, 2025 19:53
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.

3 participants