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

NWTC Library and WriteOutput updates #1254

Merged
merged 5 commits into from
Sep 20, 2022
Merged

Conversation

bjonkman
Copy link
Contributor

This PR is ready to merge.

Feature or improvement description
This PR moves the OutStrLenM1 parameter and FindValidChannelIndx function out of the auto-generated code from the MatlabToolbox for processing OutList variables (WriteOutput) and moves it into NWTC Library. This was done to help simplify some of the code in HydroDyn and its submodules (from #1008). I didn't yet update all the modules' auto-generated code to call FindValidChannelIndx(); that can be done later when the modules' output channels change.

Also in this PR:

  • My compiler complained that the MAP++ function declaration was different than its header. I fixed this by adding const to the header.
  • I updated the NWTC Library GetWords subroutine to optionally output the number of words actually read. There were two places in the HD code that tried to calculate the number again outside the routine.
  • I removed unused parameters in the NWTC Library ReadOutputListFromFileInfo routine.

Test results, if applicable
This does not change any test results.

This requires removing the definition of OutStrLenM1 from all the Matlab-generated writeOutput code. But, it also allows that matlab-generated code to be simplified

also removed some unused variables
…ation

warning C4028: formal parameter 7 different from declaration
This will cause conflict with SeaState branch, but can be ignored there.
@rafmudaf rafmudaf added this to the v3.3.0 milestone Sep 20, 2022
@rafmudaf rafmudaf self-requested a review September 20, 2022 20:41
@rafmudaf rafmudaf merged commit 782d4ae into OpenFAST:dev Sep 20, 2022
@bjonkman bjonkman deleted the f/WriteOutput branch September 20, 2022 23:40
@rafmudaf rafmudaf mentioned this pull request Oct 27, 2022
10 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.

2 participants