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

fix some compiling issues

parent bd3c984f
No related branches found
No related tags found
1 merge request!256Kernel names changed
......@@ -67,7 +67,7 @@
//////////////////////////////////////////////////////////////////////////
#include "VirtualFluids_GPU/Communication/MpiCommunicator.h"
#include "parallel/MpiCommunicator.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridProvider.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h"
......@@ -131,11 +131,12 @@ std::string simulationName("TGV_3D_Gridref_noSqPress");
void multipleLevel(const std::string& configPath)
{
vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
//vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
vf::parallel::Communicator &communicator = *vf::parallel::MPICommunicator::getInstance();
vf::basics::ConfigurationFile config;
config.load(configPath);
SPtr<Parameter> para = std::make_shared<Parameter>(communicator.getNumberOfProcess(), communicator.getPID(), &config);
SPtr<Parameter> para = std::make_shared<Parameter>(communicator.getNumberOfProcesses(), communicator.getProcessID(), &config);
BoundaryConditionFactory bcFactory = BoundaryConditionFactory();
GridScalingFactory scalingFactory = GridScalingFactory();
......
......@@ -128,7 +128,7 @@ std::string chooseVariation();
void multipleLevel(const std::string& configPath)
{
vf::parallel::Communicator &communicator = *vf::parallel::MPICommunicator::getInstance();
auto gridBuilder = MultipleGridBuilder::makeShared();
//auto gridBuilder = MultipleGridBuilder::makeShared();
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
......
......@@ -2,7 +2,7 @@
#include "B15CompressibleNavierStokesBGKplus_Device.cuh"
#include "Parameter/Parameter.h"
#include "cuda/CudaGrid.h"
#include "cuda_helper/CudaGrid.h"
std::shared_ptr<B15CompressibleNavierStokesBGKplus> B15CompressibleNavierStokesBGKplus::getNewInstance(std::shared_ptr<Parameter> para, int level)
{
......
......@@ -2,7 +2,7 @@
#include "Parameter/Parameter.h"
#include "K17CompressibleNavierStokesChimeraLegacy_Device.cuh"
#include "cuda/CudaGrid.h"
#include "cuda_helper/CudaGrid.h"
std::shared_ptr<K17CompressibleNavierStokesChimeraLegacy> K17CompressibleNavierStokesChimeraLegacy::getNewInstance(std::shared_ptr<Parameter> para, int level)
{
......
......@@ -2,7 +2,7 @@
#include "K17CompressibleNavierStokesSecondDerivatesFrom5thCumulants_Device.cuh"
#include "Parameter/Parameter.h"
#include "cuda/CudaGrid.h"
#include "cuda_helper/CudaGrid.h"
std::shared_ptr<K17CompressibleNavierStokesSecondDerivatesFrom5thCumulants> K17CompressibleNavierStokesSecondDerivatesFrom5thCumulants::getNewInstance(std::shared_ptr<Parameter> para, int level)
{
......
......@@ -2,7 +2,7 @@
#include "K15IncompressibleNavierStokesRotatingVelocityField_Device.cuh"
#include "Parameter/Parameter.h"
#include "cuda/CudaGrid.h"
#include "cuda_helper/CudaGrid.h"
std::shared_ptr<K15IncompressibleNavierStokesRotatingVelocityField> K15IncompressibleNavierStokesRotatingVelocityField::getNewInstance(std::shared_ptr<Parameter> para, int level)
{
......
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