From 4353c0f308b6035856cd0a1cbd36e57ae67be688 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Tue, 1 Sep 2020 17:59:00 +0200
Subject: [PATCH] Fix cell type to unsigned int. Adapt basics CMakeLists
according to develop.
---
src/basics/CMakeLists.txt | 49 +++----------------
.../WriteBoundaryConditionsCoProcessor.cpp | 2 +-
.../WriteBoundaryConditionsCoProcessor.h | 2 +-
.../WriteMacroscopicQuantitiesCoProcessor.cpp | 2 +-
.../WriteMacroscopicQuantitiesCoProcessor.h | 2 +-
5 files changed, 10 insertions(+), 47 deletions(-)
diff --git a/src/basics/CMakeLists.txt b/src/basics/CMakeLists.txt
index e10456fbe..3fa9ceb7d 100644
--- a/src/basics/CMakeLists.txt
+++ b/src/basics/CMakeLists.txt
@@ -1,52 +1,15 @@
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/geometry3d)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/geometry3d/KdTree)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/basics/container)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/basics/memory)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/basics/objects)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/basics/transmiitter)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/utilities)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/basics/writer)
-
-
-include (${CMAKE_SOURCE_DIR}/CMake/VirtualFluidsMacros.cmake)
-#SET(CAB_ADDITIONAL_LINK_LIBRARIES ${MPI_CXX_LIBRARIES})
-
include(Core/buildInfo.cmake)
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/VirtualFluidsCore)
-INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
-
-
-
-vf_add_library(BUILDTYPE static
- FOLDER
- ${CMAKE_CURRENT_LIST_DIR}/geometry3d
- ${CMAKE_CURRENT_LIST_DIR}/geometry3d/KdTree
- ${CMAKE_CURRENT_LIST_DIR}/basics/container
- ${CMAKE_CURRENT_LIST_DIR}/basics/memory
- ${CMAKE_CURRENT_LIST_DIR}/basics/objects
- ${CMAKE_CURRENT_LIST_DIR}/basics/transmiitter
- ${CMAKE_CURRENT_LIST_DIR}/basics/utilities
- ${CMAKE_CURRENT_LIST_DIR}/basics/writer
- ${CMAKE_CURRENT_LIST_DIR}/Core
- ${CMAKE_CURRENT_LIST_DIR}/Core/Logger
- ${CMAKE_CURRENT_LIST_DIR}/Core/Logger/implementations
- ${CMAKE_CURRENT_LIST_DIR}/Core/Input
- ${CMAKE_CURRENT_LIST_DIR}/Core/Input/ConfigData
- ${CMAKE_CURRENT_LIST_DIR}/Core/Input/ConfigFileReader
- ${CMAKE_CURRENT_LIST_DIR}/Core/Input/ConfigInput
- ${CMAKE_CURRENT_LIST_DIR}/Core/Input/JsonInput
- ${CMAKE_CURRENT_LIST_DIR}/Core/StringUtilities
- ${CMAKE_CURRENT_LIST_DIR}/Core/Timer
-
- EXCLUDE buildInfo.in.cpp
- )
+vf_add_library(BUILDTYPE static EXCLUDE buildInfo.in.cpp)
vf_get_library_name (library_name)
target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/Core)
-target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/geometry3d)
+target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/basics/container)
+target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/basics/objects)
+target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/utilities)
+target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/basics/writer)
IF(MSVC)
target_compile_definitions(${library_name} PUBLIC NOMINMAX) # Disable Min/Max-Macros
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
index 4738e1c01..dc9549c20 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
@@ -166,7 +166,7 @@ void WriteBoundaryConditionsCoProcessor::addDataGeo(SPtr<Block3D> block)
SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
//knotennummerierung faengt immer bei 0 an!
- int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
+ unsigned int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
int minX1 = 0;
int minX2 = 0;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
index e35868af0..5786f0389 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
@@ -74,7 +74,7 @@ protected:
private:
std::vector<UbTupleFloat3> nodes;
- std::vector<UbTupleInt8> cells;
+ std::vector<UbTupleUInt8> cells;
std::vector<std::string> datanames;
std::vector<std::vector<double> > data;
std::string path;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
index 59782e680..6789ff59e 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
@@ -168,7 +168,7 @@ void WriteMacroscopicQuantitiesCoProcessor::addDataMQ(SPtr<Block3D> block)
LBMReal vx1,vx2,vx3,drho,press;
//node numbering always starts at 0!
- int SWB,SEB,NEB,NWB,SWT,SET,NET,NWT;
+ unsigned int SWB,SEB,NEB,NWB,SWT,SET,NET,NWT;
if(block->getKernel()->getCompressible())
{
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
index 0b113ffe4..67a1c61f3 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
@@ -82,7 +82,7 @@ protected:
private:
void init();
std::vector<UbTupleFloat3> nodes;
- std::vector<UbTupleInt8> cells;
+ std::vector<UbTupleUInt8> cells;
std::vector<std::string> datanames;
std::vector<std::vector<double> > data;
std::string path;
--
GitLab