Skip to content
Snippets Groups Projects
Commit bc1801ec authored by Konstantin Kutscher's avatar Konstantin Kutscher
Browse files

CreateGeoObjectsCoProcessor works now correct

parent 06d83010
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
source/Applications/Thermoplast/thermoplast.cpp
+ 11
− 7
View file @ bc1801ec
......@@ -67,11 +67,11 @@ void pf1()
int myid = comm->getProcessID();
//parameters
string pathname = "d:/temp/thermoplast";
string pathname = "d:/temp/thermoplast3";
int numOfThreads = 1;
int blocknx[3] ={ 16,16,16 };
double endTime = 1000000;
double outTime = 10;
double outTime = 100;
double availMem = 8e9;
double deltax = 1;
double rhoLB = 0.0;
......@@ -109,6 +109,7 @@ void pf1()
UBLOG(logINFO, "rhoLB = " << rhoLB);
UBLOG(logINFO, "nuLB = " << nuLB);
UBLOG(logINFO, "deltaX = " << deltax);
UBLOG(logINFO, "Re = " << uLB*(g_maxX3-g_minX3)/nuLB);
UBLOG(logINFO, "Preprocess - start");
}
......@@ -185,7 +186,7 @@ void pf1()
//const std::shared_ptr<LBMUnitConverter> lbmUnitConverter = std::make_shared<LBMUnitConverter>(refLengthWorld, LBMUnitConverter::WORLD_MATERIAL::AIR_20C, refLengthLb);
const SPtr<LBMUnitConverter> lbmUnitConverter(new LBMUnitConverter(refLengthWorld, LBMUnitConverter::WORLD_MATERIAL::OIL, refLengthLb));
if (myid == 0) std::cout << lbmUnitConverter->toString() << std::endl;
double rhoSphere = 915 * lbmUnitConverter->getFactorDensityWToLb(); // 2 // kg/m^3
double rhoSphere = 0.7625;//915 * lbmUnitConverter->getFactorDensityWToLb(); // 2 // kg/m^3
if (myid == 0) UBLOG(logINFO, "rhoSphere = "<<rhoSphere);
SPtr<PhysicsEngineMaterialAdapter> sphereMaterial(new PePhysicsEngineMaterialAdapter("Polyethylen", rhoSphere, 0, 0.15, 0.1, 0.45, 0.5, 1, 0, 0));
const int timestep = 2;
......@@ -272,12 +273,15 @@ void pf1()
SPtr<UbScheduler> geoSch(new UbScheduler(1));
WriteBoundaryConditionsCoProcessor ppgeo(grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm);
ppgeo.process(0);
WriteMacroscopicQuantitiesCoProcessor ppInit(grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm);
ppInit.process(0);
}
if (myid == 0) UBLOG(logINFO, "Preprocess - end");
//write data for visualization of macroscopic quantities
SPtr<UbScheduler> visSch(new UbScheduler(outTime,1));
SPtr<UbScheduler> visSch(new UbScheduler(outTime));
SPtr<WriteMacroscopicQuantitiesCoProcessor> writeMQCoProcessor(new WriteMacroscopicQuantitiesCoProcessor(grid, visSch, pathname,
WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
......@@ -291,14 +295,14 @@ void pf1()
//////////////////////////////////////////////////////////////////////////
SPtr<UbScheduler> sphereScheduler(new UbScheduler(1,1,2));
SPtr<UbScheduler> sphereScheduler(new UbScheduler(1000,10,1010));
SPtr<CreateGeoObjectsCoProcessor> createSphereCoProcessor(new CreateGeoObjectsCoProcessor(grid,sphereScheduler,demCoProcessor,sphere1,sphereMaterial));
//start simulation
//omp_set_num_threads(numOfThreads);
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(outTime));
SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
//SPtr<UbScheduler> stepGhostLayer(new UbScheduler(outTime));
SPtr<Calculator> calculator(new BasicCalculator(grid, peScheduler, endTime));
//SPtr<Calculator> calculator(new DemCalculator(grid, stepGhostLayer, endTime));
calculator->addCoProcessor(npr);
......
source/DemCoupling/CreateGeoObjectsCoProcessor.cpp
+ 51
− 56
View file @ bc1801ec
......@@ -25,7 +25,31 @@ CreateGeoObjectsCoProcessor::CreateGeoObjectsCoProcessor(SPtr<Grid3D> grid, SPtr
//////////////////////////////////////////////////////////////////////////
void CreateGeoObjectsCoProcessor::process(double step)
{
//if (scheduler->isDue(step))
if (scheduler->isDue(step))
{
mu::Parser fct2;
fct2.SetExpr("U");
fct2.DefineConst("U", 0.0);
SPtr<BCAdapter> velocityBcParticleAdapter(new VelocityBCAdapter(true, false, false, fct2, 0, BCFunction::INFCONST));
velocityBcParticleAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityWithDensityBCAlgorithm()));
SPtr<MovableObjectInteractor> geoObjectInt;
const std::shared_ptr<Reconstructor> velocityReconstructor(new VelocityBcReconstructor());
const std::shared_ptr<Reconstructor> extrapolationReconstructor(new ExtrapolationReconstructor(velocityReconstructor));
SPtr<GbObject3D> geoObject((GbObject3D*)(geoObjectPrototype->clone()));
geoObjectInt = SPtr<MovableObjectInteractor>(new MovableObjectInteractor(geoObject, grid, velocityBcParticleAdapter, Interactor3D::SOLID, extrapolationReconstructor, State::UNPIN));
//SetSolidOrBoundaryBlockVisitor setSolidVisitor(geoObjectInt, SetSolidOrBoundaryBlockVisitor::SOLID);
//grid->accept(setSolidVisitor);
SetSolidOrBoundaryBlockVisitor setBcVisitor(geoObjectInt, SetSolidOrBoundaryBlockVisitor::BC);
grid->accept(setBcVisitor);
geoObjectInt->initInteractor();
demCoProcessor->addInteractor(geoObjectInt, geoObjectMaterial, Vector3D(0.0, 0.0, 0.0));
demCoProcessor->distributeIDs();
}
//if (step == 1)
//{
// mu::Parser fct2;
// fct2.SetExpr("U");
......@@ -36,11 +60,11 @@ void CreateGeoObjectsCoProcessor::process(double step)
// SPtr<MovableObjectInteractor> geoObjectInt;
// const std::shared_ptr<Reconstructor> velocityReconstructor(new VelocityBcReconstructor());
// const std::shared_ptr<Reconstructor> extrapolationReconstructor(new ExtrapolationReconstructor(velocityReconstructor));
//
// //SPtr<GbObject3D> geoObject((GbObject3D*)(geoObjectPrototype->clone()));
//
// double radius = 5;
// SPtr<GbObject3D> geoObject(new GbSphere3D(10, 16, 16, radius));
// SPtr<GbObject3D> geoObject(new GbSphere3D(10, 16, 10, radius));
// geoObjectInt = SPtr<MovableObjectInteractor>(new MovableObjectInteractor(geoObject, grid, velocityBcParticleAdapter, Interactor3D::SOLID, extrapolationReconstructor, State::UNPIN));
// //SetSolidOrBoundaryBlockVisitor setSolidVisitor(geoObjectInt, SetSolidOrBoundaryBlockVisitor::SOLID);
......@@ -54,62 +78,33 @@ void CreateGeoObjectsCoProcessor::process(double step)
// UBLOG(logINFO, "CreateGeoObjectsCoProcessor::process() step = "<<step);
//}
if (step == 1)
{
mu::Parser fct2;
fct2.SetExpr("U");
fct2.DefineConst("U", 0.0);
SPtr<BCAdapter> velocityBcParticleAdapter(new VelocityBCAdapter(true, false, false, fct2, 0, BCFunction::INFCONST));
velocityBcParticleAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityWithDensityBCAlgorithm()));
SPtr<MovableObjectInteractor> geoObjectInt;
const std::shared_ptr<Reconstructor> velocityReconstructor(new VelocityBcReconstructor());
const std::shared_ptr<Reconstructor> extrapolationReconstructor(new ExtrapolationReconstructor(velocityReconstructor));
//SPtr<GbObject3D> geoObject((GbObject3D*)(geoObjectPrototype->clone()));
double radius = 5;
SPtr<GbObject3D> geoObject(new GbSphere3D(10, 16, 10, radius));
geoObjectInt = SPtr<MovableObjectInteractor>(new MovableObjectInteractor(geoObject, grid, velocityBcParticleAdapter, Interactor3D::SOLID, extrapolationReconstructor, State::UNPIN));
//SetSolidOrBoundaryBlockVisitor setSolidVisitor(geoObjectInt, SetSolidOrBoundaryBlockVisitor::SOLID);
//grid->accept(setSolidVisitor);
SetSolidOrBoundaryBlockVisitor setBcVisitor(geoObjectInt, SetSolidOrBoundaryBlockVisitor::BC);
grid->accept(setBcVisitor);
geoObjectInt->initInteractor();
demCoProcessor->addInteractor(geoObjectInt, geoObjectMaterial, Vector3D(0.0, 0.0, 0.0));
demCoProcessor->distributeIDs();
UBLOG(logINFO, "CreateGeoObjectsCoProcessor::process() step = "<<step);
}
if (step==1)
{
mu::Parser fct2;
fct2.SetExpr("U");
fct2.DefineConst("U", 0.0);
SPtr<BCAdapter> velocityBcParticleAdapter(new VelocityBCAdapter(true, false, false, fct2, 0, BCFunction::INFCONST));
velocityBcParticleAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityWithDensityBCAlgorithm()));
//if (step==1)
//{
// mu::Parser fct2;
// fct2.SetExpr("U");
// fct2.DefineConst("U", 0.0);
// SPtr<BCAdapter> velocityBcParticleAdapter(new VelocityBCAdapter(true, false, false, fct2, 0, BCFunction::INFCONST));
// velocityBcParticleAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityWithDensityBCAlgorithm()));
SPtr<MovableObjectInteractor> geoObjectInt;
const std::shared_ptr<Reconstructor> velocityReconstructor(new VelocityBcReconstructor());
const std::shared_ptr<Reconstructor> extrapolationReconstructor(new ExtrapolationReconstructor(velocityReconstructor));
// SPtr<MovableObjectInteractor> geoObjectInt;
// const std::shared_ptr<Reconstructor> velocityReconstructor(new VelocityBcReconstructor());
// const std::shared_ptr<Reconstructor> extrapolationReconstructor(new ExtrapolationReconstructor(velocityReconstructor));
//SPtr<GbObject3D> geoObject((GbObject3D*)(geoObjectPrototype->clone()));
// //SPtr<GbObject3D> geoObject((GbObject3D*)(geoObjectPrototype->clone()));
double radius = 5;
SPtr<GbObject3D> geoObject(new GbSphere3D(10, 16, 23, radius));
// double radius = 5;
// SPtr<GbObject3D> geoObject(new GbSphere3D(10, 16, 23, radius));
geoObjectInt = SPtr<MovableObjectInteractor>(new MovableObjectInteractor(geoObject, grid, velocityBcParticleAdapter, Interactor3D::SOLID, extrapolationReconstructor, State::UNPIN));
//SetSolidOrBoundaryBlockVisitor setSolidVisitor(geoObjectInt, SetSolidOrBoundaryBlockVisitor::SOLID);
//grid->accept(setSolidVisitor);
SetSolidOrBoundaryBlockVisitor setBcVisitor(geoObjectInt, SetSolidOrBoundaryBlockVisitor::BC);
grid->accept(setBcVisitor);
geoObjectInt->initInteractor();
demCoProcessor->addInteractor(geoObjectInt, geoObjectMaterial, Vector3D(0.0, 0.0, 0.0));
demCoProcessor->distributeIDs();
// geoObjectInt = SPtr<MovableObjectInteractor>(new MovableObjectInteractor(geoObject, grid, velocityBcParticleAdapter, Interactor3D::SOLID, extrapolationReconstructor, State::UNPIN));
// //SetSolidOrBoundaryBlockVisitor setSolidVisitor(geoObjectInt, SetSolidOrBoundaryBlockVisitor::SOLID);
// //grid->accept(setSolidVisitor);
// SetSolidOrBoundaryBlockVisitor setBcVisitor(geoObjectInt, SetSolidOrBoundaryBlockVisitor::BC);
// grid->accept(setBcVisitor);
// geoObjectInt->initInteractor();
// demCoProcessor->addInteractor(geoObjectInt, geoObjectMaterial, Vector3D(0.0, 0.0, 0.0));
// demCoProcessor->distributeIDs();
UBLOG(logINFO, "CreateGeoObjectsCoProcessor::process() step = "<<step);
}
// UBLOG(logINFO, "CreateGeoObjectsCoProcessor::process() step = "<<step);
//}
}
source/DemCoupling/DemCoProcessor.cpp
+ 0
− 8
View file @ bc1801ec
......@@ -43,12 +43,10 @@ void DemCoProcessor::addInteractor(std::shared_ptr<MovableObjectInteractor> inte
{
peGeometry->setLinearVelolocity(initalVelocity);
physicsEngineGeometries.push_back(peGeometry);
//interactor->setActive();
}
else
{
physicsEngineGeometries.push_back(peGeometry);
//interactor->setInactive();
}
}
......@@ -189,14 +187,11 @@ void DemCoProcessor::calculateDemTimeStep(double step) const
for (int i = 0; i < physicsEngineGeometries.size(); i++)
{
//if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometries[i])->isActive())
{
physicsEngineSolver->updateGeometry(physicsEngineGeometries[i]);
if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometries[i])->isActive())
{
interactors[i]->setPhysicsEngineGeometry(physicsEngineGeometries[i]);
}
}
}
}
......@@ -245,14 +240,11 @@ void DemCoProcessor::distributeIDs()
for (int i = 0; i < physicsEngineGeometries.size(); i++)
{
//if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometries[i])->isActive())
{
physicsEngineSolver->updateGeometry(physicsEngineGeometries[i]);
if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometries[i])->isActive())
{
interactors[i]->setPhysicsEngineGeometry(physicsEngineGeometries[i]);
}
}
}
}
......
source/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
+ 0
− 1
View file @ bc1801ec
......@@ -82,7 +82,6 @@ void WriteMacroscopicQuantitiesCoProcessor::collectData(double step)
piece = subfolder + "/" + piece;
std::vector<std::string> cellDataNames;
SPtr<Communicator> comm = Communicator::getInstance();
std::vector<std::string> pieces = comm->gather(piece);
if (comm->getProcessID() == comm->getRoot())
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment