Skip to content
Snippets Groups Projects
Commit 5ecece9c authored by Hkorb's avatar Hkorb
Browse files

Merge branch 'python_bindings' into 'actuator_line'

# Conflicts:
#   src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.cu
#   src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.h
#   src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlaneProbe.h
#   src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PointProbe.h
parents 746075f5 5e1f3b41
No related branches found
No related tags found
1 merge request!84Python bindings, amd, actuator line
Showing
with 177 additions and 41 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment