Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: farm orientation Fix(north up) and matching plot turbine with fi #533

Closed
wants to merge 8 commits into from

Conversation

dhcho347
Copy link

Feature or improvement description

  1. Fix farm orientation(or north up, do not rotating to west)
  2. matching plot_turbine_with_fi
  3. enhence. plot_turbine_with_if (to consider the shape change issue of farm.rotor_diameters after claculate_wake)

Related issue, if one exists

Fix orientation: #348, #357, #372
non-matching plot turbine with fi: #448, #451, #455, #512

Impacted areas of the software

  1. fix orientation
    v grid.py: class flowfiledplanar Grid method set_grid (Braoden flowfield, rotate mesh grid)
    v utilities.py: ftn rotate_coordinates_rel_west() adding 1 parameter (inv_rot)
    v floris_interface.py: method get_plane_of_points() (reverse rotating to north up)
  2. matching plot turbine with fi
    v visualization.py: ftn plot_turbines_with_fi, plot_turbines

Additional supporting information

Test results, if applicable

@dhcho347
Copy link
Author

dhcho347 commented Nov 15, 2022

Hi @rafmudaf,
There were 1 conflicting file (visualization.py)
Since I used to fork the main branch, I've changed the conflicting visualization.py file to one in the develop branch and
modified it again.
Is it better to fork the develop branch and work on it?

@rafmudaf rafmudaf self-assigned this Nov 16, 2022
@rafmudaf
Copy link
Collaborator

Since I used to fork the main branch, I've changed the conflicting visualization.py file to one in the develop branch and
modified it again.
Is it better to fork the develop branch and work on it?

Hi @dhcho347 Yes, its best to work from the develop branch. As far as I can tell, you've done the git workflow correctly.

@dhcho347
Copy link
Author

Hi, @rafmudaf,
I worked again with the develop branch.
(There is a change in Floris_interface.py: get_turbine_velocities -> turbine_average_velocities)

How can I change this pull request with new one (fromDevelop branch)?

@rafmudaf
Copy link
Collaborator

rafmudaf commented Feb 6, 2023

Hi @dhcho347 I rebased this branch onto develop and force-pushed so that I am able to separate only the changes that you've made from any changes from your initial branch off of main. Just wanted to give you a heads up. You can update your local branch with these commands:

git fetch
git checkout visual_chk

# Optional: if you have any uncommitted changes, stash them and we'll reapply them later
git stash

# Check <remote> to the name of your repository in your local repository
git reset --hard <remote> visual_chk

# Optional: if you stashed changes, reapply them
# Note that you may have merge conflicts to resolve at this point
git stash pop

@rafmudaf
Copy link
Collaborator

rafmudaf commented Feb 7, 2023

@dhcho347 My apologies for all the noise here.

dhcho347 and others added 7 commits March 31, 2023 14:23
Results plot with original layout (not rotate to west)
horizontal cut plane with
 north up farm layout
 infor with yaw, avg speed, Ct, power & Farm power
example for visual check
chg : plot_turbine_with_fi
plot farm layout with info
plot 3d for turbine grid with rotor swept circle
plot flowfieldplanar grid
update visualization.py from develop branch
@rafmudaf
Copy link
Collaborator

rafmudaf commented Jul 3, 2023

I believe this is superseded by #578 and #633. See #530 (comment).

@rafmudaf
Copy link
Collaborator

rafmudaf commented Jul 6, 2023

I'm closing this pull request. @dhcho347 please reopen or update it if you find I've closed it in error.

@rafmudaf rafmudaf closed this Jul 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement An improvement of an existing feature floris.tools
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants