diff --git a/.github/workflows/check-working-examples.yaml b/.github/workflows/check-working-examples.yaml index c8d4b201a..2c19a341e 100644 --- a/.github/workflows/check-working-examples.yaml +++ b/.github/workflows/check-working-examples.yaml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.9] + python-version: ["3.10"] os: [ubuntu-latest] #, macos-latest, windows-latest] fail-fast: False diff --git a/.github/workflows/continuous-integration-workflow.yaml b/.github/workflows/continuous-integration-workflow.yaml index d84d7e9e3..5ae5121c9 100644 --- a/.github/workflows/continuous-integration-workflow.yaml +++ b/.github/workflows/continuous-integration-workflow.yaml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.9] + python-version: ["3.8", "3.9", "3.10"] os: [ubuntu-latest] #, macos-latest, windows-latest] fail-fast: False diff --git a/.github/workflows/deploy-pages.yaml b/.github/workflows/deploy-pages.yaml index f8fecb339..077487294 100644 --- a/.github/workflows/deploy-pages.yaml +++ b/.github/workflows/deploy-pages.yaml @@ -15,10 +15,10 @@ jobs: - uses: actions/checkout@v2 # Install dependencies - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + - name: Set up Python + uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: "3.10" - name: Install dependencies run: | diff --git a/.github/workflows/quality-metrics-workflow.yaml b/.github/workflows/quality-metrics-workflow.yaml index c6625e2ac..3e8365ff0 100644 --- a/.github/workflows/quality-metrics-workflow.yaml +++ b/.github/workflows/quality-metrics-workflow.yaml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.9] + python-version: ["3.10"] os: [ubuntu-latest] fail-fast: False diff --git a/examples/16_heterogeneous_inflow.py b/examples/16_heterogeneous_inflow.py index e0745902c..a258bafc1 100644 --- a/examples/16_heterogeneous_inflow.py +++ b/examples/16_heterogeneous_inflow.py @@ -72,16 +72,19 @@ fig, ax_list = plt.subplots(3, 1, figsize=(10, 8)) ax_list = ax_list.flatten() visualize_cut_plane(horizontal_plane_2d, ax=ax_list[0], title="Horizontal", color_bar=True) -ax_list[0].set_xlabel('x'); ax_list[0].set_ylabel('y') +ax_list[0].set_xlabel('x') +ax_list[0].set_ylabel('y') visualize_cut_plane(y_plane_2d, ax=ax_list[1], title="Streamwise profile", color_bar=True) -ax_list[1].set_xlabel('x'); ax_list[1].set_ylabel('z') +ax_list[1].set_xlabel('x') +ax_list[1].set_ylabel('z') visualize_cut_plane( cross_plane_2d, ax=ax_list[2], title="Spanwise profile at 500m downstream", color_bar=True ) -ax_list[2].set_xlabel('y'); ax_list[2].set_ylabel('z') +ax_list[2].set_xlabel('y') +ax_list[2].set_ylabel('z') # Define the speed ups of the heterogeneous inflow, and their locations. @@ -129,20 +132,23 @@ title="Horizontal", color_bar=True ) -ax_list[0].set_xlabel('x'); ax_list[0].set_ylabel('y') +ax_list[0].set_xlabel('x') +ax_list[0].set_ylabel('y') visualize_cut_plane( y_plane_3d, ax=ax_list[1], title="Streamwise profile", color_bar=True ) -ax_list[1].set_xlabel('x'); ax_list[1].set_ylabel('z') +ax_list[1].set_xlabel('x') +ax_list[1].set_ylabel('z') visualize_cut_plane( cross_plane_3d, ax=ax_list[2], title="Spanwise profile at 500m downstream", color_bar=True ) -ax_list[2].set_xlabel('y'); ax_list[2].set_ylabel('z') +ax_list[2].set_xlabel('y') +ax_list[2].set_ylabel('z') plt.show() diff --git a/floris/tools/optimization/legacy/scipy/cluster_turbines.py b/floris/tools/optimization/legacy/scipy/cluster_turbines.py index 2159d7f21..b402cd3b8 100644 --- a/floris/tools/optimization/legacy/scipy/cluster_turbines.py +++ b/floris/tools/optimization/legacy/scipy/cluster_turbines.py @@ -115,10 +115,7 @@ def determine_if_in_wake(xt, yt): # Get most downstream turbine is_downstream[ii] = not any( - [ - determine_if_in_wake(x_rot_srt[iii], y_rot_srt[iii]) - for iii in range(n_turbs) - ] + determine_if_in_wake(x_rot_srt[iii], y_rot_srt[iii]) for iii in range(n_turbs) ) # Determine which turbines are affected by this turbine ('ii') affecting_following_turbs = [ @@ -165,7 +162,7 @@ def determine_if_in_wake(xt, yt): cj = ci + 1 merged_column = False while cj < len(clusters): - if any([y in clusters[ci] for y in clusters[cj]]): + if any(y in clusters[ci] for y in clusters[cj]): # Merge clusters[ci] = np.hstack([clusters[ci], clusters[cj]]) clusters[ci] = np.array(np.unique(clusters[ci]), dtype=int) diff --git a/floris/tools/optimization/legacy/scipy/derive_downstream_turbines.py b/floris/tools/optimization/legacy/scipy/derive_downstream_turbines.py index b41b78b4a..e5e42da70 100644 --- a/floris/tools/optimization/legacy/scipy/derive_downstream_turbines.py +++ b/floris/tools/optimization/legacy/scipy/derive_downstream_turbines.py @@ -107,10 +107,7 @@ def determine_if_in_wake(xt, yt): return (yt < wake_profile_ub_turbii(xt)) & (yt > wake_profile_lb_turbii(xt)) is_downstream[ii] = not any( - [ - determine_if_in_wake(x_rot_srt[iii], y_rot_srt[iii]) - for iii in range(n_turbs) - ] + determine_if_in_wake(x_rot_srt[iii], y_rot_srt[iii]) for iii in range(n_turbs) ) if plot_lines: diff --git a/floris/tools/optimization/yaw_optimization/yaw_optimization_tools.py b/floris/tools/optimization/yaw_optimization/yaw_optimization_tools.py index 1d04977df..325637a81 100644 --- a/floris/tools/optimization/yaw_optimization/yaw_optimization_tools.py +++ b/floris/tools/optimization/yaw_optimization/yaw_optimization_tools.py @@ -108,10 +108,7 @@ def determine_if_in_wake(xt, yt): return (yt < wake_profile_ub_turbii(xt)) & (yt > wake_profile_lb_turbii(xt)) is_downstream[ii] = not any( - [ - determine_if_in_wake(x_rot_srt[iii], y_rot_srt[iii]) - for iii in range(n_turbs) - ] + determine_if_in_wake(x_rot_srt[iii], y_rot_srt[iii]) for iii in range(n_turbs) ) if plot_lines: