From f03b9d22ac13008870862892ba2fbcc89be66edc Mon Sep 17 00:00:00 2001
From: Kutscher <kutscher@irmb.tu-bs.de>
Date: Thu, 24 Aug 2023 10:57:17 +0200
Subject: [PATCH] fix conflicts after merge upstream
---
.../ConcreteExtrusion/ConcreteExtrusion.cpp | 2 +-
apps/cpu/JetBreakup/JetBreakup.cpp | 36 +++++++++++++++----
apps/cpu/Nozzle/nozzleSinglePhase.cpp | 2 +-
.../cpu/NozzleMultiphase/nozzleMultiPhase.cpp | 2 +-
apps/cpu/ShotcreteJet/jet.cpp | 2 +-
.../LiggghtsCouplingSimulationObserver.cpp | 2 +-
.../ShearStressSimulationObserver.cpp | 2 +-
7 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/apps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp b/apps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp
index cbbc9d8f9..1407d8c4d 100644
--- a/apps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp
+++ b/apps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp
@@ -53,7 +53,7 @@ void run(string configname)
real factorLz = config.getValue<real>("factorLz");
- SPtr<vf::mpi::Communicator> comm = vf::mpi::MPICommunicator::getInstance();
+ SPtr<vf::parallel::Communicator> comm = vf::parallel::MPICommunicator::getInstance();
int myid = comm->getProcessID();
if (myid == 0) UBLOG(logINFO, "Jet Breakup: Start!");
diff --git a/apps/cpu/JetBreakup/JetBreakup.cpp b/apps/cpu/JetBreakup/JetBreakup.cpp
index fecc1def8..f4a3bdc26 100644
--- a/apps/cpu/JetBreakup/JetBreakup.cpp
+++ b/apps/cpu/JetBreakup/JetBreakup.cpp
@@ -52,10 +52,10 @@ void run(string configname)
real factorLy = config.getValue<real>("factorLy");
real factorLz = config.getValue<real>("factorLz");
- real dx = config.getValue<real>("dx");
+ //real dx = config.getValue<real>("dx");
- SPtr<vf::mpi::Communicator> comm = vf::mpi::MPICommunicator::getInstance();
+ SPtr<vf::parallel::Communicator> comm = vf::parallel::MPICommunicator::getInstance();
int myid = comm->getProcessID();
if (myid == 0) UBLOG(logINFO, "Jet Breakup: Start!");
@@ -141,7 +141,8 @@ void run(string configname)
real Re = rho_h * Uo * D / mu_h;
real We = rho_h * Uo * Uo * D / sigma;
- //real dx = Dg / D_LB;
+ real dx = Dg / D_LB;
+ //real D_LB = Dg / dx;
real nu_h = U_LB * D_LB / Re;
real nu_l = nu_h;
nu_h *= 0.1;
@@ -199,14 +200,31 @@ void run(string configname)
real g_minX2 = -0.5 * Ly;
real g_minX3 = -0.5 * Lz;
- // double g_maxX1 = 8.0*D;
- // double g_maxX2 = 2.5*D;
- // double g_maxX3 = 2.5*D;
-
real g_maxX1 = Lx;
real g_maxX2 = 0.5 * Ly;
real g_maxX3 = 0.5 * Lz;
+ //real g_minX1 = -0.5 * Lx;
+ //real g_minX2 = 0;
+ //real g_minX3 = -0.5 * Lz;
+
+ //real g_maxX1 = 0.5 * Lx;
+ //real g_maxX2 = Ly;
+ //real g_maxX3 = 0.5 * Lz;
+
+ //real g_minX1 = -0.5 * Lx;
+ //real g_minX2 = -0.5 * Ly;
+ //real g_minX3 = 0;
+
+ //real g_maxX1 = 0.5 * Lx;
+ //real g_maxX2 = 0.5 * Ly;
+ //real g_maxX3 = Lz;
+
+
+ // double g_maxX1 = 8.0*D;
+ // double g_maxX2 = 2.5*D;
+ // double g_maxX3 = 2.5*D;
+
SPtr<LBMUnitConverter> conv(new LBMUnitConverter());
// const int baseLevel = 0;
@@ -362,6 +380,10 @@ void run(string configname)
GbCylinder3DPtr geoInflow(new GbCylinder3D(g_minX1 - 2.0*dx, 0.0, 0.0, g_minX1, 0.0, 0.0, Dg / 2.0));
+ //GbCylinder3DPtr geoInflow(new GbCylinder3D(0.0, g_minX2 - 2.0 * dx, 0.0, 0.0, g_minX2, 0.0, Dg / 2.0));
+
+ //GbCylinder3DPtr geoInflow(new GbCylinder3D(0.0, 0.0, g_minX3 - 2.0 * dx, 0.0, 0.0, g_minX3, Dg / 2.0));
+
//GbCylinder3DPtr geoSolid(new GbCylinder3D(g_minX1 - 2.0 * dx, g_maxX2 / 2.0, g_maxX3 / 2.0, g_minX1+2.0*dx, g_maxX2 / 2.0, g_maxX3 / 2.0, 1.5*D / 2.0));
diff --git a/apps/cpu/Nozzle/nozzleSinglePhase.cpp b/apps/cpu/Nozzle/nozzleSinglePhase.cpp
index f0ffbd1f4..fe70ce945 100644
--- a/apps/cpu/Nozzle/nozzleSinglePhase.cpp
+++ b/apps/cpu/Nozzle/nozzleSinglePhase.cpp
@@ -18,7 +18,7 @@ int main(int argc, char *argv[])
try {
- std::shared_ptr<vf::mpi::Communicator> comm = vf::mpi::MPICommunicator::getInstance();
+ std::shared_ptr<vf::parallel::Communicator> comm = vf::parallel::MPICommunicator::getInstance();
int myid = comm->getProcessID();
// bounding box
diff --git a/apps/cpu/NozzleMultiphase/nozzleMultiPhase.cpp b/apps/cpu/NozzleMultiphase/nozzleMultiPhase.cpp
index 24e52c2fc..ced2724ee 100644
--- a/apps/cpu/NozzleMultiphase/nozzleMultiPhase.cpp
+++ b/apps/cpu/NozzleMultiphase/nozzleMultiPhase.cpp
@@ -18,7 +18,7 @@ int main(int argc, char *argv[])
try {
- std::shared_ptr<vf::mpi::Communicator> comm = vf::mpi::MPICommunicator::getInstance();
+ std::shared_ptr<vf::parallel::Communicator> comm = vf::parallel::MPICommunicator::getInstance();
int myid = comm->getProcessID();
// bounding box
diff --git a/apps/cpu/ShotcreteJet/jet.cpp b/apps/cpu/ShotcreteJet/jet.cpp
index f06fdefcd..18a018f81 100644
--- a/apps/cpu/ShotcreteJet/jet.cpp
+++ b/apps/cpu/ShotcreteJet/jet.cpp
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
double restartStep = config.getValue<int>("restartStep");
int endTime = config.getValue<int>("endTime");
- std::shared_ptr<vf::mpi::Communicator> comm = vf::mpi::MPICommunicator::getInstance();
+ std::shared_ptr<vf::parallel::Communicator> comm = vf::parallel::MPICommunicator::getInstance();
int myid = comm->getProcessID();
if (myid == 0) UBLOG(logINFO, "Jet Breakup: Start!");
diff --git a/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp b/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp
index 20fb31cbf..8d4c069c7 100644
--- a/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp
+++ b/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp
@@ -1,6 +1,6 @@
#include "LiggghtsCouplingSimulationObserver.h"
#include "GbSphere3D.h"
-#include "mpi/MPICommunicator.h"
+#include "parallel/MPICommunicator.h"
#include "SimulationObserver.h"
#include "LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.h"
#include "Grid3D.h"
diff --git a/src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.cpp
index 4e2e0111b..8a2b90698 100644
--- a/src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.cpp
@@ -30,7 +30,7 @@ ShearStressSimulationObserver::ShearStressSimulationObserver(SPtr<Grid3D> grid,
for (SPtr<Block3D> block : blockVector[level]) {
UbTupleInt3 nx = grid->getBlockNX();
SPtr<ShearStressValuesArray3D> shearStressValues = SPtr<ShearStressValuesArray3D>(
- new ShearStressValuesArray3D(14, val<1>(nx) + 1, val<2>(nx) + 1, val<3>(nx) + 1, c0o1));
+ new ShearStressValuesArray3D(14, val<1>(nx) + 1, val<2>(nx) + 1, val<3>(nx) + 1, vf::basics::constant::c0o1));
block->getKernel()->getDataSet()->setShearStressValues(shearStressValues);
}
}
--
GitLab