diff --git a/src/GridGenerator/StreetPointFinder/StreetPointFinder.cpp b/src/GridGenerator/StreetPointFinder/StreetPointFinder.cpp
index 2195d25e16924f2eda70c0efed629a2d50c1bfe5..6495e02d8e60bd41cfe26f2bd63166f660b7d787 100644
--- a/src/GridGenerator/StreetPointFinder/StreetPointFinder.cpp
+++ b/src/GridGenerator/StreetPointFinder/StreetPointFinder.cpp
@@ -345,7 +345,7 @@ void StreetPointFinder::writeCarsVTK(std::ofstream& file, uint numberOfCells, co
void StreetPointFinder::writeLengthsVTK(std::ofstream & file, uint numberOfCells)
{
- file << "length 1 " << numberOfCells << " float" << std::endl;
+ file << "StreetLength 1 " << numberOfCells << " float" << std::endl;
for (auto& street : streets)
{
diff --git a/src/Traffic/GPU/TrafficTimestep.cu b/src/Traffic/GPU/TrafficTimestep.cu
index 58cddc7de1729bb12d51d182d427587e4dc4ed6b..9aee5f9c935c5749b4bc26ba4ba74d9a6022ab41 100644
--- a/src/Traffic/GPU/TrafficTimestep.cu
+++ b/src/Traffic/GPU/TrafficTimestep.cu
@@ -4,14 +4,10 @@
#include <cuda_runtime.h>
#include <helper_cuda.h>
-
#include <cmath>
#include <sstream>
-#include <thrust/device_vector.h>
#include <thrust/reduce.h>
-#include <thrust/device_ptr.h>
-#include <thrust/host_vector.h>
#include <iomanip>
diff --git a/src/Traffic/GPU/TrafficTimestep.h b/src/Traffic/GPU/TrafficTimestep.h
index b924005d5f1cc85fcb6acd66417fd861ed72e448..be05d404dfd278751b3ceac7249e7b2fc56ebf54 100644
--- a/src/Traffic/GPU/TrafficTimestep.h
+++ b/src/Traffic/GPU/TrafficTimestep.h
@@ -3,13 +3,9 @@
#include <vector>
#include <memory>
-#include <random>
-#include <thrust/device_vector.h>
+#include <thrust/device_vector.h>
#include <curand_kernel.h>
-#include <cuda.h>
-#include <cuda_runtime.h>
-#include <helper_cuda.h>
#include <VirtualFluidsDefinitions.h>
#include "Core/PointerDefinitions.h"
diff --git a/src/Traffic/TrafficMovement.cpp b/src/Traffic/TrafficMovement.cpp
index 1b9b53b00334b02feb9b21249d517b241c6fdf47..8400dd81188703607691814b4d97d2f30246382a 100644
--- a/src/Traffic/TrafficMovement.cpp
+++ b/src/Traffic/TrafficMovement.cpp
@@ -531,12 +531,12 @@ void TrafficMovement::visualizeVehicleLengthForVTK()
{
if (useGPU) copyDevToHost();
+ road->currentWithLongVehicles = *(road->pcurrent);
int speed;
if (road->safetyDistance != 0) {
for (uint i = 0; i < road->roadLength; i++) {
speed = (*(road->pcurrent))[i];
- road->currentWithLongVehicles[i] = speed;
if (speed > -1) {
//checkSpeed((*(road->pcurrent))[i]);
int neighbor = road->neighbors[i];
@@ -546,13 +546,13 @@ void TrafficMovement::visualizeVehicleLengthForVTK()
break;
if ((*(road->pcurrent))[neighbor] > -1) {
std::cerr << "safetyDistance was violated: timestep: " << currentStep << "\t carIndex: " << i << std::endl;
+ std::cin.get();
if (useLogger) TrafficLogger::writeError("safetyDistance was violated : carIndex: " + std::to_string(i), currentStep);
break;
}
else
(road->currentWithLongVehicles)[neighbor] = speed;
neighbor = road->neighbors[neighbor];
- i++;
}
}
}
diff --git a/src/Traffic/TrafficMovementFactory.cpp b/src/Traffic/TrafficMovementFactory.cpp
index 55979bf1bb64710f6e3bd22d0de84e6d15e9fcdd..61abe5812a8935b9e8a1d03046da732e92088459 100644
--- a/src/Traffic/TrafficMovementFactory.cpp
+++ b/src/Traffic/TrafficMovementFactory.cpp
@@ -26,7 +26,7 @@ void TrafficMovementFactory::initTrafficMovement(std::string path, bool useGPU,
{
//Variables
- real vehicleDensity = 0.01f;
+ real vehicleDensity = 0.03f;
uint vehicleLength = 7;
uint maxVelocity = 14;
@@ -39,7 +39,7 @@ void TrafficMovementFactory::initTrafficMovement(std::string path, bool useGPU,
bool useSlowToStart = true;
useLogger = true;
- std::string info = "Only Traffic";
+ std::string info = "Only Traffic, full writing";
diff --git a/targets/apps/LBM/Basel/main.cpp b/targets/apps/LBM/Basel/main.cpp
index ac82d66805d9a050a5adbd4da0ae93d8a52876b2..4d7890821333c52d4f4da5f8034a570c24aac472 100644
--- a/targets/apps/LBM/Basel/main.cpp
+++ b/targets/apps/LBM/Basel/main.cpp
@@ -95,13 +95,11 @@ void multipleLevel(const std::string& configPath)
real dx = 1.2;
real vx = 0.05;
-<<<<<<< HEAD
+
//TriangularMesh* BaselSTL = TriangularMesh::make("E:/temp/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_All_CLOSED.stl");
TriangularMesh* BaselSTL = TriangularMesh::make("C:/Users/hiwi/BaselDokumente/VirtualFluidsGPU/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED.stl");
-=======
//TriangularMesh* BaselSTL = TriangularMesh::make("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_All_CLOSED.stl");
- TriangularMesh* BaselSTL = TriangularMesh::make("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND.stl");
->>>>>>> origin/development/Martin
+// TriangularMesh* BaselSTL = TriangularMesh::make("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND.stl");
gridBuilder->addCoarseGrid(-256.0, -256.0, - 8.0,
256.0, 256.0, 160.0, dx);
@@ -128,7 +126,6 @@ void multipleLevel(const std::string& configPath)
gridBuilder->setPressureBoundaryCondition(SideType::PY, 0.0);
gridBuilder->setPressureBoundaryCondition(SideType::MY, 0.0);
-<<<<<<< HEAD
std::string path = "C:/Users/hiwi/BaselDokumente/";
std::string inputPath = path + "VirtualFluidsGPU/git/targets/apps/LBM/Basel/resources/";
@@ -144,7 +141,6 @@ void multipleLevel(const std::string& configPath)
//SimulationFileWriter::write("E:/temp/Basel2019/grids/BaselUni/", gridBuilder, FILEFORMAT::BINARY);
// gridBuilder->writeGridsToVtk("E:/temp/Basel2019/grids/BaselUni/Basel_Grid");
-=======
gridBuilder->setPressureBoundaryCondition(SideType::PX, 0.0);
gridBuilder->setPressureBoundaryCondition(SideType::MX, 0.0);
@@ -158,13 +154,11 @@ void multipleLevel(const std::string& configPath)
//Merged for Wind in X Direction
gridBuilder->writeGridsToVtk("M:/Basel2019/grids/BaselUniMergedX/Basel_Grid");
SimulationFileWriter::write("M:/Basel2019/grids/BaselUniMergedX/", gridBuilder, FILEFORMAT::BINARY);
->>>>>>> origin/development/Martin
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
StreetPointFinder finder;
-<<<<<<< HEAD
finder.readStreets(inputPath + "Streets.txt");
finder.writeVTK(outputPath + outputFilename + ".vtk");
@@ -175,7 +169,7 @@ void multipleLevel(const std::string& configPath)
finder.writeSimulationFile(gridPath, 1.0, gridBuilder->getNumberOfLevels(), 0);
-=======
+
finder.readStreets("C:/Users/schoen/Desktop/git/MS2/git/targets/apps/LBM/streetTest/resources/ExampleStreets.txt");
finder.writeVTK("M:/Basel2019/results/ExampleStreets.vtk");
@@ -191,7 +185,7 @@ void multipleLevel(const std::string& configPath)
//Merged for Wind in X Direction
finder.writeConnectionVTK("M:/Basel2019/grids/BaselUniMergedX/Basel_Grid/ExampleStreetsConnection.vtk", gridBuilder->getGrid(0));
finder.writeSimulationFile("M:/Basel2019/grids/BaselUniMergedX/", 1.0, gridBuilder->getNumberOfLevels(), 0);
->>>>>>> origin/development/Martin
+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
return;
diff --git a/targets/apps/LBM/Basel/resources/allStreets/Sinks.txt b/targets/apps/LBM/Basel/resources/allStreets/Sinks.txt
index c9113397aee3bc267172c80a0317b787b44df054..055ac082ae8e06a1e6b618e59460c1bc3fe1fa21 100644
--- a/targets/apps/LBM/Basel/resources/allStreets/Sinks.txt
+++ b/targets/apps/LBM/Basel/resources/allStreets/Sinks.txt
@@ -1,11 +1,11 @@
19
-25 0.2
-99 0.2
-5 0.2
-61 0.2
+25 0.5
+99 0.5
+5 0.5
+61 0.5
-7 0.2
-20 0.2
+7 0.4
+20 0.4
52 0.2
diff --git a/targets/apps/LBM/Basel/resources/allStreets/Sources.txt b/targets/apps/LBM/Basel/resources/allStreets/Sources.txt
index 242abde1a5347fabe07da39424428f5e35bdceaf..2e9dd22c480e79ad349c29e33c14b155322e86f8 100644
--- a/targets/apps/LBM/Basel/resources/allStreets/Sources.txt
+++ b/targets/apps/LBM/Basel/resources/allStreets/Sources.txt
@@ -1,11 +1,11 @@
19
-62 0.6
-8 0.6
-100 0.6
-14 0.6
+62 0.7
+8 0.7
+100 0.7
+14 0.7
-17 0.5
-0 0.5
+17 0.6
+0 0.6
54 0.2
56 0.2
diff --git a/targets/apps/LBM/TrafficTest/Traffic_Main.cpp b/targets/apps/LBM/TrafficTest/Traffic_Main.cpp
index 5022076f04a282f02c4122a576a3b282554890c2..68171c9d5076e59f268f2a251397db357e45262d 100644
--- a/targets/apps/LBM/TrafficTest/Traffic_Main.cpp
+++ b/targets/apps/LBM/TrafficTest/Traffic_Main.cpp
@@ -14,7 +14,7 @@ int main()
//////Basel
{
- uint numberOfTimesteps = 14400;
+ uint numberOfTimesteps = 1000;
bool useGPU = false;
@@ -40,9 +40,8 @@ int main()
//loop through timestep
for (uint step = 1; step <= numberOfTimesteps; step++) {
factory->calculateTimestep(step);
- //factory->writeTimestep(step);
- }
-
+ factory->writeTimestep(step);
+ }
//end simulation
duration = (std::clock() - start) / (double)CLOCKS_PER_SEC;