Pull Master into Dev #52
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jtgrasb
added a commit
that referenced
this pull request
Dec 1, 2023
* Adding load mitigating controls and OWC (#39) * 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 <akeeste@sandia.gov> * Common input files (#50) * 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 (#51) * Increase test tolerance * Change to relative tolerances * Increase relative tolerance for tower * Update README.md (#52) Co-authored-by: Kelley Ruehl <kmruehl@sandia.gov> --------- Co-authored-by: dforbush2 <dforbus@sandia.gov> Co-authored-by: akeeste <akeeste@sandia.gov> Co-authored-by: Adam Keester <72414466+akeeste@users.noreply.github.com> Co-authored-by: Kelley Ruehl <kmruehl@sandia.gov>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update README.md