diff --git a/source/Applications/Thermoplast/config.txt b/source/Applications/Thermoplast/config.txt index a8778ae1343a3373f79ff90da0a0df7af1756293..47c3af05f7885c44233e4044fdecb5f2fbff85da 100644 --- a/source/Applications/Thermoplast/config.txt +++ b/source/Applications/Thermoplast/config.txt @@ -9,8 +9,8 @@ boundingBox = 60 1370 130 190 1530 320 #test bb blocknx = 10 10 10 #blocknx = 300 420 320 -endTime = 1000 -outTime = 1000 +endTime = 2000 +outTime = 2000 availMem = 25e9 uLB = 0.1 @@ -36,9 +36,9 @@ pathOut = g:/temp/thermoplast2 logToFile = false #restart -cpStart = 1000 -cpStep = 1000 +cpStart = 2000 +cpStep = 2000 restart = true -restartStep = 20 +restartStep = 1000 nupsTime = 10 10 1000000 \ No newline at end of file diff --git a/source/DemCoupling/CreateDemObjectsCoProcessor.cpp b/source/DemCoupling/CreateDemObjectsCoProcessor.cpp index b60c6f226265713ff5ff261745f0b160edf03822..1aa6f66fa87861bcaaf731355279d488d90fea25 100644 --- a/source/DemCoupling/CreateDemObjectsCoProcessor.cpp +++ b/source/DemCoupling/CreateDemObjectsCoProcessor.cpp @@ -91,7 +91,7 @@ void CreateDemObjectsCoProcessor::createGeoObjects() for (int i = 0; i < size; i++) { SPtr<GbSphere3D> sphere = std::dynamic_pointer_cast<GbSphere3D>(geoObjectPrototypeVector[i]); - if (demCoProcessor->isSpheresIntersection(sphere->getX1Centroid(), sphere->getX2Centroid(), sphere->getX3Centroid(), sphere->getRadius()*2.0)) + if (demCoProcessor->isSpheresIntersection(sphere->getX1Centroid(), sphere->getX2Centroid(), sphere->getX3Centroid(), sphere->getRadius()*2.0*0.99)) { continue; } diff --git a/source/DemCoupling/DemCoProcessor.cpp b/source/DemCoupling/DemCoProcessor.cpp index a7f5a8f68b2e08409291f52ad3cb53a9cd2b23f1..1033180a495e895648285abe1eebc789cf51537b 100644 --- a/source/DemCoupling/DemCoProcessor.cpp +++ b/source/DemCoupling/DemCoProcessor.cpp @@ -427,7 +427,7 @@ bool DemCoProcessor::isSpheresIntersection(double centerX1, double centerX2, dou if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])->isActive()) { SPtr<GbObject3D> sphere = interactors[i]->getGbObject3D(); - result = result || (sqrt(pow(sphere->getX1Centroid()-centerX1, 2)+pow(sphere->getX2Centroid()-centerX2, 2)+pow(sphere->getX3Centroid()-centerX3, 2)) < d); + result = result || (sqrt(pow(sphere->getX1Centroid()-centerX1, 2.0)+pow(sphere->getX2Centroid()-centerX2, 2.0)+pow(sphere->getX3Centroid()-centerX3, 2.0)) <= d); } } std::vector<int> values;