diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2200a98404c11adc692a53461ba40ef12f7e81f..468a1bd7af1726b60238f1e2e856a8a055a97098 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,11 +59,11 @@ include( CTest )
option ( WALBERLA_DOUBLE_ACCURACY "Floating point accuracy, defaults to double" ON )
option ( WALBERLA_ENABLE_GUI "Compile with GUI" )
-option ( WALBERLA_BUILD_TESTS "Build Testcases" )
+option ( WALBERLA_BUILD_TESTS "Build Testcases" ON )
option ( WALBERLA_BUILD_BENCHMARKS "Build Benchmarks" ON )
-option ( WALBERLA_BUILD_TOOLS "Build Tools" )
+option ( WALBERLA_BUILD_TOOLS "Build Tools" ON )
option ( WALBERLA_BUILD_TUTORIALS "Build Tutorials" ON )
-option ( WALBERLA_BUILD_SHOWCASES "Build Showcases" OFF )
+option ( WALBERLA_BUILD_SHOWCASES "Build Showcases" ON )
option ( WALBERLA_BUILD_DOC "Build Documentation" ON )
option ( WALBERLA_BUILD_WITH_MPI "Build with MPI" ON )
@@ -1336,8 +1336,6 @@ install( FILES ${walberla_BINARY_DIR}/src/waLBerlaDefinitions.h DESTINATION walb
# test
if ( WALBERLA_BUILD_TESTS )
add_subdirectory ( tests )
-else()
- add_subdirectory( tests EXCLUDE_FROM_ALL )
endif()
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 965675d4d2f97ab025a2938701450fa092409773..0dcd3a519112717ceab8bdb1da777483fb50e95b 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -2,31 +2,23 @@
# Benchmarks
if ( WALBERLA_BUILD_BENCHMARKS )
add_subdirectory ( benchmarks )
-else ()
- add_subdirectory ( benchmarks EXCLUDE_FROM_ALL )
endif()
# Tools
if ( WALBERLA_BUILD_TOOLS )
add_subdirectory ( tools )
-else ()
- add_subdirectory ( tools EXCLUDE_FROM_ALL )
endif()
# Tutorials
if ( WALBERLA_BUILD_TUTORIALS )
add_subdirectory ( tutorials )
-else ()
- add_subdirectory ( tutorials EXCLUDE_FROM_ALL )
endif()
# Showcases
if ( WALBERLA_BUILD_SHOWCASES )
add_subdirectory ( showcases )
-else ()
- add_subdirectory ( showcases EXCLUDE_FROM_ALL )
endif()
# Python module
diff --git a/apps/showcases/FreeSurface/DamBreakCylindrical.cpp b/apps/showcases/FreeSurface/DamBreakCylindrical.cpp
index f48e23232d26c404a9ffb70350d307ee591e1b19..bebe5945166220057f2e623e9244907008893d4e 100644
--- a/apps/showcases/FreeSurface/DamBreakCylindrical.cpp
+++ b/apps/showcases/FreeSurface/DamBreakCylindrical.cpp
@@ -512,7 +512,7 @@ int main(int argc, char** argv)
timeloop.addFuncAfterTimeStep(loadBalancer, "Sweep: load balancing");
// add sweep for evaluating the column height at the origin
- const std::shared_ptr< cell_idx_t > currentColumnHeight = std::make_shared< cell_idx_t >(columnHeight);
+ const std::shared_ptr< cell_idx_t > currentColumnHeight = std::make_shared< cell_idx_t >(cell_idx_c(columnHeight));
const ColumnHeightEvaluator< FreeSurfaceBoundaryHandling_T > heightEvaluator(
blockForest, freeSurfaceBoundaryHandling, domainSize,
Vector3< real_t >(real_c(0.5) * real_c(domainSize[0]), real_c(0), real_c(0.5) * real_c(domainSize[2])),
diff --git a/apps/showcases/FreeSurface/DamBreakRectangular.cpp b/apps/showcases/FreeSurface/DamBreakRectangular.cpp
index e7abd62e6b9d605db803f8f680173c599cce61d8..4d9eeb436cad354317279402e629b4624012a130 100644
--- a/apps/showcases/FreeSurface/DamBreakRectangular.cpp
+++ b/apps/showcases/FreeSurface/DamBreakRectangular.cpp
@@ -501,13 +501,13 @@ int main(int argc, char** argv)
timeloop.addFuncAfterTimeStep(loadBalancer, "Sweep: load balancing");
// add sweep for evaluating the column height at the origin
- const std::shared_ptr< cell_idx_t > currentColumnHeight = std::make_shared< cell_idx_t >(columnHeight);
+ const std::shared_ptr< cell_idx_t > currentColumnHeight = std::make_shared< cell_idx_t >(cell_idx_c(columnHeight));
const ColumnHeightEvaluator< FreeSurfaceBoundaryHandling_T > heightEvaluator(
blockForest, freeSurfaceBoundaryHandling, domainSize, evaluationFrequency, currentColumnHeight);
timeloop.addFuncAfterTimeStep(heightEvaluator, "Evaluator: column height");
// add sweep for evaluating the column width (distance of front to origin)
- const std::shared_ptr< cell_idx_t > currentColumnWidth = std::make_shared< cell_idx_t >(columnWidth);
+ const std::shared_ptr< cell_idx_t > currentColumnWidth = std::make_shared< cell_idx_t >(cell_idx_c(columnWidth));
const ColumnWidthEvaluator< FreeSurfaceBoundaryHandling_T > widthEvaluator(
blockForest, freeSurfaceBoundaryHandling, domainSize, evaluationFrequency, currentColumnWidth);
timeloop.addFuncAfterTimeStep(widthEvaluator, "Evaluator: column width");
diff --git a/apps/showcases/PorousMedia/PorousMedia.cpp b/apps/showcases/PorousMedia/PorousMedia.cpp
index 823f2914ab4b01ea70d2cb7eb4c3607acc2ecbf2..bdd186f6e87da0f3377ef58a7e04b864af20b11e 100644
--- a/apps/showcases/PorousMedia/PorousMedia.cpp
+++ b/apps/showcases/PorousMedia/PorousMedia.cpp
@@ -275,8 +275,9 @@ class AvgDiffEvaluator
for (auto blockIterator = blocks_->begin(); blockIterator != blocks_->end(); ++blockIterator)
{
- BoundaryHandling_T* boundaryHandling = blockIterator->getData< BoundaryHandling_T >(boundaryHandlingID_);
- AvgField_T* velDensAvgField = blockIterator->getData< AvgField_T >(avgFieldID_);
+ BoundaryHandling_T* boundaryHandling =
+ blockIterator->template getData< BoundaryHandling_T >(boundaryHandlingID_);
+ AvgField_T* velDensAvgField = blockIterator->template getData< AvgField_T >(avgFieldID_);
// compute space-average over all fluid cells of the time-averaged quantities
// clang-format off
@@ -398,9 +399,10 @@ class VelDensAverager
for (auto blockIterator = blocks_->begin(); blockIterator != blocks_->end(); ++blockIterator)
{
- PdfField_T* pdfField = blockIterator->getData< PdfField_T >(pdfFieldID_);
- BoundaryHandling_T* boundaryHandling = blockIterator->getData< BoundaryHandling_T >(boundaryHandlingID_);
- AvgField_T* velDensAvgField = blockIterator->getData< AvgField_T >(avgFieldID_);
+ PdfField_T* pdfField = blockIterator->template getData< PdfField_T >(pdfFieldID_);
+ BoundaryHandling_T* boundaryHandling =
+ blockIterator->template getData< BoundaryHandling_T >(boundaryHandlingID_);
+ AvgField_T* velDensAvgField = blockIterator->template getData< AvgField_T >(avgFieldID_);
// clang-format off
WALBERLA_FOR_ALL_CELLS_XYZ(velDensAvgField,
@@ -475,9 +477,10 @@ class GradientComputer
for (auto blockIterator = blocks_->begin(); blockIterator != blocks_->end(); ++blockIterator)
{
- GradientField_T* gradientField = blockIterator->getData< GradientField_T >(gradientFieldID_);
- AvgField_T* velDensAvgField = blockIterator->getData< AvgField_T >(avgFieldID_);
- BoundaryHandling_T* boundaryHandling = blockIterator->getData< BoundaryHandling_T >(boundaryHandlingID_);
+ GradientField_T* gradientField = blockIterator->template getData< GradientField_T >(gradientFieldID_);
+ AvgField_T* velDensAvgField = blockIterator->template getData< AvgField_T >(avgFieldID_);
+ BoundaryHandling_T* boundaryHandling =
+ blockIterator->template getData< BoundaryHandling_T >(boundaryHandlingID_);
// compute dx for the level that the block resides on
const uint_t blockLevel = blocks_->getLevel(*blockIterator);
@@ -589,9 +592,10 @@ class InstStorer
for (auto blockIterator = blocks_->begin(); blockIterator != blocks_->end(); ++blockIterator)
{
- PdfField_T* pdfField = blockIterator->getData< PdfField_T >(pdfFieldID_);
- BoundaryHandling_T* boundaryHandling = blockIterator->getData< BoundaryHandling_T >(boundaryHandlingID_);
- InstField_T* instField = blockIterator->getData< InstField_T >(instFieldID_);
+ PdfField_T* pdfField = blockIterator->template getData< PdfField_T >(pdfFieldID_);
+ BoundaryHandling_T* boundaryHandling =
+ blockIterator->template getData< BoundaryHandling_T >(boundaryHandlingID_);
+ InstField_T* instField = blockIterator->template getData< InstField_T >(instFieldID_);
// compute dx for the level that the block resides on
const uint_t blockLevel = blocks_->getLevel(*blockIterator);
@@ -697,7 +701,7 @@ class VelDensPointEvaluator
if (blockIterator->getAABB().contains(evalCoord_))
{
Cell localCell = blocks_->getBlockLocalCell(*blockIterator, evalCoord_);
- PdfField_T* pdfField = blockIterator->getData< PdfField_T >(pdfFieldID_);
+ PdfField_T* pdfField = blockIterator->template getData< PdfField_T >(pdfFieldID_);
velocity = pdfField->getVelocity(localCell);
density = pdfField->getDensity(localCell);
@@ -778,8 +782,9 @@ class PressureDropEvaluator
blocks_->transformGlobalToBlockLocalCellInterval(lowerBlockLocalCellBB, *blockIterator, lowerBlockCellBB);
blocks_->transformGlobalToBlockLocalCellInterval(upperBlockLocalCellBB, *blockIterator, upperBlockCellBB);
- PdfField_T* pdfField = blockIterator->getData< PdfField_T >(pdfFieldID_);
- BoundaryHandling_T* boundaryHandling = blockIterator->getData< BoundaryHandling_T >(boundaryHandlingID_);
+ PdfField_T* pdfField = blockIterator->template getData< PdfField_T >(pdfFieldID_);
+ BoundaryHandling_T* boundaryHandling =
+ blockIterator->template getData< BoundaryHandling_T >(boundaryHandlingID_);
// sum density of relevant cells
// clang-format off