Skip to content

Pull #1373 into dev #1380

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.

Sign up for GitHub

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

Jump to bottom
Merged
akeeste merged 1 commit into from
Dec 17, 2024
Merged

Pull #1373 into dev #1380

akeeste merged 1 commit into from
Dec 17, 2024

Conversation

@akeeste
Copy link
Contributor

@akeeste akeeste commented Dec 11, 2024

This is a draft PR to pull #1373 from main into dev. The merge will likely be done locally due to the difficulty of merging the slx files.

@MShabara @akeeste
Multi wave class bug fix v2 (#1373)
bdad54a 
* fixes a bug that happens when multiple waves are defined

* Adjusts the lin block version to 2020b

* reduce number of From blocks in exc force blocks, mask update respectively

* Allows QTF calculation for multiple wave instances

* revert change to rm3.h
5

---------

Co-authored-by: akeeste <akeeste@sandia.gov>
@akeeste akeeste self-assigned this Dec 11, 2024
@akeeste akeeste mentioned this pull request Dec 17, 2024
Merged
@akeeste
Copy link
Contributor Author

akeeste commented Dec 17, 2024

This PR brings bugfix #1373 from main into dev, and ensures that all of the recent bugfixes in the library are still present:

-[x] Fix QTF and variable hydro - make the QTF force block not an atomic subsystem #1351 https://github.com/MShabara/WEC-Sim/pull/1

@dforbush2 @jtgrasb @MShabara let me know if I missed anything

@akeeste
Copy link
Contributor Author

akeeste commented Dec 17, 2024

@dforbush2 when doing this merge of the main library into dev using the matlab git mergetool, it did flag a change to the SimscapeInstrumentationLogging parameter within WECSim_Lib_Body_Elements/Rigid Body/Hydrodynamic Body/Structure/Body Properties. The main branch had this parameter disabled, while the dev branch had it enabled but off. I maintained the dev branch setting since it as not having the issue in #1381. Assuming the new dev branch does not have this issue, I think #1381 will be resolved when we force main to be dev during the release

@akeeste akeeste marked this pull request as ready for review December 17, 2024 21:57
@akeeste
Copy link
Contributor Author

akeeste commented Dec 17, 2024

I have these changes complete locally (also on my fork's dev branch). All WEC-Sim repo tests pass on R2024a. Pushing changes now.

@akeeste akeeste merged commit 4c8a539 into dev Dec 17, 2024
11 checks passed
@jtgrasb
Copy link
Contributor

jtgrasb commented Dec 17, 2024

@akeeste I don't see anything you missed at first glance, but I can take a deeper look tomorrow. As for the SimscapeInstrumentationLogging parameter, where do you see this in body properties? I can't seem to find it.

@akeeste
Copy link
Contributor Author

akeeste commented Dec 18, 2024

I don't see it either in the GUI. It first came up using the simulink compare tool. Maybe it's hidden or accessible via the command line view of the block parameters? Either way, I'm hoping #1381 does not reappear. I didn't test with a broken library link yet.

Also since I had to push directly to merge the PR, we should just make any other modifications needed in another PR into dev

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@akeeste akeeste

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@akeeste @jtgrasb @MShabara