Skip to content

Conversation

@jleonqu
Copy link
Contributor

@jleonqu jleonqu commented Mar 9, 2022

New PR to solve some conflicts in the previous PR #743

jtgrasb and others added 5 commits December 7, 2021 11:37
* Update Read_AQWA

Testing FIles

Troubleshoot effort

* Fix added mass reading

* Update RM3 AQWA Example

* renaming directory to RM3 for consistancy

Co-authored-by: kmruehl <kmruehl@sandia.gov>
* Update wecSimInputFile.m

Insert descriptive text so people reading the commit history can quickly identified what files were changed.

* Update Normalize.m to have correct sorting of the mean drift force coefficients.

* Update Normalize.m

There are three other instances where the function exist was replaced with isfield.

* Update Read_NEMOH.m

With changes to Normalize the mean drift forces from NEMOH were being normalized by rho and g twice. For consistency with using the normalize.m function removing the normalization from Read_NEMOH.m.

* Update wecSimInputFile.com

Not sure why this was changed, but reverting back to the example wecSimInputFile.m in hopes of eliminating this change.
@kmruehl
Copy link
Collaborator

kmruehl commented Mar 10, 2022

@jleonqu there are merge conflicts with this PR now that PR #803 has been merged, and it looks like there are files revised here that you didn't mean to include. Let's go through this together during the WEC-Sim working meeting tomorrow.

@kmruehl kmruehl added Feature new feature request PTO-Sim PTO-Sim (ptoSimClass.m) labels Mar 11, 2022
@kmruehl
Copy link
Collaborator

kmruehl commented Mar 14, 2022

@jleonqu looks great, thanks for resolving the merge conflicts with dev! @akeeste thanks for your help!

Copy link
Collaborator

@kmruehl kmruehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jleonqu this is looking good and I think we should prioritize merging it and opening another PR for further revisions.
These revisions should be made prior to merge:

  • Please delete this file: source/lib/PTO-Sim/BlockFigures/PTOSim_Lib.slx
  • This file should not be empty, please revert: source/objects/ptoClass.m

@jleonqu
Copy link
Contributor Author

jleonqu commented Mar 14, 2022

@kmruehl I am not sure about the second comment "This file should not be empty, please revert: source/objects/ptoClass.m", this is the file I currently have in the PR: ptoClass.m

@kmruehl
Copy link
Collaborator

kmruehl commented Mar 15, 2022

That's strange, this is what the review is showing on my end:
image

Nothing should have been updated in the ptoClass, correct?

@kmruehl
Copy link
Collaborator

kmruehl commented Mar 15, 2022

@jleonqu I'd like to merge this into dev but now there are some merge conflicts, can you resolve them?

@jleonqu
Copy link
Contributor Author

jleonqu commented Mar 15, 2022

@kmruehl I have resolved the conflicts

Copy link
Collaborator

@kmruehl kmruehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @jleonqu!

@kmruehl kmruehl merged commit 841e988 into WEC-Sim:dev Mar 16, 2022
H0R5E added a commit to H0R5E/WEC-Sim that referenced this pull request Mar 17, 2022
* Update Read_AQWA (WEC-Sim#761)

* Update Read_AQWA

Testing FIles

Troubleshoot effort

* Fix added mass reading

* Update RM3 AQWA Example

* renaming directory to RM3 for consistancy

Co-authored-by: kmruehl <kmruehl@sandia.gov>

* bugfix updating RM3 AQWA directory in test

* Update to normalize to handle sorting mean drift forces (WEC-Sim#808)

* Update wecSimInputFile.m

Insert descriptive text so people reading the commit history can quickly identified what files were changed.

* Update Normalize.m to have correct sorting of the mean drift force coefficients.

* Update Normalize.m

There are three other instances where the function exist was replaced with isfield.

* Update Read_NEMOH.m

With changes to Normalize the mean drift forces from NEMOH were being normalized by rho and g twice. For consistency with using the normalize.m function removing the normalization from Read_NEMOH.m.

* Update wecSimInputFile.com

Not sure why this was changed, but reverting back to the example wecSimInputFile.m in hopes of eliminating this change.

* Add workflow for triggering WEC-Sim_Applications CI

* Solving conflict with pots processing script

* Solve conflicts

* Excluding files that were not change in the PR

* Revisions prior to merge

* Revised names for PTO-Sim variables

Co-authored-by: jtgrasb <87095491+jtgrasb@users.noreply.github.com>
Co-authored-by: kmruehl <kmruehl@sandia.gov>
Co-authored-by: nathanmtom <nathan.tom@nrel.gov>
Co-authored-by: Mathew Topper <damm_horse@yahoo.co.uk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Feature new feature request PTO-Sim PTO-Sim (ptoSimClass.m)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants