From c9425d7971f353738c76c8991a969fa5988ac5be Mon Sep 17 00:00:00 2001
From: niikonst <niikonst@blogin3.usr.hlrn.de>
Date: Wed, 13 Oct 2021 17:13:43 +0200
Subject: [PATCH] resolve merge conflicts
---
apps/cpu/Applications.cmake | 1 -
apps/cpu/LaminarTubeFlow/ltf.cpp | 2 +-
.../CalculateTorqueCoProcessor.cpp | 19 -------------------
.../D3Q27TriFaceMeshInteractor.cpp | 4 ----
4 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/apps/cpu/Applications.cmake b/apps/cpu/Applications.cmake
index 88ada0577..e8902e5ff 100644
--- a/apps/cpu/Applications.cmake
+++ b/apps/cpu/Applications.cmake
@@ -5,7 +5,6 @@ add_subdirectory(${APPS_ROOT_CPU}/rheometer)
add_subdirectory(${APPS_ROOT_CPU}/CouetteFlow)
add_subdirectory(${APPS_ROOT_CPU}/Multiphase)
add_subdirectory(${APPS_ROOT_CPU}/ViskomatXL)
-add_subdirectory(${APPS_ROOT_CPU}/ViskomatXL_2)
add_subdirectory(${APPS_ROOT_CPU}/sphere)
add_subdirectory(${APPS_ROOT_CPU}/FlowAroundCylinder)
add_subdirectory(${APPS_ROOT_CPU}/LaminarTubeFlow)
diff --git a/apps/cpu/LaminarTubeFlow/ltf.cpp b/apps/cpu/LaminarTubeFlow/ltf.cpp
index 82f6c0063..c8c8e6cfd 100644
--- a/apps/cpu/LaminarTubeFlow/ltf.cpp
+++ b/apps/cpu/LaminarTubeFlow/ltf.cpp
@@ -73,7 +73,7 @@ void run(string configname)
denBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonReflectingOutflowBCAlgorithm()));
//denBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonEqDensityBCAlgorithm()));
- double startTime = 5;
+ //double startTime = 5;
mu::Parser fct1;
fct1.SetExpr("U");
fct1.DefineConst("U", uLB);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp
index d9379cb64..1daa28cba 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp
@@ -224,7 +224,6 @@ UbTupleDouble3 CalculateTorqueCoProcessor::getForces(int x1, int x2, int x3, SP
f = dynamicPointerCast<EsoTwist3D>(distributions)->getDistributionInvForDirection(x1, x2, x3, invDir);
fnbr = dynamicPointerCast<EsoTwist3D>(distributions)->getDistributionInvForDirection(x1+D3Q27System::DX1[invDir], x2+D3Q27System::DX2[invDir], x3+D3Q27System::DX3[invDir], fdir);
-<<<<<<< HEAD
// Vector3D boundaryVelocity;
// boundaryVelocity[0] = bc->getBoundaryVelocityX1();
// boundaryVelocity[1] = bc->getBoundaryVelocityX2();
@@ -241,24 +240,6 @@ UbTupleDouble3 CalculateTorqueCoProcessor::getForces(int x1, int x2, int x3, SP
forceX1 += (f + fnbr) * D3Q27System::DX1[invDir];// - 2.0 * D3Q27System::WEIGTH[invDir] * rho - correction[0];
forceX2 += (f + fnbr) * D3Q27System::DX2[invDir];// - 2.0 * D3Q27System::WEIGTH[invDir] * rho - correction[1];
forceX3 += (f + fnbr) * D3Q27System::DX3[invDir];// - 2.0 * D3Q27System::WEIGTH[invDir] * rho - correction[2];
-=======
- Vector3D boundaryVelocity;
- boundaryVelocity[0] = bc->getBoundaryVelocityX1();
- boundaryVelocity[1] = bc->getBoundaryVelocityX2();
- boundaryVelocity[2] = bc->getBoundaryVelocityX3();
- double correction[3] = { 0.0, 0.0, 0.0 };
- if (bc->hasVelocityBoundaryFlag(fdir))
- {
- const double forceTerm = f - fnbr;
- correction[0] = forceTerm * boundaryVelocity[0];
- correction[1] = forceTerm * boundaryVelocity[1];
- correction[2] = forceTerm * boundaryVelocity[2];
- }
-
- forceX1 += (f + fnbr) * D3Q27System::DX1[invDir];// -2.0 * D3Q27System::WEIGTH[invDir] * rho - correction[0];
- forceX2 += (f + fnbr) * D3Q27System::DX2[invDir];// -2.0 * D3Q27System::WEIGTH[invDir] * rho - correction[1];
- forceX3 += (f + fnbr) * D3Q27System::DX3[invDir];// -2.0 * D3Q27System::WEIGTH[invDir] * rho - correction[2];
->>>>>>> 27138b35e2fb7db7637caf13179316787ebf7cc7
}
}
}
diff --git a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
index b7ca47e56..452042791 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
+++ b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
@@ -523,11 +523,7 @@ void D3Q27TriFaceMeshInteractor::setQs(const double &timeStep)
;
bcMatrix->setBC(ix1, ix2, ix3, bc);
} else if (UbMath::less(bc->getQ(fdir), q) &&
-<<<<<<< HEAD
UbMath::equal(-999.0, q)) // schon ein kuerzeres q voehanden?
-=======
- UbMath::equal(-999.0, q)) // schon ein kuerzeres q voehanden?
->>>>>>> 27138b35e2fb7db7637caf13179316787ebf7cc7
{
// neu:: 18.05.2010
// um falsche qs die evtl durch die "wand" gehen zu vermeiden
--
GitLab