Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

V

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

Snippets Groups Projects

5974c9c8

Commit 5974c9c8 authored 6 years ago by Martin Schönherr

Downloads
- Plain Diff

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

# Conflicts:
#	targets/apps/LBM/Basel/main.cpp

parents 3bd051bb ef3c26c2

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/GridGenerator/StreetPointFinder/StreetPointFinder.cpp 1 addition, 1 deletion

src/GridGenerator/StreetPointFinder/StreetPointFinder.cpp
src/Traffic/GPU/TrafficTimestep.cu 0 additions, 4 deletions

src/Traffic/GPU/TrafficTimestep.cu
src/Traffic/GPU/TrafficTimestep.h 1 addition, 5 deletions

src/Traffic/GPU/TrafficTimestep.h
src/Traffic/TrafficMovement.cpp 2 additions, 2 deletions

src/Traffic/TrafficMovement.cpp
src/Traffic/TrafficMovementFactory.cpp 2 additions, 2 deletions

src/Traffic/TrafficMovementFactory.cpp
targets/apps/LBM/Basel/resources/allStreets/Sinks.txt 6 additions, 6 deletions

targets/apps/LBM/Basel/resources/allStreets/Sinks.txt
targets/apps/LBM/Basel/resources/allStreets/Sources.txt 6 additions, 6 deletions

targets/apps/LBM/Basel/resources/allStreets/Sources.txt
targets/apps/LBM/TrafficTest/Traffic_Main.cpp 3 additions, 4 deletions

targets/apps/LBM/TrafficTest/Traffic_Main.cpp

with 21 additions and 30 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