Skip to content
Snippets Groups Projects
Commit 54b86584 authored by peters's avatar peters
Browse files

use new configuration in DrivenCavity.

parent aa598f86
No related branches found
No related tags found
1 merge request!56Clean up Configuration File mess. Closes #18
......@@ -22,6 +22,8 @@
#include "Core/VectorTypes.h"
#include "Core/Logger/Logger.h"
#include <basics/config/ConfigurationFile.h>
//////////////////////////////////////////////////////////////////////////
#include "GridGenerator/grid/GridBuilder/LevelGridBuilder.h"
......@@ -119,12 +121,6 @@ void multipleLevel(const std::string& configPath)
gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::POINT_IN_OBJECT);
auto gridBuilder = MultipleGridBuilder::makeShared(gridFactory);
vf::gpu::Communicator* comm = vf::gpu::Communicator::getInstanz();
SPtr<ConfigFileReader> configReader = ConfigFileReader::getNewInstance();
std::cout << configPath << std::endl;
SPtr<ConfigData> configData = configReader->readConfigFile(configPath.c_str());
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
......@@ -152,8 +148,12 @@ void multipleLevel(const std::string& configPath)
{
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
vf::gpu::Communicator* comm = vf::gpu::Communicator::getInstanz();
vf::basics::ConfigurationFile config;
config.load(configPath);
SPtr<Parameter> para = Parameter::make(configData, comm);
SPtr<Parameter> para = std::make_shared<Parameter>(config, comm->getNummberOfProcess(), comm->getPID());
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
......
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