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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow using a CSV file to define currents for hydrodynamic system #1839

Merged
merged 9 commits into from
Dec 18, 2022

Conversation

arjo129
Copy link
Contributor

@arjo129 arjo129 commented Dec 14, 2022

馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻馃敻

馃帀 New feature

Closes #

Summary

This PR adds support for looking up hydrodynamic currents from a data file via the new Environment component. This allows users to vary currents throughout the water column.

Adds the tags:

        <lookup_current_x>current_x</lookup_current_x>
        <lookup_current_y>current_y</lookup_current_y>
        <lookup_current_z>current_z</lookup_current_z>

When present, they use the tag to look up current from the Environment component. If one is not present, that column defaults to zero.

Signed-off-by: Arjo Chakravarty arjo@openrobotics.org

Test it

Checklist

  • Signed all commits for DCO
  • Added tests
  • Added example and/or tutorial
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

This PR adds support for looking up hydrodynamic currents from a data file via the new Environment component. This allows users to vary currents throughout the water column.

Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>
Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>
Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>
@arjo129 arjo129 added the MBARI-LRAUV Sponsored by MBARI-LRAUV project: https://github.com/osrf/lrauv label Dec 14, 2022
@osrf-triage osrf-triage added this to Inbox in Core development Dec 14, 2022
@github-actions github-actions bot added the 馃尡 garden Ignition Garden label Dec 14, 2022
@arjo129 arjo129 changed the title Arjo/feat/hydro current lookup Allow using a CSV file to define currents for hydrodynamic system Dec 14, 2022
@arjo129 arjo129 mentioned this pull request Dec 14, 2022
38 tasks
Copy link
Contributor

@hidmic hidmic left a comment

Choose a reason for hiding this comment

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

First pass. Code formatting is a bit odd but otherwise it's looking good.

src/systems/hydrodynamics/Hydrodynamics.cc Outdated Show resolved Hide resolved
src/systems/hydrodynamics/Hydrodynamics.cc Outdated Show resolved Hide resolved
src/systems/hydrodynamics/Hydrodynamics.cc Outdated Show resolved Hide resolved
src/systems/hydrodynamics/Hydrodynamics.cc Outdated Show resolved Hide resolved
src/systems/hydrodynamics/Hydrodynamics.cc Outdated Show resolved Hide resolved
src/systems/hydrodynamics/Hydrodynamics.hh Outdated Show resolved Hide resolved
test/integration/hydrodynamics.cc Show resolved Hide resolved
Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>
Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>
Copy link
Contributor

@hidmic hidmic left a comment

Choose a reason for hiding this comment

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

Second pass. Looking good!

src/systems/hydrodynamics/Hydrodynamics.cc Outdated Show resolved Hide resolved
src/systems/hydrodynamics/Hydrodynamics.cc Outdated Show resolved Hide resolved
src/systems/hydrodynamics/Hydrodynamics.cc Outdated Show resolved Hide resolved
src/systems/hydrodynamics/Hydrodynamics.cc Outdated Show resolved Hide resolved
src/systems/hydrodynamics/Hydrodynamics.cc Outdated Show resolved Hide resolved
src/systems/hydrodynamics/Hydrodynamics.cc Outdated Show resolved Hide resolved
test/integration/hydrodynamics.cc Show resolved Hide resolved
test/worlds/hydrodynamics.sdf.in Show resolved Hide resolved
Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>
@arjo129 arjo129 requested a review from hidmic December 15, 2022 12:48
src/systems/hydrodynamics/Hydrodynamics.cc Outdated Show resolved Hide resolved
Core development automation moved this from Inbox to In review Dec 15, 2022
Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>
Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>
Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>
@arjo129 arjo129 merged commit 31f7d5b into gz-sim7 Dec 18, 2022
Core development automation moved this from In review to Done Dec 18, 2022
@arjo129 arjo129 deleted the arjo/feat/hydro_current_lookup branch December 18, 2022 01:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
馃尡 garden Ignition Garden MBARI-LRAUV Sponsored by MBARI-LRAUV project: https://github.com/osrf/lrauv
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

4 participants