From 7c3be19feaa0154d3457ba04cdebf77a593d55aa Mon Sep 17 00:00:00 2001
From: Martin Schoenherr <m.schoenherr@tu-braunschweig.de>
Date: Tue, 1 Aug 2023 17:49:42 +0200
Subject: [PATCH] fix some compiling issues
---
apps/gpu/TGV_3D_GridRef/TGV_3D_GridRef.cpp | 7 ++++---
apps/gpu/WTG_RUB/WTG_RUB.cpp | 2 +-
.../FluidFlow/B15/B15CompressibleNavierStokesBGKplus.cu | 2 +-
.../K17/K17CompressibleNavierStokesChimeraLegacy.cu | 2 +-
...pressibleNavierStokesSecondDerivatesFrom5thCumulants.cu | 2 +-
.../K15IncompressibleNavierStokesRotatingVelocityField.cu | 2 +-
6 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/apps/gpu/TGV_3D_GridRef/TGV_3D_GridRef.cpp b/apps/gpu/TGV_3D_GridRef/TGV_3D_GridRef.cpp
index d31a31140..83247df03 100644
--- a/apps/gpu/TGV_3D_GridRef/TGV_3D_GridRef.cpp
+++ b/apps/gpu/TGV_3D_GridRef/TGV_3D_GridRef.cpp
@@ -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();
diff --git a/apps/gpu/WTG_RUB/WTG_RUB.cpp b/apps/gpu/WTG_RUB/WTG_RUB.cpp
index 9535488f7..f9c50de1a 100644
--- a/apps/gpu/WTG_RUB/WTG_RUB.cpp
+++ b/apps/gpu/WTG_RUB/WTG_RUB.cpp
@@ -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();
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/B15/B15CompressibleNavierStokesBGKplus.cu b/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/B15/B15CompressibleNavierStokesBGKplus.cu
index 46d3c6edc..955dc0736 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/B15/B15CompressibleNavierStokesBGKplus.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/B15/B15CompressibleNavierStokesBGKplus.cu
@@ -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)
{
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/K17/K17CompressibleNavierStokesChimeraLegacy.cu b/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/K17/K17CompressibleNavierStokesChimeraLegacy.cu
index 5ef177d77..0f637558b 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/K17/K17CompressibleNavierStokesChimeraLegacy.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/K17/K17CompressibleNavierStokesChimeraLegacy.cu
@@ -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)
{
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/K17/K17CompressibleNavierStokesSecondDerivatesFrom5thCumulants.cu b/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/K17/K17CompressibleNavierStokesSecondDerivatesFrom5thCumulants.cu
index 1957ae332..1b3c97848 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/K17/K17CompressibleNavierStokesSecondDerivatesFrom5thCumulants.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/K17/K17CompressibleNavierStokesSecondDerivatesFrom5thCumulants.cu
@@ -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)
{
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Incompressible/FluidFlow/K15/K15IncompressibleNavierStokesRotatingVelocityField.cu b/src/gpu/VirtualFluids_GPU/Kernel/Incompressible/FluidFlow/K15/K15IncompressibleNavierStokesRotatingVelocityField.cu
index e405246db..5e5f99045 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Incompressible/FluidFlow/K15/K15IncompressibleNavierStokesRotatingVelocityField.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Incompressible/FluidFlow/K15/K15IncompressibleNavierStokesRotatingVelocityField.cu
@@ -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)
{
--
GitLab