-
Notifications
You must be signed in to change notification settings - Fork 184
Pull main into dev #1297
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
Merged
Merged
Pull main into dev #1297
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
This reverts commit 118f156.
…-Sim#1012) When MoorDyn is used in WEC-Sim design, it is called as an external DLL executable library, and it runs on a separate console.exe under MATLAB's main process, with its separate process-ID(PID) in the windows task manager. The issue is related to the following scenarios on the Windows platform: 1>> if the lines data text file has an error in it. 2>> MoorDyn fails to converge. 3>> MoorDyn is launched, but the model has some other error. Under such a scenario, MATLAB fails to terminate the MoorDyn Console and hangs instead, and either crash immediately or crashes if we press the close button on the MoorDyn console window. Either way, there seems to be no way the MATLAB session can recover from MoorDyn failure without crashing. It becomes a major issue if we are trying to tune mooring lines and want to try different lines configurations and stiffnesses, etc., to find an optimal mooring system because some configurations will not work, which will keep crashing MATLAB sessions during the test and trial. The goal is for MoorDyn's failure not to crash the MATLAB session but instead MoorDyn dll execution to close and the MoorDyn console to close. I've found a solution to that. For scenarios 1 and 2, the following Fix#01 seems to work on the Windows platform. And to cover scenario 3, an additional Fix#02 is needed. Fix#01 In the MoorDyn block's 'InitFcn' call, making the following suggested changes check for MoorDyn Initialization failure and terminates the MoorDyn.dll console without crashing the MATLAB Session. Fix#02 Suppose the MoorDyn console has been launched, but there is an error in the Simulink model. In that case, MATLAB throws an error and terminates the Simulink execution without terminating the MoorDyn console window. A try-catch statement in the wecsim file can address this issue. If a Simulink model error occurs, we can print the error and terminate the MoorDyn Console process.
* updates_docs_on_master * incorporating_kelleys_minor_edits
Save mooring library to R2020b
Fixes function parsing error
Change the subscript of the pitch dof from 3,3 to 5,5 in ystring.
* Update readNEMOH.m for compatibility with NEMOH v3.0 * Removing line 374 This capability is within Dev, but not currently pulled over to Master. A separate PR was submitted to Dev for this fix.
* Port dev testing PR to master * Update out of date actions versions * Re-include R2020b and R2021a in Windows tests * Use file to capture logging to support R2020b issues
adding community code of conduct
fix to WEC-Sim#1217, nonlinFK and body block changed
Changes: + Updated to MATLAB Actions V2 + Support for R2020b on Windows was removed + Updated to checkout V4 + Removed logfile option from run-command as it has no effect
Update paraview docs
Bug fixes for WEC-Sim GUI and Run From Simulink features
…is is a new PR to rebase the previous PR
* update CI to use main branch * update simulationClass to reference git commits on main * fix cubes.LIS file with merge conflicts * update repository tree references in docs from master to main * update readme and github workflow to run-tests-main.yml * update redirect in gh-pages-redirect.html * Add second redirect for old /mastet/index.html route * Build main branch rather than master * update other references to documentation --------- Co-authored-by: Mathew Topper <dataonlygreater@gmail.com>
As part of WEC-Sim#1235, a sphinx option was incorrectly renamed from master_doc to main_doc. This PR corrects this using the root_doc option, available in Sphinx >= 4.
Fix sign bug in the Generator Equivalent Circuit Block in PTO-Sim - Rebase PR to main
this is a sign correction on damping and inertia in the pto-sim/simple direct drive PTO block
* fix on pDis function call * preliminary fix for issue WEC-Sim#1288
readCapytaine - fix reading multiple bodies with <6 dofs
Collaborator
Author
|
@akeeste this has been merged, but would appreciate if you could verify that it was done correctly. |
Contributor
|
Thanks @kmruehl for git expertise. There's a lot of changes to view but as far as I can tell this looks good. |
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.
Closing #1295 and re-opening on my branch so that I can resolve merge conflicts without making any commits to main.
from @akeeste
"This PR was intended to bring #1274 from main into dev so that #1275 can be tested appropriately. However apparently we haven't brough out bugfixes in consistently so it's looking complicated."