Merge remote-tracking branch 'origin/development/TrafficAnna' into development/Martin
Showing
- src/Traffic/GPU/TrafficTimestep.cu 24 additions, 38 deletionssrc/Traffic/GPU/TrafficTimestep.cu
- src/Traffic/GPU/TrafficTimestep.h 17 additions, 6 deletionssrc/Traffic/GPU/TrafficTimestep.h
- src/Traffic/Junction/Junction.h 1 addition, 1 deletionsrc/Traffic/Junction/Junction.h
- src/Traffic/Junction/JunctionRandom.cpp 1 addition, 1 deletionsrc/Traffic/Junction/JunctionRandom.cpp
- src/Traffic/Junction/JunctionRandom.h 1 addition, 1 deletionsrc/Traffic/Junction/JunctionRandom.h
- src/Traffic/RoadNetwork/RoadMaker.cpp 10 additions, 0 deletionssrc/Traffic/RoadNetwork/RoadMaker.cpp
- src/Traffic/RoadNetwork/RoadMaker.h 1 addition, 0 deletionssrc/Traffic/RoadNetwork/RoadMaker.h
- src/Traffic/TrafficMovement.cpp 1 addition, 4 deletionssrc/Traffic/TrafficMovement.cpp
- src/Traffic/TrafficMovementFactory.cpp 3 additions, 3 deletionssrc/Traffic/TrafficMovementFactory.cpp
- targets/apps/LBM/Basel/resources/Junctions.txt 31 additions, 31 deletionstargets/apps/LBM/Basel/resources/Junctions.txt
- targets/apps/LBM/Basel/resources/Sinks.txt 14 additions, 19 deletionstargets/apps/LBM/Basel/resources/Sinks.txt
- targets/apps/LBM/Basel/resources/Sources.txt 14 additions, 16 deletionstargets/apps/LBM/Basel/resources/Sources.txt
- targets/apps/LBM/Basel/resources/Streets.txt 5 additions, 6 deletionstargets/apps/LBM/Basel/resources/Streets.txt
- targets/apps/LBM/Basel/resources/allStreets/Junctions.txt 31 additions, 31 deletionstargets/apps/LBM/Basel/resources/allStreets/Junctions.txt
- targets/apps/LBM/Basel/resources/allStreets/Sinks.txt 14 additions, 19 deletionstargets/apps/LBM/Basel/resources/allStreets/Sinks.txt
- targets/apps/LBM/Basel/resources/allStreets/Sources.txt 14 additions, 16 deletionstargets/apps/LBM/Basel/resources/allStreets/Sources.txt
- targets/apps/LBM/Basel/resources/allStreets/Streets.txt 5 additions, 6 deletionstargets/apps/LBM/Basel/resources/allStreets/Streets.txt
- targets/apps/LBM/Basel/resources/allStreetsDouble/Junctions.txt 62 additions, 0 deletions...s/apps/LBM/Basel/resources/allStreetsDouble/Junctions.txt
- targets/apps/LBM/Basel/resources/allStreetsDouble/Sinks.txt 39 additions, 0 deletionstargets/apps/LBM/Basel/resources/allStreetsDouble/Sinks.txt
- targets/apps/LBM/Basel/resources/allStreetsDouble/Sources.txt 39 additions, 0 deletions...ets/apps/LBM/Basel/resources/allStreetsDouble/Sources.txt
Loading
Please register or sign in to comment