Skip to content

WIP solver restucture - #2

Open
misi9170 wants to merge 64 commits into
v5-devfrom
ehmt/solvers
Open

WIP solver restucture#2
misi9170 wants to merge 64 commits into
v5-devfrom
ehmt/solvers

Conversation

@misi9170

Copy link
Copy Markdown
Owner

WIP solver restructure

misi9170 and others added 30 commits October 17, 2025 20:27
* Update isort requirement from <8,>=5 to >=5,<9

Updates the requirements on [isort](https://github.com/PyCQA/isort) to permit the latest version.
- [Release notes](https://github.com/PyCQA/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](PyCQA/isort@5.0.0...8.0.1)

---
updated-dependencies:
- dependency-name: isort
  dependency-version: 8.0.1
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

* Change isort hook stage from commit to pre-commit

Avoids deprecation warning and works on isort 5 through 8

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: misi9170 <39596329+misi9170@users.noreply.github.com>
NatLabRockies#1192)

* fix: correct tilt_interp parameter type in compute_tilt_angles_for_floating_turbines

- Change tilt_interp parameter type from dict[str, interp1d] to interp1d|None
- This aligns with the function's actual usage where it expects a single interpolation function or None

* Match type-hint formatting

---------

Co-authored-by: misi9170 <39596329+misi9170@users.noreply.github.com>
Co-authored-by: zhb <zhang.hongbing@meteodyn.com>
Co-authored-by: misi9170 <michael.sinner@nlr.gov>
* Check allowing pandas v3

* Remove unneeded pandas imports

* Use Numpy for multidim csv loading and condition filtering

* Add Pandas->Numpy change warning log

---------

Co-authored-by: Rafael M Mudafort <rafmudaf@gmail.com>
* Add warning for non-positive z values

* Move grid_resolution validation to subclasses

* Add tests for TurbineGrid coordinates and grid_resolution

* Add tests for FlowFieldPlanarGrid

* Deprecation warning

* Remove FlowFieldGrid as not actually supported

* Fix copy-paste errors

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

* Add test to check that error raised for flow_field_grid

* Formatting

* Minor messaging cleanup

* Update to patch release

* Patch version numnber increment

* Remove case for "flow_field_grid" anderror check test

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
misi9170 and others added 30 commits July 8, 2026 16:35
…ies#1176)

* Enable running externally provided op model

* isort

* Documentation describing how to implement a user-defined op model

* Clear notebook outputs for version control

* Reset operation models on farm_dict

* Fix line length

* Enabling changes for ParFlorisModel

* Separate BaseOperationModel into its own module'

* WIP

* Title update

* Use attrs to reinstantiate classes dynamically

* Revert to develop branch

* Improve type hints

* Assign op model as attribute

* Remove error, as I dont think it would ever be triggered

* Remove unnecessary isort violation allowance

* Clean up and add example

* sort imports

* Convert all op models to strictly class instantiations; add decorators as needed

* Fix get_operation_model (now returns classes)

* Move to always returning a list of operation_models

* Remove deprecated call to get_turbine_ais()
* Rename turbine_map -> turbine; turbine_library_path -> external_turbine_library_path

* Remove turbine_definitions

* Move _sorted versions to properties

* Fixed after merge issue, I believe

* Using op models directly for power; more changes to come and need to update reg test calls

* Remove power_thrust_table and correct_cp_ct_for_tilt from power() call signature in favor of ones already on turbines

* simplify axial_induction, thrust_coefficient calls

* import future annotations; v1

* Reorder turbine.py

* Use internal tilt; no need to pass

* Cleanup and rename of turbine_map constructor

* Ensure consistent shape for tilt_angles; move tilt calc; fix file path

* Revert unnecessarily changed files

* Simplify and hide constructors; fix docstrings

* Update error message
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.

2 participants