fixes merge errors (0a77b744) · Commits · iRMB / VirtualFluids · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

V

VirtualFluids
- Activity
- Members
- Labels
- Environments
- Terraform modules

Snippets Groups Projects

0a77b744

Commit 0a77b744 authored 3 years ago by Hkorb

Downloads
- Patches
- Plain Diff

fixes merge errors

parent c9574591

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Python/actuator_line/actuator_line.py 2 additions, 2 deletions

Python/actuator_line/actuator_line.py
apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp 2 additions, 2 deletions

apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
pythonbindings/src/gpu/submodules/communicator.cpp 2 additions, 3 deletions

pythonbindings/src/gpu/submodules/communicator.cpp
pythonbindings/src/gpu/submodules/simulation.cpp 1 addition, 1 deletion

pythonbindings/src/gpu/submodules/simulation.cpp
src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h 3 additions, 2 deletions

src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h

with 10 additions and 10 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 sign in to comment