Skip to content
Snippets Groups Projects
Commit 4353c0f3 authored by Soeren Peters's avatar Soeren Peters
Browse files

Fix cell type to unsigned int. Adapt basics CMakeLists according to develop.

parent 6c0f1ba2
No related branches found
No related tags found
No related merge requests found
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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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())
{
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment