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

Remove deleted variables BlFB and BlMB from AeroDyn_AllBldNdOuts_IO #1700

Merged
merged 1 commit into from
Jul 24, 2023

Conversation

hkross
Copy link
Contributor

@hkross hkross commented Jul 20, 2023

This pull request is ready to be merged.

During debugging of the buoyancy feature, the variables BlFB and BlMB were removed and replaced with the line meshes BladeBuoyLoad%Force and BladeBuoyLoad%Moment. At the time, this was not updated in AeroDyn_AllBldNdOuts_IO.f90. This pull request replaces the remaining instances of BlFB and BlMB.

@andrew-platt
Copy link
Collaborator

andrew-platt commented Jul 20, 2023

I'm not sure why FAST_Types.f90 and OpenFOAM_Types.f90 are showing changes. It may be due to an inconsistency between those registry files and their types files in the rc-3.5.1 branch. I can address that after merging.

@hkross
Copy link
Contributor Author

hkross commented Jul 20, 2023

I'm not sure why FAST_Types.f90 is showing changes.

I was confused by that, as well as the OpenFOAM_Types changes.

@@ -1545,7 +1544,7 @@ SUBROUTINE BldNdOuts_SetOutParam(BldNd_OutList, p, p_AD, ErrStat, ErrMsg )
endif

! The following are valid only for BEMT/DBEMT
if (p_AD%WakeMod == WakeMod_BEMT) then
if (p_AD%WakeMod /= WakeMod_BEMT) then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for doing that change :)

@ebranlard
Copy link
Contributor

Thanks for doing that. I'm not sure about those types indeed.
I'll merge after the test pass.

@andrew-platt
Copy link
Collaborator

@bjonkman, I'm thinking the same thing: it is very likely a bad merge I did at some point in the history. I'm tempted to leave it as is for now and fix it right before release.

The dev branch also seems to have a discrepancy between FAST_Types and OpenFOAM_Types for the NodeClusterType.

@bjonkman
Copy link
Contributor

@andrew-platt it looks like the dev branch registry/types files are in sync, but there is a discrepancy with the registry/types files on the 3.5.1 branch, which @hkross has now fixed with this PR. I had missed that this PR was for 3.5.1.

@andrew-platt andrew-platt merged commit 3aab901 into OpenFAST:rc-3.5.1 Jul 24, 2023
19 checks passed
@hkross hkross deleted the bug/BuoyancyOutputs branch July 28, 2023 21:10
@andrew-platt andrew-platt mentioned this pull request Oct 19, 2023
19 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants