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

Pull Dev into Master for v6.0 release #53

Merged
merged 4 commits into from
Dec 1, 2023
Merged

Pull Dev into Master for v6.0 release #53

merged 4 commits into from
Dec 1, 2023

Conversation

jtgrasb
Copy link
Contributor

@jtgrasb jtgrasb commented Dec 1, 2023

No description provided.

dforbush2 and others added 4 commits November 14, 2023 14:20
* Adding load mitigating controls

* adding OWC applications case example

* adding 2020b version

* adding hydroData source

* update readmes, linting

* adding OWC orifice data

* add h5 file, mod gitignore, add testOWC

* add LMC and OWC tests to CI

* add LMC and OWC tests

* remove R2020b simulink file, remove last LTI block

* remove extra library file

* fix some paths, toolboxes required by the tests

* fix issue from merging dev, remove paraview tests

* add OWC MCR case to tests

---------

Co-authored-by: akeeste <[email protected]>
* common RM3 hydroData and geometry

* common OSWEC hydroData and geometry files

* multiple wave headings

* update input files

* consolidate sphere hydrodata

* update input files

* revert nonlinear hydro files back to original

* fix tests

* remove outdated comments from input files
* Increase test tolerance

* Change to relative tolerances

* Increase relative tolerance for tower
Co-authored-by: Kelley Ruehl <[email protected]>
@jtgrasb jtgrasb changed the title Pull Dev into Master Pull Dev into Master for v6.0 release Dec 1, 2023
@jtgrasb jtgrasb merged commit f6b094f into master Dec 1, 2023
44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants