From e24f8bb3837ba12a88ce0792b8287fccf2273a15 Mon Sep 17 00:00:00 2001
From: kutscher <kutscher@irmb.tu-bs.de>
Date: Wed, 14 Apr 2021 13:21:24 +0200
Subject: [PATCH] fix jet setup
---
apps/cpu/Applications.cmake | 22 ++++++++++---------
apps/cpu/LaminarTubeFlow/ltf.cfg | 6 +++---
apps/cpu/Multiphase/Multiphase.cfg | 14 ++++++------
apps/cpu/Multiphase/Multiphase.cpp | 2 +-
apps/cpu/PoiseuilleFlow/CMakeLists.txt | 25 +++-------------------
src/basics/basics/container/CbVectorPool.h | 2 +-
6 files changed, 27 insertions(+), 44 deletions(-)
diff --git a/apps/cpu/Applications.cmake b/apps/cpu/Applications.cmake
index d8dff8b8c..70071d003 100644
--- a/apps/cpu/Applications.cmake
+++ b/apps/cpu/Applications.cmake
@@ -1,8 +1,18 @@
+add_subdirectory(${APPS_ROOT_CPU}/PoiseuilleFlow)
+add_subdirectory(${APPS_ROOT_CPU}/HerschelBulkleySphere)
+add_subdirectory(${APPS_ROOT_CPU}/HerschelBulkleyModel)
+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}/sphere)
+add_subdirectory(${APPS_ROOT_CPU}/FlowAroundCylinder)
+add_subdirectory(${APPS_ROOT_CPU}/LaminarTubeFlow)
+
#add_subdirectory(tests)
#add_subdirectory(Applications/gridRf)
#add_subdirectory(Applications/greenvortex)
# add_subdirectory(Applications/micropart)
-add_subdirectory(${APPS_ROOT_CPU}/sphere)
#add_subdirectory(Applications/vfscript)
#add_subdirectory(Applications/reefer)
#add_subdirectory(Applications/bananas)
@@ -11,8 +21,6 @@ add_subdirectory(${APPS_ROOT_CPU}/sphere)
#add_subdirectory(Applications/bananas2)
# add_subdirectory(Applications/plate)
# add_subdirectory(Applications/plate2)
-add_subdirectory(${APPS_ROOT_CPU}/FlowAroundCylinder)
-add_subdirectory(${APPS_ROOT_CPU}/LaminarTubeFlow)
# add_subdirectory(Applications/LaminarTubeFlowConv)
#add_subdirectory(Applications/cylinderSt)
#add_subdirectory(Applications/mpichTest)
@@ -54,7 +62,6 @@ add_subdirectory(${APPS_ROOT_CPU}/LaminarTubeFlow)
#add_subdirectory(Applications/levels)
#add_subdirectory(Applications/AcousticPulse)
#add_subdirectory(Applications/screw)
-#add_subdirectory(Applications/PoiseuilleFlow)
#add_subdirectory(Applications/InterfaceTest)
#add_subdirectory(Applications/teperm)
#add_subdirectory(Applications/Thermoplast)
@@ -64,10 +71,5 @@ add_subdirectory(${APPS_ROOT_CPU}/LaminarTubeFlow)
#add_subdirectory(Applications/bChannelVA)
#add_subdirectory(Applications/OrganPipe)
#add_subdirectory(Applications/LidDrivenCavity)
-add_subdirectory(${APPS_ROOT_CPU}/HerschelBulkleySphere)
-add_subdirectory(${APPS_ROOT_CPU}/HerschelBulkleyModel)
-add_subdirectory(${APPS_ROOT_CPU}/rheometer)
-add_subdirectory(${APPS_ROOT_CPU}/CouetteFlow)
-add_subdirectory(${APPS_ROOT_CPU}/Multiphase)
-add_subdirectory(${APPS_ROOT_CPU}/ViskomatXL)
+
diff --git a/apps/cpu/LaminarTubeFlow/ltf.cfg b/apps/cpu/LaminarTubeFlow/ltf.cfg
index 94919cc34..8b8e33e49 100644
--- a/apps/cpu/LaminarTubeFlow/ltf.cfg
+++ b/apps/cpu/LaminarTubeFlow/ltf.cfg
@@ -1,5 +1,5 @@
pathname = d:/temp/LaminarTubeFlow
-numOfThreads = 4
+numOfThreads = 1
availMem = 10e9
#Grid
@@ -22,5 +22,5 @@ restartStep = 100000
cpStart = 100000
cpStep = 100000
-outTime = 1
-endTime = 100
\ No newline at end of file
+outTime = 1000
+endTime = 1000
\ No newline at end of file
diff --git a/apps/cpu/Multiphase/Multiphase.cfg b/apps/cpu/Multiphase/Multiphase.cfg
index d52694ac8..35085de92 100644
--- a/apps/cpu/Multiphase/Multiphase.cfg
+++ b/apps/cpu/Multiphase/Multiphase.cfg
@@ -1,11 +1,11 @@
-pathname = d:/temp/MultiphaseNew4
+pathname = d:/temp/MultiphaseNew5
#pathGeo = d:/Projects/VirtualFluids-Multiphase/source/Applications/Multiphase/backup
pathGeo = d:/Projects/VirtualFluidsCombined/apps/cpu/Multiphase/backup
#geoFile = JetBreakupR.ASCII.stl
#geoFile = inlet1.stl
geoFile = tubeTransformed.stl
-numOfThreads = 1
+numOfThreads = 4
availMem = 10e9
#Grid
@@ -22,19 +22,19 @@ availMem = 10e9
#boundingBox = -40e-3 40e-3 1.0e-3 11.0e-3 -403-3 40e-3 #(Jet Breakup2) (Original without inlet length)
blocknx = 20 20 20
-boundingBox = 6.0e-3 16.0e-3 -40e-3 40e-3 -40e-3 40e-3
+boundingBox = 6.0e-3 46.0e-3 -5e-3 5e-3 -5e-3 5e-3
blocknx = 20 20 20
-dx = 0.5e-3
+dx = 1.66666666667e-4
refineLevel = 0
#Simulation
-uLB = 0.0005 #inlet velocity
+uLB = 0.005 #inlet velocity
#uF2 = 0.0001
Re = 10
nuL =1e-2# 1.0e-5 #!1e-2
nuG =1e-2# 1.16e-4 #!1e-2
-densityRatio = 30
+densityRatio = 1000
sigma = 1e-5 #4.66e-3 #surface tension 1e-4 ./. 1e-5
interfaceThickness = 5
radius = 615.0 (Jet Breakup)
@@ -55,5 +55,5 @@ restartStep = 100000
cpStart = 100000
cpStep = 100000
-outTime = 100
+outTime = 1
endTime = 10000
\ No newline at end of file
diff --git a/apps/cpu/Multiphase/Multiphase.cpp b/apps/cpu/Multiphase/Multiphase.cpp
index 10ff2b396..af7b309ad 100644
--- a/apps/cpu/Multiphase/Multiphase.cpp
+++ b/apps/cpu/Multiphase/Multiphase.cpp
@@ -176,7 +176,7 @@ void run(string configname)
new GbCuboid3D(g_minX1*0.5 - dx, g_minX2 - dx, g_minX3*0.5 - dx, g_maxX1*0.5 + dx, g_minX2, g_maxX3*0.5 + dx));
if (myid == 0) GbSystem3D::writeGeoObject(geoInflowF1.get(), pathname + "/geo/geoInflowF1", WbWriterVtkXmlASCII::getInstance());
- GbCylinder3DPtr cylinder1(new GbCylinder3D(g_minX1-dx, 0.0, 0.0, cylinder->getX1Maximum(), 0.0, 0.0, 3e-3));
+ GbCylinder3DPtr cylinder1(new GbCylinder3D(g_minX1-dx, 0.0, 0.0, g_minX1+dx, 0.0, 0.0, 3e-3));
if (myid == 0)
GbSystem3D::writeGeoObject(cylinder1.get(), pathname + "/geo/cylinder1",
WbWriterVtkXmlASCII::getInstance());
diff --git a/apps/cpu/PoiseuilleFlow/CMakeLists.txt b/apps/cpu/PoiseuilleFlow/CMakeLists.txt
index 43ea7697a..af52c6585 100644
--- a/apps/cpu/PoiseuilleFlow/CMakeLists.txt
+++ b/apps/cpu/PoiseuilleFlow/CMakeLists.txt
@@ -1,25 +1,6 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
-########################################################
-## C++ PROJECT ###
-########################################################
PROJECT(pf)
-INCLUDE(${APPS_ROOT}/IncludsList.cmake)
-
-#################################################################
-### LOCAL FILES ###
-#################################################################
-FILE(GLOB SPECIFIC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h
- ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp )
-
-SET(ALL_SOURCES ${ALL_SOURCES} ${SPECIFIC_FILES})
-SOURCE_GROUP(src FILES ${SPECIFIC_FILES})
-
-SET(CAB_ADDITIONAL_LINK_LIBRARIES VirtualFluids)
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore muparser basics ${MPI_CXX_LIBRARIES} FILES pf.cpp )
-#################################################################
-### CREATE PROJECT ###
-#################################################################
-CREATE_CAB_PROJECT(pf BINARY)
+vf_get_library_name (library_name)
+target_include_directories(${library_name} PRIVATE ${APPS_ROOT_CPU})
\ No newline at end of file
diff --git a/src/basics/basics/container/CbVectorPool.h b/src/basics/basics/container/CbVectorPool.h
index e1a061d1a..0272056b5 100644
--- a/src/basics/basics/container/CbVectorPool.h
+++ b/src/basics/basics/container/CbVectorPool.h
@@ -118,7 +118,7 @@ public:
return this->allocData(allocator, vec, dataSize, value);
}
- UB_THROW(UbException(UB_EXARGS, "vector-key=" + UbSystem::toString(allocator.key) + " bereits vergeben!"));
+ UB_THROW(UbException(UB_EXARGS, "vector-key=" + UbSystem::toString(allocator.key) + " already taken! (e.g. SetConnectorBlockVisitor was called several times"));
}
/*==================================================================*/
bool resizeVectorData(CbVector<value_type> &vec, const size_type &dataSize, const value_type &value = value_type())
--
GitLab