Skip to content

Conversation

@salhus
Copy link
Contributor

@salhus salhus commented Sep 21, 2023

This follows from #1070 for which GitHub is not performing tests and I was having compatibility issues.

@salhus salhus requested a review from nathanmtom September 21, 2023 01:16
@salhus salhus marked this pull request as ready for review September 21, 2023 04:38
@nathanmtom nathanmtom added the Feature new feature request label Sep 27, 2023
@nathanmtom nathanmtom self-assigned this Sep 27, 2023

Choose a reason for hiding this comment

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

@salhus can you double check what advanced_features.rst you are amending. Below it looks like you are missing a lot of the recent control documentation updates.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@nathanmtom
Hi Nathan,
I will update this file once the other PR is merged. I will address your other comments meanwhile.

.. Note::
If using a wave-spectra with different wave-heading directions, ensure that the BEM data has
the hydrodynamic coefficients corresponding to the desired wave-heading direction.

Copy link

@nathanmtom nathanmtom Sep 27, 2023

Choose a reason for hiding this comment

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

@salhus Editorial Comment: can you please expand the existing note or add another note highlighting what combinations of features are compatible at this time. Based on theinitializeWECSim.m edits this would only be functional for regular, regularCIC, irregular, and spectrumImport.

Also clarify if the waveClass needs to be the same i.e. regularCIC and regularCIC or can there be a mix i.e. regularCIC and irregular.

body(it).hydroForcePre(waves.omega,waves.direction,simu.cicTime,waves.bem.count,simu.dt,...
simu.rho,simu.gravity,waves.type,waves.waveAmpTime,simu.stateSpace,simu.b2b);
body(it).hydroForcePre(waves(1).omega,waves(1).direction,simu.cicTime,waves(1).bem.count,simu.dt,...
simu.rho,simu.gravity,waves(1).type,waves(1).waveAmpTime,simu.stateSpace,simu.b2b); % TODO need to rethink how user defined exc is implemented for multiple waves

Choose a reason for hiding this comment

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

@salhus Minor comment: can you remove the comment and add as a project board card. That should be relatively straightforward to allow user defined waves but will not prioritize it until next fiscal year.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

  • done

it = idx(kk);
body(it).hydroForcePre(waves.omega,waves.direction,simu.cicTime,waves.bem.count,simu.dt,...
simu.rho,simu.gravity,waves.type,waves.waveAmpTime,simu.stateSpace,simu.b2b);
body(it).hydroForcePre(waves(1).omega,waves(1).direction,simu.cicTime,waves(1).bem.count,simu.dt,...

Choose a reason for hiding this comment

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

@salhus Moderate comment: Is there a reason that waves(1) is hard coded to the first wave instance? This seems to indicate that you cannot mix and match certain wave features. This relates to my request on documentation to state what combinations of sea states are possible.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@nathanmtom
Yes that is correct. I think this can be expanded and I am planning on enabling mix-n-match in next FY.
I will update documentation to reflect this limitation.

Choose a reason for hiding this comment

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

Minor Comment: can the comments be removed below to not add lines 525-527? This seems to have no impact on this file other than commented lines. I would prefer not to have this included in the list of changed files.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was a remnant from previous version. I uncommented it and a commit-name will reflect this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

  • done

@nathanmtom
Copy link

@salhus Thanks for the PR which is going to be a good addition. I am not done reviewing, but wanted to make this point before I forget. Your two PRs both have library edits which means we are likely going to have to merge one and you will then have to take the merged library and re-incorporate you modifications so all changes to the library are captured. Just wanted to make you aware as we plan to merge both FIR and N-Wave PRs this week.

Choose a reason for hiding this comment

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

@salhus When I open this library it appears the default mask shows two separate wave trains already. Please review and see if this can be resolved with re-saving the library with only one instance.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@nathanmtom
Good catch Nathan. I have fixed this issue now.

Choose a reason for hiding this comment

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

@salhus When I open the body elements there seems to be two wave trains already present which may be a consequence of saving the library with both active. Please double check if this is intended or the library can be saved with one wave train present.

@salhus salhus mentioned this pull request Sep 28, 2023
@salhus
Copy link
Contributor Author

salhus commented Sep 28, 2023

@nathanmtom
Hi Nathan,
I had to reintroduce this PR as #1130 due to compatibility issues.

@salhus salhus closed this Sep 28, 2023
@salhus salhus deleted the MultiWaves_Sept23 branch October 4, 2023 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Feature new feature request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants