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

fix setup F16

parent a61a5b00
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
source/Applications/AcousticPulse/ap.cpp
+ 15
− 15
View file @ 39000a70
......@@ -43,15 +43,15 @@ void run()
//////////////////////////////////////////////////////////////////////////
//DLR-F16 test
////dx_coarse = 0.003 mm
//string pathname = "d:/temp/AcousticPulseXZ-BV10nuLB-0.003";
//int endTime = 20;
//double outTime = 20;
//LBMReal dx = 0.003;
//LBMReal rhoLB = 0.0;
//LBMReal nuLB = 8.66025e-6;
string pathname = "d:/temp/AcousticPulseXZ-4th-0.003";
int endTime = 20;
double outTime = 20;
LBMReal dx = 0.003;
LBMReal rhoLB = 0.0;
LBMReal nuLB = 8.66025e-6;
//////////////////////////////////////////////////////////////////////////
////dx_coarse = 0.0015 mm
//string pathname = "d:/temp/AcousticPulseXZ-BV10nuLB-0.0015";
//string pathname = "d:/temp/AcousticPulseXZ-4th-0.0015";
//double endTime = 40;
//double outTime = 40;
//LBMReal dx = 0.0015;
......@@ -59,12 +59,12 @@ void run()
//LBMReal nuLB = 8.66025e-6*2.0;
////////////////////////////////////////////////////////////////////////////
////dx_coarse = 0.00075 mm
string pathname = "d:/temp/AcousticPulseXZ-BV10nuLB-0.00075";
double endTime = 80;
double outTime = 80;
LBMReal dx = 0.00075;
LBMReal rhoLB = 0.0;
LBMReal nuLB = 8.66025e-6*4.0;
//string pathname = "d:/temp/AcousticPulseXZ-4th-0.00075";
//double endTime = 80;
//double outTime = 80;
//LBMReal dx = 0.00075;
//LBMReal rhoLB = 0.0;
//LBMReal nuLB = 8.66025e-6*4.0;
//////////////////////////////////////////////////////////////////////////
SPtr<LBMUnitConverter> conv = SPtr<LBMUnitConverter>(new LBMUnitConverter());
......@@ -161,7 +161,7 @@ void run()
double bulckViscosity = 10.0*nuLB;
SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulant4thOrderViscosityLBMKernel());
dynamicPointerCast<CompressibleCumulant4thOrderViscosityLBMKernel>(kernel)->setBulkViscosity(bulckViscosity);
//dynamicPointerCast<CompressibleCumulant4thOrderViscosityLBMKernel>(kernel)->setBulkViscosity(bulckViscosity);
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulantLBMKernel());
//dynamicPointerCast<CompressibleCumulantLBMKernel>(kernel)->setBulkOmegaToOmega(true);
//
......@@ -181,7 +181,7 @@ void run()
//set connectors
//SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetInterpolationProcessor());
SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
dynamicPointerCast<CompressibleOffsetMomentsInterpolationProcessor>(iProcessor)->setBulkViscosity(nuLB, bulckViscosity);
//dynamicPointerCast<CompressibleOffsetMomentsInterpolationProcessor>(iProcessor)->setBulkViscosity(nuLB, bulckViscosity);
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
UBLOG(logINFO, "SetConnectorsBlockVisitor:start");
......
source/Applications/DLR-F16-Solid/f16.cpp
+ 6
− 79
View file @ 39000a70
......@@ -168,19 +168,13 @@ void run(string configname)
SPtr<BCProcessor> bcProc;
bcProc = SPtr<BCProcessor>(new BCProcessor());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulantLBMKernel());
//dynamicPointerCast<CompressibleCumulantLBMKernel>(kernel)->setRelaxationParameter(CompressibleCumulantLBMKernel::NORMAL);
SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulant4thOrderViscosityLBMKernel());
//dynamicPointerCast<CompressibleCumulant4thOrderViscosityLBMKernel>(kernel)->setBulkViscosity(10.0*nuLB);
//dynamicPointerCast<CompressibleCumulant4thOrderViscosityLBMKernel>(kernel)->setBulkViscosity(nuLB*2.0e3);
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel());
double bulckViscosity = 10.0*nuLB;
dynamicPointerCast<CompressibleCumulant4thOrderViscosityLBMKernel>(kernel)->setBulkViscosity(bulckViscosity);
kernel->setBCProcessor(bcProc);
SPtr<LBMKernel> spKernel = SPtr<LBMKernel>(new CompressibleCumulantLBMKernel());
//SPtr<LBMKernel> spKernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel());
spKernel->setBCProcessor(bcProc);
//////////////////////////////////////////////////////////////////////////
//restart
......@@ -606,7 +600,9 @@ void run(string configname)
grid->accept(initVisitor1);
////set connectors
SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetInterpolationProcessor());
//SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetInterpolationProcessor());
SPtr<InterpolationProcessor> iProcessor(new CompressibleOffsetMomentsInterpolationProcessor());
dynamicPointerCast<CompressibleOffsetMomentsInterpolationProcessor>(iProcessor)->setBulkViscosity(nuLB, bulckViscosity);
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
......@@ -631,10 +627,6 @@ void run(string configname)
grid->accept(initVisitor);
}
//domain decomposition for threads
//PQueuePartitioningGridVisitor pqPartVisitor(numOfThreads);
//grid->accept(pqPartVisitor);
//bcVisitor should be accept after initialization!!!!
grid->accept(bcVisitor);
if (myid==0) UBLOG(logINFO, "grid->accept(bcVisitor):end");
......@@ -658,40 +650,10 @@ void run(string configname)
UBLOG(logINFO, "PID = "<<myid<<" Physical Memory currently used by current process: "<<Utilities::getPhysMemUsedByMe()/1073741824.0<<" GB");
}
////sponge layer
////////////////////////////////////////////////////////////////////////////
//GbCuboid3DPtr spongeLayerX1max(new GbCuboid3D(g_maxX1-0.35, g_minX2-blockLength, g_minX3-blockLength, g_maxX1+blockLength, g_maxX2+blockLength, g_maxX3+blockLength));
//if (myid==0) GbSystem3D::writeGeoObject(spongeLayerX1max.get(), pathOut+"/geo/spongeLayerX1max", WbWriterVtkXmlASCII::getInstance());
//SpongeLayerBlockVisitor slVisitorX1max(spongeLayerX1max, spKernel, nuLB, D3Q27System::E);
//grid->accept(slVisitorX1max);
//GbCuboid3DPtr spongeLayerX1min(new GbCuboid3D(g_minX1-blockLength, g_minX2-blockLength, g_minX3-blockLength, g_minX1+0.2, g_maxX2+blockLength, g_maxX3+blockLength));
//if (myid==0) GbSystem3D::writeGeoObject(spongeLayerX1min.get(), pathOut+"/geo/spongeLayerX1min", WbWriterVtkXmlASCII::getInstance());
//SpongeLayerBlockVisitor slVisitorX1min(spongeLayerX1min, spKernel, nuLB, D3Q27System::W);
//grid->accept(slVisitorX1min);
//GbCuboid3DPtr spongeLayerX3min(new GbCuboid3D(g_minX1+0.2, g_minX2-blockLength, g_minX3-blockLength, g_maxX1-0.4, g_maxX2+blockLength, g_minX3+0.2));
//if (myid==0) GbSystem3D::writeGeoObject(spongeLayerX3min.get(), pathOut+"/geo/spongeLayerX3min", WbWriterVtkXmlASCII::getInstance());
//SpongeLayerBlockVisitor slVisitorX3min(spongeLayerX3min, spKernel, nuLB, D3Q27System::B);
//grid->accept(slVisitorX3min);
//GbCuboid3DPtr spongeLayerX3max(new GbCuboid3D(g_minX1+0.2, g_minX2-blockLength, g_maxX3-0.2, g_maxX1-0.4, g_maxX2+blockLength, g_maxX3+blockLength));
//if (myid==0) GbSystem3D::writeGeoObject(spongeLayerX3max.get(), pathOut+"/geo/spongeLayerX3max", WbWriterVtkXmlASCII::getInstance());
//SpongeLayerBlockVisitor slVisitorX3max(spongeLayerX3max, spKernel, nuLB, D3Q27System::T);
//grid->accept(slVisitorX3max);
/////////////////////////////////////////////////////////////////////////////
if (myid==0) UBLOG(logINFO, "Preprozess - end");
}
else
{
//GbCuboid3DPtr mic5(new GbCuboid3D(0.3+deltaXfine, 0.015, 0.000517+0.00037+7.0*deltaXfine, 0.3+2.0*deltaXfine, 0.015+deltaXfine, 0.000517+0.00037+8.0*deltaXfine));
//if (myid==0) GbSystem3D::writeGeoObject(mic5.get(), pathOut+"/geo/mic5", WbWriterVtkXmlBinary::getInstance());
//return;
restartCoProcessor->restart((int)restartStep);
//migCoProcessor->restart((int)restartStep);
grid->setTimeStep(restartStep);
......@@ -700,45 +662,10 @@ void run(string configname)
SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
grid->accept(setConnsVisitor);
///////////////////////////////////////////////////////////////////////////////////////////////
//SPtr<GbTriFaceMesh3D> fngMeshWhole2;
//if (myid==0) UBLOG(logINFO, "Read fngFileWhole2:start");
//fngMeshWhole2 = SPtr<GbTriFaceMesh3D>(GbTriFaceMesh3DCreator::getInstance()->readMeshFromSTLFile2(pathGeo+"/"+fngFileWhole2, "fngMeshWhole2", GbTriFaceMesh3D::KDTREE_SAHPLIT, false));
//if (myid==0) UBLOG(logINFO, "Read fngFileWhole2:end");
//fngMeshWhole2->rotate(0.0, 0.5, 0.0);
//if (myid==0) GbSystem3D::writeGeoObject(fngMeshWhole2.get(), pathOut+"/geo/fngMeshWhole3", WbWriterVtkXmlBinary::getInstance());
//SPtr<Interactor3D> fngIntrWhole2 = SPtr<D3Q27TriFaceMeshInteractor>(new D3Q27TriFaceMeshInteractor(fngMeshWhole2, grid, noSlipBCAdapter, Interactor3D::SOLID, (Interactor3D::Accuracy)accuracy));
//SetBcBlocksBlockVisitor v(fngIntrWhole2);
//grid->accept(v);
//fngIntrWhole2->initInteractor();
///////////////////////////////////////////////////////////////////////////////////////////////
grid->accept(bcVisitor);
////sponge layer
////////////////////////////////////////////////////////////////////////////
//GbCuboid3DPtr spongeLayerX1max(new GbCuboid3D(g_maxX1-0.35, g_minX2-blockLength, g_minX3-blockLength, g_maxX1+blockLength, g_maxX2+blockLength, g_maxX3+blockLength));
//if (myid==0) GbSystem3D::writeGeoObject(spongeLayerX1max.get(), pathOut+"/geo/spongeLayerX1max", WbWriterVtkXmlASCII::getInstance());
//SpongeLayerBlockVisitor slVisitorX1max(spongeLayerX1max, spKernel, nuLB, D3Q27System::E);
//grid->accept(slVisitorX1max);
//GbCuboid3DPtr spongeLayerX1min(new GbCuboid3D(g_minX1-blockLength, g_minX2-blockLength, g_minX3-blockLength, g_minX1+0.2, g_maxX2+blockLength, g_maxX3+blockLength));
//if (myid==0) GbSystem3D::writeGeoObject(spongeLayerX1min.get(), pathOut+"/geo/spongeLayerX1min", WbWriterVtkXmlASCII::getInstance());
//SpongeLayerBlockVisitor slVisitorX1min(spongeLayerX1min, spKernel, nuLB, D3Q27System::W);
//grid->accept(slVisitorX1min);
//GbCuboid3DPtr spongeLayerX3min(new GbCuboid3D(g_minX1+0.2, g_minX2-blockLength, g_minX3-blockLength, g_maxX1-0.4, g_maxX2+blockLength, g_minX3+0.2));
//if (myid==0) GbSystem3D::writeGeoObject(spongeLayerX3min.get(), pathOut+"/geo/spongeLayerX3min", WbWriterVtkXmlASCII::getInstance());
//SpongeLayerBlockVisitor slVisitorX3min(spongeLayerX3min, spKernel, nuLB, D3Q27System::B);
//grid->accept(slVisitorX3min);
//GbCuboid3DPtr spongeLayerX3max(new GbCuboid3D(g_minX1+0.2, g_minX2-blockLength, g_maxX3-0.2, g_maxX1-0.4, g_maxX2+blockLength, g_maxX3+blockLength));
//if (myid==0) GbSystem3D::writeGeoObject(spongeLayerX3max.get(), pathOut+"/geo/spongeLayerX3max", WbWriterVtkXmlASCII::getInstance());
//SpongeLayerBlockVisitor slVisitorX3max(spongeLayerX3max, spKernel, nuLB, D3Q27System::T);
//grid->accept(slVisitorX3max);
}
////sponge layer
GbCuboid3DPtr spongeLayerX1max(new GbCuboid3D(g_maxX1-0.35, g_minX2-blockLength, g_minX3-blockLength, g_maxX1+blockLength, g_maxX2+blockLength, g_maxX3+blockLength));
if (myid==0) GbSystem3D::writeGeoObject(spongeLayerX1max.get(), pathOut+"/geo/spongeLayerX1max", WbWriterVtkXmlASCII::getInstance());
SpongeLayerBlockVisitor slVisitorX1max(spongeLayerX1max, spKernel, nuLB, D3Q27System::E);
......
source/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
+ 4
− 0
View file @ 39000a70
......@@ -6,6 +6,8 @@
CompressibleOffsetMomentsInterpolationProcessor::CompressibleOffsetMomentsInterpolationProcessor()
: omegaC(0.0), omegaF(0.0)
{
this->bulkViscosity = 0.0;
this->shearViscosity = 0.0;
this->OxxPyyPzzC = one;
this->OxxPyyPzzF = one;
}
......@@ -13,6 +15,8 @@ CompressibleOffsetMomentsInterpolationProcessor::CompressibleOffsetMomentsInterp
CompressibleOffsetMomentsInterpolationProcessor::CompressibleOffsetMomentsInterpolationProcessor(LBMReal omegaC, LBMReal omegaF)
: omegaC(omegaC), omegaF(omegaF)
{
this->bulkViscosity = 0.0;
this->shearViscosity = 0.0;
this->OxxPyyPzzC = one;
this->OxxPyyPzzF = one;
}
......
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