Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
8ea3558
Change main solve name for clarity
misi9170 Oct 18, 2025
5664284
First rough pass for main Jensen solve
misi9170 Oct 18, 2025
f7fdeac
Move to an abstract base model
misi9170 Oct 20, 2025
5f42b4c
wip
misi9170 Nov 18, 2025
a077533
Merge pull request #1186 from NatLabRockies/develop
misi9170 Feb 24, 2026
6e4d5ae
Update isort requirement from <8,>=5 to >=5,<9 (#1188)
dependabot[bot] Mar 3, 2026
a4a4f0c
Merge branch 'develop' into ehmt/solvers
misi9170 Mar 12, 2026
d4a48a8
Full flow solve added
misi9170 Mar 12, 2026
6a501f4
Pass in model parameters (needs to be fully built out)
misi9170 Mar 12, 2026
4de8b17
Streamline TI calc
misi9170 Mar 12, 2026
7bc9af7
Construct grids separately
misi9170 Mar 12, 2026
0552f22
Reorganize to separate module and base class
misi9170 Mar 12, 2026
38a798e
Add files missing from last commit; create None wake model
misi9170 Mar 12, 2026
695eef3
WIP gauss model implementation. Not yet passing reg tests
misi9170 Mar 13, 2026
9d75bb2
Guass model passing all tests; pass in parameters
misi9170 Mar 13, 2026
67d0e0d
Fix impropoer initialization of effective yaw angle
misi9170 Mar 16, 2026
6149bfb
Use generic grid name for point_solve
misi9170 Apr 9, 2026
4eb5810
Remove FlowFieldGrid type hint, as never used.
misi9170 Apr 10, 2026
f9b8dff
Add functionality for user-defined solvers and document. Some rough e…
misi9170 Apr 10, 2026
1bab40f
Clean notebook
misi9170 Apr 10, 2026
1e6397e
Add class version of EmGauss model
misi9170 May 5, 2026
70958b6
point sampling using point_solve method
misi9170 May 5, 2026
f215ef3
fix: correct tilt_interp parameter type in compute_tilt_angles_for_fl…
zredb May 13, 2026
de88770
Merge branch 'main' into develop
misi9170 May 13, 2026
70adeb9
Check allowing pandas v3 (#1194)
misi9170 Jun 2, 2026
0a671b2
Increment version number for patch release
misi9170 Jun 9, 2026
4bab2b0
Merge pull request #1195 from NatLabRockies/develop
misi9170 Jun 9, 2026
5538ac0
Clean up grid classes (#1183)
misi9170 Jun 25, 2026
4b0ff28
Increment patch number
misi9170 Jun 25, 2026
1e9c000
repo name update missed earlier
misi9170 Jun 25, 2026
6b27f3a
FLORIS v4.6.6 (#1196)
misi9170 Jun 25, 2026
1882532
Merge branch 'develop' into ehmt/solvers
misi9170 Jun 30, 2026
ead3020
Various infrastructure improvements for external solvers
misi9170 Jun 30, 2026
cab3bec
copy over power extraction to parflorismodel
misi9170 Jul 1, 2026
d3f9ba2
Add other output attributes; not yet built out fully
misi9170 Jul 8, 2026
e161acc
Remove repeated tilt sorting'
misi9170 Jul 9, 2026
0651b13
Allow users to pass in their own turbine operation models (#1176)
misi9170 Jul 10, 2026
99dcecb
Merge branch 'dev/v5-beta' into ehmt/solvers
misi9170 Jul 10, 2026
1093f89
Refactor the Turbine and Farm class (#1200)
misi9170 Jul 20, 2026
67aaafe
Merge branch 'dev/v5-beta' into ehmt/solvers
misi9170 Jul 20, 2026
a1d026b
CC, TPG; wip
misi9170 Jul 21, 2026
668f59b
Update TPG reg tests for supported model config
misi9170 Jul 21, 2026
d122938
CC model, TPG model refactor complete
misi9170 Jul 21, 2026
773a137
Remove prior model implementations
misi9170 Jul 22, 2026
9acb10d
Begin cleanup of model calling architecture
misi9170 Jul 22, 2026
0fb3f61
f-string fix for older python versions
misi9170 Jul 22, 2026
d544123
Update turbopark example to run with saved data, as old implmentation…
misi9170 Jul 22, 2026
1011626
isort
misi9170 Jul 22, 2026
404997f
Build converter for input files and begin conversion process
misi9170 Jul 22, 2026
a25b6a5
Proceed with conversions, including tests.
misi9170 Jul 22, 2026
4e3323d
Placeholder for testing converter
misi9170 Jul 22, 2026
d4ab78f
Update profiling scripts
misi9170 Jul 22, 2026
0b7b20c
Update floris input files in examples
misi9170 Jul 23, 2026
de914a6
Fix remaining example issues, update converters and tests
misi9170 Jul 23, 2026
e0d77a7
Refactor and reenable combination models
misi9170 Jul 24, 2026
5f746b1
Use deflection model from Gauss class
misi9170 Jul 24, 2026
8e7c03d
Add utilities and tests for accessing turbine output quantities
misi9170 Jul 27, 2026
dd9a4df
Store powers, etc at runtime
misi9170 Jul 27, 2026
d48bf50
Remove NaN error
misi9170 Jul 27, 2026
9599581
Minor cleanup
misi9170 Jul 29, 2026
ea2eb98
Improved instantiation of model
misi9170 Jul 29, 2026
f51a7ea
Ensure state resets after setting wake model
misi9170 Jul 29, 2026
8c8d2fc
Comment on __attrs_post_init__
misi9170 Jul 31, 2026
23a21c9
reset notebook to keep cleaner git history
misi9170 Aug 3, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ Release checklist:
- [ ] README.md (appears twice in README.md)
- [ ] pyproject.toml
- [ ] Verify docs builds correctly
- [ ] Create a tag in the NREL/FLORIS repository
- [ ] Create a tag in the NatLabRockies/FLORIS repository
-->
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ repos:
hooks:
- id: isort
name: isort
stages: [commit]
stages: [pre-commit]
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
FLORIS is a controls-focused wind farm simulation software incorporating
steady-state engineering wake models into a performance-focused Python
framework. It has been in active development at NLR since 2013 and the latest
release is [FLORIS v.4.6.4](https://github.com/NatLabRockies/floris/releases/latest).
release is [FLORIS v.4.6.6](https://github.com/NatLabRockies/floris/releases/latest).
Online documentation is available at https://natlabrockies.github.io/floris.

The software is in active development and engagement with the development team
Expand Down Expand Up @@ -89,7 +89,7 @@ PACKAGE CONTENTS
wind_data

VERSION
4.6.4
4.6.6

FILE
~/floris/floris/__init__.py
Expand Down
3 changes: 1 addition & 2 deletions docs/dev_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,5 @@ def function(
Some models require a special grid and/or solver, and that mapping happens in
[floris.core.core.Core](https://github.com/NatLabRockies/floris/blob/main/floris/core/core.py).
Generally, a specific kind of solver requires one or a number of specific grid-types.
For example, `full_flow_sequential_solver` requires either `FlowFieldGrid` or
`FlowFieldPlanarGrid`.
For example, `full_flow_sequential_solver` requires a `FlowFieldPlanarGrid`.
So, it is often the case that adding a new solver will require adding a new grid type, as well.
2 changes: 1 addition & 1 deletion docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ PACKAGE CONTENTS
wind_data

VERSION
4.6.4
4.6.6

FILE
~/floris/floris/__init__.py
Expand Down
Loading
Loading