Merge remote-tracking branch 'origin/development/Martin' into development/TrafficAnna (bb403ec7) · 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

bb403ec7

Commit bb403ec7 authored 6 years ago by hiwis

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/development/Martin' into development/TrafficAnna

parents f1f8499c 130ac083

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/Traffic/TrafficMovementFactory.cpp 13 additions, 7 deletions

src/Traffic/TrafficMovementFactory.cpp
src/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.cpp 4 additions, 0 deletions

...U/DataStructureInitializer/GridReaderFiles/GridReader.cpp
src/VirtualFluids_GPU/GPU/AdvecDiffBCs27.cu 1 addition, 1 deletion

src/VirtualFluids_GPU/GPU/AdvecDiffBCs27.cu
src/VirtualFluids_GPU/LBM/Simulation.cpp 6 additions, 3 deletions

src/VirtualFluids_GPU/LBM/Simulation.cpp
src/VirtualFluids_GPU/Parameter/Parameter.cpp 13 additions, 8 deletions

src/VirtualFluids_GPU/Parameter/Parameter.cpp
src/VirtualFluids_GPU/Parameter/Parameter.h 1 addition, 0 deletions

src/VirtualFluids_GPU/Parameter/Parameter.h
targets/apps/LBM/Basel/main.cpp 12 additions, 10 deletions

targets/apps/LBM/Basel/main.cpp

with 50 additions and 29 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