Skip to content
Snippets Groups Projects
Commit 42f40ace authored by Martin Schönherr's avatar Martin Schönherr :speech_balloon:
Browse files

fix some apps due to the changes in the gridFactory

parents 6ebd9c03 1ed15dfd
No related branches found
No related tags found
1 merge request!256Kernel names changed
......@@ -93,14 +93,6 @@ int main()
const uint timeStepOut = 10000;
const uint timeStepEnd = 10000;
//////////////////////////////////////////////////////////////////////////
// setup gridGenerator
//////////////////////////////////////////////////////////////////////////
auto gridFactory = GridFactory::make();
gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::POINT_IN_OBJECT);
auto gridBuilder = MultipleGridBuilder::makeShared(gridFactory);
//////////////////////////////////////////////////////////////////////////
// compute parameters in lattice units
//////////////////////////////////////////////////////////////////////////
......@@ -113,6 +105,7 @@ int main()
//////////////////////////////////////////////////////////////////////////
// create grid
//////////////////////////////////////////////////////////////////////////
auto gridBuilder = std::make_shared<MultipleGridBuilder>();
gridBuilder->addCoarseGrid(-1.0 * L, -0.6 * L, -0.6 * L,
2.0 * L, 0.6 * L, 0.6 * L, dx);
......@@ -151,7 +144,7 @@ int main()
para->setTimestepOut(timeStepOut);
para->setTimestepEnd(timeStepEnd);
para->setMainKernel(vf::CollisionKernel::Compressible::CumulantK17);
para->setMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
//////////////////////////////////////////////////////////////////////////
// set boundary conditions
......
......@@ -133,13 +133,6 @@ void multipleLevel(const std::string& configPath)
{
vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
auto gridFactory = GridFactory::make();
//gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::RAYCASTING);
gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::POINT_IN_OBJECT);
//gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::POINT_UNDER_TRIANGLE);
auto gridBuilder = MultipleGridBuilder::makeShared(gridFactory);
vf::basics::ConfigurationFile config;
config.load(configPath);
SPtr<Parameter> para = std::make_shared<Parameter>(communicator.getNumberOfProcess(), communicator.getPID(), &config);
......@@ -162,6 +155,7 @@ void multipleLevel(const std::string& configPath)
VF_LOG_INFO("viscosity = {}", viscosity);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
auto gridBuilder = std::make_shared<MultipleGridBuilder>();
real dx = 2.0 * PI / real(nx);
......
......@@ -131,10 +131,6 @@ void multipleLevel(const std::string& configPath)
{
vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
auto gridFactory = GridFactory::make();
gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::POINT_IN_OBJECT);
auto gridBuilder = MultipleGridBuilder::makeShared(gridFactory);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
......@@ -191,6 +187,7 @@ void multipleLevel(const std::string& configPath)
// bool reset_diff = false;
bool reset_flow = false;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
auto gridBuilder = std::make_shared<MultipleGridBuilder>();
gridBuilder->addCoarseGrid(x_min, y_min, z_min,
x_max, y_max, z_max, dx);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment