Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
misi9170 committed Dec 19, 2024
2 parents a3620f5 + fd0e599 commit 32f9357
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
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 NREL since 2013 and the latest
release is [FLORIS v4.2.1](https://github.com/NREL/floris/releases/latest).
release is [FLORIS v4.2.2](https://github.com/NREL/floris/releases/latest).
Online documentation is available at https://nrel.github.io/floris.

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

VERSION
4.2.1
4.2.2

FILE
~/floris/floris/__init__.py
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ def _reduce_control_problem(self):

# Initialize subset variables as full set
self.fmodel_subset = copy.deepcopy(self.fmodel)
self.fmodel_subset._wind_data = None # Accessing private attribute!
n_findex_subset = copy.deepcopy(self.fmodel.core.flow_field.n_findex)
minimum_yaw_angle_subset = copy.deepcopy(self.minimum_yaw_angle)
maximum_yaw_angle_subset = copy.deepcopy(self.maximum_yaw_angle)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "floris"
version = "4.2.1"
version = "4.2.2"
description = "A controls-oriented engineering wake model."
readme = "README.md"
requires-python = ">=3.9"
Expand Down

0 comments on commit 32f9357

Please sign in to comment.