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

Clean VirtualFluidsCore from CAB naming.

parent 9a7e8ac1
No related branches found
No related tags found
1 merge request!23Rebase some CPU files on open_source.
set(VF_LIBRARIES)
IF(${USE_METIS} AND METIS_RELEASE_LIBRARY AND METIS_DEBUG_LIBRARY) IF(${USE_METIS} AND METIS_RELEASE_LIBRARY AND METIS_DEBUG_LIBRARY)
SET(LINK_LIBRARY optimized ${METIS_RELEASE_LIBRARY} debug ${METIS_DEBUG_LIBRARY}) list(APPEND VF_LIBRARIES optimized ${METIS_RELEASE_LIBRARY} debug ${METIS_DEBUG_LIBRARY})
SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
ELSE() ELSE()
SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} metis) list(APPEND VF_LIBRARIES metis)
ENDIF() ENDIF()
IF(${USE_VTK}) IF(${USE_VTK})
SET(LINK_LIBRARY optimized ${VTK_LIBRARIES} debug ${VTK_LIBRARIES}) list(APPEND VF_LIBRARIES optimized ${VTK_LIBRARIES} debug ${VTK_LIBRARIES})
SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
ENDIF() ENDIF()
IF(${USE_CATALYST}) IF(${USE_CATALYST})
SET(LINK_LIBRARY optimized vtkPVPythonCatalyst debug vtkPVPythonCatalyst ) list(APPEND VF_LIBRARIES optimized vtkPVPythonCatalyst debug vtkPVPythonCatalyst)
SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY}) list(APPEND VF_LIBRARIES optimized vtkParallelMPI debug vtkParallelMPI )
SET(LINK_LIBRARY optimized vtkParallelMPI debug vtkParallelMPI )
SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
ENDIF() ENDIF()
...@@ -24,18 +22,10 @@ IF(${USE_DEM_COUPLING}) ...@@ -24,18 +22,10 @@ IF(${USE_DEM_COUPLING})
ENDIF() ENDIF()
if(BUILD_USE_OPENMP) if(BUILD_USE_OPENMP)
list(APPEND CAB_ADDITIONAL_LINK_LIBRARIES OpenMP::OpenMP_CXX) list(APPEND VF_LIBRARIES OpenMP::OpenMP_CXX)
endif()
vf_add_library(BUILDTYPE static PUBLIC_LINK basics muparser MPI::MPI_CXX ${CAB_ADDITIONAL_LINK_LIBRARIES})
vf_get_library_name(library_name)
if(BUILD_USE_OPENMP)
list(APPEND CAB_ADDITIONAL_LINK_LIBRARIES OpenMP::OpenMP_CXX)
endif() endif()
vf_add_library(BUILDTYPE static PUBLIC_LINK basics muparser MPI::MPI_CXX ${CAB_ADDITIONAL_LINK_LIBRARIES}) vf_add_library(BUILDTYPE static PUBLIC_LINK basics muparser MPI::MPI_CXX ${VF_LIBRARIES})
vf_get_library_name(library_name) vf_get_library_name(library_name)
......
...@@ -63,7 +63,6 @@ void BasicCalculator::calculate() ...@@ -63,7 +63,6 @@ void BasicCalculator::calculate()
int maxInitLevel = maxLevel - minLevel; int maxInitLevel = maxLevel - minLevel;
int straightStartLevel = minInitLevel; int straightStartLevel = minInitLevel;
int internalIterations = 1 << (maxInitLevel - minInitLevel); int internalIterations = 1 << (maxInitLevel - minInitLevel);
int forwardStartLevel;
int threshold; int threshold;
#ifdef TIMING #ifdef TIMING
......
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