From b3508903fb87acb871cdb1f740bd6fe2b26afd4b Mon Sep 17 00:00:00 2001 From: Dominik Thoennes <dominik.thoennes@fau.de> Date: Wed, 19 Feb 2025 14:13:43 +0100 Subject: [PATCH] Prefix CMake targets --- CMakeLists.txt | 3 - .../CMakeLists.txt | 6 +- apps/benchmarks/CNT/CMakeLists.txt | 2 +- .../benchmarks/ComplexGeometry/CMakeLists.txt | 4 +- apps/benchmarks/CouetteFlow/CMakeLists.txt | 4 +- apps/benchmarks/DEM/CMakeLists.txt | 2 +- .../FieldCommunication/CMakeLists.txt | 2 +- .../FluidParticleCoupling/CMakeLists.txt | 48 +++--- .../CMakeLists.txt | 4 +- apps/benchmarks/FluidizedBed/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../FreeSurfaceAdvection/CMakeLists.txt | 6 +- apps/benchmarks/GranularGas/CMakeLists.txt | 12 +- .../IntegratorAccuracy/CMakeLists.txt | 4 +- apps/benchmarks/LennardJones/CMakeLists.txt | 2 +- apps/benchmarks/MeshDistance/CMakeLists.txt | 2 +- .../MotionSingleHeavySphere/CMakeLists.txt | 4 +- apps/benchmarks/NonUniformGrid/CMakeLists.txt | 4 +- .../NonUniformGridCPU/CMakeLists.txt | 2 +- .../NonUniformGridGPU/CMakeLists.txt | 2 +- apps/benchmarks/Percolation/CMakeLists.txt | 2 +- .../PhaseFieldAllenCahn/CMakeLists.txt | 4 +- .../PoiseuilleChannel/CMakeLists.txt | 4 +- .../ProbeVsExtraMessage/CMakeLists.txt | 4 +- apps/benchmarks/SchaeferTurek/CMakeLists.txt | 4 +- .../TurbulentChannel/CMakeLists.txt | 8 +- apps/benchmarks/UniformGrid/CMakeLists.txt | 4 +- apps/benchmarks/UniformGridCPU/CMakeLists.txt | 2 +- apps/benchmarks/UniformGridGPU/CMakeLists.txt | 2 +- apps/pythonmodule/CMakeLists.txt | 8 +- apps/showcases/Antidunes/CMakeLists.txt | 25 +-- .../BidisperseFluidizedBed/CMakeLists.txt | 2 +- .../CombinedResolvedUnresolved/CMakeLists.txt | 2 +- .../showcases/FlowAroundSphere/CMakeLists.txt | 4 +- apps/showcases/FluidizedBed/CMakeLists.txt | 4 +- apps/showcases/FreeSurface/CMakeLists.txt | 107 ++++++------ apps/showcases/HeatConduction/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- apps/showcases/Mixer/CMakeLists.txt | 2 +- apps/showcases/ParticlePacking/CMakeLists.txt | 2 +- .../showcases/PegIntoSphereBed/CMakeLists.txt | 2 +- .../PhaseFieldAllenCahn/CPU/CMakeLists.txt | 2 +- .../PhaseFieldAllenCahn/GPU/CMakeLists.txt | 2 +- apps/showcases/Piping/CMakeLists.txt | 2 +- apps/showcases/PorousMedia/CMakeLists.txt | 4 +- apps/showcases/Thermocapillary/CMakeLists.txt | 4 +- apps/tools/MixedPrecision/CMakeLists.txt | 2 +- .../tools/povrayFileCompressor/CMakeLists.txt | 4 +- apps/tutorials/basics/CMakeLists.txt | 6 +- apps/tutorials/codegen/CMakeLists.txt | 24 +-- apps/tutorials/gpu/CMakeLists.txt | 2 +- apps/tutorials/lbm/CMakeLists.txt | 12 +- apps/tutorials/mesa_pd/CMakeLists.txt | 2 +- apps/tutorials/pde/CMakeLists.txt | 6 +- apps/tutorials/pe/CMakeLists.txt | 4 +- cmake/waLBerlaFunctions.cmake | 137 +--------------- cmake/waLBerlaModuleDependencySystem.cmake | 44 +---- src/CMakeLists.txt | 23 ++- src/blockforest/CMakeLists.txt | 7 +- src/blockforest/communication/CMakeLists.txt | 2 +- src/blockforest/loadbalancing/CMakeLists.txt | 2 +- .../level_determination/CMakeLists.txt | 2 +- .../weight_assignment/CMakeLists.txt | 2 +- src/boundary/CMakeLists.txt | 7 +- src/boundary/communication/CMakeLists.txt | 2 +- src/communication/CMakeLists.txt | 7 +- src/core/CMakeLists.txt | 135 +++++++-------- src/core/cell/CMakeLists.txt | 2 +- src/core/config/CMakeLists.txt | 2 +- src/core/debug/CMakeLists.txt | 2 +- src/core/grid_generator/CMakeLists.txt | 2 +- src/core/load_balancing/CMakeLists.txt | 2 +- src/core/logging/CMakeLists.txt | 2 +- src/core/math/CMakeLists.txt | 2 +- src/core/mpi/CMakeLists.txt | 2 +- src/core/timing/CMakeLists.txt | 2 +- src/domain_decomposition/CMakeLists.txt | 7 +- src/executiontree/CMakeLists.txt | 7 +- src/fft/CMakeLists.txt | 7 +- src/field/CMakeLists.txt | 11 +- src/field/adaptors/CMakeLists.txt | 2 +- src/field/allocation/CMakeLists.txt | 2 +- src/field/blockforest/CMakeLists.txt | 2 +- src/field/communication/CMakeLists.txt | 2 +- src/field/distributors/CMakeLists.txt | 2 +- src/field/doc/CMakeLists.txt | 2 +- src/field/interpolators/CMakeLists.txt | 2 +- src/field/iterators/CMakeLists.txt | 2 +- src/field/refinement/CMakeLists.txt | 2 +- src/field/vtk/CMakeLists.txt | 2 +- src/gather/CMakeLists.txt | 9 +- src/geometry/CMakeLists.txt | 7 +- src/geometry/bodies/CMakeLists.txt | 2 +- .../containment_octree/CMakeLists.txt | 2 +- src/geometry/initializer/CMakeLists.txt | 2 +- src/geometry/mesh/CMakeLists.txt | 2 +- src/geometry/structured/CMakeLists.txt | 2 +- src/gpu/CMakeLists.txt | 9 +- src/gpu/communication/CMakeLists.txt | 2 +- src/gpu/lbm/CMakeLists.txt | 2 +- src/gpu/sweeps/CMakeLists.txt | 2 +- src/lbm/CMakeLists.txt | 27 +-- src/lbm/blockforest/CMakeLists.txt | 2 +- .../blockforest/communication/CMakeLists.txt | 2 +- src/lbm/boundary/CMakeLists.txt | 2 +- src/lbm/boundary/factories/CMakeLists.txt | 2 +- src/lbm/communication/CMakeLists.txt | 2 +- src/lbm/cumulant/CMakeLists.txt | 2 +- src/lbm/evaluations/CMakeLists.txt | 2 +- src/lbm/field/CMakeLists.txt | 2 +- src/lbm/field/initializer/CMakeLists.txt | 2 +- src/lbm/free_surface/CMakeLists.txt | 2 +- src/lbm/free_surface/boundary/CMakeLists.txt | 2 +- .../free_surface/bubble_model/CMakeLists.txt | 2 +- src/lbm/free_surface/dynamics/CMakeLists.txt | 2 +- .../dynamics/functionality/CMakeLists.txt | 2 +- .../surface_geometry/CMakeLists.txt | 2 +- src/lbm/geometry/CMakeLists.txt | 2 +- src/lbm/geometry/initializer/CMakeLists.txt | 2 +- src/lbm/inplace_streaming/CMakeLists.txt | 2 +- src/lbm/lattice_model/CMakeLists.txt | 2 +- src/lbm/mrt/CMakeLists.txt | 2 +- src/lbm/mrt/cell_operations/CMakeLists.txt | 2 +- src/lbm/refinement/CMakeLists.txt | 2 +- src/lbm/srt/CMakeLists.txt | 2 +- src/lbm/srt/cell_operations/CMakeLists.txt | 2 +- src/lbm/sweeps/CMakeLists.txt | 2 +- src/lbm/sweeps/cell_operations/CMakeLists.txt | 2 +- src/lbm/trt/CMakeLists.txt | 2 +- src/lbm/trt/cell_operations/CMakeLists.txt | 2 +- src/lbm/vtk/CMakeLists.txt | 2 +- src/lbm_generated/CMakeLists.txt | 25 +-- src/lbm_generated/boundary/CMakeLists.txt | 2 +- .../communication/CMakeLists.txt | 2 +- src/lbm_generated/evaluation/CMakeLists.txt | 2 +- src/lbm_generated/field/CMakeLists.txt | 2 +- src/lbm_generated/gpu/CMakeLists.txt | 2 +- src/lbm_generated/refinement/CMakeLists.txt | 2 +- .../storage_specification/CMakeLists.txt | 2 +- .../sweep_collection/CMakeLists.txt | 2 +- src/lbm_mesapd_coupling/CMakeLists.txt | 13 +- src/lbm_mesapd_coupling/amr/CMakeLists.txt | 2 +- .../amr/level_determination/CMakeLists.txt | 2 +- .../amr/weight_assignment/CMakeLists.txt | 2 +- .../mapping/CMakeLists.txt | 2 +- .../momentum_exchange_method/CMakeLists.txt | 2 +- .../boundary/CMakeLists.txt | 2 +- .../reconstruction/CMakeLists.txt | 2 +- .../overlapping/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../codegen/CMakeLists.txt | 4 +- .../utility/CMakeLists.txt | 2 +- src/mesa_pd/CMakeLists.txt | 7 +- .../collision_detection/CMakeLists.txt | 2 +- src/mesa_pd/common/CMakeLists.txt | 2 +- src/mesa_pd/data/CMakeLists.txt | 2 +- src/mesa_pd/data/shape/CMakeLists.txt | 2 +- src/mesa_pd/domain/CMakeLists.txt | 4 +- src/mesa_pd/kernel/CMakeLists.txt | 2 +- src/mesa_pd/kernel/cnt/CMakeLists.txt | 2 +- src/mesa_pd/mpi/CMakeLists.txt | 2 +- src/mesa_pd/mpi/notifications/CMakeLists.txt | 2 +- src/mesa_pd/sorting/CMakeLists.txt | 2 +- src/mesa_pd/vtk/CMakeLists.txt | 2 +- .../vtk/ConvexPolyhedron/CMakeLists.txt | 2 +- .../data_sources/CMakeLists.txt | 2 +- .../tesselation/CMakeLists.txt | 2 +- src/mesh/CMakeLists.txt | 9 +- src/mesh/blockforest/CMakeLists.txt | 2 +- src/mesh/boundary/CMakeLists.txt | 2 +- src/mesh/pe/CMakeLists.txt | 2 +- src/mesh/pe/communication/CMakeLists.txt | 2 +- src/mesh/pe/raytracing/CMakeLists.txt | 2 +- src/mesh/pe/rigid_body/CMakeLists.txt | 2 +- src/mesh/pe/tesselation/CMakeLists.txt | 2 +- src/mesh/pe/vtk/CMakeLists.txt | 2 +- src/mesh_common/CMakeLists.txt | 9 +- .../distance_octree/CMakeLists.txt | 2 +- src/mesh_common/vtk/CMakeLists.txt | 2 +- src/pde/CMakeLists.txt | 9 +- src/pde/boundary/CMakeLists.txt | 2 +- src/pde/iterations/CMakeLists.txt | 2 +- src/pde/sweeps/CMakeLists.txt | 2 +- src/pe/CMakeLists.txt | 7 +- src/pe/amr/CMakeLists.txt | 2 +- src/pe/bg/CMakeLists.txt | 2 +- src/pe/ccd/CMakeLists.txt | 2 +- src/pe/collision/CMakeLists.txt | 2 +- src/pe/communication/CMakeLists.txt | 2 +- src/pe/communication/rigidbody/CMakeLists.txt | 2 +- src/pe/contact/CMakeLists.txt | 2 +- src/pe/cr/CMakeLists.txt | 2 +- src/pe/debug/CMakeLists.txt | 2 +- src/pe/fcd/CMakeLists.txt | 2 +- src/pe/raytracing/CMakeLists.txt | 2 +- src/pe/rigidbody/CMakeLists.txt | 2 +- src/pe/statistics/CMakeLists.txt | 2 +- src/pe/synchronization/CMakeLists.txt | 2 +- src/pe/utility/CMakeLists.txt | 2 +- src/pe/vtk/CMakeLists.txt | 2 +- src/pe_coupling/CMakeLists.txt | 7 +- src/pe_coupling/amr/CMakeLists.txt | 2 +- .../amr/level_determination/CMakeLists.txt | 2 +- .../amr/weight_assignment/CMakeLists.txt | 2 +- .../correlations/CMakeLists.txt | 2 +- .../evaluators/CMakeLists.txt | 2 +- .../gns_lbm/CMakeLists.txt | 2 +- .../gns_lbm/utility/CMakeLists.txt | 2 +- .../utility/CMakeLists.txt | 2 +- src/pe_coupling/geometry/CMakeLists.txt | 2 +- src/pe_coupling/mapping/CMakeLists.txt | 2 +- .../momentum_exchange_method/CMakeLists.txt | 2 +- .../boundary/CMakeLists.txt | 2 +- .../destruction/CMakeLists.txt | 2 +- .../restoration/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- src/pe_coupling/utility/CMakeLists.txt | 2 +- src/postprocessing/CMakeLists.txt | 7 +- src/python_coupling/CMakeLists.txt | 9 +- src/python_coupling/export/CMakeLists.txt | 2 +- src/python_coupling/helper/CMakeLists.txt | 2 +- src/simd/CMakeLists.txt | 7 +- src/sqlite/CMakeLists.txt | 7 +- src/stencil/CMakeLists.txt | 7 +- src/timeloop/CMakeLists.txt | 7 +- src/vtk/CMakeLists.txt | 7 +- tests/blockforest/CMakeLists.txt | 20 +-- .../blockforest/communication/CMakeLists.txt | 4 +- tests/boundary/CMakeLists.txt | 4 +- tests/core/CMakeLists.txt | 21 +-- tests/domain_decomposition/CMakeLists.txt | 8 +- tests/fft/CMakeLists.txt | 4 +- tests/field/CMakeLists.txt | 30 ++-- tests/gather/CMakeLists.txt | 9 +- tests/geometry/CMakeLists.txt | 4 +- tests/gpu/CMakeLists.txt | 22 +-- tests/lbm/CMakeLists.txt | 94 +++++------ tests/lbm/codegen/CMakeLists.txt | 2 +- tests/lbm/field/CMakeLists.txt | 2 +- tests/lbm_generated/CMakeLists.txt | 10 +- tests/lbm_mesapd_coupling/CMakeLists.txt | 38 ++--- tests/mesa_pd/CMakeLists.txt | 154 +++++++++--------- tests/mesh/CMakeLists.txt | 68 ++++---- tests/pde/CMakeLists.txt | 16 +- tests/pe/CMakeLists.txt | 84 +++++----- tests/pe_coupling/CMakeLists.txt | 50 +++--- tests/postprocessing/CMakeLists.txt | 2 +- tests/python_coupling/CMakeLists.txt | 8 +- tests/simd/CMakeLists.txt | 2 +- tests/sqlite/CMakeLists.txt | 2 +- tests/stencil/CMakeLists.txt | 2 +- tests/timeloop/CMakeLists.txt | 26 ++- 252 files changed, 908 insertions(+), 1034 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e5badc0f..b7ae62b8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -604,9 +604,6 @@ endif ( ) ############################################################################################################################# if ( WALBERLA_BUILD_WITH_CODEGEN OR WALBERLA_BUILD_WITH_PYTHON ) - if ( DEFINED PYTHON_ROOT_DIR OR DEFINED PYTHON_EXECUTABLE ) - message( WARNING "Setting PYTHON_ROOT_DIR or PYTHON_EXECUTABLE will likely not work. Use Python_ROOT_DIR instead." ) - endif () cmake_policy( SET CMP0094 NEW ) set( Python_FIND_FRAMEWORK LAST ) find_package( Python COMPONENTS Interpreter Development ) diff --git a/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/CMakeLists.txt b/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/CMakeLists.txt index 0bb7b6c3b..fd370b7ce 100644 --- a/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/CMakeLists.txt +++ b/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/CMakeLists.txt @@ -1,5 +1,5 @@ -waLBerla_add_executable( NAME WorkloadEvaluation FILES WorkloadEvaluation.cpp DEPENDS blockforest boundary core field lbm pe pe_coupling postprocessing stencil timeloop vtk ) +waLBerla_add_executable( NAME WorkloadEvaluation FILES WorkloadEvaluation.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk ) -waLBerla_add_executable( NAME AMRSedimentSettling FILES AMRSedimentSettling.cpp DEPENDS blockforest boundary core field lbm pe pe_coupling postprocessing stencil timeloop vtk ) +waLBerla_add_executable( NAME AMRSedimentSettling FILES AMRSedimentSettling.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk ) -waLBerla_add_executable( NAME AMRSettlingSphere FILES AMRSettlingSphere.cpp DEPENDS blockforest boundary core field lbm pe pe_coupling postprocessing stencil timeloop vtk ) +waLBerla_add_executable( NAME AMRSettlingSphere FILES AMRSettlingSphere.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk ) diff --git a/apps/benchmarks/CNT/CMakeLists.txt b/apps/benchmarks/CNT/CMakeLists.txt index 41c52ccc8..dc9c7166e 100644 --- a/apps/benchmarks/CNT/CMakeLists.txt +++ b/apps/benchmarks/CNT/CMakeLists.txt @@ -7,4 +7,4 @@ waLBerla_add_executable( NAME 01_cnt_film InitializeCNTs.cpp SQLProperties.cpp Statistics.cpp - DEPENDS blockforest core mesa_pd sqlite vtk ) + DEPENDS walberla::blockforest walberla::core walberla::mesa_pd walberla::sqlite walberla::vtk ) diff --git a/apps/benchmarks/ComplexGeometry/CMakeLists.txt b/apps/benchmarks/ComplexGeometry/CMakeLists.txt index 68f4d989f..76a434fbb 100644 --- a/apps/benchmarks/ComplexGeometry/CMakeLists.txt +++ b/apps/benchmarks/ComplexGeometry/CMakeLists.txt @@ -2,8 +2,8 @@ if ( WALBERLA_BUILD_WITH_OPENMESH ) waLBerla_link_geometry_to_builddir( "*.obj" ) waLBerla_link_files_to_builddir( "*.conf" ) - - waLBerla_add_executable( NAME ComplexGeometry FILES ComplexGeometry.cpp DEPENDS boundary core lbm mesh vtk ) + + waLBerla_add_executable( NAME ComplexGeometry FILES ComplexGeometry.cpp DEPENDS walberla::boundary walberla::core walberla::lbm mesh walberla::vtk ) ############## # Some tests # diff --git a/apps/benchmarks/CouetteFlow/CMakeLists.txt b/apps/benchmarks/CouetteFlow/CMakeLists.txt index caf4e4173..3743fbe61 100644 --- a/apps/benchmarks/CouetteFlow/CMakeLists.txt +++ b/apps/benchmarks/CouetteFlow/CMakeLists.txt @@ -1,7 +1,7 @@ waLBerla_link_files_to_builddir( "*.dat" ) - -waLBerla_add_executable( NAME CouetteFlow DEPENDS blockforest boundary core field lbm postprocessing stencil timeloop vtk sqlite ) + +waLBerla_add_executable( NAME CouetteFlow DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk walberla::sqlite ) ############## # Some tests # diff --git a/apps/benchmarks/DEM/CMakeLists.txt b/apps/benchmarks/DEM/CMakeLists.txt index 138e92026..a364f0140 100644 --- a/apps/benchmarks/DEM/CMakeLists.txt +++ b/apps/benchmarks/DEM/CMakeLists.txt @@ -1 +1 @@ -waLBerla_add_executable( NAME DEM FILES DEM.cpp DEPENDS blockforest core pe ) +waLBerla_add_executable( NAME DEM FILES DEM.cpp DEPENDS walberla::blockforest walberla::core walberla::pe ) diff --git a/apps/benchmarks/FieldCommunication/CMakeLists.txt b/apps/benchmarks/FieldCommunication/CMakeLists.txt index edb815612..ed587fb1d 100644 --- a/apps/benchmarks/FieldCommunication/CMakeLists.txt +++ b/apps/benchmarks/FieldCommunication/CMakeLists.txt @@ -4,4 +4,4 @@ waLBerla_link_files_to_builddir( "*.py" ) waLBerla_add_executable ( NAME FieldCommunication - DEPENDS blockforest core domain_decomposition field postprocessing sqlite python_coupling ) + DEPENDS walberla::blockforest walberla::core walberla::domain_decomposition walberla::field walberla::postprocessing walberla::sqlite walberla::python_coupling ) diff --git a/apps/benchmarks/FluidParticleCoupling/CMakeLists.txt b/apps/benchmarks/FluidParticleCoupling/CMakeLists.txt index 34ffaca07..213778d40 100644 --- a/apps/benchmarks/FluidParticleCoupling/CMakeLists.txt +++ b/apps/benchmarks/FluidParticleCoupling/CMakeLists.txt @@ -11,61 +11,61 @@ if( WALBERLA_BUILD_WITH_CODEGEN ) ) waLBerla_add_executable(NAME SphereWallCollision FILES SphereWallCollision.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling - mesa_pd postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling + walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBM ) waLBerla_add_executable(NAME SettlingSphereInBox FILES SettlingSphereInBox.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling - mesa_pd postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling + walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBM ) waLBerla_add_executable(NAME SphereMovingWithPrescribedVelocity FILES SphereMovingWithPrescribedVelocity.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm mesa_pd lbm_mesapd_coupling - postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::mesa_pd walberla::lbm_mesapd_coupling + walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBM ) waLBerla_add_executable(NAME LubricationForceEvaluation FILES LubricationForceEvaluation.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd - postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd + walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBM ) waLBerla_add_executable(NAME DragForceSphere FILES DragForceSphere.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd - postprocessing timeloop vtk FluidParticleCouplingGeneratedLBMWithForce) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd + walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBMWithForce ) waLBerla_add_executable(NAME ForcesOnSphereNearPlane FILES ForcesOnSphereNearPlane.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd - postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd + walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBM ) waLBerla_add_executable(NAME ObliqueWetCollision FILES ObliqueWetCollision.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd - postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd + walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBM ) waLBerla_add_executable(NAME MotionSettlingSphere FILES MotionSettlingSphere.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd - postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd + walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBM ) else() waLBerla_add_executable ( NAME SphereWallCollision FILES SphereWallCollision.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk ) waLBerla_add_executable ( NAME SettlingSphereInBox FILES SettlingSphereInBox.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk ) waLBerla_add_executable ( NAME SphereMovingWithPrescribedVelocity FILES SphereMovingWithPrescribedVelocity.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm mesa_pd lbm_mesapd_coupling postprocessing timeloop vtk ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::mesa_pd walberla::lbm_mesapd_coupling walberla::postprocessing walberla::timeloop walberla::vtk ) waLBerla_add_executable ( NAME LubricationForceEvaluation FILES LubricationForceEvaluation.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk ) waLBerla_add_executable ( NAME DragForceSphere FILES DragForceSphere.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk ) waLBerla_add_executable ( NAME ForcesOnSphereNearPlane FILES ForcesOnSphereNearPlane.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk ) waLBerla_add_executable ( NAME ObliqueWetCollision FILES ObliqueWetCollision.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk ) endif() waLBerla_add_executable ( NAME ObliqueDryCollision FILES ObliqueDryCollision.cpp - DEPENDS blockforest core mesa_pd postprocessing ) + DEPENDS walberla::blockforest walberla::core walberla::mesa_pd walberla::postprocessing ) diff --git a/apps/benchmarks/FluidParticleCouplingWithLoadBalancing/CMakeLists.txt b/apps/benchmarks/FluidParticleCouplingWithLoadBalancing/CMakeLists.txt index 4742f47b6..44a8d9f5e 100644 --- a/apps/benchmarks/FluidParticleCouplingWithLoadBalancing/CMakeLists.txt +++ b/apps/benchmarks/FluidParticleCouplingWithLoadBalancing/CMakeLists.txt @@ -1,3 +1,3 @@ -waLBerla_add_executable( NAME FluidParticleWorkloadEvaluation FILES FluidParticleWorkloadEvaluation.cpp DEPENDS blockforest boundary core field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk ) +waLBerla_add_executable( NAME FluidParticleWorkloadEvaluation FILES FluidParticleWorkloadEvaluation.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk ) -waLBerla_add_executable( NAME FluidParticleWorkloadDistribution FILES FluidParticleWorkloadDistribution.cpp DEPENDS blockforest boundary core field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk ) +waLBerla_add_executable( NAME FluidParticleWorkloadDistribution FILES FluidParticleWorkloadDistribution.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk ) diff --git a/apps/benchmarks/FluidizedBed/CMakeLists.txt b/apps/benchmarks/FluidizedBed/CMakeLists.txt index 9c33fb523..b43a90a1e 100644 --- a/apps/benchmarks/FluidizedBed/CMakeLists.txt +++ b/apps/benchmarks/FluidizedBed/CMakeLists.txt @@ -2,5 +2,5 @@ waLBerla_link_files_to_builddir("*.prm") if (WALBERLA_BUILD_WITH_GPU_SUPPORT AND WALBERLA_BUILD_WITH_CODEGEN AND (CMAKE_CUDA_ARCHITECTURES GREATER_EQUAL 60 OR WALBERLA_BUILD_WITH_HIP)) waLBerla_add_executable(NAME FluidizedBed_PSM_GPU FILES FluidizedBedGPU.cpp - DEPENDS blockforest boundary core gpu domain_decomposition field lbm lbm_mesapd_coupling mesa_pd timeloop vtk PSMCodegenPython_srt_sc1) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::gpu walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::timeloop walberla::vtk PSMCodegenPython_srt_sc1 ) endif () diff --git a/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/CMakeLists.txt b/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/CMakeLists.txt index d2c67b31a..c880740b6 100644 --- a/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/CMakeLists.txt +++ b/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/CMakeLists.txt @@ -1,2 +1,2 @@ waLBerla_add_executable ( NAME ForcesOnSphereNearPlaneInShearFlow - DEPENDS blockforest boundary core domain_decomposition field lbm pe pe_coupling postprocessing timeloop vtk ) \ No newline at end of file + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::timeloop walberla::vtk ) \ No newline at end of file diff --git a/apps/benchmarks/FreeSurfaceAdvection/CMakeLists.txt b/apps/benchmarks/FreeSurfaceAdvection/CMakeLists.txt index e14b5fe37..8596633ab 100644 --- a/apps/benchmarks/FreeSurfaceAdvection/CMakeLists.txt +++ b/apps/benchmarks/FreeSurfaceAdvection/CMakeLists.txt @@ -2,12 +2,12 @@ waLBerla_link_files_to_builddir( *.prm ) waLBerla_add_executable(NAME DeformationField FILES DeformationField.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk ) waLBerla_add_executable(NAME SingleVortex FILES SingleVortex.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk ) waLBerla_add_executable(NAME ZalesakDisk FILES ZalesakDisk.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk) \ No newline at end of file + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk ) \ No newline at end of file diff --git a/apps/benchmarks/GranularGas/CMakeLists.txt b/apps/benchmarks/GranularGas/CMakeLists.txt index f54ca9096..0e389e2eb 100644 --- a/apps/benchmarks/GranularGas/CMakeLists.txt +++ b/apps/benchmarks/GranularGas/CMakeLists.txt @@ -3,24 +3,24 @@ waLBerla_link_files_to_builddir( *.py ) waLBerla_add_executable ( NAME PE_GranularGas FILES PE_GranularGas.cpp SQLProperties.cpp Parameters.cpp NodeTimings.cpp - DEPENDS blockforest core pe postprocessing sqlite ) + DEPENDS walberla::blockforest walberla::core walberla::pe walberla::postprocessing walberla::sqlite ) waLBerla_add_executable ( NAME PE_LoadBalancing FILES PE_LoadBalancing.cpp SQLProperties.cpp Parameters.cpp NodeTimings.cpp - DEPENDS blockforest core pe postprocessing sqlite ) + DEPENDS walberla::blockforest walberla::core walberla::pe walberla::postprocessing walberla::sqlite ) waLBerla_add_executable ( NAME MESA_PD_LoadBalancing FILES MESA_PD_LoadBalancing.cpp SQLProperties.cpp Parameters.cpp NodeTimings.cpp sortParticleStorage.cpp CreateParticles.cpp - DEPENDS blockforest core pe mesa_pd postprocessing sqlite vtk ) + DEPENDS walberla::blockforest walberla::core walberla::pe walberla::mesa_pd walberla::postprocessing walberla::sqlite walberla::vtk ) waLBerla_add_executable ( NAME MESA_PD_GranularGas FILES MESA_PD_GranularGas.cpp SQLProperties.cpp Parameters.cpp NodeTimings.cpp sortParticleStorage.cpp CreateParticles.cpp - DEPENDS blockforest core mesa_pd postprocessing sqlite vtk ) + DEPENDS walberla::blockforest walberla::core walberla::mesa_pd walberla::postprocessing walberla::sqlite walberla::vtk ) waLBerla_add_executable ( NAME MESA_PD_KernelBenchmark FILES MESA_PD_KernelBenchmark.cpp SQLProperties.cpp Parameters.cpp NodeTimings.cpp sortParticleStorage.cpp CreateParticles.cpp - DEPENDS blockforest core mesa_pd postprocessing sqlite vtk ) + DEPENDS walberla::blockforest walberla::core walberla::mesa_pd walberla::postprocessing walberla::sqlite walberla::vtk ) waLBerla_add_executable ( NAME MESA_PD_KernelLoadBalancing FILES MESA_PD_KernelLoadBalancing.cpp SQLProperties.cpp Parameters.cpp NodeTimings.cpp sortParticleStorage.cpp CreateParticles.cpp - DEPENDS blockforest core pe mesa_pd postprocessing sqlite vtk ) + DEPENDS walberla::blockforest walberla::core walberla::pe walberla::mesa_pd walberla::postprocessing walberla::sqlite walberla::vtk ) diff --git a/apps/benchmarks/IntegratorAccuracy/CMakeLists.txt b/apps/benchmarks/IntegratorAccuracy/CMakeLists.txt index 8e95e831c..c648095f1 100644 --- a/apps/benchmarks/IntegratorAccuracy/CMakeLists.txt +++ b/apps/benchmarks/IntegratorAccuracy/CMakeLists.txt @@ -1,4 +1,4 @@ waLBerla_link_files_to_builddir( "*.ipynb" ) -waLBerla_add_executable ( NAME IntegratorAccuracy - DEPENDS core mesa_pd ) +waLBerla_add_executable ( NAME IntegratorAccuracy + DEPENDS walberla::core walberla::mesa_pd ) diff --git a/apps/benchmarks/LennardJones/CMakeLists.txt b/apps/benchmarks/LennardJones/CMakeLists.txt index f0438a663..da7aeec38 100644 --- a/apps/benchmarks/LennardJones/CMakeLists.txt +++ b/apps/benchmarks/LennardJones/CMakeLists.txt @@ -3,4 +3,4 @@ waLBerla_link_files_to_builddir( *.py ) waLBerla_add_executable ( NAME LennardJones FILES LennardJones.cpp - DEPENDS blockforest core pe ) + DEPENDS walberla::blockforest walberla::core walberla::pe ) diff --git a/apps/benchmarks/MeshDistance/CMakeLists.txt b/apps/benchmarks/MeshDistance/CMakeLists.txt index 774f5329a..1a3c2d714 100644 --- a/apps/benchmarks/MeshDistance/CMakeLists.txt +++ b/apps/benchmarks/MeshDistance/CMakeLists.txt @@ -1,7 +1,7 @@ if ( WALBERLA_BUILD_WITH_OPENMESH ) waLBerla_link_geometry_to_builddir( "bunny.obj" ) - waLBerla_add_executable( NAME MeshDistanceBenchmark DEPENDS core mesh ) + waLBerla_add_executable( NAME MeshDistanceBenchmark DEPENDS walberla::core walberla::mesh ) ############## # Some tests # diff --git a/apps/benchmarks/MotionSingleHeavySphere/CMakeLists.txt b/apps/benchmarks/MotionSingleHeavySphere/CMakeLists.txt index 5fd40d16f..80acdf762 100644 --- a/apps/benchmarks/MotionSingleHeavySphere/CMakeLists.txt +++ b/apps/benchmarks/MotionSingleHeavySphere/CMakeLists.txt @@ -1,2 +1,2 @@ -waLBerla_add_executable ( NAME MotionSingleHeavySphere - DEPENDS blockforest boundary core domain_decomposition field lbm pe pe_coupling postprocessing timeloop vtk ) \ No newline at end of file +waLBerla_add_executable ( NAME MotionSingleHeavySphere + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::timeloop walberla::vtk ) \ No newline at end of file diff --git a/apps/benchmarks/NonUniformGrid/CMakeLists.txt b/apps/benchmarks/NonUniformGrid/CMakeLists.txt index 4e118017b..8ed8db3a4 100644 --- a/apps/benchmarks/NonUniformGrid/CMakeLists.txt +++ b/apps/benchmarks/NonUniformGrid/CMakeLists.txt @@ -2,5 +2,5 @@ waLBerla_link_files_to_builddir( "*.dat" ) -waLBerla_add_executable ( NAME NonUniformGridBenchmark - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk sqlite) \ No newline at end of file +waLBerla_add_executable ( NAME NonUniformGridBenchmark + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk walberla::sqlite ) \ No newline at end of file diff --git a/apps/benchmarks/NonUniformGridCPU/CMakeLists.txt b/apps/benchmarks/NonUniformGridCPU/CMakeLists.txt index 1a58f36da..ed36e4e95 100644 --- a/apps/benchmarks/NonUniformGridCPU/CMakeLists.txt +++ b/apps/benchmarks/NonUniformGridCPU/CMakeLists.txt @@ -13,4 +13,4 @@ waLBerla_generate_target_from_python(NAME NonUniformGridCPUGenerated waLBerla_add_executable( NAME NonUniformGridCPU FILES NonUniformGridCPU.cpp LdcSetup.h GridGeneration.h - DEPENDS blockforest boundary core domain_decomposition field geometry lbm_generated python_coupling timeloop vtk NonUniformGridCPUGenerated ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::lbm_generated walberla::python_coupling walberla::timeloop walberla::vtk NonUniformGridCPUGenerated ) diff --git a/apps/benchmarks/NonUniformGridGPU/CMakeLists.txt b/apps/benchmarks/NonUniformGridGPU/CMakeLists.txt index c8b02785b..5158557de 100644 --- a/apps/benchmarks/NonUniformGridGPU/CMakeLists.txt +++ b/apps/benchmarks/NonUniformGridGPU/CMakeLists.txt @@ -12,4 +12,4 @@ waLBerla_generate_target_from_python(NAME NonUniformGridGPUGenerated NonUniformGridGPUInfoHeader.h) waLBerla_add_executable( NAME NonUniformGridGPU FILES NonUniformGridGPU.cpp LdcSetup.h GridGeneration.h - DEPENDS blockforest boundary core gpu domain_decomposition field geometry lbm_generated python_coupling timeloop vtk NonUniformGridGPUGenerated ) \ No newline at end of file + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::gpu walberla::domain_decomposition walberla::field walberla::geometry walberla::lbm_generated walberla::python_coupling walberla::timeloop walberla::vtk NonUniformGridGPUGenerated ) \ No newline at end of file diff --git a/apps/benchmarks/Percolation/CMakeLists.txt b/apps/benchmarks/Percolation/CMakeLists.txt index bb8c4f3dc..c37d6afbc 100644 --- a/apps/benchmarks/Percolation/CMakeLists.txt +++ b/apps/benchmarks/Percolation/CMakeLists.txt @@ -3,7 +3,7 @@ waLBerla_link_files_to_builddir("*.prm") if (WALBERLA_BUILD_WITH_CODEGEN) if (NOT WALBERLA_BUILD_WITH_GPU_SUPPORT OR (WALBERLA_BUILD_WITH_GPU_SUPPORT AND (CMAKE_CUDA_ARCHITECTURES GREATER_EQUAL 60 OR WALBERLA_BUILD_WITH_HIP))) waLBerla_add_executable(NAME Percolation FILES Percolation.cpp - DEPENDS blockforest core field geometry gpu lbm lbm_mesapd_coupling mesa_pd sqlite vtk PSMCodegenPython_trt-smagorinsky_sc1) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::geometry walberla::gpu walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::sqlite walberla::vtk PSMCodegenPython_trt-smagorinsky_sc1 ) target_compile_definitions(Percolation PRIVATE Weighting=2) endif () endif () diff --git a/apps/benchmarks/PhaseFieldAllenCahn/CMakeLists.txt b/apps/benchmarks/PhaseFieldAllenCahn/CMakeLists.txt index 14aaa76e7..d0b064e91 100644 --- a/apps/benchmarks/PhaseFieldAllenCahn/CMakeLists.txt +++ b/apps/benchmarks/PhaseFieldAllenCahn/CMakeLists.txt @@ -15,10 +15,10 @@ waLBerla_generate_target_from_python(NAME BenchmarkPhaseFieldCodeGen if (WALBERLA_BUILD_WITH_GPU_SUPPORT ) waLBerla_add_executable(NAME benchmark_multiphase FILES benchmark_multiphase.cpp InitializerFunctions.cpp multiphase_codegen.py - DEPENDS blockforest core gpu field postprocessing python_coupling lbm_generated geometry timeloop BenchmarkPhaseFieldCodeGen) + DEPENDS walberla::blockforest walberla::core walberla::gpu walberla::field walberla::postprocessing walberla::python_coupling walberla::lbm_generated walberla::geometry walberla::timeloop BenchmarkPhaseFieldCodeGen ) else () waLBerla_add_executable(NAME benchmark_multiphase FILES benchmark_multiphase.cpp InitializerFunctions.cpp multiphase_codegen.py - DEPENDS blockforest core field postprocessing python_coupling lbm_generated geometry timeloop BenchmarkPhaseFieldCodeGen) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::postprocessing walberla::python_coupling walberla::lbm_generated walberla::geometry walberla::timeloop BenchmarkPhaseFieldCodeGen ) endif (WALBERLA_BUILD_WITH_GPU_SUPPORT ) diff --git a/apps/benchmarks/PoiseuilleChannel/CMakeLists.txt b/apps/benchmarks/PoiseuilleChannel/CMakeLists.txt index 7d354fba8..c0c051910 100644 --- a/apps/benchmarks/PoiseuilleChannel/CMakeLists.txt +++ b/apps/benchmarks/PoiseuilleChannel/CMakeLists.txt @@ -1,7 +1,7 @@ waLBerla_link_files_to_builddir( "*.dat" ) - -waLBerla_add_executable( NAME PoiseuilleChannel DEPENDS blockforest boundary core field lbm postprocessing stencil timeloop vtk sqlite) + +waLBerla_add_executable( NAME PoiseuilleChannel DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk walberla::sqlite ) ############## # Some tests # diff --git a/apps/benchmarks/ProbeVsExtraMessage/CMakeLists.txt b/apps/benchmarks/ProbeVsExtraMessage/CMakeLists.txt index 70ff75bc6..111fe9eab 100644 --- a/apps/benchmarks/ProbeVsExtraMessage/CMakeLists.txt +++ b/apps/benchmarks/ProbeVsExtraMessage/CMakeLists.txt @@ -1,7 +1,7 @@ waLBerla_add_executable ( NAME PackPerformance FILES PackPerformance.cpp - DEPENDS core ) + DEPENDS walberla::core ) waLBerla_add_executable ( NAME ProbeVsExtraMessage FILES ProbeVsExtraMessage.cpp - DEPENDS core postprocessing stencil sqlite) + DEPENDS walberla::core walberla::postprocessing walberla::stencil walberla::sqlite ) diff --git a/apps/benchmarks/SchaeferTurek/CMakeLists.txt b/apps/benchmarks/SchaeferTurek/CMakeLists.txt index 06cfca6e3..36aad6cd3 100644 --- a/apps/benchmarks/SchaeferTurek/CMakeLists.txt +++ b/apps/benchmarks/SchaeferTurek/CMakeLists.txt @@ -1,6 +1,6 @@ waLBerla_link_files_to_builddir( "*.dat" ) - -waLBerla_add_executable( NAME SchaeferTurek DEPENDS blockforest boundary core field lbm postprocessing stencil timeloop vtk sqlite ) + +waLBerla_add_executable( NAME SchaeferTurek DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk walberla::sqlite ) waLBerla_execute_test( NO_MODULE_LABEL NAME SchaeferTurekTest COMMAND $<TARGET_FILE:SchaeferTurek> Test2D.dat PROCESSES 4 CONFIGURATIONS Release RelWithDbgInfo DEPENDS_ON_TARGETS SchaeferTurek ) \ No newline at end of file diff --git a/apps/benchmarks/TurbulentChannel/CMakeLists.txt b/apps/benchmarks/TurbulentChannel/CMakeLists.txt index 73aa9ef56..748b30300 100644 --- a/apps/benchmarks/TurbulentChannel/CMakeLists.txt +++ b/apps/benchmarks/TurbulentChannel/CMakeLists.txt @@ -18,9 +18,9 @@ if( WALBERLA_BUILD_WITH_CODEGEN ) TurbulentChannel_TKE_SGS_Writer.cpp TurbulentChannel_TKE_SGS_Writer.h ) - walberla_add_executable ( NAME TurbulentChannel_Application - FILES TurbulentChannel.cpp - DEPENDS blockforest core domain_decomposition field geometry timeloop lbm stencil vtk - TurbulentChannel_CodeGeneration ) + walberla_add_executable( NAME TurbulentChannel_Application + FILES TurbulentChannel.cpp + DEPENDS walberla::blockforest walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::timeloop + walberla::lbm walberla::stencil walberla::vtk TurbulentChannel_CodeGeneration ) endif() \ No newline at end of file diff --git a/apps/benchmarks/UniformGrid/CMakeLists.txt b/apps/benchmarks/UniformGrid/CMakeLists.txt index 2f75f12b5..16eca03a2 100644 --- a/apps/benchmarks/UniformGrid/CMakeLists.txt +++ b/apps/benchmarks/UniformGrid/CMakeLists.txt @@ -2,5 +2,5 @@ waLBerla_link_files_to_builddir( "*.dat" ) -waLBerla_add_executable ( NAME UniformGridBenchmark - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk sqlite ) \ No newline at end of file +waLBerla_add_executable ( NAME UniformGridBenchmark + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk walberla::sqlite ) \ No newline at end of file diff --git a/apps/benchmarks/UniformGridCPU/CMakeLists.txt b/apps/benchmarks/UniformGridCPU/CMakeLists.txt index 76c40ea57..49d68423e 100644 --- a/apps/benchmarks/UniformGridCPU/CMakeLists.txt +++ b/apps/benchmarks/UniformGridCPU/CMakeLists.txt @@ -29,7 +29,7 @@ foreach(streaming_pattern pull push aa esotwist esopull esopush) waLBerla_add_executable(NAME UniformGridCPU_${config} FILES UniformGridCPU.cpp - DEPENDS blockforest boundary core domain_decomposition field geometry python_coupling timeloop vtk UniformGridCPUGenerated_${config}) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::python_coupling walberla::timeloop walberla::vtk UniformGridCPUGenerated_${config} ) # all configs are excluded from all except for pull d3q27. if (${streaming_pattern} STREQUAL "pull" AND ${stencil} STREQUAL "d3q27") diff --git a/apps/benchmarks/UniformGridGPU/CMakeLists.txt b/apps/benchmarks/UniformGridGPU/CMakeLists.txt index 25ca68ed2..f03f6841d 100644 --- a/apps/benchmarks/UniformGridGPU/CMakeLists.txt +++ b/apps/benchmarks/UniformGridGPU/CMakeLists.txt @@ -28,7 +28,7 @@ foreach(streaming_pattern pull push aa esotwist esopull esopush) waLBerla_add_executable(NAME UniformGridGPU_${config} FILES UniformGridGPU.cpp - DEPENDS blockforest boundary core gpu domain_decomposition field geometry lbm_generated python_coupling timeloop vtk UniformGridGPUGenerated_${config}) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::gpu walberla::domain_decomposition walberla::field walberla::geometry walberla::lbm_generated walberla::python_coupling walberla::timeloop walberla::vtk UniformGridGPUGenerated_${config} ) # all configs are excluded from all except for pull d3q27. if (${streaming_pattern} STREQUAL "pull" AND ${stencil} STREQUAL "d3q27") diff --git a/apps/pythonmodule/CMakeLists.txt b/apps/pythonmodule/CMakeLists.txt index d2c6251c1..b15c6ab08 100644 --- a/apps/pythonmodule/CMakeLists.txt +++ b/apps/pythonmodule/CMakeLists.txt @@ -1,12 +1,12 @@ # waLBerla Python module -if( NOT TARGET python_coupling ) - message( WARNING "python module ist not build since the python_coupling target is non-existent" ) +if ( NOT TARGET walberla::python_coupling ) + message( WARNING "python module ist not build since the walberla::python_coupling target is non-existent" ) else() if ( WALBERLA_BUILD_WITH_PYTHON ) if ( WALBERLA_BUILD_WITH_GPU_SUPPORT ) - set(PYTHON_MODULE_DEPENDENCIES blockforest boundary domain_decomposition core field python_coupling timeloop vtk gpu) + set( PYTHON_MODULE_DEPENDENCIES walberla::blockforest walberla::boundary walberla::domain_decomposition walberla::core walberla::field walberla::python_coupling walberla::timeloop walberla::vtk walberla::gpu ) else() - set(PYTHON_MODULE_DEPENDENCIES blockforest boundary domain_decomposition core field python_coupling timeloop vtk) + set( PYTHON_MODULE_DEPENDENCIES walberla::blockforest walberla::boundary walberla::domain_decomposition walberla::core walberla::field walberla::python_coupling walberla::timeloop walberla::vtk ) endif() if( WALBERLA_CXX_COMPILER_IS_MSVC ) diff --git a/apps/showcases/Antidunes/CMakeLists.txt b/apps/showcases/Antidunes/CMakeLists.txt index a0feea41c..f77f729d0 100644 --- a/apps/showcases/Antidunes/CMakeLists.txt +++ b/apps/showcases/Antidunes/CMakeLists.txt @@ -1,16 +1,17 @@ waLBerla_link_files_to_builddir( *.prm ) -if( WALBERLA_BUILD_WITH_CODEGEN ) - walberla_generate_target_from_python( NAME AntidunesLatticeModelGeneration - FILE AntidunesLatticeModelGeneration.py - OUT_FILES AntidunesLatticeModel.cpp AntidunesLatticeModel.h ) +if ( WALBERLA_BUILD_WITH_CODEGEN ) + walberla_generate_target_from_python( NAME AntidunesLatticeModelGeneration + FILE AntidunesLatticeModelGeneration.py + OUT_FILES AntidunesLatticeModel.cpp AntidunesLatticeModel.h ) - waLBerla_add_executable(NAME Antidunes - FILES Antidunes.cpp PIDController.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm mesa_pd lbm_mesapd_coupling - postprocessing timeloop vtk AntidunesLatticeModelGeneration) -endif() + waLBerla_add_executable( NAME Antidunes + FILES Antidunes.cpp PIDController.cpp + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field + walberla::lbm walberla::mesa_pd walberla::lbm_mesapd_coupling walberla::postprocessing walberla::timeloop + walberla::vtk AntidunesLatticeModelGeneration ) +endif () -waLBerla_add_executable(NAME BedGeneration - FILES BedGeneration.cpp - DEPENDS blockforest core domain_decomposition mesa_pd vtk) +waLBerla_add_executable( NAME BedGeneration + FILES BedGeneration.cpp + DEPENDS walberla::blockforest walberla::core walberla::domain_decomposition walberla::mesa_pd walberla::vtk ) diff --git a/apps/showcases/BidisperseFluidizedBed/CMakeLists.txt b/apps/showcases/BidisperseFluidizedBed/CMakeLists.txt index 51318ee88..a59959bad 100644 --- a/apps/showcases/BidisperseFluidizedBed/CMakeLists.txt +++ b/apps/showcases/BidisperseFluidizedBed/CMakeLists.txt @@ -1,2 +1,2 @@ waLBerla_add_executable ( NAME BidisperseFluidizedBedDPM - DEPENDS blockforest boundary core domain_decomposition field lbm pe pe_coupling postprocessing timeloop vtk ) \ No newline at end of file + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::timeloop walberla::vtk ) \ No newline at end of file diff --git a/apps/showcases/CombinedResolvedUnresolved/CMakeLists.txt b/apps/showcases/CombinedResolvedUnresolved/CMakeLists.txt index a550c3006..1d19269dd 100644 --- a/apps/showcases/CombinedResolvedUnresolved/CMakeLists.txt +++ b/apps/showcases/CombinedResolvedUnresolved/CMakeLists.txt @@ -1,2 +1,2 @@ waLBerla_add_executable ( NAME CombinedResolvedUnresolved - DEPENDS blockforest boundary core domain_decomposition field lbm pe pe_coupling postprocessing timeloop vtk ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::timeloop walberla::vtk ) diff --git a/apps/showcases/FlowAroundSphere/CMakeLists.txt b/apps/showcases/FlowAroundSphere/CMakeLists.txt index f11856924..ba0c2a745 100644 --- a/apps/showcases/FlowAroundSphere/CMakeLists.txt +++ b/apps/showcases/FlowAroundSphere/CMakeLists.txt @@ -22,10 +22,10 @@ waLBerla_generate_target_from_python(NAME FlowAroundSphereCodeGen if (WALBERLA_BUILD_WITH_CUDA OR WALBERLA_BUILD_WITH_HIP) waLBerla_add_executable ( NAME FlowAroundSphere FILES FlowAroundSphere.cpp Sphere.cpp Evaluation.cpp GridGeneration.h Types.h - DEPENDS blockforest boundary core field gpu lbm_generated stencil timeloop vtk FlowAroundSphereCodeGen ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::gpu walberla::lbm_generated walberla::stencil walberla::timeloop walberla::vtk FlowAroundSphereCodeGen ) else() waLBerla_add_executable ( NAME FlowAroundSphere FILES FlowAroundSphere.cpp Sphere.cpp Evaluation.cpp GridGeneration.h Types.h - DEPENDS blockforest boundary core field lbm_generated stencil timeloop vtk FlowAroundSphereCodeGen ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm_generated walberla::stencil walberla::timeloop walberla::vtk FlowAroundSphereCodeGen ) endif(WALBERLA_BUILD_WITH_CUDA OR WALBERLA_BUILD_WITH_HIP) diff --git a/apps/showcases/FluidizedBed/CMakeLists.txt b/apps/showcases/FluidizedBed/CMakeLists.txt index fd529a751..01ae9cd1a 100644 --- a/apps/showcases/FluidizedBed/CMakeLists.txt +++ b/apps/showcases/FluidizedBed/CMakeLists.txt @@ -1,7 +1,7 @@ waLBerla_link_files_to_builddir( "*.prm" ) waLBerla_add_executable ( NAME FluidizedBedMEM FILES FluidizedBedMEM.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd timeloop vtk ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::timeloop walberla::vtk ) waLBerla_add_executable ( NAME FluidizedBedPSM FILES FluidizedBedPSM.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd timeloop vtk ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::timeloop walberla::vtk ) diff --git a/apps/showcases/FreeSurface/CMakeLists.txt b/apps/showcases/FreeSurface/CMakeLists.txt index 34bed9ecd..55f2a6bfe 100644 --- a/apps/showcases/FreeSurface/CMakeLists.txt +++ b/apps/showcases/FreeSurface/CMakeLists.txt @@ -1,52 +1,59 @@ waLBerla_link_files_to_builddir( *.prm ) -waLBerla_add_executable(NAME BubblyPoiseuille - FILES BubblyPoiseuille.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk) - -waLBerla_add_executable(NAME CapillaryWave - FILES CapillaryWave.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk) - -waLBerla_add_executable(NAME DamBreakCylindrical - FILES DamBreakCylindrical.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk) - -waLBerla_add_executable(NAME DamBreakRectangular - FILES DamBreakRectangular.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk) - -waLBerla_add_executable(NAME DropImpact - FILES DropImpact.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk) - -waLBerla_add_executable(NAME DropWetting - FILES DropWetting.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk) - -waLBerla_add_executable(NAME GravityWave - FILES GravityWave.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk) - -if( WALBERLA_BUILD_WITH_CODEGEN ) - walberla_generate_target_from_python( NAME GravityWaveLatticeModelGeneration - FILE GravityWaveLatticeModelGeneration.py - OUT_FILES GravityWaveLatticeModel.cpp GravityWaveLatticeModel.h ) - - waLBerla_add_executable(NAME GravityWaveCodegen - FILES GravityWaveCodegen.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk - GravityWaveLatticeModelGeneration) -endif() - -waLBerla_add_executable(NAME MovingDrop - FILES MovingDrop.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk) - -waLBerla_add_executable(NAME RisingBubble - FILES RisingBubble.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk) - -waLBerla_add_executable(NAME TaylorBubble - FILES TaylorBubble.cpp - DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk) \ No newline at end of file +waLBerla_add_executable( NAME BubblyPoiseuille + FILES BubblyPoiseuille.cpp + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm + walberla::postprocessing walberla::timeloop walberla::vtk ) + +waLBerla_add_executable( NAME CapillaryWave + FILES CapillaryWave.cpp + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm + walberla::postprocessing walberla::timeloop walberla::vtk ) + +waLBerla_add_executable( NAME DamBreakCylindrical + FILES DamBreakCylindrical.cpp + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm + walberla::postprocessing walberla::timeloop walberla::vtk ) + +waLBerla_add_executable( NAME DamBreakRectangular + FILES DamBreakRectangular.cpp + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm + walberla::postprocessing walberla::timeloop walberla::vtk ) + +waLBerla_add_executable( NAME DropImpact + FILES DropImpact.cpp + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm + walberla::postprocessing walberla::timeloop walberla::vtk ) + +waLBerla_add_executable( NAME DropWetting + FILES DropWetting.cpp + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm + walberla::postprocessing walberla::timeloop walberla::vtk ) + +waLBerla_add_executable( NAME GravityWave + FILES GravityWave.cpp + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm + walberla::postprocessing walberla::timeloop walberla::vtk ) + +if ( WALBERLA_BUILD_WITH_CODEGEN ) + walberla_generate_target_from_python( NAME GravityWaveLatticeModelGeneration + FILE GravityWaveLatticeModelGeneration.py + OUT_FILES GravityWaveLatticeModel.cpp GravityWaveLatticeModel.h ) + + waLBerla_add_executable( NAME GravityWaveCodegen + FILES GravityWaveCodegen.cpp + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm + walberla::postprocessing walberla::timeloop walberla::vtk GravityWaveLatticeModelGeneration ) +endif () + +waLBerla_add_executable( NAME MovingDrop + FILES MovingDrop.cpp + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk ) + +waLBerla_add_executable( NAME RisingBubble + FILES RisingBubble.cpp + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk ) + +waLBerla_add_executable( NAME TaylorBubble + FILES TaylorBubble.cpp + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk ) \ No newline at end of file diff --git a/apps/showcases/HeatConduction/CMakeLists.txt b/apps/showcases/HeatConduction/CMakeLists.txt index f9465cda0..0a9407699 100644 --- a/apps/showcases/HeatConduction/CMakeLists.txt +++ b/apps/showcases/HeatConduction/CMakeLists.txt @@ -2,4 +2,4 @@ waLBerla_link_files_to_builddir( *.cfg ) waLBerla_add_executable( NAME HeatConduction FILES HeatConduction.cpp - DEPENDS core mesa_pd vtk ) + DEPENDS walberla::core walberla::mesa_pd walberla::vtk ) diff --git a/apps/showcases/LightRisingParticleInFluidAMR/CMakeLists.txt b/apps/showcases/LightRisingParticleInFluidAMR/CMakeLists.txt index 96fd54bdb..312abbea1 100644 --- a/apps/showcases/LightRisingParticleInFluidAMR/CMakeLists.txt +++ b/apps/showcases/LightRisingParticleInFluidAMR/CMakeLists.txt @@ -1,3 +1,3 @@ waLBerla_add_executable ( NAME LightRisingParticleInFluidAMR FILES LightRisingParticleInFluidAMR.cpp - DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field vtk geometry postprocessing ) + DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field walberla::vtk walberla::geometry walberla::postprocessing ) diff --git a/apps/showcases/Mixer/CMakeLists.txt b/apps/showcases/Mixer/CMakeLists.txt index c355caf51..e1a9b3519 100644 --- a/apps/showcases/Mixer/CMakeLists.txt +++ b/apps/showcases/Mixer/CMakeLists.txt @@ -2,4 +2,4 @@ waLBerla_link_files_to_builddir( *.cfg ) waLBerla_add_executable( NAME Mixer FILES Mixer.cpp - DEPENDS core mesa_pd sqlite vtk ) + DEPENDS walberla::core walberla::mesa_pd walberla::sqlite walberla::vtk ) diff --git a/apps/showcases/ParticlePacking/CMakeLists.txt b/apps/showcases/ParticlePacking/CMakeLists.txt index abe7636fa..a385d7bd6 100644 --- a/apps/showcases/ParticlePacking/CMakeLists.txt +++ b/apps/showcases/ParticlePacking/CMakeLists.txt @@ -3,6 +3,6 @@ waLBerla_link_files_to_builddir( *.cfg ) if (WALBERLA_MESAPD_CONVEX_POLYHEDRON_AVAILABLE) waLBerla_add_executable ( NAME ParticlePacking FILES ParticlePacking.cpp - DEPENDS blockforest core mesa_pd postprocessing sqlite vtk ) + DEPENDS walberla::blockforest walberla::core walberla::mesa_pd walberla::postprocessing walberla::sqlite walberla::vtk ) endif() diff --git a/apps/showcases/PegIntoSphereBed/CMakeLists.txt b/apps/showcases/PegIntoSphereBed/CMakeLists.txt index 3ddd2e024..7a71c0c6e 100644 --- a/apps/showcases/PegIntoSphereBed/CMakeLists.txt +++ b/apps/showcases/PegIntoSphereBed/CMakeLists.txt @@ -3,5 +3,5 @@ waLBerla_link_files_to_builddir( *.cfg ) if (OPENMESH_FOUND AND WALBERLA_MESAPD_CONVEX_POLYHEDRON_AVAILABLE) waLBerla_add_executable ( NAME MESA_PD_MESH_APP_PegIntoSphereBed FILES PegIntoSphereBed.cpp - DEPENDS blockforest mesh_common mesa_pd core vtk ) + DEPENDS walberla::blockforest mesh_common walberla::mesa_pd walberla::core walberla::vtk ) endif() \ No newline at end of file diff --git a/apps/showcases/PhaseFieldAllenCahn/CPU/CMakeLists.txt b/apps/showcases/PhaseFieldAllenCahn/CPU/CMakeLists.txt index 383c9d31a..ea5b2a420 100644 --- a/apps/showcases/PhaseFieldAllenCahn/CPU/CMakeLists.txt +++ b/apps/showcases/PhaseFieldAllenCahn/CPU/CMakeLists.txt @@ -18,4 +18,4 @@ waLBerla_generate_target_from_python(NAME PhaseFieldCodeGenCPU waLBerla_add_executable(NAME multiphaseCPU FILES multiphase.cpp PythonExports.cpp InitializerFunctions.cpp multiphase_codegen.py - DEPENDS blockforest core field postprocessing python_coupling lbm geometry timeloop PhaseFieldCodeGenCPU) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::postprocessing walberla::python_coupling walberla::lbm walberla::geometry walberla::timeloop PhaseFieldCodeGenCPU ) diff --git a/apps/showcases/PhaseFieldAllenCahn/GPU/CMakeLists.txt b/apps/showcases/PhaseFieldAllenCahn/GPU/CMakeLists.txt index 61e4464d1..ee17a19c2 100644 --- a/apps/showcases/PhaseFieldAllenCahn/GPU/CMakeLists.txt +++ b/apps/showcases/PhaseFieldAllenCahn/GPU/CMakeLists.txt @@ -18,4 +18,4 @@ waLBerla_generate_target_from_python(NAME PhaseFieldCodeGenGPU waLBerla_add_executable(NAME multiphaseGPU FILES multiphase.cpp PythonExports.cpp InitializerFunctions.cpp util.cpp multiphase_codegen.py - DEPENDS blockforest core gpu field postprocessing python_coupling lbm geometry timeloop PhaseFieldCodeGenGPU) + DEPENDS walberla::blockforest walberla::core walberla::gpu walberla::field walberla::postprocessing walberla::python_coupling walberla::lbm walberla::geometry walberla::timeloop PhaseFieldCodeGenGPU ) diff --git a/apps/showcases/Piping/CMakeLists.txt b/apps/showcases/Piping/CMakeLists.txt index c86a1ee33..489ae94ac 100644 --- a/apps/showcases/Piping/CMakeLists.txt +++ b/apps/showcases/Piping/CMakeLists.txt @@ -2,4 +2,4 @@ add_subdirectory(setups) waLBerla_add_executable(NAME SettlingSpheres FILES SettlingSpheres.cpp - DEPENDS blockforest core field lbm_mesapd_coupling mesa_pd vtk) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::vtk ) diff --git a/apps/showcases/PorousMedia/CMakeLists.txt b/apps/showcases/PorousMedia/CMakeLists.txt index 73e240929..1376fa1c7 100644 --- a/apps/showcases/PorousMedia/CMakeLists.txt +++ b/apps/showcases/PorousMedia/CMakeLists.txt @@ -4,7 +4,7 @@ waLBerla_link_files_to_builddir( *.txt ) waLBerla_add_executable ( NAME PackedBedCreation FILES PackedBedCreation.cpp - DEPENDS blockforest core field geometry timeloop pe pe_coupling vtk) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::geometry walberla::timeloop walberla::pe walberla::pe_coupling walberla::vtk ) waLBerla_generate_target_from_python( NAME GeneratedLatticeModel @@ -14,5 +14,5 @@ waLBerla_generate_target_from_python( waLBerla_add_executable ( NAME PorousMedia FILES PorousMediaCumulantLBMKernel.py PorousMedia.cpp - DEPENDS blockforest core field lbm geometry timeloop pe pe_coupling GeneratedLatticeModel ) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::lbm walberla::geometry walberla::timeloop walberla::pe walberla::pe_coupling GeneratedLatticeModel ) diff --git a/apps/showcases/Thermocapillary/CMakeLists.txt b/apps/showcases/Thermocapillary/CMakeLists.txt index 5a06ee8e3..f884505c6 100644 --- a/apps/showcases/Thermocapillary/CMakeLists.txt +++ b/apps/showcases/Thermocapillary/CMakeLists.txt @@ -35,9 +35,9 @@ waLBerla_generate_target_from_python(NAME ThermocapillaryGen if ( WALBERLA_BUILD_WITH_GPU_SUPPORT ) waLBerla_add_executable(NAME thermocapillary FILES thermocapillary.cpp PythonExports.cpp InitializerFunctions.cpp thermocapillary_codegen.py - DEPENDS blockforest core gpu field postprocessing python_coupling lbm geometry timeloop ThermocapillaryGen) + DEPENDS walberla::blockforest walberla::core walberla::gpu walberla::field walberla::postprocessing walberla::python_coupling walberla::lbm walberla::geometry walberla::timeloop ThermocapillaryGen ) else () waLBerla_add_executable(NAME thermocapillary FILES thermocapillary.cpp PythonExports.cpp InitializerFunctions.cpp thermocapillary_codegen.py - DEPENDS blockforest core field postprocessing python_coupling lbm geometry timeloop ThermocapillaryGen) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::postprocessing walberla::python_coupling walberla::lbm walberla::geometry walberla::timeloop ThermocapillaryGen ) endif ( WALBERLA_BUILD_WITH_GPU_SUPPORT ) diff --git a/apps/tools/MixedPrecision/CMakeLists.txt b/apps/tools/MixedPrecision/CMakeLists.txt index 5f14c7e5a..272a8c18c 100644 --- a/apps/tools/MixedPrecision/CMakeLists.txt +++ b/apps/tools/MixedPrecision/CMakeLists.txt @@ -1,3 +1,3 @@ waLBerla_add_executable ( NAME CheckFP16 FILES CheckFP16.cpp - DEPENDS core ) \ No newline at end of file + DEPENDS walberla::core ) \ No newline at end of file diff --git a/apps/tools/povrayFileCompressor/CMakeLists.txt b/apps/tools/povrayFileCompressor/CMakeLists.txt index a9ad58f57..707b13319 100644 --- a/apps/tools/povrayFileCompressor/CMakeLists.txt +++ b/apps/tools/povrayFileCompressor/CMakeLists.txt @@ -1,3 +1,3 @@ waLBerla_add_executable ( NAME PovrayFileCompressor - FILES main.cpp - DEPENDS postprocessing ) \ No newline at end of file + FILES main.cpp + DEPENDS walberla::postprocessing ) \ No newline at end of file diff --git a/apps/tutorials/basics/CMakeLists.txt b/apps/tutorials/basics/CMakeLists.txt index e417b9516..12617529e 100644 --- a/apps/tutorials/basics/CMakeLists.txt +++ b/apps/tutorials/basics/CMakeLists.txt @@ -3,13 +3,13 @@ waLBerla_link_files_to_builddir( *.png ) waLBerla_add_executable ( NAME 01_Tutorial_BlocksAndFields1 FILES 01_BlocksAndFields.cpp - DEPENDS blockforest core field timeloop ) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::timeloop ) waLBerla_add_executable ( NAME 02_Tutorial_Sweeps FILES 02_Sweeps.cpp - DEPENDS blockforest core field timeloop ) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::timeloop ) waLBerla_add_executable ( NAME 03_Tutorial_GameOfLife FILES 03_GameOfLife.cpp - DEPENDS blockforest core field geometry timeloop ) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::geometry walberla::timeloop ) diff --git a/apps/tutorials/codegen/CMakeLists.txt b/apps/tutorials/codegen/CMakeLists.txt index f24cdab2b..fb4cc9b77 100644 --- a/apps/tutorials/codegen/CMakeLists.txt +++ b/apps/tutorials/codegen/CMakeLists.txt @@ -6,10 +6,11 @@ if( WALBERLA_BUILD_WITH_CODEGEN ) walberla_generate_target_from_python( NAME CodegenHeatEquationKernel FILE HeatEquationKernel.py OUT_FILES HeatEquationKernel.cpp HeatEquationKernel.h ) - - walberla_add_executable ( NAME 01_CodegenHeatEquation - FILES 01_CodegenHeatEquation.cpp - DEPENDS blockforest core field stencil timeloop vtk pde CodegenHeatEquationKernel ) + + walberla_add_executable( NAME 01_CodegenHeatEquation + FILES 01_CodegenHeatEquation.cpp + DEPENDS walberla::blockforest walberla::core walberla::field walberla::stencil walberla::timeloop + walberla::vtk walberla::pde CodegenHeatEquationKernel ) # Tutorial 2: lbmpy Lattice Model Generation waLBerla_link_files_to_builddir( *.prm ) @@ -19,9 +20,10 @@ if( WALBERLA_BUILD_WITH_CODEGEN ) OUT_FILES SRTLatticeModel.cpp SRTLatticeModel.h SRTPackInfo.cpp SRTPackInfo.h ) - walberla_add_executable ( NAME 02_LBMLatticeModelGenerationApp - FILES 02_LBMLatticeModelGeneration.cpp - DEPENDS blockforest core domain_decomposition field geometry timeloop lbm stencil vtk 02_LBMLatticeModelGenerationPython ) + walberla_add_executable( NAME 02_LBMLatticeModelGenerationApp + FILES 02_LBMLatticeModelGeneration.cpp + DEPENDS walberla::blockforest walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::timeloop + walberla::lbm walberla::stencil walberla::vtk 02_LBMLatticeModelGenerationPython ) # Tutorial 3: Advanced lbmpy Code Generation walberla_generate_target_from_python( NAME 03_AdvancedLBMCodegenPython @@ -34,11 +36,11 @@ if( WALBERLA_BUILD_WITH_CODEGEN ) if(WALBERLA_BUILD_WITH_GPU_SUPPORT) walberla_add_executable ( NAME 03_AdvancedLBMCodegenApp FILES 03_AdvancedLBMCodegen.cpp - DEPENDS blockforest gpu core domain_decomposition field geometry timeloop lbm stencil vtk 03_AdvancedLBMCodegenPython ) + DEPENDS walberla::blockforest walberla::gpu walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::timeloop walberla::lbm walberla::stencil walberla::vtk 03_AdvancedLBMCodegenPython ) else() walberla_add_executable ( NAME 03_AdvancedLBMCodegenApp FILES 03_AdvancedLBMCodegen.cpp - DEPENDS blockforest core domain_decomposition field geometry timeloop lbm stencil vtk 03_AdvancedLBMCodegenPython ) + DEPENDS walberla::blockforest walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::timeloop walberla::lbm walberla::stencil walberla::vtk 03_AdvancedLBMCodegenPython ) endif() # Tutorial 4: Advanced lbmpy Code Generation with Complex geometry @@ -63,8 +65,8 @@ if( WALBERLA_BUILD_WITH_CODEGEN ) LBComplexGeometryBoundaryCollection.h InfoHeader.h ) - - set(TUT4_DEPENDENCIES blockforest boundary core field geometry lbm lbm_generated mesh python_coupling stencil timeloop vtk 04_LBComplexGeometryPython) + + set( TUT4_DEPENDENCIES walberla::blockforest walberla::boundary walberla::core walberla::field walberla::geometry walberla::lbm lbm_generated walberla::mesh walberla::python_coupling walberla::stencil walberla::timeloop walberla::vtk 04_LBComplexGeometryPython ) if(WALBERLA_BUILD_WITH_GPU_SUPPORT) list(APPEND TUT4_DEPENDENCIES gpu) diff --git a/apps/tutorials/gpu/CMakeLists.txt b/apps/tutorials/gpu/CMakeLists.txt index 14590ec05..8e02d00d8 100644 --- a/apps/tutorials/gpu/CMakeLists.txt +++ b/apps/tutorials/gpu/CMakeLists.txt @@ -3,5 +3,5 @@ waLBerla_link_files_to_builddir( *.png ) waLBerla_add_executable ( NAME 01_GameOfLife_cuda FILES 01_GameOfLife_cuda.cpp 01_GameOfLife_kernels.cu - DEPENDS blockforest core gpu field lbm geometry timeloop ) + DEPENDS walberla::blockforest walberla::core walberla::gpu walberla::field walberla::lbm walberla::geometry walberla::timeloop ) \ No newline at end of file diff --git a/apps/tutorials/lbm/CMakeLists.txt b/apps/tutorials/lbm/CMakeLists.txt index fd200aebb..8fd53ddae 100644 --- a/apps/tutorials/lbm/CMakeLists.txt +++ b/apps/tutorials/lbm/CMakeLists.txt @@ -3,15 +3,15 @@ waLBerla_link_files_to_builddir( *.png ) waLBerla_add_executable ( NAME 01_BasicLBM FILES 01_BasicLBM.cpp - DEPENDS blockforest core field lbm geometry timeloop ) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::lbm walberla::geometry walberla::timeloop ) waLBerla_add_executable ( NAME 02_BasicLBM_ExemplaryExtensions FILES 02_BasicLBM_ExemplaryExtensions.cpp - DEPENDS blockforest core field lbm geometry timeloop ) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::lbm walberla::geometry walberla::timeloop ) waLBerla_add_executable ( NAME 03_LBLidDrivenCavity FILES 03_LBLidDrivenCavity.cpp - DEPENDS blockforest boundary core field lbm stencil timeloop vtk ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::stencil walberla::timeloop walberla::vtk ) if ( WALBERLA_BUILD_WITH_OPENMESH ) @@ -19,14 +19,14 @@ waLBerla_link_geometry_to_builddir(*.obj) waLBerla_add_executable ( NAME 04_LBComplexGeometry FILES 04_LBComplexGeometry.cpp - DEPENDS blockforest boundary core field lbm mesh stencil timeloop vtk ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm mesh walberla::stencil walberla::timeloop walberla::vtk ) endif() waLBerla_add_executable ( NAME 05_BackwardFacingStep FILES 05_BackwardFacingStep.cpp - DEPENDS blockforest boundary core field lbm stencil timeloop vtk ) + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::stencil walberla::timeloop walberla::vtk ) waLBerla_add_executable ( NAME 06_LBBoundaryCondition FILES 06_LBBoundaryCondition.cpp - DEPENDS blockforest boundary core field lbm stencil timeloop vtk ) \ No newline at end of file + DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::stencil walberla::timeloop walberla::vtk ) \ No newline at end of file diff --git a/apps/tutorials/mesa_pd/CMakeLists.txt b/apps/tutorials/mesa_pd/CMakeLists.txt index 6c49f6996..2a0dc3074 100644 --- a/apps/tutorials/mesa_pd/CMakeLists.txt +++ b/apps/tutorials/mesa_pd/CMakeLists.txt @@ -2,4 +2,4 @@ waLBerla_link_files_to_builddir( *.cfg ) waLBerla_add_executable ( NAME 01_MESA_PD FILES 01_MESAPD.cpp - DEPENDS blockforest core mesa_pd ) + DEPENDS walberla::blockforest walberla::core walberla::mesa_pd ) diff --git a/apps/tutorials/pde/CMakeLists.txt b/apps/tutorials/pde/CMakeLists.txt index b0b4514a5..da96d1bc2 100644 --- a/apps/tutorials/pde/CMakeLists.txt +++ b/apps/tutorials/pde/CMakeLists.txt @@ -4,13 +4,13 @@ waLBerla_link_files_to_builddir( *.png ) waLBerla_add_executable ( NAME 01_SolvingPDE FILES 01_SolvingPDE.cpp - DEPENDS blockforest core field stencil timeloop ) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::stencil walberla::timeloop ) waLBerla_add_executable ( NAME 02_HeatEquation FILES 02_HeatEquation.cpp - DEPENDS blockforest core field stencil timeloop ) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::stencil walberla::timeloop ) waLBerla_add_executable ( NAME 03_HeatEquation_Extensions FILES 03_HeatEquation_Extensions.cpp - DEPENDS blockforest core field stencil timeloop vtk ) + DEPENDS walberla::blockforest walberla::core walberla::field walberla::stencil walberla::timeloop walberla::vtk ) \ No newline at end of file diff --git a/apps/tutorials/pe/CMakeLists.txt b/apps/tutorials/pe/CMakeLists.txt index 5b71226d3..6c0ab17fb 100644 --- a/apps/tutorials/pe/CMakeLists.txt +++ b/apps/tutorials/pe/CMakeLists.txt @@ -2,11 +2,11 @@ waLBerla_link_files_to_builddir( *.cfg ) waLBerla_add_executable ( NAME 01_Tutorial_ConfinedGas FILES 01_ConfinedGas.cpp - DEPENDS blockforest core pe ) + DEPENDS walberla::blockforest walberla::core walberla::pe ) waLBerla_add_executable ( NAME 02_Tutorial_ConfinedGasExtended FILES 02_ConfinedGasExtended.cpp - DEPENDS blockforest core pe postprocessing vtk sqlite ) + DEPENDS walberla::blockforest walberla::core walberla::pe walberla::postprocessing walberla::vtk walberla::sqlite ) waLBerla_execute_test( NO_MODULE_LABEL NAME 01_Tutorial_ConfinedGas PROCESSES 8 ) waLBerla_execute_test( NO_MODULE_LABEL NAME 02_Tutorial_ConfinedGasExtended diff --git a/cmake/waLBerlaFunctions.cmake b/cmake/waLBerlaFunctions.cmake index 7e957da2c..5fa1c4993 100644 --- a/cmake/waLBerlaFunctions.cmake +++ b/cmake/waLBerlaFunctions.cmake @@ -9,140 +9,6 @@ set ( WALBERLA_GLOB_FILES *.cpp CACHE INTERNAL "File endings to glob for source files" ) -####################################################################################################################### -# -# Creates a walberla module library -# -# -# Keywords: -# DEPENDS [required] list of modules, that this module depends on -# FILES [optional] list of all source and header files belonging to that module -# if this is not given, all source and header files in the directory are added. -# Careful: when file was added or deleted, cmake has to be run again -# EXCLUDE [optional] Files that should not be included in the module (but are located in module directory). -# This makes only sense if FILES was not specified, and all files have been added automatically. -# BUILD_ONLY_IF_FOUND Before building the module test if all libraries specified here are availbable. -# [optional] This is done using the ${arg}_FOUND variable. -# Example: waLBerla_add_module( DEPENDS someModule BUILD_ONLY_IF_FOUND pe) -# This module is only built if PE_FOUND is true. -# OPTIONAL_DEPENDS Lists modules, that this module might depend on. For example a module could depend on mesh_common if OpenMesh is -# [optional] available. -# -####################################################################################################################### - -function ( waLBerla_add_module ) - message(WARNING "This function is deprecated. Please use the default cmake mechanisms like add_library.") - set( options ) - set( oneValueArgs ) - set( multiValueArgs DEPENDS EXCLUDE FILES BUILD_ONLY_IF_FOUND OPTIONAL_DEPENDS ) - cmake_parse_arguments( ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) - - set( ALL_DEPENDENCIES ${ARG_DEPENDS} ${ARG_OPTIONAL_DEPENDS}) - # Module name is the directory relative to WALBERLA_MODULE_DIRS - get_current_module_name ( ) - get_module_library_name ( moduleLibraryName ${moduleName} ) - - # Test if all required libraries are available - # this is detected using the _FOUND variable - foreach ( externalName ${ARG_BUILD_ONLY_IF_FOUND} ) - string( TOUPPER ${externalName} externalNameUpper ) - if ( NOT ${externalNameUpper}_FOUND ) - message ( STATUS "Module ${moduleName} is not built, because ${externalName} not available" ) - return() - endif() - endforeach() - - # Take source files either from parameter or search all source files - file ( GLOB_RECURSE allFiles "*" ) # Find all files - if ( ARG_FILES ) - foreach( sourceFile ${ARG_FILES} ) - get_filename_component( sourceFile ${sourceFile} ABSOLUTE ) - list( APPEND sourceFiles ${sourceFile} ) - endforeach() - else() - file ( GLOB_RECURSE sourceFiles ${WALBERLA_GLOB_FILES} ) # Find all source files - endif() - - # Remove exclude files from the sources - if ( ARG_EXCLUDE ) - foreach ( fileToExclude ${ARG_EXCLUDE} ) - get_filename_component( fileToExclude ${fileToExclude} ABSOLUTE ) - list (REMOVE_ITEM sourceFiles ${fileToExclude} ) - endforeach() - endif() - - list_minus ( otherFiles LIST1 ${allFiles} LIST2 ${sourceFiles} ) - set_source_files_properties( ${otherFiles} PROPERTIES HEADER_FILE_ONLY ON ) - - if ( WALBERLA_GROUP_FILES ) - group_files( "Other Files" FILES ${otherFiles} ) - group_files( "Source Files" FILES ${sourceFiles} ) - endif ( ) - - # Dependency Check - check_dependencies( missingDeps additionalDeps FILES ${sourceFiles} EXPECTED_DEPS ${ALL_DEPENDENCIES} ${moduleName} ) - if ( missingDeps ) - message ( WARNING "The module ${moduleName} depends on ${missingDeps} which are not listed as dependencies!" ) - endif() - - set( hasSourceFiles FALSE ) - foreach ( sourceFile ${sourceFiles} ) - if ( ${sourceFile} MATCHES "\\.(c|cpp|cu)" ) - set( hasSourceFiles TRUE ) - endif( ) - endforeach( ) - - if ( hasSourceFiles ) - add_library( ${moduleLibraryName} STATIC ${sourceFiles} ${otherFiles} ) - else( ) - add_custom_target( ${moduleLibraryName} SOURCES ${sourceFiles} ${otherFiles} ) # dummy IDE target - endif( ) - - waLBerla_register_dependency ( ${moduleName} ${ARG_DEPENDS} ) - - set_property( TARGET ${moduleLibraryName} PROPERTY CXX_STANDARD ${CMAKE_CXX_STANDARD} ) - - # This property is needed for visual studio to group modules together - if( WALBERLA_GROUP_PROJECTS ) - set_property( TARGET ${moduleLibraryName} PROPERTY FOLDER "SRC" ) - endif() - - # Install rule for library - get_target_property( module_type ${moduleLibraryName} TYPE ) - if( ${module_type} MATCHES LIBRARY ) - install ( TARGETS ${moduleLibraryName} RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib ) - endif( ) - - # Install rule for header - install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ - DESTINATION "walberla/${moduleName}" - FILES_MATCHING PATTERN "*.h" - PATTERN "*.in.h" EXCLUDE - PATTERN "CMakeFiles" EXCLUDE ) - - # Install generated headers if necessary - if ( NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR} ) - install ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ - DESTINATION "walberla/${moduleName}" - FILES_MATCHING PATTERN "*.h" - PATTERN "*.in.h" EXCLUDE - PATTERN "CMakeFiles" EXCLUDE ) - endif() - - - # Report module statistics - which is later on written out to a json file - # This file is used in the doxygen documentation to display a module graph - #waLBerla_module_statistics ( FILES ${sourceFiles} DEPENDS ${ARG_DEPENDS} ) - -endfunction ( waLBerla_add_module ) -####################################################################################################################### - - - - - ####################################################################################################################### # # Compiles an application either from given source files, or otherwise globs all files in the current folder. @@ -205,8 +71,7 @@ function ( waLBerla_add_executable ) endif() add_executable( ${ARG_NAME} ${sourceFiles} ) - - target_link_modules ( ${ARG_NAME} ${ARG_DEPENDS} ) + target_link_libraries( ${ARG_NAME} ${WALBERLA_LINK_LIBRARIES_KEYWORD} ${ARG_DEPENDS} ) target_link_libraries( ${ARG_NAME} ${WALBERLA_LINK_LIBRARIES_KEYWORD} ${SERVICE_LIBS} ) set_property( TARGET ${ARG_NAME} PROPERTY CXX_STANDARD ${CMAKE_CXX_STANDARD} ) diff --git a/cmake/waLBerlaModuleDependencySystem.cmake b/cmake/waLBerlaModuleDependencySystem.cmake index fc3ad4f7e..488b635da 100644 --- a/cmake/waLBerlaModuleDependencySystem.cmake +++ b/cmake/waLBerlaModuleDependencySystem.cmake @@ -59,7 +59,7 @@ function ( get_current_module_name ) if ( NOT ${moduleFolder} MATCHES "\\.\\./.*" ) #append / to make cmake_path also work with one directory only string(REGEX REPLACE "(.*)/.*" "\\1" moduleNameOut ${moduleFolder}) - set(moduleName ${moduleNameOut} PARENT_SCOPE) + set( moduleName walberla::${moduleNameOut} PARENT_SCOPE ) return() endif() endforeach() @@ -173,48 +173,6 @@ endfunction ( waLBerla_resolve_dependencies ) - - -####################################################################################################################### -# -# Links a list of modules to a given target -# -# - Translates module names to library names -# - links transitively all modules that depend on given modules -# -####################################################################################################################### - -function ( target_link_modules target ) - - set ( libs ) - foreach ( module ${ARGN} ) - get_module_library_name ( libraryName ${module} ) - list( APPEND libs ${libraryName} ) - endforeach() - - waLBerla_resolve_dependencies ( libs ${libs} ) - - # The linker needs the modules in the correct order depending on their - # dependencies. We would have to do a topological sorting here, instead - # we specify all libs twice -> Could be improved -> faster linking times - set ( libs ${libs} ${libs} ${libs} ) - - foreach ( libraryName ${libs} ) - if( TARGET ${libraryName} ) - get_target_property( target_type ${libraryName} TYPE ) - if( ${target_type} MATCHES LIBRARY ) - target_link_libraries( ${target} ${WALBERLA_LINK_LIBRARIES_KEYWORD} ${libraryName} ) - endif( ) - endif( ) - endforeach() - -endfunction ( target_link_modules ) -####################################################################################################################### - - - - - ####################################################################################################################### # If path contains a CMakeLists.txt, path is returned # otherwise recursivly the parent directories are checked and returned if they contain a CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0dea809f1..fd91d9190 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ # List modules here that should not be built -#set ( excludedModules core ) +#set ( excludedModules walberla::core ) # # # @@ -54,3 +54,24 @@ add_subdirectory( stencil ) add_subdirectory( timeloop ) add_subdirectory( vtk ) +#### TODO: Remove with waLBerla 7.2. +list( APPEND MODULES blockforest boundary communication core gpu domain_decomposition executiontree field gather geometry lbm lbm_generated + lbm_mesapd_coupling mesa_pd pde pe pe_coupling postprocessing simd sqlite stencil timeloop vtk ) +if ( WALBERLA_BUILD_WITH_FFT AND FFTW3_FOUND ) + list( APPEND MODULES fft ) +endif () +if ( OPENMESH_FOUND ) + list( APPEND MODULES mesh mesh_common ) +endif () +if ( WALBERLA_BUILD_WITH_PYTHON ) + list( APPEND MODULES python_coupling ) +endif () + + +foreach ( MODULE IN LISTS MODULES ) + add_library( ${MODULE} INTERFACE ) + target_link_libraries( ${MODULE} INTERFACE walberla::${MODULE} ) + set_target_properties( ${MODULE} PROPERTIES DEPRECATION "Target '${MODULE}' is deprecated and will be removed with waLBerla 7.2. + Please use 'walberla::${MODULE}' instead." ) +endforeach () +#### TODO: Remove until here diff --git a/src/blockforest/CMakeLists.txt b/src/blockforest/CMakeLists.txt index 0c4e8f8bc..56f0035c0 100644 --- a/src/blockforest/CMakeLists.txt +++ b/src/blockforest/CMakeLists.txt @@ -4,9 +4,10 @@ mark_as_advanced( WALBERLA_BLOCKFOREST_PRIMITIVE_BLOCKID ) configure_file( CMakeDefs.in.h CMakeDefs.h ) -add_library( blockforest ) -target_link_libraries( blockforest PUBLIC communication core domain_decomposition stencil ) -target_sources( blockforest +add_library( walberla_blockforest ) +add_library( walberla::blockforest ALIAS walberla_blockforest ) +target_link_libraries( walberla_blockforest PUBLIC walberla::communication walberla::core walberla::domain_decomposition walberla::stencil ) +target_sources( walberla_blockforest PRIVATE AABBRefinementSelection.h all.h diff --git a/src/blockforest/communication/CMakeLists.txt b/src/blockforest/communication/CMakeLists.txt index 9038ee5c6..8285df1b9 100644 --- a/src/blockforest/communication/CMakeLists.txt +++ b/src/blockforest/communication/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( blockforest +target_sources( walberla_blockforest PRIVATE DirectionBasedReduceScheme.h LocalCommunicationMode.h diff --git a/src/blockforest/loadbalancing/CMakeLists.txt b/src/blockforest/loadbalancing/CMakeLists.txt index a40165a2e..40d01b49c 100644 --- a/src/blockforest/loadbalancing/CMakeLists.txt +++ b/src/blockforest/loadbalancing/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( blockforest +target_sources( walberla_blockforest PRIVATE BlockInfo.h Cartesian.h diff --git a/src/blockforest/loadbalancing/level_determination/CMakeLists.txt b/src/blockforest/loadbalancing/level_determination/CMakeLists.txt index 34358b29d..31f3dfd0c 100644 --- a/src/blockforest/loadbalancing/level_determination/CMakeLists.txt +++ b/src/blockforest/loadbalancing/level_determination/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( blockforest +target_sources( walberla_blockforest PRIVATE MinMaxLevelDetermination.h MinMaxLevelDetermination.cpp diff --git a/src/blockforest/loadbalancing/weight_assignment/CMakeLists.txt b/src/blockforest/loadbalancing/weight_assignment/CMakeLists.txt index fd84f74ce..cfe0de336 100644 --- a/src/blockforest/loadbalancing/weight_assignment/CMakeLists.txt +++ b/src/blockforest/loadbalancing/weight_assignment/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( blockforest +target_sources( walberla_blockforest PRIVATE WeightAssignmentFunctor.h MetisAssignmentFunctor.h diff --git a/src/boundary/CMakeLists.txt b/src/boundary/CMakeLists.txt index 7da3ebfe3..770c907c5 100644 --- a/src/boundary/CMakeLists.txt +++ b/src/boundary/CMakeLists.txt @@ -5,9 +5,10 @@ ################################################################################################### -add_library( boundary ) -target_link_libraries( boundary PUBLIC core communication domain_decomposition field stencil ) -target_sources( boundary +add_library( walberla_boundary ) +add_library( walberla::boundary ALIAS walberla_boundary ) +target_link_libraries( walberla_boundary PUBLIC walberla::core walberla::communication walberla::domain_decomposition walberla::field walberla::stencil ) +target_sources( walberla_boundary PRIVATE BoundaryHandling.h Boundary.h diff --git a/src/boundary/communication/CMakeLists.txt b/src/boundary/communication/CMakeLists.txt index 63d92d9db..4836bc286 100644 --- a/src/boundary/communication/CMakeLists.txt +++ b/src/boundary/communication/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( boundary +target_sources( walberla_boundary PRIVATE HandlingPackInfo.h ) diff --git a/src/communication/CMakeLists.txt b/src/communication/CMakeLists.txt index 82b1a4cc2..04a5678a5 100644 --- a/src/communication/CMakeLists.txt +++ b/src/communication/CMakeLists.txt @@ -4,13 +4,14 @@ # ################################################################################################### -add_library( communication INTERFACE ) -target_sources( communication +add_library( walberla_communication INTERFACE ) +add_library( walberla::communication ALIAS walberla_communication ) +target_sources( walberla_communication INTERFACE ReducePackInfo.h UniformMPIDatatypeInfo.h UniformPackInfo.h ) -target_link_libraries( communication INTERFACE core domain_decomposition stencil ) +target_link_libraries( walberla_communication INTERFACE walberla::core walberla::domain_decomposition walberla::stencil ) ################################################################################################### \ No newline at end of file diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 1cb6a5137..230d68c5f 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -6,93 +6,94 @@ ############################################################################################################################ -include(GetGitRevisionDescription) -get_git_head_revision(GIT_REFSPEC WALBERLA_GIT_SHA1) +include( GetGitRevisionDescription ) +get_git_head_revision( GIT_REFSPEC WALBERLA_GIT_SHA1 ) string( TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UPPER ) -set ( WALBERLA_BUILD_TYPE ${CMAKE_BUILD_TYPE} ) -set ( WALBERLA_COMPILER_FLAGS "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER}} ${CMAKE_CXX_FLAGS}" ) -string ( REPLACE "\"" "\\\"" WALBERLA_COMPILER_FLAGS ${WALBERLA_COMPILER_FLAGS} ) +set( WALBERLA_BUILD_TYPE ${CMAKE_BUILD_TYPE} ) +set( WALBERLA_COMPILER_FLAGS "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER}} ${CMAKE_CXX_FLAGS}" ) +string( REPLACE "\"" "\\\"" WALBERLA_COMPILER_FLAGS ${WALBERLA_COMPILER_FLAGS} ) site_name( WALBERLA_BUILD_MACHINE ) # Generate file with compile options, and add install rule for it -configure_file ( waLBerlaBuildInfo.in.cpp - waLBerlaBuildInfo.cpp ) - +configure_file( waLBerlaBuildInfo.in.cpp + waLBerlaBuildInfo.cpp ) + ############################################################################################################################ include( math/math.cmake ) include( logging/logging.cmake ) -add_library( core ) -if( MPI_FOUND ) - target_link_libraries( core PUBLIC MPI::MPI_CXX ) -endif() +add_library( walberla_core ) +add_library( walberla::core ALIAS walberla_core ) +if ( MPI_FOUND ) + target_link_libraries( walberla_core PUBLIC MPI::MPI_CXX ) +endif () if ( WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT ) - # Actual support for float16 is available only since C++23 - # before is_arithmetic and is_floating_point evaluated to false, - # also many STL functions are compatible with float16 only since C++23. - # Which features are actually supported depend on the compiler - target_compile_features(core PUBLIC cxx_std_23) + # Actual support for float16 is available only since C++23 + # before is_arithmetic and is_floating_point evaluated to false, + # also many STL functions are compatible with float16 only since C++23. + # Which features are actually supported depend on the compiler + target_compile_features( walberla_core PUBLIC cxx_std_23 ) endif () -target_link_libraries( core PUBLIC ${SERVICE_LIBS} ) -target_include_directories( core PUBLIC ${walberla_SOURCE_DIR}/src/ ${walberla_BINARY_DIR}/src/ ) -target_sources( core +target_link_libraries( walberla_core PUBLIC ${SERVICE_LIBS} ) +target_include_directories( walberla_core PUBLIC ${walberla_SOURCE_DIR}/src/ ${walberla_BINARY_DIR}/src/ ) +target_sources( walberla_core PRIVATE - Abort.cpp - Conversion.cpp - DataTypes.cpp - Environment.cpp - GetPID.cpp - Hostname.cpp - MemoryUsage.cpp - RandomUUID.cpp - Sleep.cpp - waLBerlaBuildInfo.cpp - Abort.h - AllSet.h - Any.h - Array.h - ConcatIterator.h - Conversion.h - DataTypes.h - EndianIndependentSerialization.h - Environment.h - Filesystem.h - Format.hpp - FunctionTraits.h - GetPID.h - Hostname.h - Macros.h - MemoryUsage.h - NonCopyable.h - NonCreateable.h - OpenMP.h - Optional.h - RandomUUID.h - Regex.h - Sanitizer.h - Set.h - SharedFunctor.h - Sleep.h - STLIO.h - stringToNum.h - StringUtility.h - StringUtility.impl.h - typeToString.h - UniqueID.h - Variant.h - VectorTrait.h - waLBerlaBuildInfo.h - ) + Abort.cpp + Conversion.cpp + DataTypes.cpp + Environment.cpp + GetPID.cpp + Hostname.cpp + MemoryUsage.cpp + RandomUUID.cpp + Sleep.cpp + waLBerlaBuildInfo.cpp + Abort.h + AllSet.h + Any.h + Array.h + ConcatIterator.h + Conversion.h + DataTypes.h + EndianIndependentSerialization.h + Environment.h + Filesystem.h + Format.hpp + FunctionTraits.h + GetPID.h + Hostname.h + Macros.h + MemoryUsage.h + NonCopyable.h + NonCreateable.h + OpenMP.h + Optional.h + RandomUUID.h + Regex.h + Sanitizer.h + Set.h + SharedFunctor.h + Sleep.h + STLIO.h + stringToNum.h + StringUtility.h + StringUtility.impl.h + typeToString.h + UniqueID.h + Variant.h + VectorTrait.h + waLBerlaBuildInfo.h +) add_subdirectory( cell ) add_subdirectory( debug ) add_subdirectory( mpi ) -add_subdirectory( logging) +add_subdirectory( logging ) add_subdirectory( load_balancing ) add_subdirectory( config ) add_subdirectory( math ) diff --git a/src/core/cell/CMakeLists.txt b/src/core/cell/CMakeLists.txt index fbc636d7c..762ebbf17 100644 --- a/src/core/cell/CMakeLists.txt +++ b/src/core/cell/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( core +target_sources( walberla_core PRIVATE Cell.h CellArray.h diff --git a/src/core/config/CMakeLists.txt b/src/core/config/CMakeLists.txt index ea80d2ac4..1edb0f298 100644 --- a/src/core/config/CMakeLists.txt +++ b/src/core/config/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( core +target_sources( walberla_core PRIVATE Config.cpp Config.h diff --git a/src/core/debug/CMakeLists.txt b/src/core/debug/CMakeLists.txt index 1d3a9743a..d0a0ec292 100644 --- a/src/core/debug/CMakeLists.txt +++ b/src/core/debug/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources(core +target_sources( walberla_core PRIVATE CMakeLists.txt CheckFunctions.cpp diff --git a/src/core/grid_generator/CMakeLists.txt b/src/core/grid_generator/CMakeLists.txt index 4570ae56f..351e1b446 100644 --- a/src/core/grid_generator/CMakeLists.txt +++ b/src/core/grid_generator/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( core +target_sources( walberla_core PRIVATE HCPIterator.cpp HCPIterator.h diff --git a/src/core/load_balancing/CMakeLists.txt b/src/core/load_balancing/CMakeLists.txt index 17a1aea23..351329573 100644 --- a/src/core/load_balancing/CMakeLists.txt +++ b/src/core/load_balancing/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( core +target_sources( walberla_core PRIVATE MetisWrapper.h ParMetisWrapper.h diff --git a/src/core/logging/CMakeLists.txt b/src/core/logging/CMakeLists.txt index 563e57263..b663f35f5 100644 --- a/src/core/logging/CMakeLists.txt +++ b/src/core/logging/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( core +target_sources( walberla_core PRIVATE Initialization.cpp Initialization.h diff --git a/src/core/math/CMakeLists.txt b/src/core/math/CMakeLists.txt index 5f8733c9a..3c09c74c5 100644 --- a/src/core/math/CMakeLists.txt +++ b/src/core/math/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( core +target_sources( walberla_core PRIVATE AABB.h AABBFwd.h diff --git a/src/core/mpi/CMakeLists.txt b/src/core/mpi/CMakeLists.txt index 2987e28c2..739677b3e 100644 --- a/src/core/mpi/CMakeLists.txt +++ b/src/core/mpi/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( core +target_sources( walberla_core PRIVATE Broadcast.h BufferDataTypeExtensions.h diff --git a/src/core/timing/CMakeLists.txt b/src/core/timing/CMakeLists.txt index 1de08d962..974d54d88 100644 --- a/src/core/timing/CMakeLists.txt +++ b/src/core/timing/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( core +target_sources( walberla_core PRIVATE CpuPolicy.h ReduceType.h diff --git a/src/domain_decomposition/CMakeLists.txt b/src/domain_decomposition/CMakeLists.txt index 548c73ed4..12514b736 100644 --- a/src/domain_decomposition/CMakeLists.txt +++ b/src/domain_decomposition/CMakeLists.txt @@ -4,9 +4,10 @@ # ################################################################################################### -add_library( domain_decomposition ) -target_link_libraries( domain_decomposition PUBLIC core ) -target_sources( domain_decomposition +add_library( walberla_domain_decomposition ) +add_library( walberla::domain_decomposition ALIAS walberla_domain_decomposition ) +target_link_libraries( walberla_domain_decomposition PUBLIC walberla::core ) +target_sources( walberla_domain_decomposition PRIVATE BlockCounter.h BlockDataHandling.h diff --git a/src/executiontree/CMakeLists.txt b/src/executiontree/CMakeLists.txt index 8d7e31419..8b7c1f387 100644 --- a/src/executiontree/CMakeLists.txt +++ b/src/executiontree/CMakeLists.txt @@ -4,9 +4,10 @@ # ################################################################################################### -add_library( executiontree ) -target_link_libraries( executiontree PUBLIC core domain_decomposition timeloop ) -target_sources( executiontree +add_library( walberla_executiontree ) +add_library( walberla::executiontree ALIAS walberla_executiontree ) +target_link_libraries( walberla_executiontree PUBLIC walberla::core walberla::domain_decomposition walberla::timeloop ) +target_sources( walberla_executiontree PRIVATE ExecutionTreeSweep.h ExecutionTree.cpp diff --git a/src/fft/CMakeLists.txt b/src/fft/CMakeLists.txt index 641010004..6a9c17cd2 100644 --- a/src/fft/CMakeLists.txt +++ b/src/fft/CMakeLists.txt @@ -4,9 +4,10 @@ # ################################################################################################### -add_library( fft ) -target_link_libraries( fft PUBLIC core blockforest field ) -target_sources( fft +add_library( walberla_fft ) +add_library( walberla::fft ALIAS walberla_fft ) +target_link_libraries( walberla_fft PUBLIC walberla::core walberla::blockforest walberla::field ) +target_sources( walberla_fft PRIVATE Fft.h Fft.cpp diff --git a/src/field/CMakeLists.txt b/src/field/CMakeLists.txt index 6ef0a5835..c6b03fd8f 100644 --- a/src/field/CMakeLists.txt +++ b/src/field/CMakeLists.txt @@ -1,19 +1,20 @@ ################################################################################################### # -# Module field ( lattice data structure ) +# Module walberla::field ( lattice data structure ) # ################################################################################################### OPTION ( WALBERLA_FIELD_MONITORED_ACCESS "Enable (slow) monitoring mechanism for Fields" ) -OPTION ( WALBERLA_THREAD_SAFE_FIELD_ALLOCATION "Enables/Disables thread-safe field allocation (do NOT disable if you are not absolutely sure what you are doing!)" ON ) +OPTION( WALBERLA_THREAD_SAFE_FIELD_ALLOCATION "Enables/Disables thread-safe walberla::field allocation (do NOT disable if you are not absolutely sure what you are doing!)" ON ) mark_as_advanced( WALBERLA_THREAD_SAFE_FIELD_ALLOCATION ) configure_file ( CMakeDefs.in.h CMakeDefs.h ) -add_library( field ) -target_link_libraries( field PUBLIC blockforest core communication domain_decomposition stencil vtk ) -target_sources( field +add_library( walberla_field ) +add_library( walberla::field ALIAS walberla_field ) +target_link_libraries( walberla_field PUBLIC walberla::blockforest walberla::core walberla::communication walberla::domain_decomposition walberla::stencil walberla::vtk ) +target_sources( walberla_field PRIVATE SwapableCompare.h AccuracyEvaluation.h diff --git a/src/field/adaptors/CMakeLists.txt b/src/field/adaptors/CMakeLists.txt index b139d0e14..660f8f5a5 100644 --- a/src/field/adaptors/CMakeLists.txt +++ b/src/field/adaptors/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( field +target_sources( walberla_field PRIVATE VectorFieldAccessor.h GhostLayerFieldAdaptor.h diff --git a/src/field/allocation/CMakeLists.txt b/src/field/allocation/CMakeLists.txt index d257a62cc..5b6eee723 100644 --- a/src/field/allocation/CMakeLists.txt +++ b/src/field/allocation/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( field +target_sources( walberla_field PRIVATE AlignedMalloc.cpp AlignedMalloc.h diff --git a/src/field/blockforest/CMakeLists.txt b/src/field/blockforest/CMakeLists.txt index cb64f75c1..5b3afea2f 100644 --- a/src/field/blockforest/CMakeLists.txt +++ b/src/field/blockforest/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( field +target_sources( walberla_field PRIVATE GradientRefinement.h BlockDataHandling.h diff --git a/src/field/communication/CMakeLists.txt b/src/field/communication/CMakeLists.txt index 005bda8d2..81e8c3e3b 100644 --- a/src/field/communication/CMakeLists.txt +++ b/src/field/communication/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( field +target_sources( walberla_field PRIVATE MPIDatatypes.impl.h StencilRestrictedMPIDatatypeInfo.h diff --git a/src/field/distributors/CMakeLists.txt b/src/field/distributors/CMakeLists.txt index b74a8d3f2..7ba086a1e 100644 --- a/src/field/distributors/CMakeLists.txt +++ b/src/field/distributors/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( field +target_sources( walberla_field PRIVATE NearestNeighborDistributor.h KernelDistributor.h diff --git a/src/field/doc/CMakeLists.txt b/src/field/doc/CMakeLists.txt index 4f2d83c38..f884c246d 100644 --- a/src/field/doc/CMakeLists.txt +++ b/src/field/doc/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( field +target_sources( walberla_field PRIVATE ) diff --git a/src/field/interpolators/CMakeLists.txt b/src/field/interpolators/CMakeLists.txt index 2e78a0e25..289689113 100644 --- a/src/field/interpolators/CMakeLists.txt +++ b/src/field/interpolators/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( field +target_sources( walberla_field PRIVATE NearestNeighborFieldInterpolator.h TrilinearInterpolator.h diff --git a/src/field/iterators/CMakeLists.txt b/src/field/iterators/CMakeLists.txt index 696f02855..c66e1215b 100644 --- a/src/field/iterators/CMakeLists.txt +++ b/src/field/iterators/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( field +target_sources( walberla_field PRIVATE FieldIterator.h IteratorMacros.h diff --git a/src/field/refinement/CMakeLists.txt b/src/field/refinement/CMakeLists.txt index b88cbdabe..a4603cc60 100644 --- a/src/field/refinement/CMakeLists.txt +++ b/src/field/refinement/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( field +target_sources( walberla_field PRIVATE PackInfo.h ) diff --git a/src/field/vtk/CMakeLists.txt b/src/field/vtk/CMakeLists.txt index 8fbb8e803..9da76145c 100644 --- a/src/field/vtk/CMakeLists.txt +++ b/src/field/vtk/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( field +target_sources( walberla_field PRIVATE FlagFieldCellFilter.h FlagFieldMapping.h diff --git a/src/gather/CMakeLists.txt b/src/gather/CMakeLists.txt index 19cdf86ab..4f1d5e950 100644 --- a/src/gather/CMakeLists.txt +++ b/src/gather/CMakeLists.txt @@ -1,12 +1,13 @@ ################################################################################################### # -# Module gather ( all-to-one communication for output ) +# Module gather ( all-to-one walberla::communication for output ) # ################################################################################################### -add_library( gather ) -target_link_libraries( gather PUBLIC core domain_decomposition field ) -target_sources( gather +add_library( walberla_gather ) +add_library( walberla::gather ALIAS walberla_gather ) +target_link_libraries( walberla_gather PUBLIC walberla::core walberla::domain_decomposition walberla::field ) +target_sources( walberla_gather PRIVATE CellGatherPackInfo.h FileGatherScheme.cpp diff --git a/src/geometry/CMakeLists.txt b/src/geometry/CMakeLists.txt index 43972ee5f..2344ed8d1 100644 --- a/src/geometry/CMakeLists.txt +++ b/src/geometry/CMakeLists.txt @@ -4,14 +4,15 @@ # ################################################################################################### -add_library( geometry ) -target_sources( geometry +add_library( walberla_geometry ) +add_library( walberla::geometry ALIAS walberla_geometry ) +target_sources( walberla_geometry PRIVATE GeometricalFunctions.h InitBoundaryHandling.h GeometricalFunctions.cpp ) -target_link_libraries(geometry PUBLIC core domain_decomposition boundary field stencil PRIVATE lodepng) +target_link_libraries( walberla_geometry PUBLIC walberla::core walberla::domain_decomposition walberla::boundary walberla::field walberla::stencil PRIVATE lodepng ) add_subdirectory( bodies ) add_subdirectory( containment_octree ) diff --git a/src/geometry/bodies/CMakeLists.txt b/src/geometry/bodies/CMakeLists.txt index 9a1194d43..304b12e31 100644 --- a/src/geometry/bodies/CMakeLists.txt +++ b/src/geometry/bodies/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( geometry +target_sources( walberla_geometry PRIVATE Torus.h BodyFromConfig.h diff --git a/src/geometry/containment_octree/CMakeLists.txt b/src/geometry/containment_octree/CMakeLists.txt index 560169572..c327d7580 100644 --- a/src/geometry/containment_octree/CMakeLists.txt +++ b/src/geometry/containment_octree/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( geometry +target_sources( walberla_geometry PRIVATE InsideLeafNode.h OutsideLeafNode.h diff --git a/src/geometry/initializer/CMakeLists.txt b/src/geometry/initializer/CMakeLists.txt index a6af8b351..218e3cec7 100644 --- a/src/geometry/initializer/CMakeLists.txt +++ b/src/geometry/initializer/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( geometry +target_sources( walberla_geometry PRIVATE BoundaryFromCellInterval.h BoundaryFromBody.impl.h diff --git a/src/geometry/mesh/CMakeLists.txt b/src/geometry/mesh/CMakeLists.txt index 4979f5fac..425c35d4b 100644 --- a/src/geometry/mesh/CMakeLists.txt +++ b/src/geometry/mesh/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( geometry +target_sources( walberla_geometry PRIVATE TriangleMeshComm.h TriangleMeshIO.h diff --git a/src/geometry/structured/CMakeLists.txt b/src/geometry/structured/CMakeLists.txt index 0b2c842aa..5171aca7f 100644 --- a/src/geometry/structured/CMakeLists.txt +++ b/src/geometry/structured/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( geometry +target_sources( walberla_geometry PRIVATE RGBAImage.h RGBAImage.cpp diff --git a/src/gpu/CMakeLists.txt b/src/gpu/CMakeLists.txt index e870cdb5d..263650bbc 100644 --- a/src/gpu/CMakeLists.txt +++ b/src/gpu/CMakeLists.txt @@ -4,11 +4,12 @@ # ################################################################################################### -add_library( gpu ) -target_link_libraries( gpu PUBLIC blockforest core communication domain_decomposition executiontree field stencil lbm ) +add_library( walberla_gpu ) +add_library( walberla::gpu ALIAS walberla_gpu ) +target_link_libraries( walberla_gpu PUBLIC walberla::blockforest walberla::core walberla::communication walberla::domain_decomposition walberla::executiontree walberla::field walberla::stencil walberla::lbm ) # sources for HIP and CUDA -target_sources( gpu +target_sources( walberla_gpu PRIVATE AlignedAllocation.h AddGPUFieldToStorage.h @@ -44,7 +45,7 @@ target_sources( gpu # sources only for CUDA if (WALBERLA_BUILD_WITH_CUDA) -target_sources( gpu + target_sources( walberla_gpu PRIVATE NVTX.h ) diff --git a/src/gpu/communication/CMakeLists.txt b/src/gpu/communication/CMakeLists.txt index 7b9c0cced..849c356d6 100644 --- a/src/gpu/communication/CMakeLists.txt +++ b/src/gpu/communication/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( gpu +target_sources( walberla_gpu PRIVATE MemcpyPackInfo.h UniformGPUScheme.impl.h diff --git a/src/gpu/lbm/CMakeLists.txt b/src/gpu/lbm/CMakeLists.txt index ae7f60ac8..35e8c10fa 100644 --- a/src/gpu/lbm/CMakeLists.txt +++ b/src/gpu/lbm/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( gpu +target_sources( walberla_gpu PRIVATE CombinedInPlaceGpuPackInfo.h ) diff --git a/src/gpu/sweeps/CMakeLists.txt b/src/gpu/sweeps/CMakeLists.txt index 2126d798c..6c204b1f1 100644 --- a/src/gpu/sweeps/CMakeLists.txt +++ b/src/gpu/sweeps/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( gpu +target_sources( walberla_gpu PRIVATE GPUSweepBase.h ) diff --git a/src/lbm/CMakeLists.txt b/src/lbm/CMakeLists.txt index 3e2574153..808223940 100644 --- a/src/lbm/CMakeLists.txt +++ b/src/lbm/CMakeLists.txt @@ -4,21 +4,22 @@ # ################################################################################################### -add_library( lbm ) -target_link_libraries( lbm +add_library( walberla_lbm ) +add_library( walberla::lbm ALIAS walberla_lbm ) +target_link_libraries( walberla_lbm PUBLIC - blockforest - boundary - communication - core - domain_decomposition - field - geometry - stencil - timeloop - vtk + walberla::blockforest + walberla::boundary + walberla::communication + walberla::core + walberla::domain_decomposition + walberla::field + walberla::geometry + walberla::stencil + walberla::timeloop + walberla::vtk ) -target_sources( lbm +target_sources( walberla_lbm PRIVATE PerformanceEvaluation.h BlockForestEvaluation.h diff --git a/src/lbm/blockforest/CMakeLists.txt b/src/lbm/blockforest/CMakeLists.txt index 2fa5d1378..0c06e6f66 100644 --- a/src/lbm/blockforest/CMakeLists.txt +++ b/src/lbm/blockforest/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE PostProcessing.h ) diff --git a/src/lbm/blockforest/communication/CMakeLists.txt b/src/lbm/blockforest/communication/CMakeLists.txt index a39e2f187..a22e6323e 100644 --- a/src/lbm/blockforest/communication/CMakeLists.txt +++ b/src/lbm/blockforest/communication/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE SimpleCommunication.h UpdateSecondGhostLayer.h diff --git a/src/lbm/boundary/CMakeLists.txt b/src/lbm/boundary/CMakeLists.txt index 9916174cf..1ebcdf43b 100644 --- a/src/lbm/boundary/CMakeLists.txt +++ b/src/lbm/boundary/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE SimplePressure.h SimpleUBB.h diff --git a/src/lbm/boundary/factories/CMakeLists.txt b/src/lbm/boundary/factories/CMakeLists.txt index f15a18fd2..153f49359 100644 --- a/src/lbm/boundary/factories/CMakeLists.txt +++ b/src/lbm/boundary/factories/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE DefaultDiffusionBoundaryHandling.h DefaultBoundaryHandling.h diff --git a/src/lbm/communication/CMakeLists.txt b/src/lbm/communication/CMakeLists.txt index daac664f2..41b4e1265 100644 --- a/src/lbm/communication/CMakeLists.txt +++ b/src/lbm/communication/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE PdfFieldMPIDatatypeInfo.h SparsePdfFieldPackInfo.h diff --git a/src/lbm/cumulant/CMakeLists.txt b/src/lbm/cumulant/CMakeLists.txt index f04767f95..ac5887f8c 100644 --- a/src/lbm/cumulant/CMakeLists.txt +++ b/src/lbm/cumulant/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE CellwiseSweep.impl.h ) diff --git a/src/lbm/evaluations/CMakeLists.txt b/src/lbm/evaluations/CMakeLists.txt index 1e014fb72..b6c8e2f40 100644 --- a/src/lbm/evaluations/CMakeLists.txt +++ b/src/lbm/evaluations/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE Permeability.impl.h Permeability.h diff --git a/src/lbm/field/CMakeLists.txt b/src/lbm/field/CMakeLists.txt index 706196f4d..d242056f9 100644 --- a/src/lbm/field/CMakeLists.txt +++ b/src/lbm/field/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE MomentumDensity.h MacroscopicValueCalculation.h diff --git a/src/lbm/field/initializer/CMakeLists.txt b/src/lbm/field/initializer/CMakeLists.txt index 4404f566c..ba190f8c1 100644 --- a/src/lbm/field/initializer/CMakeLists.txt +++ b/src/lbm/field/initializer/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE PdfFieldInitializer.h ExprSystemInitFunction.h diff --git a/src/lbm/free_surface/CMakeLists.txt b/src/lbm/free_surface/CMakeLists.txt index 54b500251..131c8debc 100644 --- a/src/lbm/free_surface/CMakeLists.txt +++ b/src/lbm/free_surface/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE BlockStateDetectorSweep.h FlagDefinitions.h diff --git a/src/lbm/free_surface/boundary/CMakeLists.txt b/src/lbm/free_surface/boundary/CMakeLists.txt index 9b3f1195a..cf52dab51 100644 --- a/src/lbm/free_surface/boundary/CMakeLists.txt +++ b/src/lbm/free_surface/boundary/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE FreeSurfaceBoundaryHandling.h FreeSurfaceBoundaryHandling.impl.h diff --git a/src/lbm/free_surface/bubble_model/CMakeLists.txt b/src/lbm/free_surface/bubble_model/CMakeLists.txt index 712930e38..07cffed3e 100644 --- a/src/lbm/free_surface/bubble_model/CMakeLists.txt +++ b/src/lbm/free_surface/bubble_model/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE Bubble.h BubbleDefinitions.h diff --git a/src/lbm/free_surface/dynamics/CMakeLists.txt b/src/lbm/free_surface/dynamics/CMakeLists.txt index 2d7145db3..f2e52bb5b 100644 --- a/src/lbm/free_surface/dynamics/CMakeLists.txt +++ b/src/lbm/free_surface/dynamics/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE CellConversionSweep.h ConversionFlagsResetSweep.h diff --git a/src/lbm/free_surface/dynamics/functionality/CMakeLists.txt b/src/lbm/free_surface/dynamics/functionality/CMakeLists.txt index 357412052..5d3ec6452 100644 --- a/src/lbm/free_surface/dynamics/functionality/CMakeLists.txt +++ b/src/lbm/free_surface/dynamics/functionality/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE AdvectMass.h FindInterfaceCellConversion.h diff --git a/src/lbm/free_surface/surface_geometry/CMakeLists.txt b/src/lbm/free_surface/surface_geometry/CMakeLists.txt index 42fb177b7..fca49e2ca 100644 --- a/src/lbm/free_surface/surface_geometry/CMakeLists.txt +++ b/src/lbm/free_surface/surface_geometry/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE ContactAngle.h CurvatureModel.h diff --git a/src/lbm/geometry/CMakeLists.txt b/src/lbm/geometry/CMakeLists.txt index a5c3af8d6..e219c7739 100644 --- a/src/lbm/geometry/CMakeLists.txt +++ b/src/lbm/geometry/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE IntersectionRatio.h IntersectionRatio.impl.h diff --git a/src/lbm/geometry/initializer/CMakeLists.txt b/src/lbm/geometry/initializer/CMakeLists.txt index 4dcc7bc2f..8d587310d 100644 --- a/src/lbm/geometry/initializer/CMakeLists.txt +++ b/src/lbm/geometry/initializer/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE PoiseuilleInitializer.impl.h PoiseuilleInitializer.h diff --git a/src/lbm/inplace_streaming/CMakeLists.txt b/src/lbm/inplace_streaming/CMakeLists.txt index 6784a9a1a..61c87586b 100644 --- a/src/lbm/inplace_streaming/CMakeLists.txt +++ b/src/lbm/inplace_streaming/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE TimestepTracker.h ) diff --git a/src/lbm/lattice_model/CMakeLists.txt b/src/lbm/lattice_model/CMakeLists.txt index 58f62308c..44ef969c4 100644 --- a/src/lbm/lattice_model/CMakeLists.txt +++ b/src/lbm/lattice_model/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE CollisionModel.cpp D3Q27.h diff --git a/src/lbm/mrt/CMakeLists.txt b/src/lbm/mrt/CMakeLists.txt index 6dc8a16b5..40bfcad0e 100644 --- a/src/lbm/mrt/CMakeLists.txt +++ b/src/lbm/mrt/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE SplitPureSweep.impl.h SplitSweep.impl.h diff --git a/src/lbm/mrt/cell_operations/CMakeLists.txt b/src/lbm/mrt/cell_operations/CMakeLists.txt index d5d533f23..ecd134f38 100644 --- a/src/lbm/mrt/cell_operations/CMakeLists.txt +++ b/src/lbm/mrt/cell_operations/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE DefaultCellOperation.impl.h ) diff --git a/src/lbm/refinement/CMakeLists.txt b/src/lbm/refinement/CMakeLists.txt index 6aff34698..a4a7ebf03 100644 --- a/src/lbm/refinement/CMakeLists.txt +++ b/src/lbm/refinement/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE TimeTracker.h TimeStep.h diff --git a/src/lbm/srt/CMakeLists.txt b/src/lbm/srt/CMakeLists.txt index e95415ab9..04e9e6971 100644 --- a/src/lbm/srt/CMakeLists.txt +++ b/src/lbm/srt/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE AdvectionDiffusionSweep.impl.h SplitPureSweep.impl.h diff --git a/src/lbm/srt/cell_operations/CMakeLists.txt b/src/lbm/srt/cell_operations/CMakeLists.txt index 6a8de6a5b..e651169c0 100644 --- a/src/lbm/srt/cell_operations/CMakeLists.txt +++ b/src/lbm/srt/cell_operations/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE AdvectionDiffusionCellOperation.impl.h DefaultCellOperation.impl.h diff --git a/src/lbm/sweeps/CMakeLists.txt b/src/lbm/sweeps/CMakeLists.txt index 3cf1a982f..68bb794c1 100644 --- a/src/lbm/sweeps/CMakeLists.txt +++ b/src/lbm/sweeps/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE FlagFieldSweepBase.h SplitPureSweep.h diff --git a/src/lbm/sweeps/cell_operations/CMakeLists.txt b/src/lbm/sweeps/cell_operations/CMakeLists.txt index 3875dd5ab..606b8f69c 100644 --- a/src/lbm/sweeps/cell_operations/CMakeLists.txt +++ b/src/lbm/sweeps/cell_operations/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE DefaultCellOperation.h AdvectionDiffusionCellOperation.h diff --git a/src/lbm/trt/CMakeLists.txt b/src/lbm/trt/CMakeLists.txt index 6dc8a16b5..40bfcad0e 100644 --- a/src/lbm/trt/CMakeLists.txt +++ b/src/lbm/trt/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE SplitPureSweep.impl.h SplitSweep.impl.h diff --git a/src/lbm/trt/cell_operations/CMakeLists.txt b/src/lbm/trt/cell_operations/CMakeLists.txt index d5d533f23..ecd134f38 100644 --- a/src/lbm/trt/cell_operations/CMakeLists.txt +++ b/src/lbm/trt/cell_operations/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE DefaultCellOperation.impl.h ) diff --git a/src/lbm/vtk/CMakeLists.txt b/src/lbm/vtk/CMakeLists.txt index ad2713023..46751aae2 100644 --- a/src/lbm/vtk/CMakeLists.txt +++ b/src/lbm/vtk/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm +target_sources( walberla_lbm PRIVATE QCriterion.h NonEquilibrium.h diff --git a/src/lbm_generated/CMakeLists.txt b/src/lbm_generated/CMakeLists.txt index 0da224ed7..ba78234a5 100644 --- a/src/lbm_generated/CMakeLists.txt +++ b/src/lbm_generated/CMakeLists.txt @@ -1,17 +1,18 @@ -add_library( lbm_generated) +add_library( walberla_lbm_generated ) +add_library( walberla::lbm_generated ALIAS walberla_lbm_generated ) -target_link_libraries( lbm_generated +target_link_libraries( walberla_lbm_generated PUBLIC - blockforest - boundary - communication - core - domain_decomposition - field - geometry - stencil - timeloop - vtk + walberla::blockforest + walberla::boundary + walberla::communication + walberla::core + walberla::domain_decomposition + walberla::field + walberla::geometry + walberla::stencil + walberla::timeloop + walberla::vtk ) add_subdirectory( boundary ) diff --git a/src/lbm_generated/boundary/CMakeLists.txt b/src/lbm_generated/boundary/CMakeLists.txt index 201337a88..779775c48 100644 --- a/src/lbm_generated/boundary/CMakeLists.txt +++ b/src/lbm_generated/boundary/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_generated +target_sources( walberla_lbm_generated PRIVATE D3Q19BoundaryCollection.h D3Q27BoundaryCollection.h diff --git a/src/lbm_generated/communication/CMakeLists.txt b/src/lbm_generated/communication/CMakeLists.txt index cd5516b9e..a1040f49f 100644 --- a/src/lbm_generated/communication/CMakeLists.txt +++ b/src/lbm_generated/communication/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_generated +target_sources( walberla_lbm_generated PRIVATE CombinedInPlacePackInfo.h NonuniformCommData.h diff --git a/src/lbm_generated/evaluation/CMakeLists.txt b/src/lbm_generated/evaluation/CMakeLists.txt index 922cf93c3..9cc61f751 100644 --- a/src/lbm_generated/evaluation/CMakeLists.txt +++ b/src/lbm_generated/evaluation/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_generated +target_sources( walberla_lbm_generated PRIVATE PerformanceEvaluation.h ) diff --git a/src/lbm_generated/field/CMakeLists.txt b/src/lbm_generated/field/CMakeLists.txt index 63bc11c8f..4cb39eca0 100644 --- a/src/lbm_generated/field/CMakeLists.txt +++ b/src/lbm_generated/field/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_generated +target_sources( walberla_lbm_generated PRIVATE AddToStorage.h PdfField.h diff --git a/src/lbm_generated/gpu/CMakeLists.txt b/src/lbm_generated/gpu/CMakeLists.txt index f81e5f2b3..e80682369 100644 --- a/src/lbm_generated/gpu/CMakeLists.txt +++ b/src/lbm_generated/gpu/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_generated +target_sources( walberla_lbm_generated PRIVATE AddToStorage.h BasicRecursiveTimeStepGPU.h diff --git a/src/lbm_generated/refinement/CMakeLists.txt b/src/lbm_generated/refinement/CMakeLists.txt index 216b4a268..b02e160fa 100644 --- a/src/lbm_generated/refinement/CMakeLists.txt +++ b/src/lbm_generated/refinement/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_generated +target_sources( walberla_lbm_generated PRIVATE BasicRecursiveTimeStep.h BasicRecursiveTimeStep.impl.h diff --git a/src/lbm_generated/storage_specification/CMakeLists.txt b/src/lbm_generated/storage_specification/CMakeLists.txt index 83d211632..7e3f28487 100644 --- a/src/lbm_generated/storage_specification/CMakeLists.txt +++ b/src/lbm_generated/storage_specification/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_generated +target_sources( walberla_lbm_generated PRIVATE D3Q19StorageSpecification.h D3Q19StorageSpecification.cpp diff --git a/src/lbm_generated/sweep_collection/CMakeLists.txt b/src/lbm_generated/sweep_collection/CMakeLists.txt index 91fbfb9d6..ec130974f 100644 --- a/src/lbm_generated/sweep_collection/CMakeLists.txt +++ b/src/lbm_generated/sweep_collection/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_generated +target_sources( walberla_lbm_generated PRIVATE D3Q19SRT.h D3Q19SRT.cpp diff --git a/src/lbm_mesapd_coupling/CMakeLists.txt b/src/lbm_mesapd_coupling/CMakeLists.txt index 1e04ba7fd..924b9ca8b 100644 --- a/src/lbm_mesapd_coupling/CMakeLists.txt +++ b/src/lbm_mesapd_coupling/CMakeLists.txt @@ -1,13 +1,14 @@ ################################################################################################### # -# Module lbm - mesapd - coupling +# Module walberla::lbm - mesapd - coupling # ################################################################################################### -add_library( lbm_mesapd_coupling ) -target_link_libraries( lbm_mesapd_coupling PUBLIC boundary blockforest core domain_decomposition field lbm mesa_pd stencil ) -target_sources( lbm_mesapd_coupling +add_library( walberla_lbm_mesapd_coupling ) +add_library( walberla::lbm_mesapd_coupling ALIAS walberla_lbm_mesapd_coupling ) +target_link_libraries( walberla_lbm_mesapd_coupling PUBLIC walberla::boundary walberla::blockforest walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::mesa_pd walberla::stencil ) +target_sources( walberla_lbm_mesapd_coupling PRIVATE DataTypes.h ) @@ -16,11 +17,11 @@ target_sources( lbm_mesapd_coupling # sufficient (for a sufficiently high stiffness in the DEM). set(MAX_PARTICLES_PER_CELL 2) add_custom_target(MAX_PARTICLES_PER_CELL) # Make it a target such that the code generation runs again if changed -target_sources( lbm_mesapd_coupling +target_sources( walberla_lbm_mesapd_coupling PRIVATE DataTypesCodegen.h ) -target_compile_definitions(lbm_mesapd_coupling PUBLIC MAX_PARTICLES_PER_CELL=${MAX_PARTICLES_PER_CELL}) +target_compile_definitions( walberla_lbm_mesapd_coupling PUBLIC MAX_PARTICLES_PER_CELL=${MAX_PARTICLES_PER_CELL} ) add_subdirectory( amr ) diff --git a/src/lbm_mesapd_coupling/amr/CMakeLists.txt b/src/lbm_mesapd_coupling/amr/CMakeLists.txt index e88039b3e..f25007d5e 100644 --- a/src/lbm_mesapd_coupling/amr/CMakeLists.txt +++ b/src/lbm_mesapd_coupling/amr/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_mesapd_coupling +target_sources( walberla_lbm_mesapd_coupling PRIVATE BlockInfo.h InfoCollection.h diff --git a/src/lbm_mesapd_coupling/amr/level_determination/CMakeLists.txt b/src/lbm_mesapd_coupling/amr/level_determination/CMakeLists.txt index b6177fb27..4d4ae90bd 100644 --- a/src/lbm_mesapd_coupling/amr/level_determination/CMakeLists.txt +++ b/src/lbm_mesapd_coupling/amr/level_determination/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_mesapd_coupling +target_sources( walberla_lbm_mesapd_coupling PRIVATE ParticlePresenceLevelDetermination.h ) diff --git a/src/lbm_mesapd_coupling/amr/weight_assignment/CMakeLists.txt b/src/lbm_mesapd_coupling/amr/weight_assignment/CMakeLists.txt index b13d50d4e..dac9ace1b 100644 --- a/src/lbm_mesapd_coupling/amr/weight_assignment/CMakeLists.txt +++ b/src/lbm_mesapd_coupling/amr/weight_assignment/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_mesapd_coupling +target_sources( walberla_lbm_mesapd_coupling PRIVATE WeightAssignmentFunctor.h MetisAssignmentFunctor.cpp diff --git a/src/lbm_mesapd_coupling/mapping/CMakeLists.txt b/src/lbm_mesapd_coupling/mapping/CMakeLists.txt index 04f7fd66d..49f3695c6 100644 --- a/src/lbm_mesapd_coupling/mapping/CMakeLists.txt +++ b/src/lbm_mesapd_coupling/mapping/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_mesapd_coupling +target_sources( walberla_lbm_mesapd_coupling PRIVATE ParticleMapping.h ParticleBoundingBox.h diff --git a/src/lbm_mesapd_coupling/momentum_exchange_method/CMakeLists.txt b/src/lbm_mesapd_coupling/momentum_exchange_method/CMakeLists.txt index e0c1a0bd3..956918cc1 100644 --- a/src/lbm_mesapd_coupling/momentum_exchange_method/CMakeLists.txt +++ b/src/lbm_mesapd_coupling/momentum_exchange_method/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_mesapd_coupling +target_sources( walberla_lbm_mesapd_coupling PRIVATE MovingParticleMapping.h ) diff --git a/src/lbm_mesapd_coupling/momentum_exchange_method/boundary/CMakeLists.txt b/src/lbm_mesapd_coupling/momentum_exchange_method/boundary/CMakeLists.txt index 092fd13c0..074ab16f8 100644 --- a/src/lbm_mesapd_coupling/momentum_exchange_method/boundary/CMakeLists.txt +++ b/src/lbm_mesapd_coupling/momentum_exchange_method/boundary/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_mesapd_coupling +target_sources( walberla_lbm_mesapd_coupling PRIVATE CurvedLinear.h SimpleBB.h diff --git a/src/lbm_mesapd_coupling/momentum_exchange_method/reconstruction/CMakeLists.txt b/src/lbm_mesapd_coupling/momentum_exchange_method/reconstruction/CMakeLists.txt index a5b4e0b9b..dc031e495 100644 --- a/src/lbm_mesapd_coupling/momentum_exchange_method/reconstruction/CMakeLists.txt +++ b/src/lbm_mesapd_coupling/momentum_exchange_method/reconstruction/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_mesapd_coupling +target_sources( walberla_lbm_mesapd_coupling PRIVATE PdfReconstructionManager.h ExtrapolationDirectionFinder.h diff --git a/src/lbm_mesapd_coupling/overlapping/CMakeLists.txt b/src/lbm_mesapd_coupling/overlapping/CMakeLists.txt index 1dfa6dc12..de4324190 100644 --- a/src/lbm_mesapd_coupling/overlapping/CMakeLists.txt +++ b/src/lbm_mesapd_coupling/overlapping/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources(lbm_mesapd_coupling +target_sources( walberla_lbm_mesapd_coupling PRIVATE OverlapFraction.h ) diff --git a/src/lbm_mesapd_coupling/partially_saturated_cells_method/CMakeLists.txt b/src/lbm_mesapd_coupling/partially_saturated_cells_method/CMakeLists.txt index 4a87ce81e..00b352450 100644 --- a/src/lbm_mesapd_coupling/partially_saturated_cells_method/CMakeLists.txt +++ b/src/lbm_mesapd_coupling/partially_saturated_cells_method/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_mesapd_coupling +target_sources( walberla_lbm_mesapd_coupling PRIVATE PSMSweep.h ParticleAndVolumeFractionMapping.h diff --git a/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/CMakeLists.txt b/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/CMakeLists.txt index 82b23cd77..df20a9020 100644 --- a/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/CMakeLists.txt +++ b/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources(lbm_mesapd_coupling +target_sources( walberla_lbm_mesapd_coupling PRIVATE ParticleAndVolumeFractionMappingSweepsCPU.h PSMSweepCollection.h @@ -22,7 +22,7 @@ if (WALBERLA_BUILD_WITH_CODEGEN) endforeach () endif () if (WALBERLA_BUILD_WITH_GPU_SUPPORT AND (CMAKE_CUDA_ARCHITECTURES GREATER_EQUAL 60 OR WALBERLA_BUILD_WITH_HIP)) - target_sources(lbm_mesapd_coupling + target_sources( walberla_lbm_mesapd_coupling PRIVATE ParticleAndVolumeFractionMappingSweepsGPU.h ParticleAndVolumeFractionMappingKernels.${CODEGEN_FILE_SUFFIX} diff --git a/src/lbm_mesapd_coupling/utility/CMakeLists.txt b/src/lbm_mesapd_coupling/utility/CMakeLists.txt index 36f682d8e..2e6c5ab91 100644 --- a/src/lbm_mesapd_coupling/utility/CMakeLists.txt +++ b/src/lbm_mesapd_coupling/utility/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( lbm_mesapd_coupling +target_sources( walberla_lbm_mesapd_coupling PRIVATE SubCyclingManager.h AddHydrodynamicInteractionKernel.h diff --git a/src/mesa_pd/CMakeLists.txt b/src/mesa_pd/CMakeLists.txt index b71b17698..aacbb1a5d 100644 --- a/src/mesa_pd/CMakeLists.txt +++ b/src/mesa_pd/CMakeLists.txt @@ -5,8 +5,9 @@ # ################################################################################################### -add_library( mesa_pd ) -target_link_libraries( mesa_pd PUBLIC blockforest core stencil vtk ) +add_library( walberla_mesa_pd ) +add_library( walberla::mesa_pd ALIAS walberla_mesa_pd ) +target_link_libraries( walberla_mesa_pd PUBLIC walberla::blockforest walberla::core walberla::stencil walberla::vtk ) add_subdirectory( collision_detection ) add_subdirectory( common ) add_subdirectory( data ) @@ -17,7 +18,7 @@ add_subdirectory( sorting ) add_subdirectory( vtk ) if(OPENMESH_CORE_FOUND) set( WALBERLA_MESAPD_CONVEX_POLYHEDRON_AVAILABLE ON CACHE INTERNAL "") - target_link_libraries( mesa_pd PUBLIC mesh_common ) + target_link_libraries( walberla_mesa_pd PUBLIC walberla::mesh_common ) message( DEBUG "MESA-PD: ConvexPolyhedron shape is available (OpenMesh dependency satisfied)" ) else() set( WALBERLA_MESAPD_CONVEX_POLYHEDRON_AVAILABLE OFF CACHE INTERNAL "") diff --git a/src/mesa_pd/collision_detection/CMakeLists.txt b/src/mesa_pd/collision_detection/CMakeLists.txt index 0f971b71a..7fcc661cc 100644 --- a/src/mesa_pd/collision_detection/CMakeLists.txt +++ b/src/mesa_pd/collision_detection/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesa_pd +target_sources( walberla_mesa_pd PRIVATE AnalyticCollisionFunctions.h GJK.h diff --git a/src/mesa_pd/common/CMakeLists.txt b/src/mesa_pd/common/CMakeLists.txt index db4a239b7..150900d34 100644 --- a/src/mesa_pd/common/CMakeLists.txt +++ b/src/mesa_pd/common/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesa_pd +target_sources( walberla_mesa_pd PRIVATE RayParticleIntersection.h Contains.h diff --git a/src/mesa_pd/data/CMakeLists.txt b/src/mesa_pd/data/CMakeLists.txt index 01e85915b..d65277f08 100644 --- a/src/mesa_pd/data/CMakeLists.txt +++ b/src/mesa_pd/data/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesa_pd +target_sources( walberla_mesa_pd PRIVATE ParticleStorage.h IAccessor.h diff --git a/src/mesa_pd/data/shape/CMakeLists.txt b/src/mesa_pd/data/shape/CMakeLists.txt index da0f60879..ea9726c8c 100644 --- a/src/mesa_pd/data/shape/CMakeLists.txt +++ b/src/mesa_pd/data/shape/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesa_pd +target_sources( walberla_mesa_pd PRIVATE CylindricalBoundary.h BaseShape.h diff --git a/src/mesa_pd/domain/CMakeLists.txt b/src/mesa_pd/domain/CMakeLists.txt index eaac7e4cd..0ae798829 100644 --- a/src/mesa_pd/domain/CMakeLists.txt +++ b/src/mesa_pd/domain/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesa_pd +target_sources( walberla_mesa_pd PRIVATE BlockForestDomain.cpp IDomain.h @@ -6,5 +6,5 @@ target_sources( mesa_pd BlockForestDataHandling.h InfoCollection.h BlockForestDataHandling.cpp - BlockForestDomain.h + BlockForestDomain.h ) diff --git a/src/mesa_pd/kernel/CMakeLists.txt b/src/mesa_pd/kernel/CMakeLists.txt index 884aeedef..5467db1ea 100644 --- a/src/mesa_pd/kernel/CMakeLists.txt +++ b/src/mesa_pd/kernel/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesa_pd +target_sources( walberla_mesa_pd PRIVATE NonLinearSpringDashpot.h SingleCast.h diff --git a/src/mesa_pd/kernel/cnt/CMakeLists.txt b/src/mesa_pd/kernel/cnt/CMakeLists.txt index db078539b..7cb14e4cd 100644 --- a/src/mesa_pd/kernel/cnt/CMakeLists.txt +++ b/src/mesa_pd/kernel/cnt/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesa_pd +target_sources( walberla_mesa_pd PRIVATE IsotropicVDWContact.h VBondContact.h diff --git a/src/mesa_pd/mpi/CMakeLists.txt b/src/mesa_pd/mpi/CMakeLists.txt index 04e543f8a..60b5c3ce1 100644 --- a/src/mesa_pd/mpi/CMakeLists.txt +++ b/src/mesa_pd/mpi/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesa_pd +target_sources( walberla_mesa_pd PRIVATE SyncNextNeighborsBlockForest.h BroadcastProperty.h diff --git a/src/mesa_pd/mpi/notifications/CMakeLists.txt b/src/mesa_pd/mpi/notifications/CMakeLists.txt index 16e1bac37..540c955d7 100644 --- a/src/mesa_pd/mpi/notifications/CMakeLists.txt +++ b/src/mesa_pd/mpi/notifications/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesa_pd +target_sources( walberla_mesa_pd PRIVATE ParticleGhostCopyNotification.h ParticleRemovalNotification.h diff --git a/src/mesa_pd/sorting/CMakeLists.txt b/src/mesa_pd/sorting/CMakeLists.txt index 4b6badef8..97abf6df6 100644 --- a/src/mesa_pd/sorting/CMakeLists.txt +++ b/src/mesa_pd/sorting/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesa_pd +target_sources( walberla_mesa_pd PRIVATE LinearizedCompareFunctor.h HilbertCompareFunctor.h diff --git a/src/mesa_pd/vtk/CMakeLists.txt b/src/mesa_pd/vtk/CMakeLists.txt index ffda945a2..c93e00fef 100644 --- a/src/mesa_pd/vtk/CMakeLists.txt +++ b/src/mesa_pd/vtk/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesa_pd +target_sources( walberla_mesa_pd PRIVATE TensorGlyph.h TensorGlyph.cpp diff --git a/src/mesa_pd/vtk/ConvexPolyhedron/CMakeLists.txt b/src/mesa_pd/vtk/ConvexPolyhedron/CMakeLists.txt index a6a8cf4a0..3a2d0d953 100644 --- a/src/mesa_pd/vtk/ConvexPolyhedron/CMakeLists.txt +++ b/src/mesa_pd/vtk/ConvexPolyhedron/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesa_pd +target_sources( walberla_mesa_pd PRIVATE Types.h MeshParticleVTKOutput.h diff --git a/src/mesa_pd/vtk/ConvexPolyhedron/data_sources/CMakeLists.txt b/src/mesa_pd/vtk/ConvexPolyhedron/data_sources/CMakeLists.txt index 367bb6ea8..5dd986f4b 100644 --- a/src/mesa_pd/vtk/ConvexPolyhedron/data_sources/CMakeLists.txt +++ b/src/mesa_pd/vtk/ConvexPolyhedron/data_sources/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesa_pd +target_sources( walberla_mesa_pd PRIVATE OutputSelectorFaceDataSource.h FaceDataSource.h diff --git a/src/mesa_pd/vtk/ConvexPolyhedron/tesselation/CMakeLists.txt b/src/mesa_pd/vtk/ConvexPolyhedron/tesselation/CMakeLists.txt index cdf2a2e4c..7587d493c 100644 --- a/src/mesa_pd/vtk/ConvexPolyhedron/tesselation/CMakeLists.txt +++ b/src/mesa_pd/vtk/ConvexPolyhedron/tesselation/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesa_pd +target_sources( walberla_mesa_pd PRIVATE ConvexPolyhedronTesselation.h ) diff --git a/src/mesh/CMakeLists.txt b/src/mesh/CMakeLists.txt index 9a47783b0..be45ad6d0 100644 --- a/src/mesh/CMakeLists.txt +++ b/src/mesh/CMakeLists.txt @@ -4,12 +4,13 @@ # ################################################################################################### -add_library( mesh ) -target_link_libraries( mesh PUBLIC blockforest boundary core domain_decomposition field geometry pe stencil mesh_common ) +add_library( walberla_mesh ) +add_library( walberla::mesh ALIAS walberla_mesh ) +target_link_libraries( walberla_mesh PUBLIC walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla:: walberla::pe walberla::stencil walberla::mesh_common ) if ( OPENMESH_CORE_FOUND ) - target_link_directories( mesh PUBLIC OpenMeshCore) + target_link_directories( walberla::mesh PUBLIC OpenMeshCore ) endif() -target_sources( mesh +target_sources( walberla_mesh PRIVATE MeshConversion.h ) diff --git a/src/mesh/blockforest/CMakeLists.txt b/src/mesh/blockforest/CMakeLists.txt index d7cf9894a..8b8c471bc 100644 --- a/src/mesh/blockforest/CMakeLists.txt +++ b/src/mesh/blockforest/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesh +target_sources( walberla_mesh PRIVATE RefinementSelection.h BlockForestInitialization.cpp diff --git a/src/mesh/boundary/CMakeLists.txt b/src/mesh/boundary/CMakeLists.txt index 44f12efd6..4c8a05bf5 100644 --- a/src/mesh/boundary/CMakeLists.txt +++ b/src/mesh/boundary/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesh +target_sources( walberla_mesh PRIVATE BoundarySetup.cpp ColorToBoundaryMapper.h diff --git a/src/mesh/pe/CMakeLists.txt b/src/mesh/pe/CMakeLists.txt index b6cab535d..325f9bb5e 100644 --- a/src/mesh/pe/CMakeLists.txt +++ b/src/mesh/pe/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesh +target_sources( walberla_mesh PRIVATE DefaultTesselation.h Types.h diff --git a/src/mesh/pe/communication/CMakeLists.txt b/src/mesh/pe/communication/CMakeLists.txt index f84235cb9..382e2ba1e 100644 --- a/src/mesh/pe/communication/CMakeLists.txt +++ b/src/mesh/pe/communication/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesh +target_sources( walberla_mesh PRIVATE ConvexPolyhedron.cpp ConvexPolyhedron.h diff --git a/src/mesh/pe/raytracing/CMakeLists.txt b/src/mesh/pe/raytracing/CMakeLists.txt index 67ee47c9f..70cf0c5f2 100644 --- a/src/mesh/pe/raytracing/CMakeLists.txt +++ b/src/mesh/pe/raytracing/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesh +target_sources( walberla_mesh PRIVATE Intersects.h ) diff --git a/src/mesh/pe/rigid_body/CMakeLists.txt b/src/mesh/pe/rigid_body/CMakeLists.txt index f8413ca67..9abe3cadd 100644 --- a/src/mesh/pe/rigid_body/CMakeLists.txt +++ b/src/mesh/pe/rigid_body/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesh +target_sources( walberla_mesh PRIVATE ConvexPolyhedronFactory.h ConvexPolyhedron.cpp diff --git a/src/mesh/pe/tesselation/CMakeLists.txt b/src/mesh/pe/tesselation/CMakeLists.txt index 437b5ad9d..e102b8714 100644 --- a/src/mesh/pe/tesselation/CMakeLists.txt +++ b/src/mesh/pe/tesselation/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesh +target_sources( walberla_mesh PRIVATE Sphere.h ConvexPolyhedron.h diff --git a/src/mesh/pe/vtk/CMakeLists.txt b/src/mesh/pe/vtk/CMakeLists.txt index ed2b8bfe3..fa10c11c3 100644 --- a/src/mesh/pe/vtk/CMakeLists.txt +++ b/src/mesh/pe/vtk/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesh +target_sources( walberla_mesh PRIVATE CommonDataSources.h PeVTKMeshWriter.h diff --git a/src/mesh_common/CMakeLists.txt b/src/mesh_common/CMakeLists.txt index 9da41feda..024e4d56e 100644 --- a/src/mesh_common/CMakeLists.txt +++ b/src/mesh_common/CMakeLists.txt @@ -4,12 +4,13 @@ # ################################################################################################### -add_library( mesh_common INTERFACE ) -target_link_libraries( mesh_common INTERFACE core vtk ) +add_library( walberla_mesh_common INTERFACE ) +add_library( walberla::mesh_common ALIAS walberla_mesh_common ) +target_link_libraries( walberla_mesh_common INTERFACE walberla::core walberla::vtk ) if ( OPENMESH_CORE_FOUND ) - target_link_directories( mesh_common INTERFACE OpenMeshCore) + target_link_directories( walberla::mesh_common INTERFACE OpenMeshCore ) endif() -target_sources( mesh_common +target_sources( walberla_mesh_common INTERFACE DistanceFunction.h QHull.h diff --git a/src/mesh_common/distance_octree/CMakeLists.txt b/src/mesh_common/distance_octree/CMakeLists.txt index 8146a0ed9..670ded93d 100644 --- a/src/mesh_common/distance_octree/CMakeLists.txt +++ b/src/mesh_common/distance_octree/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesh_common +target_sources( walberla_mesh_common INTERFACE BranchNode.h LeafNode.h diff --git a/src/mesh_common/vtk/CMakeLists.txt b/src/mesh_common/vtk/CMakeLists.txt index 570e32c99..6a0a02375 100644 --- a/src/mesh_common/vtk/CMakeLists.txt +++ b/src/mesh_common/vtk/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( mesh_common +target_sources( walberla_mesh_common INTERFACE CommonFilters.h VTKMeshWriter.h diff --git a/src/pde/CMakeLists.txt b/src/pde/CMakeLists.txt index 33005a006..305db602f 100644 --- a/src/pde/CMakeLists.txt +++ b/src/pde/CMakeLists.txt @@ -1,12 +1,13 @@ ################################################################################################### # -# Module pde +# Module walberla::pde # ################################################################################################### -add_library( pde ) -target_link_libraries( pde PUBLIC blockforest boundary core domain_decomposition field stencil ) -target_sources( pde +add_library( walberla_pde ) +add_library( walberla::pde ALIAS walberla_pde ) +target_link_libraries( walberla_pde PUBLIC walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::stencil ) +target_sources( walberla_pde PRIVATE ConditionalResidualNorm.h ResidualNormStencilField.h diff --git a/src/pde/boundary/CMakeLists.txt b/src/pde/boundary/CMakeLists.txt index 7f5861ef0..b00ab0ba8 100644 --- a/src/pde/boundary/CMakeLists.txt +++ b/src/pde/boundary/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pde +target_sources( walberla_pde PRIVATE Dirichlet_withDx.h Dirichlet.h diff --git a/src/pde/iterations/CMakeLists.txt b/src/pde/iterations/CMakeLists.txt index 3356f0cb2..3e0184eb4 100644 --- a/src/pde/iterations/CMakeLists.txt +++ b/src/pde/iterations/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pde +target_sources( walberla_pde PRIVATE JacobiIteration.h JacobiIteration.cpp diff --git a/src/pde/sweeps/CMakeLists.txt b/src/pde/sweeps/CMakeLists.txt index 2f6d4893d..1774dfcdb 100644 --- a/src/pde/sweeps/CMakeLists.txt +++ b/src/pde/sweeps/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pde +target_sources( walberla_pde PRIVATE Multigrid.impl.h StencilSweepBase.h diff --git a/src/pe/CMakeLists.txt b/src/pe/CMakeLists.txt index 12a3ebb4e..84c293427 100644 --- a/src/pe/CMakeLists.txt +++ b/src/pe/CMakeLists.txt @@ -5,9 +5,10 @@ # ################################################################################################### -add_library( pe ) -target_link_libraries( pe PUBLIC core blockforest domain_decomposition geometry stencil vtk PRIVATE lodepng ) -target_sources( pe +add_library( walberla_pe ) +add_library( walberla::pe ALIAS walberla_pe ) +target_link_libraries( walberla_pe PUBLIC walberla::core walberla::blockforest walberla::domain_decomposition walberla::geometry walberla::stencil walberla::vtk PRIVATE lodepng ) +target_sources( walberla_pe PRIVATE Config.h Thresholds.h diff --git a/src/pe/amr/CMakeLists.txt b/src/pe/amr/CMakeLists.txt index c5643990d..5a3224347 100644 --- a/src/pe/amr/CMakeLists.txt +++ b/src/pe/amr/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE InfoCollection.cpp InfoCollection.h diff --git a/src/pe/bg/CMakeLists.txt b/src/pe/bg/CMakeLists.txt index 043041125..0ba1bd6c0 100644 --- a/src/pe/bg/CMakeLists.txt +++ b/src/pe/bg/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE SimpleBG.h SimpleBGDataHandling.h diff --git a/src/pe/ccd/CMakeLists.txt b/src/pe/ccd/CMakeLists.txt index bfc001c40..c99403c71 100644 --- a/src/pe/ccd/CMakeLists.txt +++ b/src/pe/ccd/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE HashGrids.cpp SimpleCCD.h diff --git a/src/pe/collision/CMakeLists.txt b/src/pe/collision/CMakeLists.txt index 132304871..126b2dfe5 100644 --- a/src/pe/collision/CMakeLists.txt +++ b/src/pe/collision/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE GJK.h GJK.cpp diff --git a/src/pe/communication/CMakeLists.txt b/src/pe/communication/CMakeLists.txt index f6a10f37c..716b9743e 100644 --- a/src/pe/communication/CMakeLists.txt +++ b/src/pe/communication/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE RigidBodyRemovalNotification.h RigidBodyCopyNotification.h diff --git a/src/pe/communication/rigidbody/CMakeLists.txt b/src/pe/communication/rigidbody/CMakeLists.txt index 832e9bc00..7b03c1ddd 100644 --- a/src/pe/communication/rigidbody/CMakeLists.txt +++ b/src/pe/communication/rigidbody/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE Capsule.h Capsule.cpp diff --git a/src/pe/contact/CMakeLists.txt b/src/pe/contact/CMakeLists.txt index 8c7387e86..09d0248d3 100644 --- a/src/pe/contact/CMakeLists.txt +++ b/src/pe/contact/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE Contact.h ContactFunctions.h diff --git a/src/pe/cr/CMakeLists.txt b/src/pe/cr/CMakeLists.txt index 6ed5db655..1f41f6920 100644 --- a/src/pe/cr/CMakeLists.txt +++ b/src/pe/cr/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE HCSITSBodyTrait.h Integrators.h diff --git a/src/pe/debug/CMakeLists.txt b/src/pe/debug/CMakeLists.txt index 15053b394..17baa9a65 100644 --- a/src/pe/debug/CMakeLists.txt +++ b/src/pe/debug/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE BodyData.cpp BodyData.h diff --git a/src/pe/fcd/CMakeLists.txt b/src/pe/fcd/CMakeLists.txt index 5a720cdb0..0109c2ac6 100644 --- a/src/pe/fcd/CMakeLists.txt +++ b/src/pe/fcd/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE GenericFCD.h SimpleFCD.h diff --git a/src/pe/raytracing/CMakeLists.txt b/src/pe/raytracing/CMakeLists.txt index a130633b5..09a47d867 100644 --- a/src/pe/raytracing/CMakeLists.txt +++ b/src/pe/raytracing/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE Intersects.h Ray.cpp diff --git a/src/pe/rigidbody/CMakeLists.txt b/src/pe/rigidbody/CMakeLists.txt index 36c0cca2e..42732a775 100644 --- a/src/pe/rigidbody/CMakeLists.txt +++ b/src/pe/rigidbody/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE RigidBodyIterator.h UnionFactory.h diff --git a/src/pe/statistics/CMakeLists.txt b/src/pe/statistics/CMakeLists.txt index 224b36ca2..e2a1dc3a5 100644 --- a/src/pe/statistics/CMakeLists.txt +++ b/src/pe/statistics/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE BodyStatistics.cpp BodyStatistics.h diff --git a/src/pe/synchronization/CMakeLists.txt b/src/pe/synchronization/CMakeLists.txt index 83f27e388..8b6ad4222 100644 --- a/src/pe/synchronization/CMakeLists.txt +++ b/src/pe/synchronization/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE SyncNextNeighbors.h SyncShadowOwners.h diff --git a/src/pe/utility/CMakeLists.txt b/src/pe/utility/CMakeLists.txt index 3f9f429a5..87e245be1 100644 --- a/src/pe/utility/CMakeLists.txt +++ b/src/pe/utility/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE DestroyBody.cpp Distance.h diff --git a/src/pe/vtk/CMakeLists.txt b/src/pe/vtk/CMakeLists.txt index 01cb51744..e6d93c4e8 100644 --- a/src/pe/vtk/CMakeLists.txt +++ b/src/pe/vtk/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe +target_sources( walberla_pe PRIVATE EllipsoidVtkOutput.cpp BodyVtkOutput.h diff --git a/src/pe_coupling/CMakeLists.txt b/src/pe_coupling/CMakeLists.txt index 7883137c4..0ef08e09f 100644 --- a/src/pe_coupling/CMakeLists.txt +++ b/src/pe_coupling/CMakeLists.txt @@ -1,11 +1,12 @@ ################################################################################################### # -# Module pe_coupling +# Module walberla::pe_coupling # ################################################################################################### -add_library( pe_coupling ) -target_link_libraries( pe_coupling PUBLIC blockforest boundary communication core domain_decomposition field geometry lbm pe stencil vtk ) +add_library( walberla_pe_coupling ) +add_library( walberla::pe_coupling ALIAS walberla_pe_coupling ) +target_link_libraries( walberla_pe_coupling PUBLIC walberla::blockforest walberla::boundary walberla::communication walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::lbm walberla::pe walberla::stencil walberla::vtk ) add_subdirectory( amr ) add_subdirectory( discrete_particle_methods ) diff --git a/src/pe_coupling/amr/CMakeLists.txt b/src/pe_coupling/amr/CMakeLists.txt index 4304ceaf4..cf725cb0e 100644 --- a/src/pe_coupling/amr/CMakeLists.txt +++ b/src/pe_coupling/amr/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE InfoCollection.cpp BlockInfo.h diff --git a/src/pe_coupling/amr/level_determination/CMakeLists.txt b/src/pe_coupling/amr/level_determination/CMakeLists.txt index 19072c57c..70add7989 100644 --- a/src/pe_coupling/amr/level_determination/CMakeLists.txt +++ b/src/pe_coupling/amr/level_determination/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE GlobalBodyPresenceLevelDetermination.cpp BodyPresenceLevelDetermination.cpp diff --git a/src/pe_coupling/amr/weight_assignment/CMakeLists.txt b/src/pe_coupling/amr/weight_assignment/CMakeLists.txt index 5698849c1..170167338 100644 --- a/src/pe_coupling/amr/weight_assignment/CMakeLists.txt +++ b/src/pe_coupling/amr/weight_assignment/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE WeightAssignmentFunctor.h MetisAssignmentFunctor.cpp diff --git a/src/pe_coupling/discrete_particle_methods/correlations/CMakeLists.txt b/src/pe_coupling/discrete_particle_methods/correlations/CMakeLists.txt index 38f6af983..d4d436350 100644 --- a/src/pe_coupling/discrete_particle_methods/correlations/CMakeLists.txt +++ b/src/pe_coupling/discrete_particle_methods/correlations/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE DragForceCorrelations.h LiftForceCorrelations.h diff --git a/src/pe_coupling/discrete_particle_methods/evaluators/CMakeLists.txt b/src/pe_coupling/discrete_particle_methods/evaluators/CMakeLists.txt index 18b816062..e21d26c4c 100644 --- a/src/pe_coupling/discrete_particle_methods/evaluators/CMakeLists.txt +++ b/src/pe_coupling/discrete_particle_methods/evaluators/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE EffectiveViscosityFieldEvaluator.h AddedMassForceEvaluator.h diff --git a/src/pe_coupling/discrete_particle_methods/gns_lbm/CMakeLists.txt b/src/pe_coupling/discrete_particle_methods/gns_lbm/CMakeLists.txt index e97a9c4fc..567f42a23 100644 --- a/src/pe_coupling/discrete_particle_methods/gns_lbm/CMakeLists.txt +++ b/src/pe_coupling/discrete_particle_methods/gns_lbm/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE GNSSweep.h ) diff --git a/src/pe_coupling/discrete_particle_methods/gns_lbm/utility/CMakeLists.txt b/src/pe_coupling/discrete_particle_methods/gns_lbm/utility/CMakeLists.txt index b5ac25e11..4f58057bb 100644 --- a/src/pe_coupling/discrete_particle_methods/gns_lbm/utility/CMakeLists.txt +++ b/src/pe_coupling/discrete_particle_methods/gns_lbm/utility/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE GNSPressureFieldEvaluator.h GNSVelocityFieldEvaluator.h diff --git a/src/pe_coupling/discrete_particle_methods/utility/CMakeLists.txt b/src/pe_coupling/discrete_particle_methods/utility/CMakeLists.txt index b6c117c97..4c0cec7e5 100644 --- a/src/pe_coupling/discrete_particle_methods/utility/CMakeLists.txt +++ b/src/pe_coupling/discrete_particle_methods/utility/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE BodyVelocityInitializer.h AveragedInteractionForceFieldToForceFieldAdder.h diff --git a/src/pe_coupling/geometry/CMakeLists.txt b/src/pe_coupling/geometry/CMakeLists.txt index 9331843e2..607013eed 100644 --- a/src/pe_coupling/geometry/CMakeLists.txt +++ b/src/pe_coupling/geometry/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE SphereEquivalentDiameter.h PeIntersectionRatio.cpp diff --git a/src/pe_coupling/mapping/CMakeLists.txt b/src/pe_coupling/mapping/CMakeLists.txt index 4954955a1..1c0109913 100644 --- a/src/pe_coupling/mapping/CMakeLists.txt +++ b/src/pe_coupling/mapping/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE BodyMapping.h BodyBBMapping.h diff --git a/src/pe_coupling/momentum_exchange_method/CMakeLists.txt b/src/pe_coupling/momentum_exchange_method/CMakeLists.txt index db5a4e0f8..cf557a1ac 100644 --- a/src/pe_coupling/momentum_exchange_method/CMakeLists.txt +++ b/src/pe_coupling/momentum_exchange_method/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE BodyMapping.h ) diff --git a/src/pe_coupling/momentum_exchange_method/boundary/CMakeLists.txt b/src/pe_coupling/momentum_exchange_method/boundary/CMakeLists.txt index 1c082cba5..5d81860a7 100644 --- a/src/pe_coupling/momentum_exchange_method/boundary/CMakeLists.txt +++ b/src/pe_coupling/momentum_exchange_method/boundary/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE CurvedQuadratic.h CurvedLinear.h diff --git a/src/pe_coupling/momentum_exchange_method/destruction/CMakeLists.txt b/src/pe_coupling/momentum_exchange_method/destruction/CMakeLists.txt index e237634a3..22f245b50 100644 --- a/src/pe_coupling/momentum_exchange_method/destruction/CMakeLists.txt +++ b/src/pe_coupling/momentum_exchange_method/destruction/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE Destroyer.h ) diff --git a/src/pe_coupling/momentum_exchange_method/restoration/CMakeLists.txt b/src/pe_coupling/momentum_exchange_method/restoration/CMakeLists.txt index 6930bd57e..535b860db 100644 --- a/src/pe_coupling/momentum_exchange_method/restoration/CMakeLists.txt +++ b/src/pe_coupling/momentum_exchange_method/restoration/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE ExtrapolationDirectionFinder.h ExtrapolationDirectionFinder.cpp diff --git a/src/pe_coupling/partially_saturated_cells_method/CMakeLists.txt b/src/pe_coupling/partially_saturated_cells_method/CMakeLists.txt index df940c6fb..bc0de60e5 100644 --- a/src/pe_coupling/partially_saturated_cells_method/CMakeLists.txt +++ b/src/pe_coupling/partially_saturated_cells_method/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE PSMUtility.h BodyAndVolumeFractionMapping.cpp diff --git a/src/pe_coupling/utility/CMakeLists.txt b/src/pe_coupling/utility/CMakeLists.txt index 007e856e0..3b611f1c5 100644 --- a/src/pe_coupling/utility/CMakeLists.txt +++ b/src/pe_coupling/utility/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( pe_coupling +target_sources( walberla_pe_coupling PRIVATE LubricationCorrection.h TimeStep.h diff --git a/src/postprocessing/CMakeLists.txt b/src/postprocessing/CMakeLists.txt index 1a1ad27e0..10e5371e7 100644 --- a/src/postprocessing/CMakeLists.txt +++ b/src/postprocessing/CMakeLists.txt @@ -4,9 +4,10 @@ # ################################################################################################### -add_library( postprocessing ) -target_link_libraries( postprocessing PUBLIC core domain_decomposition field geometry ) -target_sources( postprocessing +add_library( walberla_postprocessing ) +add_library( walberla::postprocessing ALIAS walberla_postprocessing ) +target_link_libraries( walberla_postprocessing PUBLIC walberla::core walberla::domain_decomposition walberla::field walberla::geometry ) +target_sources( walberla_postprocessing PRIVATE MarchingCubes.impl.h MarchingCubes.h diff --git a/src/python_coupling/CMakeLists.txt b/src/python_coupling/CMakeLists.txt index 309a7cb9a..9bd55a3d5 100644 --- a/src/python_coupling/CMakeLists.txt +++ b/src/python_coupling/CMakeLists.txt @@ -1,9 +1,10 @@ - add_library( python_coupling ) - target_link_libraries( python_coupling PUBLIC pybind11::embed core communication domain_decomposition stencil field blockforest vtk ) + add_library( walberla_python_coupling ) + add_library( walberla::python_coupling ALIAS walberla_python_coupling ) + target_link_libraries( walberla_python_coupling PUBLIC pybind11::embed walberla::core walberla::communication walberla::domain_decomposition walberla::stencil walberla::field walberla::blockforest walberla::vtk ) if( WALBERLA_BUILD_WITH_GPU_SUPPORT ) - target_link_libraries( python_coupling PUBLIC gpu ) + target_link_libraries( walberla_python_coupling PUBLIC walberla::gpu ) endif() - target_sources( python_coupling + target_sources( walberla_python_coupling PRIVATE Manager.cpp PythonWrapper.h diff --git a/src/python_coupling/export/CMakeLists.txt b/src/python_coupling/export/CMakeLists.txt index a7b389297..8e6f15866 100644 --- a/src/python_coupling/export/CMakeLists.txt +++ b/src/python_coupling/export/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( python_coupling +target_sources( walberla_python_coupling PRIVATE GatherExport.impl.h VTKExport.cpp diff --git a/src/python_coupling/helper/CMakeLists.txt b/src/python_coupling/helper/CMakeLists.txt index 2c9fc4587..7581d3c8a 100644 --- a/src/python_coupling/helper/CMakeLists.txt +++ b/src/python_coupling/helper/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources( python_coupling +target_sources( walberla_python_coupling PRIVATE ConfigFromDict.h MplHelpers.h diff --git a/src/simd/CMakeLists.txt b/src/simd/CMakeLists.txt index f850ff00d..eb0cf6e3f 100644 --- a/src/simd/CMakeLists.txt +++ b/src/simd/CMakeLists.txt @@ -5,9 +5,10 @@ # ################################################################################################### -add_library( simd INTERFACE ) -target_link_libraries( simd INTERFACE core ) -target_sources( simd +add_library( walberla_simd INTERFACE ) +add_library( walberla::simd ALIAS walberla_simd ) +target_link_libraries( walberla_simd INTERFACE walberla::core ) +target_sources( walberla_simd INTERFACE AVX.h SSE4.h diff --git a/src/sqlite/CMakeLists.txt b/src/sqlite/CMakeLists.txt index b7b339751..62804e550 100644 --- a/src/sqlite/CMakeLists.txt +++ b/src/sqlite/CMakeLists.txt @@ -4,9 +4,10 @@ # ################################################################################################### -add_library( sqlite ) -target_link_libraries( sqlite PUBLIC core PRIVATE sqlite3 ) -target_sources( sqlite +add_library( walberla_sqlite ) +add_library( walberla::sqlite ALIAS walberla_sqlite ) +target_link_libraries( walberla_sqlite PUBLIC walberla::core PRIVATE sqlite3 ) +target_sources( walberla_sqlite PRIVATE SQLite.cpp SQLite.h diff --git a/src/stencil/CMakeLists.txt b/src/stencil/CMakeLists.txt index 466e376fa..ec4f55d46 100644 --- a/src/stencil/CMakeLists.txt +++ b/src/stencil/CMakeLists.txt @@ -4,8 +4,9 @@ # ################################################################################################### -add_library( stencil INTERFACE ) -target_sources( stencil +add_library( walberla_stencil INTERFACE ) +add_library( walberla::stencil ALIAS walberla_stencil ) +target_sources( walberla_stencil INTERFACE AABBQuadrant.h D2CornerStencil.h @@ -24,6 +25,6 @@ target_sources( stencil Iterator.h Stencil.in.h ) -target_link_libraries( stencil INTERFACE core ) +target_link_libraries( walberla_stencil INTERFACE walberla::core ) ################################################################################################### diff --git a/src/timeloop/CMakeLists.txt b/src/timeloop/CMakeLists.txt index ba2ef178c..b4993e408 100644 --- a/src/timeloop/CMakeLists.txt +++ b/src/timeloop/CMakeLists.txt @@ -4,9 +4,10 @@ # ################################################################################################### -add_library( timeloop ) -target_link_libraries( timeloop PUBLIC core domain_decomposition ) -target_sources( timeloop +add_library( walberla_timeloop ) +add_library( walberla::timeloop ALIAS walberla_timeloop ) +target_link_libraries( walberla_timeloop PUBLIC walberla::core walberla::domain_decomposition ) +target_sources( walberla_timeloop PRIVATE ITimeloop.h PerformanceMeter.h diff --git a/src/vtk/CMakeLists.txt b/src/vtk/CMakeLists.txt index 2b21bd8d5..5d5275495 100644 --- a/src/vtk/CMakeLists.txt +++ b/src/vtk/CMakeLists.txt @@ -4,8 +4,9 @@ # ################################################################################################### -add_library( vtk ) -target_sources( vtk +add_library( walberla_vtk ) +add_library( walberla::vtk ALIAS walberla_vtk ) +target_sources( walberla_vtk PRIVATE Base64Writer.cpp Base64Writer.h @@ -24,6 +25,6 @@ target_sources( vtk UtilityFunctions.h ChainedFilter.h ) -target_link_libraries( vtk PUBLIC core blockforest domain_decomposition ) +target_link_libraries( walberla_vtk PUBLIC walberla::core walberla::blockforest walberla::domain_decomposition ) ################################################################################################### diff --git a/tests/blockforest/CMakeLists.txt b/tests/blockforest/CMakeLists.txt index 4778166c9..99f9ad38c 100644 --- a/tests/blockforest/CMakeLists.txt +++ b/tests/blockforest/CMakeLists.txt @@ -1,22 +1,22 @@ ################################################################################################### # -# Tests for blockforest module +# Tests for walberla::blockforest module # ################################################################################################### -waLBerla_compile_test ( FILES BlockIDTest.cpp DEPENDS core ) +waLBerla_compile_test( FILES BlockIDTest.cpp DEPENDS walberla::core ) waLBerla_execute_test ( NAME BlockIDTest LABELS longrun ) -waLBerla_compile_test( FILES SetupBlockForestTest.cpp DEPENDS core ) +waLBerla_compile_test( FILES SetupBlockForestTest.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME SetupBlockForestTest LABELS longrun CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES BlockForestTest.cpp DEPENDS core domain_decomposition ) +waLBerla_compile_test( FILES BlockForestTest.cpp DEPENDS walberla::core walberla::domain_decomposition ) waLBerla_execute_test( NAME BlockForestTest PROCESSES 4 ) -waLBerla_compile_test( FILES DeterministicCreation.cpp DEPENDS core ) +waLBerla_compile_test( FILES DeterministicCreation.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME DeterministicCreation PROCESSES 8 ) -waLBerla_compile_test( NAME SaveLoad FILES SaveLoadTest.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME SaveLoad FILES SaveLoadTest.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME SaveLoad01 COMMAND $<TARGET_FILE:SaveLoad> PROCESSES 1 ) waLBerla_execute_test( NAME SaveLoad02 COMMAND $<TARGET_FILE:SaveLoad> PROCESSES 2 ) waLBerla_execute_test( NAME SaveLoad04 COMMAND $<TARGET_FILE:SaveLoad> PROCESSES 4 ) @@ -27,10 +27,10 @@ set_property( TEST SaveLoad04 PROPERTY DEPENDS SaveLoad02 ) #serialize runs of t set_property( TEST SaveLoad08 PROPERTY DEPENDS SaveLoad04 ) #serialize runs of tets to avoid i/o conflicts when running ctest with -jN endif() -waLBerla_compile_test( FILES StructuredBlockForestTest.cpp DEPENDS core domain_decomposition ) +waLBerla_compile_test( FILES StructuredBlockForestTest.cpp DEPENDS walberla::core walberla::domain_decomposition ) waLBerla_execute_test( NAME StructuredBlockForestTest ) -waLBerla_compile_test( FILES BlockDataIOTest.cpp DEPENDS core field ) +waLBerla_compile_test( FILES BlockDataIOTest.cpp DEPENDS walberla::core walberla::field ) waLBerla_execute_test( NAME BlockDataIOTest1 COMMAND $<TARGET_FILE:BlockDataIOTest> DEPENDS_ON_TARGETS BlockDataIOTest ) waLBerla_execute_test( NAME BlockDataIOTest3 COMMAND $<TARGET_FILE:BlockDataIOTest> PROCESSES 3 DEPENDS_ON_TARGETS BlockDataIOTest ) waLBerla_execute_test( NAME BlockDataIOTest8 COMMAND $<TARGET_FILE:BlockDataIOTest> PROCESSES 8 DEPENDS_ON_TARGETS BlockDataIOTest ) @@ -44,12 +44,12 @@ endif( WALBERLA_BUILD_WITH_MPI ) # communication -waLBerla_compile_test( FILES communication/GhostLayerCommTest.cpp DEPENDS field timeloop ) +waLBerla_compile_test( FILES communication/GhostLayerCommTest.cpp DEPENDS walberla::field walberla::timeloop ) waLBerla_execute_test( NAME GhostLayerCommTest1 COMMAND $<TARGET_FILE:GhostLayerCommTest> DEPENDS_ON_TARGETS GhostLayerCommTest ) waLBerla_execute_test( NAME GhostLayerCommTest4 COMMAND $<TARGET_FILE:GhostLayerCommTest> PROCESSES 4 DEPENDS_ON_TARGETS GhostLayerCommTest ) waLBerla_execute_test( NAME GhostLayerCommTest8 COMMAND $<TARGET_FILE:GhostLayerCommTest> PROCESSES 8 DEPENDS_ON_TARGETS GhostLayerCommTest ) -waLBerla_compile_test( FILES communication/DirectionBasedReduceCommTest.cpp DEPENDS field timeloop ) +waLBerla_compile_test( FILES communication/DirectionBasedReduceCommTest.cpp DEPENDS walberla::field walberla::timeloop ) waLBerla_execute_test( NAME DirectionBasedReduceCommTest1 COMMAND $<TARGET_FILE:DirectionBasedReduceCommTest> DEPENDS_ON_TARGETS DirectionBasedReduceCommTest ) waLBerla_execute_test( NAME DirectionBasedReduceCommTest3 COMMAND $<TARGET_FILE:DirectionBasedReduceCommTest> PROCESSES 3 DEPENDS_ON_TARGETS DirectionBasedReduceCommTest ) waLBerla_execute_test( NAME DirectionBasedReduceCommTest8 COMMAND $<TARGET_FILE:DirectionBasedReduceCommTest> PROCESSES 8 DEPENDS_ON_TARGETS DirectionBasedReduceCommTest ) diff --git a/tests/blockforest/communication/CMakeLists.txt b/tests/blockforest/communication/CMakeLists.txt index f7e392c47..f8e67a5ee 100644 --- a/tests/blockforest/communication/CMakeLists.txt +++ b/tests/blockforest/communication/CMakeLists.txt @@ -4,12 +4,12 @@ # ################################################################################################### -waLBerla_compile_test( FILES GhostLayerCommTest.cpp DEPENDS timeloop ) +waLBerla_compile_test( FILES GhostLayerCommTest.cpp DEPENDS walberla::timeloop ) waLBerla_execute_test( NAME GhostLayerCommTest1 COMMAND $<TARGET_FILE:GhostLayerCommTest> ) waLBerla_execute_test( NAME GhostLayerCommTest4 COMMAND $<TARGET_FILE:GhostLayerCommTest> PROCESSES 4 ) waLBerla_execute_test( NAME GhostLayerCommTest8 COMMAND $<TARGET_FILE:GhostLayerCommTest> PROCESSES 8 ) -waLBerla_compile_test( FILES DirectionBasedReduceCommTest.cpp DEPENDS timeloop ) +waLBerla_compile_test( FILES DirectionBasedReduceCommTest.cpp DEPENDS walberla::timeloop ) waLBerla_execute_test( NAME DirectionBasedReduceCommTest1 COMMAND $<TARGET_FILE:DirectionBasedReduceCommTest> ) waLBerla_execute_test( NAME DirectionBasedReduceCommTest3 COMMAND $<TARGET_FILE:DirectionBasedReduceCommTest> PROCESSES 3 ) waLBerla_execute_test( NAME DirectionBasedReduceCommTest8 COMMAND $<TARGET_FILE:DirectionBasedReduceCommTest> PROCESSES 8 ) diff --git a/tests/boundary/CMakeLists.txt b/tests/boundary/CMakeLists.txt index 8dd843d97..ab46510bb 100644 --- a/tests/boundary/CMakeLists.txt +++ b/tests/boundary/CMakeLists.txt @@ -1,6 +1,6 @@ ################################################################################################### # -# Tests for boundary module +# Tests for walberla::boundary module # ################################################################################################### @@ -12,7 +12,7 @@ if (WALBERLA_BUILD_WITH_PYTHON) waLBerla_link_files_to_builddir( *.py ) - waLBerla_compile_test( FILES TestShiftedPeriodicity.cpp DEPENDS blockforest field python_coupling ) + waLBerla_compile_test( FILES TestShiftedPeriodicity.cpp DEPENDS walberla::blockforest walberla::field walberla::python_coupling ) waLBerla_execute_test( NAME TestShiftedPeriodicity1 COMMAND $<TARGET_FILE:TestShiftedPeriodicity> ${CMAKE_CURRENT_SOURCE_DIR}/TestShiftedPeriodicitySetup.py ) waLBerla_execute_test( NAME TestShiftedPeriodicity2 COMMAND $<TARGET_FILE:TestShiftedPeriodicity> ${CMAKE_CURRENT_SOURCE_DIR}/TestShiftedPeriodicitySetup.py PROCESSES 2 ) waLBerla_execute_test( NAME TestShiftedPeriodicity4 COMMAND $<TARGET_FILE:TestShiftedPeriodicity> ${CMAKE_CURRENT_SOURCE_DIR}/TestShiftedPeriodicitySetup.py PROCESSES 4 ) diff --git a/tests/core/CMakeLists.txt b/tests/core/CMakeLists.txt index 604de6371..74a84d652 100644 --- a/tests/core/CMakeLists.txt +++ b/tests/core/CMakeLists.txt @@ -1,6 +1,6 @@ ################################################################################################### # -# Tests for core module +# Tests for walberla::core module # ################################################################################################### @@ -73,7 +73,7 @@ waLBerla_execute_test( NAME MatrixVector2Test ) waLBerla_compile_test( FILES math/Matrix3Test.cpp ) waLBerla_execute_test( NAME Matrix3Test ) -waLBerla_compile_test( FILES math/GenericAABBTest.cpp DEPENDS stencil domain_decomposition ) +waLBerla_compile_test( FILES math/GenericAABBTest.cpp DEPENDS walberla::stencil walberla::domain_decomposition ) waLBerla_execute_test( NAME GenericAABBTest ) @@ -120,7 +120,7 @@ waLBerla_execute_test( NAME SetReductionTest5 COMMAND $<TARGET_FILE:SetReductio waLBerla_execute_test( NAME SetReductionTest27 COMMAND $<TARGET_FILE:SetReductionTest> PROCESSES 27 ) if ( WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT ) - waLBerla_compile_test( Name MPIFloat16Test FILES mpi/MPIFloat16Test.cpp DEPENDS core ) + waLBerla_compile_test( Name MPIFloat16Test FILES mpi/MPIFloat16Test.cpp DEPENDS walberla::core ) target_compile_features( MPIFloat16Test PUBLIC cxx_std_23 ) waLBerla_execute_test( NAME MPIFloat16Test4 COMMAND $<TARGET_FILE:MPIFloat16Test> PROCESSES 4) endif () @@ -149,18 +149,18 @@ waLBerla_execute_test( NAME TimingPoolTest PROCESSES 3 ) waLBerla_compile_test( FILES timing/TimingTreeTest.cpp ) waLBerla_execute_test( NAME TimingTreeTest PROCESSES 3) -waLBerla_compile_test( FILES timing/SweepTimeloopTimerReduction.cpp DEPENDS blockforest domain_decomposition timeloop) +waLBerla_compile_test( FILES timing/SweepTimeloopTimerReduction.cpp DEPENDS walberla::blockforest walberla::domain_decomposition walberla::timeloop ) waLBerla_execute_test( NAME SweepTimeloopTimerReduction PROCESSES 9 ) ######## -# core # +# walberla::core # ######## if ( WALBERLA_BUILD_WITH_PYTHON ) - waLBerla_compile_test( FILES AllHeaderTest.cpp DEPENDS blockforest field geometry pe pe_coupling python_coupling ) + waLBerla_compile_test( FILES AllHeaderTest.cpp DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::pe walberla::pe_coupling walberla::python_coupling ) else() - waLBerla_compile_test( FILES AllHeaderTest.cpp DEPENDS blockforest field geometry pe pe_coupling ) + waLBerla_compile_test( FILES AllHeaderTest.cpp DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::pe walberla::pe_coupling ) endif() waLBerla_execute_test( NAME AllHeaderTest ) @@ -211,12 +211,13 @@ endif() ################## if( WALBERLA_BUILD_WITH_METIS ) - waLBerla_compile_test( NAME MetisTest FILES load_balancing/MetisTest.cpp DEPENDS field ) + waLBerla_compile_test( NAME MetisTest FILES load_balancing/MetisTest.cpp DEPENDS walberla::field ) waLBerla_execute_test( NAME MetisTest COMMAND $<TARGET_FILE:MetisTest> 64 64 4 --no-vtk ) endif() if( WALBERLA_BUILD_WITH_PARMETIS ) - waLBerla_compile_test( NAME ParMetisTest FILES load_balancing/ParMetisTest.cpp DEPENDS blockforest field stencil vtk ) + waLBerla_compile_test( NAME ParMetisTest FILES load_balancing/ParMetisTest.cpp + DEPENDS walberla::blockforest walberla::field walberla::stencil walberla::vtk ) waLBerla_execute_test( NAME ParMetisTest1 COMMAND $<TARGET_FILE:ParMetisTest> 64 64 4 --no-vtk ) waLBerla_execute_test( NAME ParMetisTest2 COMMAND $<TARGET_FILE:ParMetisTest> 64 64 8 --no-vtk PROCESSES 2 ) waLBerla_execute_test( NAME ParMetisTest4 COMMAND $<TARGET_FILE:ParMetisTest> 64 64 16 --no-vtk PROCESSES 4 ) @@ -230,7 +231,7 @@ endif() ################### if ( WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT ) - waLBerla_compile_test( Name Float16SupportTest FILES Float16SupportTest.cpp DEPENDS core) + waLBerla_compile_test( Name Float16SupportTest FILES Float16SupportTest.cpp DEPENDS walberla::core ) # Actual support for float16 is available only since C++23 # before is_arithmetic and is_floating_point evaluated to false, # also many STL functions are compatible with float16 only since C++23. diff --git a/tests/domain_decomposition/CMakeLists.txt b/tests/domain_decomposition/CMakeLists.txt index 56fd5c358..8ca610f24 100644 --- a/tests/domain_decomposition/CMakeLists.txt +++ b/tests/domain_decomposition/CMakeLists.txt @@ -1,14 +1,14 @@ ################################################################################################### # -# Tests for domain_decomposition module +# Tests for walberla::domain_decomposition module # ################################################################################################### -waLBerla_compile_test( NAME MapPointToPeriodicDomain FILES MapPointToPeriodicDomain.cpp DEPENDS core ) +waLBerla_compile_test( NAME MapPointToPeriodicDomain FILES MapPointToPeriodicDomain.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MapPointToPeriodicDomain ) -waLBerla_compile_test( NAME PeriodicIntersect FILES PeriodicIntersect.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME PeriodicIntersect FILES PeriodicIntersect.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PeriodicIntersect ) -waLBerla_compile_test( NAME PeriodicIntersectionVolume FILES PeriodicIntersectionVolume.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME PeriodicIntersectionVolume FILES PeriodicIntersectionVolume.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PeriodicIntersectionVolume ) diff --git a/tests/fft/CMakeLists.txt b/tests/fft/CMakeLists.txt index 97dcd8bfb..2328d182d 100644 --- a/tests/fft/CMakeLists.txt +++ b/tests/fft/CMakeLists.txt @@ -1,8 +1,8 @@ if ( WALBERLA_BUILD_WITH_FFT ) - waLBerla_compile_test( FILES FftTest.cpp DEPENDS field fft ) + waLBerla_compile_test( FILES FftTest.cpp DEPENDS walberla::field walberla::fft ) waLBerla_execute_test( NAME FftTest COMMAND $<TARGET_FILE:FftTest> PROCESSES 1 ) waLBerla_execute_test( NAME FftTestParallel COMMAND $<TARGET_FILE:FftTest> PROCESSES 8 ) - waLBerla_compile_test( FILES GreensTest.cpp DEPENDS field fft ) + waLBerla_compile_test( FILES GreensTest.cpp DEPENDS walberla::field walberla::fft ) waLBerla_execute_test( NAME GreensTest COMMAND $<TARGET_FILE:GreensTest> PROCESSES 1 ) waLBerla_execute_test( NAME GreensTestParallel COMMAND $<TARGET_FILE:GreensTest> PROCESSES 8 ) endif() diff --git a/tests/field/CMakeLists.txt b/tests/field/CMakeLists.txt index c45c668aa..295147c96 100644 --- a/tests/field/CMakeLists.txt +++ b/tests/field/CMakeLists.txt @@ -1,16 +1,16 @@ ################################################################################################### # -# Tests for field module +# Tests for walberla::field module # ################################################################################################### -waLBerla_compile_test( FILES AccuracyEvaluationTest.cpp DEPENDS blockforest ) +waLBerla_compile_test( FILES AccuracyEvaluationTest.cpp DEPENDS walberla::blockforest ) waLBerla_execute_test( NAME AccuracyEvaluationTest4 COMMAND $<TARGET_FILE:AccuracyEvaluationTest> PROCESSES 4 ) -waLBerla_compile_test( FILES AddToStorageTest.cpp DEPENDS blockforest ) +waLBerla_compile_test( FILES AddToStorageTest.cpp DEPENDS walberla::blockforest ) waLBerla_execute_test( NAME AddToStorageTest ) -waLBerla_compile_test( FILES communication/FieldPackInfoTest.cpp DEPENDS blockforest ) +waLBerla_compile_test( FILES communication/FieldPackInfoTest.cpp DEPENDS walberla::blockforest ) waLBerla_execute_test( NAME FieldPackInfoTest ) waLBerla_compile_test( FILES distributors/DistributionTest.cpp) @@ -28,7 +28,7 @@ waLBerla_execute_test( NAME FieldTiming ) waLBerla_compile_test( FILES FlagFieldTest.cpp) waLBerla_execute_test( NAME FlagFieldTest ) -waLBerla_compile_test( FILES StabilityCheckerTest.cpp DEPENDS blockforest field timeloop ) +waLBerla_compile_test( FILES StabilityCheckerTest.cpp DEPENDS walberla::blockforest walberla::field walberla::timeloop ) waLBerla_execute_test( NAME StabilityCheckerTest ) waLBerla_compile_test( FILES interpolators/InterpolationTest.cpp) @@ -37,14 +37,14 @@ waLBerla_execute_test( NAME InterpolationTest ) waLBerla_compile_test( FILES interpolators/FieldInterpolationTest.cpp) waLBerla_execute_test( NAME FieldInterpolationTest ) -waLBerla_compile_test( FILES adaptors/AdaptorTest.cpp DEPENDS blockforest lbm ) +waLBerla_compile_test( FILES adaptors/AdaptorTest.cpp DEPENDS walberla::blockforest walberla::lbm ) waLBerla_execute_test( NAME AdaptorTest ) -waLBerla_compile_test( FILES FieldGatherTest.cpp DEPENDS blockforest ) +waLBerla_compile_test( FILES FieldGatherTest.cpp DEPENDS walberla::blockforest ) waLBerla_execute_test( NAME FieldGatherTest3 COMMAND $<TARGET_FILE:FieldGatherTest> PROCESSES 3 DEPENDS_ON_TARGETS FieldGatherTest ) waLBerla_execute_test( NAME FieldGatherTest1 COMMAND $<TARGET_FILE:FieldGatherTest> PROCESSES 1 DEPENDS_ON_TARGETS FieldGatherTest ) -waLBerla_compile_test( FILES FieldFileIOTest.cpp DEPENDS blockforest ) +waLBerla_compile_test( FILES FieldFileIOTest.cpp DEPENDS walberla::blockforest ) waLBerla_execute_test( NAME FieldFileIOTest1Proc COMMAND $<TARGET_FILE:FieldFileIOTest> PROCESSES 1 ) waLBerla_execute_test( NAME FieldFileIOTest2Proc COMMAND $<TARGET_FILE:FieldFileIOTest> PROCESSES 2 ) waLBerla_execute_test( NAME FieldFileIOTest4Proc COMMAND $<TARGET_FILE:FieldFileIOTest> PROCESSES 4 ) @@ -57,7 +57,7 @@ if( WALBERLA_BUILD_WITH_MPI ) endif( WALBERLA_BUILD_WITH_MPI ) if( WALBERLA_BUILD_WITH_MPI ) - waLBerla_compile_test( FILES FieldMPIDatatypesTest.cpp DEPENDS blockforest ) + waLBerla_compile_test( FILES FieldMPIDatatypesTest.cpp DEPENDS walberla::blockforest ) waLBerla_execute_test( NAME FieldMPIDatatypesTestRelease COMMAND $<TARGET_FILE:FieldMPIDatatypesTest> PROCESSES 1 CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME FieldMPIDatatypesTestDebug COMMAND $<TARGET_FILE:FieldMPIDatatypesTest> PROCESSES 1 LABELS longrun CONFIGURATIONS Debug DebugOptimized ) endif( WALBERLA_BUILD_WITH_MPI ) @@ -68,33 +68,33 @@ endif( WALBERLA_BUILD_WITH_MPI ) if( WALBERLA_BUILD_WITH_CODEGEN ) waLBerla_generate_target_from_python(NAME CodegenJacobiCPUGeneratedJacobiKernel FILE codegen/JacobiKernel.py OUT_FILES JacobiKernel2D.cpp JacobiKernel2D.h JacobiKernel3D.cpp JacobiKernel3D.h ) -waLBerla_compile_test( FILES codegen/CodegenJacobiCPU.cpp DEPENDS timeloop CodegenJacobiCPUGeneratedJacobiKernel) +waLBerla_compile_test( FILES codegen/CodegenJacobiCPU.cpp DEPENDS walberla::timeloop CodegenJacobiCPUGeneratedJacobiKernel ) waLBerla_execute_test( NAME CodegenJacobiCPU ) waLBerla_generate_target_from_python(NAME SweepCollectionKernel FILE codegen/SweepCollection.py OUT_FILES SweepCollection.h SweepCollection.cpp) -waLBerla_compile_test( FILES codegen/SweepCollection.cpp DEPENDS timeloop SweepCollectionKernel) +waLBerla_compile_test( FILES codegen/SweepCollection.cpp DEPENDS walberla::timeloop SweepCollectionKernel ) waLBerla_execute_test( NAME SweepCollection ) waLBerla_generate_target_from_python(NAME CodegenPoissonCPUGeneratedKernel FILE codegen/Poisson.py OUT_FILES Poisson.cpp Poisson.h ) -waLBerla_compile_test( FILES codegen/CodegenPoissonCPU.cpp DEPENDS timeloop CodegenPoissonCPUGeneratedKernel) +waLBerla_compile_test( FILES codegen/CodegenPoissonCPU.cpp DEPENDS walberla::timeloop CodegenPoissonCPUGeneratedKernel ) waLBerla_execute_test( NAME CodegenPoissonCPU ) waLBerla_generate_target_from_python(NAME CodeGenMultipleFieldSwaps FILE codegen/MultipleFieldSwaps.py OUT_FILES MultipleFieldSwaps.cpp MultipleFieldSwaps.h ) -waLBerla_compile_test( FILES codegen/MultipleFieldSwaps.cpp DEPENDS timeloop CodeGenMultipleFieldSwaps) +waLBerla_compile_test( FILES codegen/MultipleFieldSwaps.cpp DEPENDS walberla::timeloop CodeGenMultipleFieldSwaps ) waLBerla_execute_test( NAME MultipleFieldSwaps ) waLBerla_generate_target_from_python(NAME CodegenGeneratedCPUFieldPackInfo FILE codegen/GeneratedFieldPackInfoTest.py OUT_FILES ScalarFieldCommunication.cpp ScalarFieldCommunication.h ScalarFieldPullReduction.cpp ScalarFieldPullReduction.h ) waLBerla_compile_test( FILES codegen/GeneratedFieldPackInfoTest.cpp - DEPENDS blockforest core field CodegenGeneratedCPUFieldPackInfo ) + DEPENDS walberla::blockforest walberla::core walberla::field CodegenGeneratedCPUFieldPackInfo ) waLBerla_execute_test( NAME GeneratedFieldPackInfoTest ) waLBerla_generate_target_from_python(NAME CodeGenEK FILE codegen/EK.py OUT_FILES EKFlux.cpp EKFlux.h EKContinuity.cpp EKContinuity.h ) -waLBerla_compile_test( FILES codegen/EK.cpp DEPENDS blockforest core field timeloop CodeGenEK) +waLBerla_compile_test( FILES codegen/EK.cpp DEPENDS walberla::blockforest walberla::core walberla::field walberla::timeloop CodeGenEK ) waLBerla_execute_test( NAME EK ) endif() diff --git a/tests/gather/CMakeLists.txt b/tests/gather/CMakeLists.txt index 1939770dd..3df89ff75 100644 --- a/tests/gather/CMakeLists.txt +++ b/tests/gather/CMakeLists.txt @@ -5,14 +5,11 @@ ################################################################################################### - - - -waLBerla_compile_test( FILES MPIGatherSchemeTest.cpp ) +waLBerla_compile_test( FILES MPIGatherSchemeTest.cpp DEPENDS ) waLBerla_execute_test( NAME MPIGatherSchemeTest PROCESSES 7 ) -waLBerla_compile_test( FILES CurveGatherTest.cpp ) +waLBerla_compile_test( FILES CurveGatherTest.cpp DEPENDS ) waLBerla_execute_test( NAME CurveGatherTest PROCESSES 4 ) -waLBerla_compile_test( FILES GatherSchemeTest.cpp ) +waLBerla_compile_test( FILES GatherSchemeTest.cpp DEPENDS ) waLBerla_execute_test( NAME GatherSchemeTest PROCESSES 4 ) diff --git a/tests/geometry/CMakeLists.txt b/tests/geometry/CMakeLists.txt index 01ac0cba6..c78d25b24 100644 --- a/tests/geometry/CMakeLists.txt +++ b/tests/geometry/CMakeLists.txt @@ -17,12 +17,12 @@ waLBerla_execute_test( NAME VoxelFileTestLong COMMAND $<TARGET_FILE:VoxelFileTes set_property( TEST VoxelFileTestLong PROPERTY DEPENDS VoxelFileTest ) #serialize runs of tets to avoid i/o conflicts when running ctest with -jN -waLBerla_compile_test( FILES ScalarFieldFromBodyTest.cpp ) +waLBerla_compile_test( FILES ScalarFieldFromBodyTest.cpp DEPENDS ) waLBerla_execute_test( NAME ScalarFieldFromBodyTest ) file( COPY "test.png" DESTINATION ${CMAKE_CURRENT_BINARY_DIR} ) -waLBerla_compile_test( FILES ScalarFieldFromGrayScaleImageTest.cpp ) +waLBerla_compile_test( FILES ScalarFieldFromGrayScaleImageTest.cpp DEPENDS ) waLBerla_execute_test( NAME ScalarFieldFromGrayScaleImageTest ) diff --git a/tests/gpu/CMakeLists.txt b/tests/gpu/CMakeLists.txt index 7a134adde..1214794a2 100644 --- a/tests/gpu/CMakeLists.txt +++ b/tests/gpu/CMakeLists.txt @@ -6,19 +6,21 @@ if( WALBERLA_BUILD_WITH_CUDA ) -waLBerla_compile_test( FILES communication/GPUPackInfoTest.cpp DEPENDS blockforest ) + waLBerla_compile_test( FILES communication/GPUPackInfoTest.cpp DEPENDS walberla::blockforest ) waLBerla_execute_test( NAME GPUPackInfoTest ) -waLBerla_compile_test( FILES communication/GPUPackInfoCommunicationTest.cpp DEPENDS domain_decomposition blockforest stencil ) + waLBerla_compile_test( FILES communication/GPUPackInfoCommunicationTest.cpp + DEPENDS walberla::domain_decomposition walberla::blockforest walberla::stencil ) waLBerla_execute_test( NAME GPUPackInfoCommunicationTest ) -waLBerla_compile_test( FILES communication/GPUBlockSelectorCommunicationTest.cpp DEPENDS domain_decomposition blockforest stencil ) + waLBerla_compile_test( FILES communication/GPUBlockSelectorCommunicationTest.cpp + DEPENDS walberla::domain_decomposition walberla::blockforest walberla::stencil ) waLBerla_execute_test( NAME GPUBlockSelectorCommunicationTest ) waLBerla_compile_test( FILES FieldTransferTest.cpp ) waLBerla_execute_test( NAME FieldTransferTest ) -waLBerla_compile_test( FILES SimpleKernelTest.cpp Kernels.cu DEPENDS blockforest timeloop ) + waLBerla_compile_test( FILES SimpleKernelTest.cpp Kernels.cu DEPENDS walberla::blockforest walberla::timeloop ) waLBerla_execute_test( NAME SimpleKernelTest ) waLBerla_compile_test( FILES FieldIndexing3DTest.cpp FieldIndexing3DTest.cu ) @@ -29,22 +31,22 @@ waLBerla_generate_target_from_python(NAME CodegenJacobiGPUGeneratedCudaJacobiKer OUT_FILES CudaJacobiKernel2D.cu CudaJacobiKernel2D.h CudaJacobiKernel3D.cu CudaJacobiKernel3D.h) waLBerla_compile_test( FILES codegen/CodegenJacobiGPU.cpp - DEPENDS blockforest timeloop CodegenJacobiGPUGeneratedCudaJacobiKernel ) + DEPENDS walberla::blockforest walberla::timeloop CodegenJacobiGPUGeneratedCudaJacobiKernel ) waLBerla_execute_test( NAME CodegenJacobiGPU ) waLBerla_generate_target_from_python(NAME CodegenPoissonGPUGeneratedKernel FILE codegen/CudaPoisson.py OUT_FILES PoissonGPU.cu PoissonGPU.h ) -waLBerla_compile_test( FILES codegen/CodegenPoissonGPU.cpp DEPENDS gpu timeloop CodegenPoissonGPUGeneratedKernel) + waLBerla_compile_test( FILES codegen/CodegenPoissonGPU.cpp DEPENDS walberla::gpu walberla::timeloop CodegenPoissonGPUGeneratedKernel ) waLBerla_execute_test( NAME CodegenPoissonGPU ) # The following tests work only for CUDA enabled MPI waLBerla_compile_test( FILES communication/CommTest.cpp ) #waLBerla_execute_test( NAME CommTest PROCESSES 2) -waLBerla_compile_test( FILES CudaMPI.cpp DEPENDS blockforest timeloop ) + waLBerla_compile_test( FILES CudaMPI.cpp DEPENDS walberla::blockforest walberla::timeloop ) #waLBerla_execute_test( NAME CudaMPI ) -waLBerla_compile_test( FILES AlignmentTest.cpp DEPENDS blockforest timeloop ) + waLBerla_compile_test( FILES AlignmentTest.cpp DEPENDS walberla::blockforest walberla::timeloop ) waLBerla_generate_target_from_python(NAME MicroBenchmarkGpuLbmGenerated FILE codegen/MicroBenchmarkGpuLbm.py OUT_FILES MicroBenchmarkStreamKernel.cu MicroBenchmarkCopyKernel.cu MicroBenchmarkStreamKernel.h MicroBenchmarkCopyKernel.h) @@ -54,14 +56,14 @@ waLBerla_generate_target_from_python(NAME CodegenGeneratedGPUFieldPackInfo FILE OUT_FILES ScalarFieldCommunicationGPU.cu ScalarFieldCommunicationGPU.h ScalarFieldPullReductionGPU.cu ScalarFieldPullReductionGPU.h ) waLBerla_compile_test( FILES codegen/GeneratedFieldPackInfoTestGPU.cpp - DEPENDS blockforest core field CodegenGeneratedGPUFieldPackInfo ) + DEPENDS walberla::blockforest walberla::core walberla::field CodegenGeneratedGPUFieldPackInfo ) waLBerla_execute_test( NAME GeneratedFieldPackInfoTestGPU ) if (WALBERLA_BUILD_WITH_PYTHON) waLBerla_link_files_to_builddir( *.py ) - waLBerla_compile_test( FILES TestShiftedPeriodicityGPU.cpp DEPENDS gpu blockforest field python_coupling ) + waLBerla_compile_test( FILES TestShiftedPeriodicityGPU.cpp DEPENDS walberla::gpu walberla::blockforest walberla::field walberla::python_coupling ) waLBerla_execute_test( NAME TestShiftedPeriodicityGPU COMMAND $<TARGET_FILE:TestShiftedPeriodicityGPU> ${CMAKE_CURRENT_SOURCE_DIR}/TestShiftedPeriodicitySetupGPU.py ) endif() diff --git a/tests/lbm/CMakeLists.txt b/tests/lbm/CMakeLists.txt index 76a38b811..d3111aa32 100644 --- a/tests/lbm/CMakeLists.txt +++ b/tests/lbm/CMakeLists.txt @@ -1,63 +1,63 @@ ############################################################################################################################# # -# Tests for lbm module +# Tests for walberla::lbm module # ############################################################################################################################# waLBerla_link_files_to_builddir( "*.prm" ) -waLBerla_compile_test( FILES SweepEquivalenceTest.cpp DEPENDS blockforest timeloop ) +waLBerla_compile_test( FILES SweepEquivalenceTest.cpp DEPENDS walberla::blockforest walberla::timeloop ) waLBerla_execute_test( NAME SweepEquivalenceTest ) -waLBerla_compile_test( FILES BoundaryHandlingCommunication.cpp DEPENDS blockforest timeloop ) +waLBerla_compile_test( FILES BoundaryHandlingCommunication.cpp DEPENDS walberla::blockforest walberla::timeloop ) waLBerla_execute_test( NAME BoundaryHandlingCommunication PROCESSES 8 ) -waLBerla_compile_test( FILES UnrollTest.cpp ) +waLBerla_compile_test( FILES UnrollTest.cpp DEPENDS walberla::core ) -waLBerla_compile_test( FILES boundary/SimplePABTest.cpp DEPENDS field blockforest timeloop vtk ) +waLBerla_compile_test( FILES boundary/SimplePABTest.cpp DEPENDS walberla::field walberla::blockforest walberla::timeloop walberla::vtk ) -waLBerla_compile_test( FILES boundary/SimpleDiffusionDirichlet.cpp DEPENDS field blockforest geometry timeloop vtk ) +waLBerla_compile_test( FILES boundary/SimpleDiffusionDirichlet.cpp DEPENDS walberla::field walberla::blockforest walberla::geometry walberla::timeloop walberla::vtk ) waLBerla_execute_test( NAME SimpleDiffusionDirichletDef COMMAND $<TARGET_FILE:SimpleDiffusionDirichlet> -l 4 -w 2 -o 1.2 -d 3 -t 333 -c 0 -r 0 ) waLBerla_execute_test( NAME SimpleDiffusionDirichletRef COMMAND $<TARGET_FILE:SimpleDiffusionDirichlet> -l 4 -w 4 -o 1.2 -d 3 -t 3 -c 0 -r 1 ) waLBerla_execute_test( NAME SimpleDiffusionDirichletCav COMMAND $<TARGET_FILE:SimpleDiffusionDirichlet> -l 5 -w 3 -o 1.2 -d 3 -t 333 -c 1 ) -waLBerla_compile_test( FILES boundary/BoundaryForce.cpp DEPENDS blockforest timeloop ) +waLBerla_compile_test( FILES boundary/BoundaryForce.cpp DEPENDS walberla::blockforest walberla::timeloop ) waLBerla_execute_test( NAME BoundaryForceShort COMMAND $<TARGET_FILE:BoundaryForce> 10 PROCESSES 2 CONFIGURATIONS Debug DebugOptimized ) waLBerla_execute_test( NAME BoundaryForce COMMAND COMMAND $<TARGET_FILE:BoundaryForce> PROCESSES 2 CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES boundary/BoundaryForceCouette.cpp DEPENDS blockforest timeloop ) +waLBerla_compile_test( FILES boundary/BoundaryForceCouette.cpp DEPENDS walberla::blockforest walberla::timeloop ) waLBerla_execute_test( NAME BoundaryForceCouetteShort COMMAND $<TARGET_FILE:BoundaryForceCouette> 10 PROCESSES 2 CONFIGURATIONS Debug DebugOptimized ) waLBerla_execute_test( NAME BoundaryForceCouette COMMAND COMMAND $<TARGET_FILE:BoundaryForceCouette> PROCESSES 2 CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES boundary/DiffusionDirichlet.cpp DEPENDS field blockforest geometry timeloop vtk ) +waLBerla_compile_test( FILES boundary/DiffusionDirichlet.cpp DEPENDS walberla::field walberla::blockforest walberla::geometry walberla::timeloop walberla::vtk ) waLBerla_execute_test( NAME DiffusionDirichletTest1 COMMAND $<TARGET_FILE:DiffusionDirichlet> -l 16 -w 1 -o 1.2 -v 0.1 -e 0.097711 -t 50 ) waLBerla_execute_test( NAME DiffusionDirichletTest2 COMMAND $<TARGET_FILE:DiffusionDirichlet> -l 16 -w 1 -o 1.79 -v 0.05 -e 0.295170 -t 100 ) -waLBerla_compile_test( FILES DiffusionTest.cpp DEPENDS field blockforest timeloop vtk postprocessing) +waLBerla_compile_test( FILES DiffusionTest.cpp DEPENDS walberla::field walberla::blockforest walberla::timeloop walberla::vtk walberla::postprocessing ) waLBerla_execute_test( NAME DiffusionTestCorr COMMAND $<TARGET_FILE:DiffusionTest> -c 1 -dx 0.01 -dt 0.002 -d 0.005 -v 5 -err 0.0025 DEPENDS_ON_TARGETS DiffusionTest ) waLBerla_execute_test( NAME DiffusionTestNone COMMAND $<TARGET_FILE:DiffusionTest> -c 0 -dx 0.01 -dt 0.002 -d 0.005 -v 5 -err 0.0040 DEPENDS_ON_TARGETS DiffusionTest ) -waLBerla_compile_test( FILES refinement/Uniformity.cpp DEPENDS blockforest stencil ) +waLBerla_compile_test( FILES refinement/Uniformity.cpp DEPENDS walberla::blockforest walberla::stencil ) waLBerla_execute_test( NAME UniformityShortTest COMMAND $<TARGET_FILE:Uniformity> --shortrun PROCESSES 4 ) waLBerla_execute_test( NAME UniformityLongTest COMMAND $<TARGET_FILE:Uniformity> PROCESSES 4 LABELS longrun verylongrun CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES refinement/CommunicationEquivalence.cpp DEPENDS blockforest stencil ) +waLBerla_compile_test( FILES refinement/CommunicationEquivalence.cpp DEPENDS walberla::blockforest walberla::stencil ) waLBerla_execute_test( NAME CommunicationEquivalenceShortTest COMMAND $<TARGET_FILE:CommunicationEquivalence> --shortrun PROCESSES 4 ) waLBerla_execute_test( NAME CommunicationEquivalenceLongTest COMMAND $<TARGET_FILE:CommunicationEquivalence> PROCESSES 4 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES refinement/NonConstantDiffusion.cpp DEPENDS field blockforest geometry timeloop vtk ) +waLBerla_compile_test( FILES refinement/NonConstantDiffusion.cpp DEPENDS walberla::field walberla::blockforest walberla::geometry walberla::timeloop walberla::vtk ) -waLBerla_compile_test( FILES geometry/IntersectionRatioTest.cpp DEPENDS geometry ) +waLBerla_compile_test( FILES geometry/IntersectionRatioTest.cpp DEPENDS walberla::geometry ) waLBerla_execute_test( NAME IntersectionRatioTest COMMAND $<TARGET_FILE:IntersectionRatioTest> ) -waLBerla_compile_test( FILES evaluations/PermeabilityTest.cpp DEPENDS field blockforest geometry timeloop vtk ) +waLBerla_compile_test( FILES evaluations/PermeabilityTest.cpp DEPENDS walberla::field walberla::blockforest walberla::geometry walberla::timeloop walberla::vtk ) waLBerla_execute_test( NAME PermeabilityTest_TRT_16_4 COMMAND $<TARGET_FILE:PermeabilityTest> --length 16 --kappa 0.85 --omega 0.3 --collisionModel TRT --timesteps 1001 --epsilon 0.005 PROCESSES 4 CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME PermeabilityTest_TRT_32_4 COMMAND $<TARGET_FILE:PermeabilityTest> --length 32 --kappa 0.85 --omega 0.3 --collisionModel TRT --timesteps 1001 --epsilon 0.005 PROCESSES 4 CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME PermeabilityTest_TRT_64_1 COMMAND $<TARGET_FILE:PermeabilityTest> --length 64 --kappa 0.85 --omega 0.3 --collisionModel TRT --timesteps 1001 --epsilon 0.025 PROCESSES 1 CONFIGURATIONS Release RelWithDbgInfo ) @@ -70,11 +70,11 @@ waLBerla_execute_test( NAME UniformPdfFieldInitializerTest COMMAND $<TARGET_FILE waLBerla_compile_test( FILES initializer/NonUniformPdfFieldInitializerTest.cpp ) waLBerla_execute_test( NAME NonUniformPdfFieldInitializerTest CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES field/QCriterionTest.cpp DEPENDS field blockforest ) +waLBerla_compile_test( FILES field/QCriterionTest.cpp DEPENDS walberla::field walberla::blockforest ) waLBerla_execute_test( NAME QCriterionTest ) add_subdirectory(field) -waLBerla_compile_test( FILES field/AlignedPDFfieldTest.cpp DEPENDS field blockforest lbm ) +waLBerla_compile_test( FILES field/AlignedPDFfieldTest.cpp DEPENDS walberla::field walberla::blockforest walberla::lbm ) waLBerla_execute_test( NAME AlignedPDFfieldTest COMMAND $<TARGET_FILE:AlignedPDFfieldTest> ${CMAKE_CURRENT_SOURCE_DIR}/field/AlignedPDFfieldTest.prm ) # Code Generation @@ -165,7 +165,7 @@ waLBerla_generate_target_from_python( NAME StreamInCellIntervalCodegen OUT_FILES GeneratedLatticeModel.h GeneratedLatticeModel.cpp) waLBerla_compile_test( FILES codegen/StreamInCellIntervalCodegenTest.cpp - DEPENDS blockforest field lbm timeloop StreamInCellIntervalCodegen ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop StreamInCellIntervalCodegen ) waLBerla_execute_test( NAME StreamInCellIntervalCodegenTest ) @@ -173,7 +173,7 @@ endif() # Free Surface waLBerla_compile_test( FILES free_surface/bubble_model/BubbleInitializationTest.cpp - DEPENDS blockforest field geometry lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME BubbleInitializationTest PROCESSES 2 ) @@ -183,36 +183,36 @@ file( COPY free_surface/bubble_model/MergeAndSplitTestUnconnected.png waLBerla_compile_test( FILES free_surface/bubble_model/MergeAndSplitTest.cpp free_surface/bubble_model/BubbleBodyMover.impl.h free_surface/bubble_model/BubbleModelTester.impl.h - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME MergeAndSplitTest PROCESSES 10 ) waLBerla_compile_test( FILES free_surface/bubble_model/MergeInformationTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME MergeInformationTest PROCESSES 3 ) waLBerla_compile_test( FILES free_surface/bubble_model/MovingSpheresTest.cpp free_surface/bubble_model/BubbleBodyMover.impl.h free_surface/bubble_model/BubbleModelTester.impl.h - DEPENDS blockforest field geometry lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME MovingSpheresTest PROCESSES 2 ) waLBerla_compile_test( FILES free_surface/bubble_model/RegionalFloodFillTest.cpp - DEPENDS field lbm ) + DEPENDS walberla::field walberla::lbm ) waLBerla_execute_test( NAME RegionalFloodFillTest ) waLBerla_compile_test( FILES free_surface/bubble_model/SplitDetectionTest.cpp - DEPENDS field lbm) + DEPENDS walberla::field walberla::lbm ) waLBerla_execute_test( NAME SplitDetectionTest ) waLBerla_compile_test( FILES free_surface/dynamics/AdvectionTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME AdvectionTest ) waLBerla_compile_test( FILES free_surface/dynamics/CellConversionTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME CellConversionTest ) if( WALBERLA_BUILD_WITH_CODEGEN ) @@ -221,88 +221,88 @@ if( WALBERLA_BUILD_WITH_CODEGEN ) OUT_FILES GeneratedLatticeModel_FreeSurface.cpp GeneratedLatticeModel_FreeSurface.h ) waLBerla_compile_test( FILES free_surface/dynamics/CodegenTest.cpp - DEPENDS blockforest field lbm timeloop LatticeModelGenerationFreeSurfacePython ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop LatticeModelGenerationFreeSurfacePython ) waLBerla_execute_test( NAME CodegenTest ) endif() waLBerla_compile_test( FILES free_surface/dynamics/ExcessMassDistributionFallbackTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME ExcessMassDistributionFallbackTest ) waLBerla_compile_test( FILES free_surface/dynamics/ExcessMassDistributionParallelTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME ExcessMassDistributionParallelTest PROCESSES 2) waLBerla_compile_test( FILES free_surface/dynamics/InflowTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME InflowTest ) waLBerla_compile_test( FILES free_surface/LoadBalancingTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME LoadBalancingTest PROCESSES 4) waLBerla_compile_test( FILES free_surface/dynamics/PdfReconstructionFreeSlipTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME PdfReconstructionFreeSlipTest ) waLBerla_compile_test( FILES free_surface/dynamics/PdfReconstructionTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME PdfReconstructionTest ) waLBerla_compile_test( FILES free_surface/dynamics/PdfRefillingTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME PdfRefillingTest ) waLBerla_compile_test( FILES free_surface/dynamics/WettingConversionTest.cpp - DEPENDS blockforest field geometry lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME WettingConversionTest ) waLBerla_compile_test( FILES free_surface/surface_geometry/CellFluidVolumeTest.cpp - DEPENDS lbm ) + DEPENDS walberla::lbm ) waLBerla_execute_test( NAME CellFluidVolumeTest ) waLBerla_compile_test( FILES free_surface/surface_geometry/CurvatureOfSineTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME CurvatureOfSineTest ) waLBerla_compile_test( FILES free_surface/surface_geometry/CurvatureOfSphereTest.cpp - DEPENDS blockforest field geometry lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME CurvatureOfSphereTest ) waLBerla_compile_test( FILES free_surface/surface_geometry/DetectWettingTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME DetectWettingTest ) waLBerla_compile_test( FILES free_surface/surface_geometry/GetInterfacePointTest.cpp - DEPENDS lbm ) + DEPENDS walberla::lbm ) waLBerla_execute_test( NAME GetInterfacePointTest ) waLBerla_compile_test( FILES free_surface/surface_geometry/NormalsOfSineTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME NormalsOfSineTest ) waLBerla_compile_test( FILES free_surface/surface_geometry/NormalsOfSphereTest.cpp - DEPENDS blockforest field geometry lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME NormalsOfSphereTest ) waLBerla_compile_test( FILES free_surface/surface_geometry/NormalsEquivalenceTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME NormalsEquivalenceTest ) waLBerla_compile_test( FILES free_surface/surface_geometry/NormalsNearSolidTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME NormalsNearSolidTest ) waLBerla_compile_test( FILES free_surface/surface_geometry/ObstacleFillLevelTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME ObstacleFillLevelTest ) waLBerla_compile_test( FILES free_surface/surface_geometry/ObstacleNormalsTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME ObstacleNormalsTest ) waLBerla_compile_test( FILES free_surface/surface_geometry/WettingCurvatureTest.cpp - DEPENDS blockforest field lbm timeloop ) + DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop ) waLBerla_execute_test( NAME WettingCurvatureTest ) \ No newline at end of file diff --git a/tests/lbm/codegen/CMakeLists.txt b/tests/lbm/codegen/CMakeLists.txt index b149eda3f..32e7b3e92 100644 --- a/tests/lbm/codegen/CMakeLists.txt +++ b/tests/lbm/codegen/CMakeLists.txt @@ -1,6 +1,6 @@ ############################################################################################################################# # -# Tests for lbm module +# Tests for walberla::lbm module # ############################################################################################################################# diff --git a/tests/lbm/field/CMakeLists.txt b/tests/lbm/field/CMakeLists.txt index 7170fde6d..bbb2be198 100644 --- a/tests/lbm/field/CMakeLists.txt +++ b/tests/lbm/field/CMakeLists.txt @@ -1,6 +1,6 @@ ############################################################################################################################# # -# Tests for lbm module +# Tests for walberla::lbm module # ############################################################################################################################# diff --git a/tests/lbm_generated/CMakeLists.txt b/tests/lbm_generated/CMakeLists.txt index 8ba33e735..15c000274 100644 --- a/tests/lbm_generated/CMakeLists.txt +++ b/tests/lbm_generated/CMakeLists.txt @@ -1,6 +1,6 @@ ############################################################################################################################# # -# Tests for generated lbm module +# Tests for generated walberla::lbm module # ############################################################################################################################# waLBerla_link_files_to_builddir( "*.prm" ) @@ -17,7 +17,7 @@ waLBerla_generate_target_from_python(NAME ExampleGenerated UBB.h UBB.cpp LBMBoundaryCollection.h Example_InfoHeader.h) -waLBerla_compile_test( FILES Example.cpp DEPENDS ExampleGenerated blockforest field lbm_generated timeloop ) +waLBerla_compile_test( FILES Example.cpp DEPENDS ExampleGenerated walberla::blockforest walberla::field walberla::lbm_generated walberla::timeloop ) waLBerla_generate_target_from_python(NAME InterpolationNoSlipGenerated FILE InterpolationNoSlip.py @@ -31,7 +31,7 @@ waLBerla_generate_target_from_python(NAME InterpolationNoSlipGenerated InterpolationNoSlipBoundaryCollection.h InterpolationNoSlipHeader.h) -waLBerla_compile_test( FILES InterpolationNoSlip.cpp DEPENDS InterpolationNoSlipGenerated blockforest core field geometry lbm_generated timeloop ) +waLBerla_compile_test( FILES InterpolationNoSlip.cpp DEPENDS InterpolationNoSlipGenerated walberla::blockforest walberla::core walberla::field walberla::geometry walberla::lbm_generated walberla::timeloop ) # waLBerla_execute_test( NAME InterpolationNoSlip1 COMMAND $<TARGET_FILE:InterpolationNoSlip> ${CMAKE_CURRENT_SOURCE_DIR}/InterpolationNoSlip.prm -Parameters.distanceWall=0.1 ) # waLBerla_execute_test( NAME InterpolationNoSlip2 COMMAND $<TARGET_FILE:InterpolationNoSlip> ${CMAKE_CURRENT_SOURCE_DIR}/InterpolationNoSlip.prm -Parameters.distanceWall=0.5 ) waLBerla_execute_test( NAME InterpolationNoSlip3 COMMAND $<TARGET_FILE:InterpolationNoSlip> ${CMAKE_CURRENT_SOURCE_DIR}/InterpolationNoSlip.prm ) @@ -47,8 +47,8 @@ waLBerla_generate_target_from_python(NAME FreeSlipRefinementGenerated Outflow.h Outflow.cpp FreeSlipRefinementBoundaryCollection.h FreeSlipRefinementInfoHeader.h) -waLBerla_compile_test( FILES FreeSlipRefinement.cpp DEPENDS FreeSlipRefinementGenerated blockforest field lbm_generated timeloop ) +waLBerla_compile_test( FILES FreeSlipRefinement.cpp DEPENDS FreeSlipRefinementGenerated walberla::blockforest walberla::field walberla::lbm_generated walberla::timeloop ) if( WALBERLA_DOUBLE_ACCURACY ) -waLBerla_compile_test( FILES LDC.cpp DEPENDS blockforest field lbm_generated timeloop ) + waLBerla_compile_test( FILES LDC.cpp DEPENDS walberla::blockforest walberla::field walberla::lbm_generated walberla::timeloop ) endif() diff --git a/tests/lbm_mesapd_coupling/CMakeLists.txt b/tests/lbm_mesapd_coupling/CMakeLists.txt index b6c8f1539..cb8f11860 100644 --- a/tests/lbm_mesapd_coupling/CMakeLists.txt +++ b/tests/lbm_mesapd_coupling/CMakeLists.txt @@ -4,16 +4,16 @@ # ################################################################################################### -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_Mapping FILES mapping/ParticleMapping.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field ) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_Mapping FILES mapping/ParticleMapping.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_Mapping PROCESSES 3) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_MovingMapping FILES momentum_exchange_method/MovingParticleMappingMEM.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field vtk) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_MovingMapping FILES momentum_exchange_method/MovingParticleMappingMEM.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field walberla::vtk ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_MovingMapping PROCESSES 3) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_DragForceSphere FILES momentum_exchange_method/DragForceSphereMEM.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field vtk ) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_DragForceSphere FILES momentum_exchange_method/DragForceSphereMEM.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field walberla::vtk ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_DragForceSphere COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_MEM_DragForceSphere> --funcTest PROCESSES 2) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjs FILES momentum_exchange_method/ForceBetweenTwoStationaryObjectsMEM.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field vtk ) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjs FILES momentum_exchange_method/ForceBetweenTwoStationaryObjectsMEM.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field walberla::vtk ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjsSS1 COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjs> PROCESSES 1) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjsSS2 COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjs> --useSBB PROCESSES 1) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjsSS3 COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjs> --useCompressible PROCESSES 1) @@ -23,45 +23,45 @@ waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjsSW2 COMMAND waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjsSW3 COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjs> --useSphereWallSetup --useCompressible PROCESSES 1) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjsSW4 COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjs> --useSphereWallSetup --systemVelocity 0.1 PROCESSES 1) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_SettlingSphere FILES momentum_exchange_method/SettlingSphereMEM.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field vtk ) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_SettlingSphere FILES momentum_exchange_method/SettlingSphereMEM.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field walberla::vtk ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_SettlingSphere COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_MEM_SettlingSphere> --funcTest PROCESSES 4) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_PdfReconstruction FILES momentum_exchange_method/PdfReconstructionMEM.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field vtk) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_PdfReconstruction FILES momentum_exchange_method/PdfReconstructionMEM.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field walberla::vtk ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_PdfReconstruction PROCESSES 3) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_UpdateParticleMapping FILES momentum_exchange_method/UpdateParticleMappingMEM.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field vtk) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_UpdateParticleMapping FILES momentum_exchange_method/UpdateParticleMappingMEM.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field walberla::vtk ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_UpdateParticleMapping PROCESSES 1) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_LubricationCorrection FILES utility/LubricationCorrection.cpp DEPENDS mesa_pd lbm_mesapd_coupling ) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_LubricationCorrection FILES utility/LubricationCorrection.cpp DEPENDS walberla::mesa_pd walberla::lbm_mesapd_coupling ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_UTIL_LubricationCorrection PROCESSES 1 ) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_VirtualMass FILES utility/VirtualMass.cpp DEPENDS mesa_pd lbm_mesapd_coupling ) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_VirtualMass FILES utility/VirtualMass.cpp DEPENDS walberla::mesa_pd walberla::lbm_mesapd_coupling ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_UTIL_VirtualMass PROCESSES 1 ) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_InspectionProbe FILES utility/InspectionProbe.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field ) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_InspectionProbe FILES utility/InspectionProbe.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_UTIL_InspectionProbe PROCESSES 1 ) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks FILES utility/HydrodynamicForceOnMultipleBlocks.cpp DEPENDS mesa_pd lbm_mesapd_coupling ) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks FILES utility/HydrodynamicForceOnMultipleBlocks.cpp DEPENDS walberla::mesa_pd walberla::lbm_mesapd_coupling ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks_EulerAvg COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks> PROCESSES 4 ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks_VVAvg COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks> --useVV PROCESSES 4 ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks_EulerNoAvg COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks> --noForceAveraging PROCESSES 4 ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks_VVNoAvg COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks> --noForceAveraging --useVV PROCESSES 4 ) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping FILES partially_saturated_cells_method/ParticleAndVolumeFractionMappingPSM.cpp DEPENDS blockforest boundary core field lbm_mesapd_coupling stencil mesa_pd ) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping FILES partially_saturated_cells_method/ParticleAndVolumeFractionMappingPSM.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm_mesapd_coupling walberla::stencil walberla::mesa_pd ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping> PROCESSES 27 ) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping_CPU_GPU FILES partially_saturated_cells_method/codegen/ParticleAndVolumeFractionMapping.cpp DEPENDS blockforest boundary core gpu field lbm_mesapd_coupling stencil mesa_pd ) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping_CPU_GPU FILES partially_saturated_cells_method/codegen/ParticleAndVolumeFractionMapping.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::gpu walberla::field walberla::lbm_mesapd_coupling walberla::stencil walberla::mesa_pd ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping_CPU_GPU COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping_CPU_GPU> PROCESSES 27 ) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_DragForceSphere FILES partially_saturated_cells_method/DragForceSpherePSM.cpp DEPENDS blockforest boundary core field lbm lbm_mesapd_coupling timeloop mesa_pd ) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_DragForceSphere FILES partially_saturated_cells_method/DragForceSpherePSM.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::timeloop walberla::mesa_pd ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_DragForceSphereFuncTest COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_DragForceSphere> --funcTest PROCESSES 8 ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_DragForceSphere COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_DragForceSphere> PROCESSES 8 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_SettlingSphere FILES partially_saturated_cells_method/SettlingSpherePSM.cpp DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling timeloop mesa_pd ) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_SettlingSphere FILES partially_saturated_cells_method/SettlingSpherePSM.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::timeloop walberla::mesa_pd ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_SettlingSphereFuncTest COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_SettlingSphere> --funcTest PROCESSES 4 ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_SettlingSphere COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_SettlingSphere> --resolution 70 PROCESSES 4 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_TorqueSphere FILES partially_saturated_cells_method/TorqueSpherePSM.cpp DEPENDS blockforest boundary core domain_decomposition field lbm stencil timeloop ) +waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_TorqueSphere FILES partially_saturated_cells_method/TorqueSpherePSM.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::stencil walberla::timeloop ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_TorqueSphereSC1W1FuncTest COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_TorqueSphere> --funcTest --SC1W1 PROCESSES 1 ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_TorqueSphereSC1W1SingleTest COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_TorqueSphere> --SC1W1 PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_TorqueSphereSC1W1ParallelTest COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_TorqueSphere> --SC1W1 PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) @@ -78,7 +78,7 @@ waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_TorqueSphereSC3W2SingleTest if (WALBERLA_BUILD_WITH_CODEGEN) if (NOT WALBERLA_BUILD_WITH_GPU_SUPPORT OR (WALBERLA_BUILD_WITH_GPU_SUPPORT AND (CMAKE_CUDA_ARCHITECTURES GREATER_EQUAL 60 OR WALBERLA_BUILD_WITH_HIP))) - waLBerla_compile_test(NAME LBM_MESAPD_COUPLING_PSM_DragForceSphere_CPU_GPU FILES partially_saturated_cells_method/codegen/DragForceSpherePSM.cpp DEPENDS blockforest core gpu field lbm_mesapd_coupling mesa_pd PSMCodegenPython_srt_sc1) + waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_DragForceSphere_CPU_GPU FILES partially_saturated_cells_method/codegen/DragForceSpherePSM.cpp DEPENDS walberla::blockforest walberla::core walberla::gpu walberla::field walberla::lbm_mesapd_coupling walberla::mesa_pd PSMCodegenPython_srt_sc1 ) waLBerla_execute_test(NAME LBM_MESAPD_COUPLING_PSM_DragForceSphere_CPU_GPU_FuncTest COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_DragForceSphere_CPU_GPU> --funcTest PROCESSES 1) waLBerla_execute_test(NAME LBM_MESAPD_COUPLING_PSM_DragForceSphere_CPU_GPU COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_DragForceSphere_CPU_GPU> PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo) @@ -86,7 +86,7 @@ if (WALBERLA_BUILD_WITH_CODEGEN) foreach (solid_collision 1 2 3) foreach (weighting 1 2) set(config ${collision_setup}_sc${solid_collision}_w${weighting}) - waLBerla_compile_test(NAME LBM_MESAPD_COUPLING_PSM_TorqueSphere_CPU_GPU_${config} FILES partially_saturated_cells_method/codegen/TorqueSpherePSM.cpp DEPENDS blockforest core gpu field lbm_mesapd_coupling mesa_pd PSMCodegenPython_${collision_setup}_sc${solid_collision}) + waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_TorqueSphere_CPU_GPU_${config} FILES partially_saturated_cells_method/codegen/TorqueSpherePSM.cpp DEPENDS walberla::blockforest walberla::core walberla::gpu walberla::field walberla::lbm_mesapd_coupling walberla::mesa_pd PSMCodegenPython_${collision_setup}_sc${solid_collision} ) target_compile_definitions(LBM_MESAPD_COUPLING_PSM_TorqueSphere_CPU_GPU_${config} PRIVATE SC=${solid_collision}) target_compile_definitions(LBM_MESAPD_COUPLING_PSM_TorqueSphere_CPU_GPU_${config} PRIVATE Weighting=${weighting}) waLBerla_execute_test(NAME LBM_MESAPD_COUPLING_PSM_TorqueSphere_CPU_GPU_${config}_FuncTest COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_TorqueSphere_CPU_GPU_${config}> --funcTest PROCESSES 1) @@ -95,7 +95,7 @@ if (WALBERLA_BUILD_WITH_CODEGEN) endforeach () endforeach () - waLBerla_compile_test(NAME LBM_MESAPD_COUPLING_PSM_SettlingSphere_CPU_GPU FILES partially_saturated_cells_method/codegen/SettlingSpherePSM.cpp DEPENDS blockforest core gpu field lbm lbm_mesapd_coupling mesa_pd timeloop vtk PSMCodegenPython_trt-smagorinsky_sc2) + waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_SettlingSphere_CPU_GPU FILES partially_saturated_cells_method/codegen/SettlingSpherePSM.cpp DEPENDS walberla::blockforest walberla::core walberla::gpu walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::timeloop walberla::vtk PSMCodegenPython_trt-smagorinsky_sc2 ) waLBerla_execute_test(NAME LBM_MESAPD_COUPLING_PSM_SettlingSphere_CPU_GPU_FuncTest COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_SettlingSphere_CPU_GPU> --funcTest PROCESSES 1) waLBerla_execute_test(NAME LBM_MESAPD_COUPLING_PSM_SettlingSphere_CPU_GPU COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_SettlingSphere_CPU_GPU> PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo) endif () diff --git a/tests/mesa_pd/CMakeLists.txt b/tests/mesa_pd/CMakeLists.txt index 7b217a136..dd9e73ab6 100644 --- a/tests/mesa_pd/CMakeLists.txt +++ b/tests/mesa_pd/CMakeLists.txt @@ -6,241 +6,241 @@ waLBerla_link_files_to_builddir(*.prm) -waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_AnalyticCollisionFunctions FILES collision_detection/AnalyticCollisionFunctions.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_AnalyticCollisionFunctions FILES collision_detection/AnalyticCollisionFunctions.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_COLLISIONDETECTION_AnalyticCollisionFunctions ) -waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_AnalyticContactDetection FILES collision_detection/AnalyticContactDetection.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_AnalyticContactDetection FILES collision_detection/AnalyticContactDetection.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_COLLISIONDETECTION_AnalyticContactDetection ) -waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_BoxSupport FILES collision_detection/BoxSupport.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_BoxSupport FILES collision_detection/BoxSupport.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_COLLISIONDETECTION_BoxSupport ) -waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_EllipsoidSupport FILES collision_detection/EllipsoidSupport.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_EllipsoidSupport FILES collision_detection/EllipsoidSupport.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_COLLISIONDETECTION_EllipsoidSupport ) -waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_EPA FILES collision_detection/EPA.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_EPA FILES collision_detection/EPA.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_COLLISIONDETECTION_EPA ) -waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_GeneralContactDetection FILES collision_detection/GeneralContactDetection.cpp DEPENDS blockforest core pe) +waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_GeneralContactDetection FILES collision_detection/GeneralContactDetection.cpp DEPENDS walberla::blockforest walberla::core walberla::pe ) waLBerla_execute_test( NAME MESA_PD_COLLISIONDETECTION_GeneralContactDetection ) -waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_GJK FILES collision_detection/GJK.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_GJK FILES collision_detection/GJK.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_COLLISIONDETECTION_GJK ) -waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_GJKEPA FILES collision_detection/GJK_EPA.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_GJKEPA FILES collision_detection/GJK_EPA.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_COLLISIONDETECTION_GJKEPA ) -waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_SphereSupport FILES collision_detection/SphereSupport.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_SphereSupport FILES collision_detection/SphereSupport.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_COLLISIONDETECTION_SphereSupport ) -waLBerla_compile_test( NAME MESA_PD_COMMON_IntersectionRatio FILES common/IntersectionRatio.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_COMMON_IntersectionRatio FILES common/IntersectionRatio.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_COMMON_IntersectionRatio ) -waLBerla_compile_test( NAME MESA_PD_COMMON_ContainsPoint FILES common/ContainsPoint.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_COMMON_ContainsPoint FILES common/ContainsPoint.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_COMMON_ContainsPoint ) -waLBerla_compile_test( NAME MESA_PD_ContactDetection FILES ContactDetection.cpp DEPENDS blockforest core pe) +waLBerla_compile_test( NAME MESA_PD_ContactDetection FILES ContactDetection.cpp DEPENDS walberla::blockforest walberla::core walberla::pe ) waLBerla_execute_test( NAME MESA_PD_ContactDetection PROCESSES 8 ) -waLBerla_compile_test( NAME MESA_PD_Data_ContactHistory FILES data/ContactHistory.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Data_ContactHistory FILES data/ContactHistory.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Data_ContactHistory ) -waLBerla_compile_test( NAME MESA_PD_Data_Flags FILES data/Flags.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Data_Flags FILES data/Flags.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Data_Flags ) -waLBerla_compile_test( NAME MESA_PD_Data_HashGridsVsBruteForce FILES data/HashGridsVsBruteForce.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Data_HashGridsVsBruteForce FILES data/HashGridsVsBruteForce.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Data_HashGridsVsBruteForce PROCESSES 27 ) -waLBerla_compile_test( NAME MESA_PD_Data_LinkedCells FILES data/LinkedCells.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Data_LinkedCells FILES data/LinkedCells.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Data_LinkedCells ) -waLBerla_compile_test( NAME MESA_PD_Data_ParticleStorage FILES data/ParticleStorage.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Data_ParticleStorage FILES data/ParticleStorage.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Data_ParticleStorage ) -waLBerla_compile_test( NAME MESA_PD_Data_SparseLinkedCells FILES data/SparseLinkedCells.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Data_SparseLinkedCells FILES data/SparseLinkedCells.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Data_SparseLinkedCells ) -waLBerla_compile_test( NAME MESA_PD_Domain_BlockForestDomain FILES domain/BlockForestDomain.cpp DEPENDS blockforest core ) +waLBerla_compile_test( NAME MESA_PD_Domain_BlockForestDomain FILES domain/BlockForestDomain.cpp DEPENDS walberla::blockforest walberla::core ) waLBerla_execute_test( NAME MESA_PD_Domain_BlockForestDomain ) -waLBerla_compile_test( NAME MESA_PD_Domain_BlockForestSync FILES domain/BlockForestSync.cpp DEPENDS blockforest core pe) +waLBerla_compile_test( NAME MESA_PD_Domain_BlockForestSync FILES domain/BlockForestSync.cpp DEPENDS walberla::blockforest walberla::core walberla::pe ) waLBerla_execute_test( NAME MESA_PD_Domain_BlockForestSync2 COMMAND $<TARGET_FILE:MESA_PD_Domain_BlockForestSync> PROCESSES 2 ) waLBerla_execute_test( NAME MESA_PD_Domain_BlockForestSync4 COMMAND $<TARGET_FILE:MESA_PD_Domain_BlockForestSync> PROCESSES 4 ) waLBerla_execute_test( NAME MESA_PD_Domain_BlockForestSync8 COMMAND $<TARGET_FILE:MESA_PD_Domain_BlockForestSync> PROCESSES 8 ) -waLBerla_compile_test( NAME MESA_PD_Domain_BlockForestSyncPeriodic FILES domain/BlockForestSyncPeriodic.cpp DEPENDS blockforest core pe) +waLBerla_compile_test( NAME MESA_PD_Domain_BlockForestSyncPeriodic FILES domain/BlockForestSyncPeriodic.cpp DEPENDS walberla::blockforest walberla::core walberla::pe ) waLBerla_execute_test( NAME MESA_PD_Domain_BlockForestSyncPeriodic PROCESSES 8 ) -waLBerla_compile_test( NAME MESA_PD_Domain_DistanceCalculation FILES domain/DistanceCalculation.cpp DEPENDS blockforest core ) +waLBerla_compile_test( NAME MESA_PD_Domain_DistanceCalculation FILES domain/DistanceCalculation.cpp DEPENDS walberla::blockforest walberla::core ) waLBerla_execute_test( NAME MESA_PD_Domain_DistanceCalculation ) -waLBerla_compile_test( NAME MESA_PD_Domain_DynamicRefinement FILES domain/DynamicRefinement.cpp DEPENDS blockforest core pe ) +waLBerla_compile_test( NAME MESA_PD_Domain_DynamicRefinement FILES domain/DynamicRefinement.cpp DEPENDS walberla::blockforest walberla::core walberla::pe ) waLBerla_execute_test( NAME MESA_PD_Domain_DynamicRefinement PROCESSES 8) -waLBerla_compile_test( NAME MESA_PD_Domain_InfiniteDomain FILES domain/InfiniteDomain.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Domain_InfiniteDomain FILES domain/InfiniteDomain.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Domain_InfiniteDomain ) -waLBerla_compile_test( NAME MESA_PD_Domain_SerializeDeserialize FILES domain/SerializeDeserialize.cpp DEPENDS blockforest core pe) +waLBerla_compile_test( NAME MESA_PD_Domain_SerializeDeserialize FILES domain/SerializeDeserialize.cpp DEPENDS walberla::blockforest walberla::core walberla::pe ) waLBerla_execute_test( NAME MESA_PD_Domain_SerializeDeserialize PROCESSES 8 ) -waLBerla_compile_test( NAME MESA_PD_DropTestAnalytic FILES DropTestAnalytic.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_DropTestAnalytic FILES DropTestAnalytic.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_DropTestAnalytic ) -waLBerla_compile_test( NAME MESA_PD_DropTestGeneral FILES DropTestGeneral.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_DropTestGeneral FILES DropTestGeneral.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_DropTestGeneral ) -waLBerla_compile_test( NAME MESA_PD_Kernel_ClearNextNeighborSync FILES kernel/ClearNextNeighborSync.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_ClearNextNeighborSync FILES kernel/ClearNextNeighborSync.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_ClearNextNeighborSync PROCESSES 2 ) -waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_AnisotropicVDWContact FILES kernel/cnt/AnisotropicVDWContact.test.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_AnisotropicVDWContact FILES kernel/cnt/AnisotropicVDWContact.test.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_CNT_AnisotropicVDWContact ) -waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_IntegratedVDWContact FILES kernel/cnt/IntegratedVDWContact.test.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_IntegratedVDWContact FILES kernel/cnt/IntegratedVDWContact.test.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_CNT_IntegratedVDWContact ) -waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_IsotropicVDWContact FILES kernel/cnt/IsotropicVDWContact.test.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_IsotropicVDWContact FILES kernel/cnt/IsotropicVDWContact.test.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_CNT_IsotropicVDWContact ) -waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_VBondContact FILES kernel/cnt/VBondContact.test.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_VBondContact FILES kernel/cnt/VBondContact.test.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_CNT_VBondContact ) -waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_VBondContactIntegration FILES kernel/cnt/VBondContactIntegration.test.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_VBondContactIntegration FILES kernel/cnt/VBondContactIntegration.test.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_CNT_VBondContactIntegration ) -waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_ViscousDamping FILES kernel/cnt/ViscousDamping.test.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_ViscousDamping FILES kernel/cnt/ViscousDamping.test.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_CNT_ViscousDamping ) -waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_WallContact FILES kernel/cnt/WallContact.test.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_WallContact FILES kernel/cnt/WallContact.test.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_CNT_WallContact ) -waLBerla_compile_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionSD FILES kernel/CoefficientOfRestitutionSD.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionSD FILES kernel/CoefficientOfRestitutionSD.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionSDEuler COMMAND $<TARGET_FILE:MESA_PD_Kernel_CoefficientOfRestitutionSD> ) waLBerla_execute_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionSDVelocityVerlet COMMAND $<TARGET_FILE:MESA_PD_Kernel_CoefficientOfRestitutionSD> --useVV ) -waLBerla_compile_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionLSD FILES kernel/CoefficientOfRestitutionLSD.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionLSD FILES kernel/CoefficientOfRestitutionLSD.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionLSDEuler COMMAND $<TARGET_FILE:MESA_PD_Kernel_CoefficientOfRestitutionLSD> ) waLBerla_execute_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionLSDVelocityVerlet COMMAND $<TARGET_FILE:MESA_PD_Kernel_CoefficientOfRestitutionLSD> --useVV ) -waLBerla_compile_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionNLSD FILES kernel/CoefficientOfRestitutionNLSD.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionNLSD FILES kernel/CoefficientOfRestitutionNLSD.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionNLSDEuler COMMAND $<TARGET_FILE:MESA_PD_Kernel_CoefficientOfRestitutionNLSD> ) waLBerla_execute_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionVelocityVerlet COMMAND $<TARGET_FILE:MESA_PD_Kernel_CoefficientOfRestitutionNLSD> --useVV ) -waLBerla_compile_test( NAME MESA_PD_Kernel_DetectAndStoreContacts FILES kernel/DetectAndStoreContacts.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_DetectAndStoreContacts FILES kernel/DetectAndStoreContacts.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_DetectAndStoreContacts ) -waLBerla_compile_test( NAME MESA_PD_Kernel_DoubleCast FILES kernel/DoubleCast.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_DoubleCast FILES kernel/DoubleCast.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_DoubleCast ) -waLBerla_compile_test( NAME MESA_PD_Kernel_ExplicitEuler FILES kernel/ExplicitEuler.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_ExplicitEuler FILES kernel/ExplicitEuler.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_ExplicitEuler ) -waLBerla_compile_test( NAME MESA_PD_Kernel_ForceLJ FILES kernel/ForceLJ.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_ForceLJ FILES kernel/ForceLJ.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_ForceLJ ) -waLBerla_compile_test( NAME MESA_PD_Kernel_GenerateAnalyticContacts FILES kernel/GenerateAnalyticContacts.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_GenerateAnalyticContacts FILES kernel/GenerateAnalyticContacts.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_GenerateAnalyticContacts PROCESSES 27 ) -waLBerla_compile_test( NAME MESA_PD_Kernel_GenerateLinkedCells FILES kernel/GenerateLinkedCells.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_GenerateLinkedCells FILES kernel/GenerateLinkedCells.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_GenerateLinkedCells ) -waLBerla_compile_test( NAME MESA_PD_Kernel_HCSITSKernels FILES kernel/HCSITSKernels.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_HCSITSKernels FILES kernel/HCSITSKernels.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_HCSITSKernels ) -waLBerla_compile_test( NAME MESA_PD_Kernel_HeatConduction FILES kernel/HeatConduction.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_HeatConduction FILES kernel/HeatConduction.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_HeatConduction ) -waLBerla_compile_test( NAME MESA_PD_Kernel_IntegratorAccuracy FILES kernel/IntegratorAccuracy.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_IntegratorAccuracy FILES kernel/IntegratorAccuracy.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_IntegratorAccuracyEuler COMMAND $<TARGET_FILE:MESA_PD_Kernel_IntegratorAccuracy> ) waLBerla_execute_test( NAME MESA_PD_Kernel_IntegratorAccuracyVelocityVerlet COMMAND $<TARGET_FILE:MESA_PD_Kernel_IntegratorAccuracy> --useVV ) aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/kernel/interfaces MESA_PD_INTERFACE_CHECKS) -waLBerla_compile_test( NAME MESA_PD_Kernel_Interfaces FILES kernel/Interfaces.cpp ${MESA_PD_INTERFACE_CHECKS} DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_Interfaces FILES kernel/Interfaces.cpp ${MESA_PD_INTERFACE_CHECKS} DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_Interfaces ) -waLBerla_compile_test( NAME MESA_PD_Kernel_LinearSpringDashpot FILES kernel/LinearSpringDashpot.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_LinearSpringDashpot FILES kernel/LinearSpringDashpot.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_LinearSpringDashpot ) -waLBerla_compile_test( NAME MESA_PD_Kernel_LinkedCellsVsBruteForce FILES kernel/LinkedCellsVsBruteForce.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_LinkedCellsVsBruteForce FILES kernel/LinkedCellsVsBruteForce.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_LinkedCellsVsBruteForce PROCESSES 27 ) -waLBerla_compile_test( NAME MESA_PD_Kernel_PFCDamping FILES kernel/PFCDamping.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_PFCDamping FILES kernel/PFCDamping.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_PFCDamping ) -waLBerla_compile_test( NAME MESA_PD_Kernel_SemiImplicitEuler FILES kernel/SemiImplicitEuler.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_SemiImplicitEuler FILES kernel/SemiImplicitEuler.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_SemiImplicitEuler ) -waLBerla_compile_test( NAME MESA_PD_Kernel_SingleCast FILES kernel/SingleCast.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_SingleCast FILES kernel/SingleCast.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_SingleCast ) -waLBerla_compile_test( NAME MESA_PD_Kernel_SpherePile FILES kernel/SpherePile.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_SpherePile FILES kernel/SpherePile.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_SpherePile ) -waLBerla_compile_test( NAME MESA_PD_Kernel_SpringDashpot FILES kernel/SpringDashpot.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_SpringDashpot FILES kernel/SpringDashpot.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_SpringDashpot ) -waLBerla_compile_test( NAME MESA_PD_Kernel_SyncGhostOwners FILES kernel/SyncGhostOwners.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_SyncGhostOwners FILES kernel/SyncGhostOwners.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_SyncGhostOwners PROCESSES 27 ) -waLBerla_compile_test( NAME MESA_PD_Kernel_SyncGhostOwnersLarge FILES kernel/SyncGhostOwnersLarge.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_SyncGhostOwnersLarge FILES kernel/SyncGhostOwnersLarge.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_SyncGhostOwnersLarge PROCESSES 27 ) -waLBerla_compile_test( NAME MESA_PD_Kernel_SyncNextNeighbors FILES kernel/SyncNextNeighbors.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_SyncNextNeighbors FILES kernel/SyncNextNeighbors.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_SyncNextNeighbors PROCESSES 27 ) -waLBerla_compile_test( NAME MESA_PD_Kernel_SyncNextNeighborsBlockForest FILES kernel/SyncNextNeighborsBlockForest.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_SyncNextNeighborsBlockForest FILES kernel/SyncNextNeighborsBlockForest.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_SyncNextNeighborsBlockForest PROCESSES 27 ) -waLBerla_compile_test( NAME MESA_PD_Kernel_TemperatureIntegration FILES kernel/TemperatureIntegration.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_TemperatureIntegration FILES kernel/TemperatureIntegration.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_TemperatureIntegration ) -waLBerla_compile_test( NAME MESA_PD_Kernel_VelocityVerlet FILES kernel/VelocityVerlet.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Kernel_VelocityVerlet FILES kernel/VelocityVerlet.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Kernel_VelocityVerlet ) -waLBerla_compile_test( NAME MESA_PD_MPI_BroadcastProperty FILES mpi/BroadcastProperty.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_MPI_BroadcastProperty FILES mpi/BroadcastProperty.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_MPI_BroadcastProperty PROCESSES 8 ) -waLBerla_compile_test( NAME MESA_PD_MPI_ClearGhostOwnerSync FILES mpi/ClearGhostOwnerSync.cpp DEPENDS blockforest core) +waLBerla_compile_test( NAME MESA_PD_MPI_ClearGhostOwnerSync FILES mpi/ClearGhostOwnerSync.cpp DEPENDS walberla::blockforest walberla::core ) waLBerla_execute_test( NAME MESA_PD_MPI_ClearGhostOwnerSync PROCESSES 8 ) -waLBerla_compile_test( NAME MESA_PD_MPI_ClearNextNeighborSync FILES mpi/ClearNextNeighborSync.cpp DEPENDS blockforest core ) +waLBerla_compile_test( NAME MESA_PD_MPI_ClearNextNeighborSync FILES mpi/ClearNextNeighborSync.cpp DEPENDS walberla::blockforest walberla::core ) waLBerla_execute_test( NAME MESA_PD_MPI_ClearNextNeighborSync PROCESSES 8 ) -waLBerla_compile_test( NAME MESA_PD_MPI_Notifications FILES mpi/Notifications.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_MPI_Notifications FILES mpi/Notifications.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_MPI_Notifications ) -waLBerla_compile_test( NAME MESA_PD_MPI_ReduceContactHistory FILES mpi/ReduceContactHistory.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_MPI_ReduceContactHistory FILES mpi/ReduceContactHistory.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_MPI_ReduceContactHistory PROCESSES 8 ) -waLBerla_compile_test( NAME MESA_PD_MPI_ReduceProperty FILES mpi/ReduceProperty.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_MPI_ReduceProperty FILES mpi/ReduceProperty.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_MPI_ReduceProperty PROCESSES 8 ) -waLBerla_compile_test( NAME MESA_PD_MPI_ShapePackUnpack FILES mpi/ShapePackUnpack.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_MPI_ShapePackUnpack FILES mpi/ShapePackUnpack.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_MPI_ShapePackUnpack ) -waLBerla_compile_test( NAME MESA_PD_MPI_SyncNextNeighborsNoGhosts FILES mpi/SyncNextNeighborsNoGhosts.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_MPI_SyncNextNeighborsNoGhosts FILES mpi/SyncNextNeighborsNoGhosts.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_MPI_SyncNextNeighborsNoGhosts PROCESSES 2 ) -waLBerla_compile_test( NAME MESA_PD_MPI_VelocityCorrectionNotification FILES mpi/VelocityCorrectionNotification.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_MPI_VelocityCorrectionNotification FILES mpi/VelocityCorrectionNotification.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_MPI_VelocityCorrectionNotification PROCESSES 8) -waLBerla_compile_test( NAME MESA_PD_Sorting FILES Sorting.cpp DEPENDS core ) +waLBerla_compile_test( NAME MESA_PD_Sorting FILES Sorting.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME MESA_PD_Sorting ) -waLBerla_compile_test( NAME MESA_PD_Stiffness FILES Stiffness.cpp DEPENDS blockforest core mesa_pd ) +waLBerla_compile_test( NAME MESA_PD_Stiffness FILES Stiffness.cpp DEPENDS walberla::blockforest walberla::core walberla::mesa_pd ) -waLBerla_compile_test( NAME MESA_PD_VTK_Outputs FILES vtk/VTKOutputs.cpp DEPENDS blockforest core vtk ) +waLBerla_compile_test( NAME MESA_PD_VTK_Outputs FILES vtk/VTKOutputs.cpp DEPENDS walberla::blockforest walberla::core walberla::vtk ) waLBerla_execute_test( NAME MESA_PD_VTK_Outputs PROCESSES 8 ) if (WALBERLA_MESAPD_CONVEX_POLYHEDRON_AVAILABLE) - waLBerla_compile_test( NAME MESA_PD_VTK_ConvexPolyhedron FILES vtk/ConvexPolyhedronVTKOutput.cpp DEPENDS core mesa_pd mesh_common vtk ) + waLBerla_compile_test( NAME MESA_PD_VTK_ConvexPolyhedron FILES vtk/ConvexPolyhedronVTKOutput.cpp DEPENDS walberla::core walberla::mesa_pd mesh_common walberla::vtk ) waLBerla_execute_test( NAME MESA_PD_VTK_ConvexPolyhedron ) - waLBerla_compile_test( NAME MESA_PD_Common_ContainsPointConvexPolyhedron FILES common/ContainsPointConvexPolyhedron.cpp DEPENDS core mesa_pd mesh_common ) + waLBerla_compile_test( NAME MESA_PD_Common_ContainsPointConvexPolyhedron FILES common/ContainsPointConvexPolyhedron.cpp DEPENDS walberla::core walberla::mesa_pd mesh_common ) waLBerla_execute_test( NAME MESA_PD_Common_ContainsPointConvexPolyhedron ) - waLBerla_compile_test( NAME MESA_PD_Data_ConvexPolyhedron FILES data/ConvexPolyhedron.cpp DEPENDS core mesa_pd mesh_common ) + waLBerla_compile_test( NAME MESA_PD_Data_ConvexPolyhedron FILES data/ConvexPolyhedron.cpp DEPENDS walberla::core walberla::mesa_pd mesh_common ) waLBerla_execute_test( NAME MESA_PD_Data_ConvexPolyhedron ) - waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_ConvexPolyhedron_GJK_EPA FILES collision_detection/ConvexPolyhedron_GJK_EPA.cpp DEPENDS core mesa_pd mesh_common ) + waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_ConvexPolyhedron_GJK_EPA FILES collision_detection/ConvexPolyhedron_GJK_EPA.cpp DEPENDS walberla::core walberla::mesa_pd mesh_common ) waLBerla_execute_test( NAME MESA_PD_COLLISIONDETECTION_ConvexPolyhedron_GJK_EPA ) endif() diff --git a/tests/mesh/CMakeLists.txt b/tests/mesh/CMakeLists.txt index baa156488..a420ea0bd 100644 --- a/tests/mesh/CMakeLists.txt +++ b/tests/mesh/CMakeLists.txt @@ -1,6 +1,6 @@ ############################################################################################################################# # -# Tests for mesh module +# Tests for walberla::mesh module # ############################################################################################################################# @@ -8,35 +8,35 @@ if ( WALBERLA_BUILD_WITH_OPENMESH ) waLBerla_link_files_to_builddir( "w.obj" ) waLBerla_link_geometry_to_builddir( "*.obj" ) - waLBerla_compile_test( FILES MatrixVectorOperationsTest.cpp DEPENDS mesh ) + waLBerla_compile_test( FILES MatrixVectorOperationsTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME MatrixVectorOperationsTest COMMAND $<TARGET_FILE:MatrixVectorOperationsTest> ) - waLBerla_compile_test( FILES MeshConversionTest.cpp DEPENDS mesh geometry ) + waLBerla_compile_test( FILES MeshConversionTest.cpp DEPENDS walberla::mesh walberla::geometry ) waLBerla_execute_test( NAME MeshConversionTest COMMAND $<TARGET_FILE:MeshConversionTest> ) - waLBerla_compile_test( FILES MeshOperationsTest.cpp DEPENDS mesh ) + waLBerla_compile_test( FILES MeshOperationsTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME MeshOperationsTest COMMAND $<TARGET_FILE:MeshOperationsTest> ) - waLBerla_compile_test( FILES MeshDistanceCompareTest.cpp DEPENDS mesh ) + waLBerla_compile_test( FILES MeshDistanceCompareTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME MeshDistanceCompareTest COMMAND $<TARGET_FILE:MeshDistanceCompareTest> ) - waLBerla_compile_test( FILES MeshAABBSelectionTest.cpp DEPENDS mesh ) + waLBerla_compile_test( FILES MeshAABBSelectionTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME MeshAABBSelectionTestBunnyDbg COMMAND $<TARGET_FILE:MeshAABBSelectionTest> bunny.obj 2 2 ) waLBerla_execute_test( NAME MeshAABBSelectionTestBunny COMMAND $<TARGET_FILE:MeshAABBSelectionTest> bunny.obj 100 10 CONFIGURATIONS Release RelWithDbgInfo ) - - waLBerla_compile_test( FILES MeshDistanceOctreeTest.cpp DEPENDS mesh ) + + waLBerla_compile_test( FILES MeshDistanceOctreeTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME MeshDistanceOctreeTestBunny COMMAND $<TARGET_FILE:MeshDistanceOctreeTest> bunny.obj CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME MeshDistanceOctreeTestW COMMAND $<TARGET_FILE:MeshDistanceOctreeTest> w.obj ) waLBerla_execute_test( NAME MeshDistanceOctreeTestCube COMMAND $<TARGET_FILE:MeshDistanceOctreeTest> cube.obj ) waLBerla_execute_test( NAME MeshDistanceOctreeTestSphere COMMAND $<TARGET_FILE:MeshDistanceOctreeTest> sphere.obj ) - - waLBerla_compile_test( FILES MeshDistanceMollerTrumboreTest.cpp DEPENDS mesh ) + + waLBerla_compile_test( FILES MeshDistanceMollerTrumboreTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME MeshDistanceMollerTrumboreTestCube COMMAND $<TARGET_FILE:MeshDistanceMollerTrumboreTest> cube.obj ) - waLBerla_compile_test( FILES MeshDistanceCallbackMollerTrumboreTest.cpp DEPENDS mesh ) + waLBerla_compile_test( FILES MeshDistanceCallbackMollerTrumboreTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME MeshDistanceCallbackMollerTrumboreTestCube COMMAND $<TARGET_FILE:MeshDistanceCallbackMollerTrumboreTest> cube.obj ) waLBerla_execute_test( NAME MeshDistanceCallbackMollerTrumboreTestSphere COMMAND $<TARGET_FILE:MeshDistanceCallbackMollerTrumboreTest> sphere.obj ) - waLBerla_compile_test( FILES MeshDistancePlausibilityTest.cpp DEPENDS mesh ) + waLBerla_compile_test( FILES MeshDistancePlausibilityTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME MeshDistancePlausibilityTestBunny COMMAND $<TARGET_FILE:MeshDistancePlausibilityTest> bunny.obj 1.25 CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME MeshDistancePlausibilityTestBunnyLong COMMAND $<TARGET_FILE:MeshDistancePlausibilityTest> bunny.obj 0.6 CONFIGURATIONS Release RelWithDbgInfo LABELS longrun ) waLBerla_execute_test( NAME MeshDistancePlausibilityTestW COMMAND $<TARGET_FILE:MeshDistancePlausibilityTest> w.obj 0.005 CONFIGURATIONS Release RelWithDbgInfo ) @@ -45,30 +45,30 @@ if ( WALBERLA_BUILD_WITH_OPENMESH ) waLBerla_execute_test( NAME MeshDistancePlausibilityTestCubeDbg COMMAND $<TARGET_FILE:MeshDistancePlausibilityTest> cube.obj 0.1 ) waLBerla_execute_test( NAME MeshDistancePlausibilityTestSphere COMMAND $<TARGET_FILE:MeshDistancePlausibilityTest> sphere.obj 0.04 CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME MeshDistancePlausibilityTestSphereDbg COMMAND $<TARGET_FILE:MeshDistancePlausibilityTest> sphere.obj 0.1 ) - - waLBerla_compile_test( FILES MeshContainmentOctreeTest.cpp DEPENDS mesh ) + + waLBerla_compile_test( FILES MeshContainmentOctreeTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME MeshContainmentOctreeTestBunny COMMAND $<TARGET_FILE:MeshContainmentOctreeTest> bunny.obj CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME MeshContainmentOctreeTestW COMMAND $<TARGET_FILE:MeshContainmentOctreeTest> w.obj ) waLBerla_execute_test( NAME MeshContainmentOctreeTestCube COMMAND $<TARGET_FILE:MeshContainmentOctreeTest> cube.obj ) waLBerla_execute_test( NAME MeshContainmentOctreeTestSphere COMMAND $<TARGET_FILE:MeshContainmentOctreeTest> sphere.obj ) - - waLBerla_compile_test( FILES MeshVTKTest.cpp DEPENDS mesh ) + + waLBerla_compile_test( FILES MeshVTKTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME MeshVTKTest COMMAND $<TARGET_FILE:MeshVTKTest> sphere.obj ) - - waLBerla_compile_test( FILES DistributedMeshVTKTest.cpp DEPENDS mesh ) + + waLBerla_compile_test( FILES DistributedMeshVTKTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME DistributedMeshVTKTest COMMAND $<TARGET_FILE:DistributedMeshVTKTest> sphere.obj ) - - waLBerla_compile_test( FILES PeVTKMeshWriterTest.cpp DEPENDS mesh ) + + waLBerla_compile_test( FILES PeVTKMeshWriterTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME PeVTKMeshWriterTest COMMAND $<TARGET_FILE:PeVTKMeshWriterTest> ) - - waLBerla_compile_test( FILES MeshPeRaytracing.cpp DEPENDS mesh pe ) + + waLBerla_compile_test( FILES MeshPeRaytracing.cpp DEPENDS walberla::mesh walberla::pe ) waLBerla_execute_test( NAME MeshPeRaytracing ) - - waLBerla_compile_test( FILES MeshAABBIntersectionTest.cpp DEPENDS mesh ) + + waLBerla_compile_test( FILES MeshAABBIntersectionTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME MeshAABBIntersectionTestDbg COMMAND $<TARGET_FILE:MeshAABBIntersectionTest> 10 ) waLBerla_execute_test( NAME MeshAABBIntersectionTest COMMAND $<TARGET_FILE:MeshAABBIntersectionTest> 10000 CONFIGURATIONS Release RelWithDbgInfo ) - - waLBerla_compile_test( FILES MeshInitilizationTest.cpp DEPENDS mesh ) + + waLBerla_compile_test( FILES MeshInitilizationTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME MeshInitializationTestDbg1P1 COMMAND $<TARGET_FILE:MeshInitilizationTest> cube.obj 1 1 LABELS longrun ) waLBerla_execute_test( NAME MeshInitializationTestDbg2P1 COMMAND $<TARGET_FILE:MeshInitilizationTest> cube.obj 2 12 LABELS longrun ) waLBerla_execute_test( NAME MeshInitializationTestDbg2P2 COMMAND $<TARGET_FILE:MeshInitilizationTest> cube.obj 2 12 PROCESSES 2 ) @@ -76,15 +76,15 @@ if ( WALBERLA_BUILD_WITH_OPENMESH ) waLBerla_execute_test( NAME MeshInitializationTest1P COMMAND $<TARGET_FILE:MeshInitilizationTest> bunny.obj 6 40 CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME MeshInitializationTest4P COMMAND $<TARGET_FILE:MeshInitilizationTest> bunny.obj 6 40 PROCESSES 4 CONFIGURATIONS Release RelWithDbgInfo ) - waLBerla_compile_test( FILES MeshInitilizationHelperTest.cpp DEPENDS mesh ) + waLBerla_compile_test( FILES MeshInitilizationHelperTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME MeshInitializationHelperTestDbg1P1 COMMAND $<TARGET_FILE:MeshInitilizationHelperTest> cube.obj 1 1 ) waLBerla_execute_test( NAME MeshInitializationHelperTestDbg2P1 COMMAND $<TARGET_FILE:MeshInitilizationHelperTest> cube.obj 2 12 ) waLBerla_execute_test( NAME MeshInitializationHelperTestDbg2P2 COMMAND $<TARGET_FILE:MeshInitilizationHelperTest> cube.obj 2 12 PROCESSES 2 ) waLBerla_execute_test( NAME MeshInitializationHelperTest1P COMMAND $<TARGET_FILE:MeshInitilizationHelperTest> bunny.obj 6 40 CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME MeshInitializationHelperTest4P COMMAND $<TARGET_FILE:MeshInitilizationHelperTest> bunny.obj 6 40 PROCESSES 4 CONFIGURATIONS Release RelWithDbgInfo ) - - waLBerla_compile_test( FILES MeshBlockExclusionTest.cpp DEPENDS mesh ) + + waLBerla_compile_test( FILES MeshBlockExclusionTest.cpp DEPENDS walberla::mesh ) waLBerla_execute_test( NAME MeshBlockExclusionTestBunny COMMAND $<TARGET_FILE:MeshBlockExclusionTest> bunny.obj 10000 CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME MeshBlockExclusionTestW COMMAND $<TARGET_FILE:MeshBlockExclusionTest> w.obj 1000 ) waLBerla_execute_test( NAME MeshBlockExclusionTestCube COMMAND $<TARGET_FILE:MeshBlockExclusionTest> cube.obj 1000 ) @@ -95,20 +95,20 @@ if ( WALBERLA_BUILD_WITH_OPENMESH ) waLBerla_execute_test( NAME MeshBlockExclusionTest2PCube COMMAND $<TARGET_FILE:MeshBlockExclusionTest> cube.obj 1000 PROCESSES 2 ) waLBerla_execute_test( NAME MeshBlockExclusionTest2PSphere COMMAND $<TARGET_FILE:MeshBlockExclusionTest> sphere.obj 1000 PROCESSES 2 ) - waLBerla_compile_test( FILES OpenMeshBufferTypeExtensionsTest.cpp DEPENDS core mesh ) + waLBerla_compile_test( FILES OpenMeshBufferTypeExtensionsTest.cpp DEPENDS walberla::core walberla::mesh ) waLBerla_execute_test( NAME OpenMeshBufferTypeExtensionsTest COMMAND $<TARGET_FILE:OpenMeshBufferTypeExtensionsTest> ) - waLBerla_compile_test( FILES QHullTest.cpp DEPENDS core mesh ) + waLBerla_compile_test( FILES QHullTest.cpp DEPENDS walberla::core walberla::mesh ) waLBerla_execute_test( NAME QHullTest COMMAND $<TARGET_FILE:QHullTest> 10000 CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME QHullTestFloatMesh COMMAND $<TARGET_FILE:QHullTest> --floatMesh 10000 CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME QHullTestDbg COMMAND $<TARGET_FILE:QHullTest> 10 ) waLBerla_execute_test( NAME QHullTestFloatMeshDbg COMMAND $<TARGET_FILE:QHullTest> --floatMesh 10 ) - - waLBerla_compile_test( FILES NumericIntegrationTest.cpp DEPENDS core mesh ) + + waLBerla_compile_test( FILES NumericIntegrationTest.cpp DEPENDS walberla::core walberla::mesh ) waLBerla_execute_test( NAME NumericIntegrationTestCube COMMAND $<TARGET_FILE:NumericIntegrationTest> cube.obj ) waLBerla_execute_test( NAME NumericIntegrationTestSphere COMMAND $<TARGET_FILE:NumericIntegrationTest> sphere.obj ) waLBerla_execute_test( NAME NumericIntegrationTestBunny COMMAND $<TARGET_FILE:NumericIntegrationTest> bunny.obj CONFIGURATIONS Release RelWithDbgInfo ) - waLBerla_compile_test( FILES MeshMarshalling.cpp DEPENDS core mesh ) + waLBerla_compile_test( FILES MeshMarshalling.cpp DEPENDS walberla::core walberla::mesh ) waLBerla_execute_test( NAME MeshMarshalling ) endif() diff --git a/tests/pde/CMakeLists.txt b/tests/pde/CMakeLists.txt index 5dde027cc..0d46f4dd2 100644 --- a/tests/pde/CMakeLists.txt +++ b/tests/pde/CMakeLists.txt @@ -1,29 +1,29 @@ ############################################################################################################################# # -# Tests for pde module +# Tests for walberla::pde module # ############################################################################################################################# -waLBerla_compile_test( FILES CGTest.cpp DEPENDS blockforest timeloop vtk ) +waLBerla_compile_test( FILES CGTest.cpp DEPENDS walberla::blockforest walberla::timeloop walberla::vtk ) waLBerla_execute_test( NAME CGShortTest COMMAND $<TARGET_FILE:CGTest> --shortrun PROCESSES 8 ) -waLBerla_compile_test( FILES JacobiTest.cpp DEPENDS blockforest timeloop vtk ) +waLBerla_compile_test( FILES JacobiTest.cpp DEPENDS walberla::blockforest walberla::timeloop walberla::vtk ) waLBerla_execute_test( NAME JacobiShortTest COMMAND $<TARGET_FILE:JacobiTest> --shortrun PROCESSES 8 ) -waLBerla_compile_test( FILES RBGSTest.cpp DEPENDS blockforest timeloop vtk ) +waLBerla_compile_test( FILES RBGSTest.cpp DEPENDS walberla::blockforest walberla::timeloop walberla::vtk ) waLBerla_execute_test( NAME RBGSShortTest COMMAND $<TARGET_FILE:RBGSTest> --shortrun PROCESSES 8 ) -waLBerla_compile_test( FILES SORTest.cpp DEPENDS blockforest timeloop vtk ) +waLBerla_compile_test( FILES SORTest.cpp DEPENDS walberla::blockforest walberla::timeloop walberla::vtk ) waLBerla_execute_test( NAME SORShortTest COMMAND $<TARGET_FILE:SORTest> --shortrun PROCESSES 8 ) -waLBerla_compile_test( FILES MGTest.cpp DEPENDS blockforest timeloop vtk ) +waLBerla_compile_test( FILES MGTest.cpp DEPENDS walberla::blockforest walberla::timeloop walberla::vtk ) waLBerla_execute_test( NAME MGShortTest COMMAND $<TARGET_FILE:MGTest> --shortrun PROCESSES 8 ) waLBerla_execute_test( NAME MGTest COMMAND $<TARGET_FILE:MGTest> PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES MGConvergenceTest.cpp DEPENDS blockforest timeloop vtk ) +waLBerla_compile_test( FILES MGConvergenceTest.cpp DEPENDS walberla::blockforest walberla::timeloop walberla::vtk ) waLBerla_execute_test( NAME MGConvergenceTest COMMAND $<TARGET_FILE:MGConvergenceTest> PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES BoundaryTest.cpp DEPENDS blockforest timeloop vtk boundary ) +waLBerla_compile_test( FILES BoundaryTest.cpp DEPENDS walberla::blockforest walberla::timeloop walberla::vtk walberla::boundary ) waLBerla_execute_test( NAME BoundaryShortTest COMMAND $<TARGET_FILE:BoundaryTest> --shortrun PROCESSES 8 ) waLBerla_execute_test( NAME BoundaryTest COMMAND $<TARGET_FILE:BoundaryTest> PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo ) diff --git a/tests/pe/CMakeLists.txt b/tests/pe/CMakeLists.txt index 9da367cc1..0b337411a 100644 --- a/tests/pe/CMakeLists.txt +++ b/tests/pe/CMakeLists.txt @@ -1,95 +1,95 @@ ################################################################################################### # -# Tests for pe module +# Tests for walberla::pe module # ################################################################################################### waLBerla_link_files_to_builddir( *.cfg ) waLBerla_link_files_to_builddir( *.sbf ) -waLBerla_compile_test( NAME PE_BODYFLAGS FILES BodyFlags.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_BODYFLAGS FILES BodyFlags.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_BODYFLAGS PROCESSES 8) -waLBerla_compile_test( NAME PE_BODYITERATORS FILES BodyIterators.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME PE_BODYITERATORS FILES BodyIterators.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PE_BODYITERATORS PROCESSES 2 ) -waLBerla_compile_test( NAME PE_BODYSTORAGE FILES BodyStorage.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_BODYSTORAGE FILES BodyStorage.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_BODYSTORAGE ) -waLBerla_compile_test( NAME PE_CALLBACK FILES Callback.cpp DEPENDS blockforest core domain_decomposition ) +waLBerla_compile_test( NAME PE_CALLBACK FILES Callback.cpp DEPENDS walberla::blockforest walberla::core walberla::domain_decomposition ) waLBerla_execute_test( NAME PE_CALLBACK PROCESSES 2 ) -waLBerla_compile_test( NAME PE_CHECKVITALPARAMETERS FILES CheckVitalParameters.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_CHECKVITALPARAMETERS FILES CheckVitalParameters.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_CHECKVITALPARAMETERS ) -waLBerla_compile_test( NAME PE_COLLISION FILES Collision.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_COLLISION FILES Collision.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_COLLISION ) -waLBerla_compile_test( NAME PE_COLLISIONTOBIASGJK FILES CollisionTobiasGJK.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_COLLISIONTOBIASGJK FILES CollisionTobiasGJK.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_COLLISIONTOBIASGJK ) -waLBerla_compile_test( NAME PE_CREATEWORLD FILES CreateWorld.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_CREATEWORLD FILES CreateWorld.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_CREATEWORLD ) -waLBerla_compile_test( NAME PE_DELETEBODY FILES DeleteBody.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME PE_DELETEBODY FILES DeleteBody.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PE_DELETEBODY_NN COMMAND $<TARGET_FILE:PE_DELETEBODY> ) waLBerla_execute_test( NAME PE_DELETEBODY_SO COMMAND $<TARGET_FILE:PE_DELETEBODY> --syncShadowOwners ) -waLBerla_compile_test( NAME PE_DESTROYBODY FILES DestroyBody.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME PE_DESTROYBODY FILES DestroyBody.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PE_DESTROYBODY ) -waLBerla_compile_test( NAME PE_DOCUMENTATIONSNIPPETS FILES PeDocumentationSnippets.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_DOCUMENTATIONSNIPPETS FILES PeDocumentationSnippets.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_DOCUMENTATIONSNIPPETS ) -waLBerla_compile_test( NAME PE_DYNAMICREFINEMENT FILES DynamicRefinement.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME PE_DYNAMICREFINEMENT FILES DynamicRefinement.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PE_DYNAMICREFINEMENT ) -waLBerla_compile_test( NAME PE_FORCESYNC FILES ForceSync.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME PE_FORCESYNC FILES ForceSync.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PE_FORCESYNC ) -waLBerla_compile_test( NAME PE_HASHGRIDS FILES HashGrids.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME PE_HASHGRIDS FILES HashGrids.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PE_HASHGRIDS_REL COMMAND $<TARGET_FILE:PE_HASHGRIDS> 10000 CONFIGURATIONS Release RelWithDbgInfo) waLBerla_execute_test( NAME PE_HASHGRIDS_DBG COMMAND $<TARGET_FILE:PE_HASHGRIDS> 1000) -waLBerla_compile_test( NAME PE_HCSITS FILES HCSITS.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME PE_HCSITS FILES HCSITS.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PE_HCSITS ) -waLBerla_compile_test( NAME PE_LOADFROMCONFIG FILES LoadFromConfig.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME PE_LOADFROMCONFIG FILES LoadFromConfig.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PE_LOADFROMCONFIG COMMAND $<TARGET_FILE:PE_LOADFROMCONFIG> ${CMAKE_CURRENT_SOURCE_DIR}/LoadFromConfig.cfg ) -waLBerla_compile_test( NAME PE_MARSHALLING FILES Marshalling.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_MARSHALLING FILES Marshalling.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_MARSHALLING ) -waLBerla_compile_test( NAME PE_MATERIAL FILES Material.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_MATERIAL FILES Material.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_MATERIAL ) -waLBerla_compile_test( NAME PE_MINMAXREFINEMENT FILES MinMaxRefinement.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME PE_MINMAXREFINEMENT FILES MinMaxRefinement.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PE_MINMAXREFINEMENT PROCESSES 8 ) -waLBerla_compile_test( NAME PE_OVERLAP FILES Overlap.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_OVERLAP FILES Overlap.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_OVERLAP ) -waLBerla_compile_test( NAME PE_PARALLELEQUIVALENCE FILES ParallelEquivalence.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME PE_PARALLELEQUIVALENCE FILES ParallelEquivalence.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PE_PARALLELEQUIVALENCE PROCESSES 4 ) if( WALBERLA_BUILD_WITH_PARMETIS ) - waLBerla_compile_test( NAME PE_PARMETIS FILES ParMetis.cpp DEPENDS core blockforest ) + waLBerla_compile_test( NAME PE_PARMETIS FILES ParMetis.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PE_PARMETIS PROCESSES 64 ) endif() -waLBerla_compile_test( NAME PE_PARSEMESSAGE FILES ParseMessage.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_PARSEMESSAGE FILES ParseMessage.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_PARSEMESSAGE ) -waLBerla_compile_test( NAME PE_REFINEMENT FILES Refinement.cpp DEPENDS core blockforest timeloop ) +waLBerla_compile_test( NAME PE_REFINEMENT FILES Refinement.cpp DEPENDS walberla::core walberla::blockforest walberla::timeloop ) waLBerla_execute_test( NAME PE_REFINEMENT ) -waLBerla_compile_test( NAME PE_REFINEMENTWITHSPAREPROCESSES FILES RefinementWithSpareProcesses.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME PE_REFINEMENTWITHSPAREPROCESSES FILES RefinementWithSpareProcesses.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PE_REFINEMENTWITHSPAREPROCESSES PROCESSES 27 ) -waLBerla_compile_test( NAME PE_RIGIDBODY FILES RigidBody.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_RIGIDBODY FILES RigidBody.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_RIGIDBODY ) -waLBerla_compile_test( NAME PE_SERIALIZEDESERIALIZE FILES SerializeDeserialize.cpp DEPENDS core blockforest ) +waLBerla_compile_test( NAME PE_SERIALIZEDESERIALIZE FILES SerializeDeserialize.cpp DEPENDS walberla::core walberla::blockforest ) waLBerla_execute_test( NAME PE_SERIALIZEDESERIALIZE01 COMMAND $<TARGET_FILE:PE_SERIALIZEDESERIALIZE> PROCESSES 1 ) waLBerla_execute_test( NAME PE_SERIALIZEDESERIALIZE02 COMMAND $<TARGET_FILE:PE_SERIALIZEDESERIALIZE> PROCESSES 2 ) waLBerla_execute_test( NAME PE_SERIALIZEDESERIALIZE04 COMMAND $<TARGET_FILE:PE_SERIALIZEDESERIALIZE> PROCESSES 4 ) @@ -100,23 +100,23 @@ set_property( TEST PE_SERIALIZEDESERIALIZE04 PROPERTY DEPENDS PE_SERIALIZEDESERI set_property( TEST PE_SERIALIZEDESERIALIZE08 PROPERTY DEPENDS PE_SERIALIZEDESERIALIZE04 ) #serialize runs of tets to avoid i/o conflicts when running ctest with -jN endif() -waLBerla_compile_test( NAME PE_SHADOWCOPY FILES ShadowCopy.cpp DEPENDS core blockforest domain_decomposition ) +waLBerla_compile_test( NAME PE_SHADOWCOPY FILES ShadowCopy.cpp DEPENDS walberla::core walberla::blockforest walberla::domain_decomposition ) waLBerla_execute_test( NAME PE_SHADOWCOPY_NN COMMAND $<TARGET_FILE:PE_SHADOWCOPY> ) waLBerla_execute_test( NAME PE_SHADOWCOPY_SO COMMAND $<TARGET_FILE:PE_SHADOWCOPY> --syncShadowOwners ) -waLBerla_compile_test( NAME PE_SIMPLECCD FILES SimpleCCD.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_SIMPLECCD FILES SimpleCCD.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_SIMPLECCD ) -waLBerla_compile_test( NAME PE_SYNCEQUIVALENCE FILES SyncEquivalence.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_SYNCEQUIVALENCE FILES SyncEquivalence.cpp DEPENDS walberla::core ) #waLBerla_execute_test( NAME PE_SYNCEQUIVALENCE COMMAND $<TARGET_FILE:PE_SYNCEQUIVALENCE> PROCESSES 8 ) -waLBerla_compile_test( NAME PE_SYNCHRONIZATION FILES Synchronization.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_SYNCHRONIZATION FILES Synchronization.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_SYNCHRONIZATION01 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATION> ) waLBerla_execute_test( NAME PE_SYNCHRONIZATION03 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATION> PROCESSES 3 LABELS longrun) waLBerla_execute_test( NAME PE_SYNCHRONIZATION09 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATION> PROCESSES 9 LABELS longrun) waLBerla_execute_test( NAME PE_SYNCHRONIZATION27 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATION> PROCESSES 27) -waLBerla_compile_test( NAME PE_SYNCHRONIZATIONDELETE FILES SynchronizationDelete.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_SYNCHRONIZATIONDELETE FILES SynchronizationDelete.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE01_NN COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> ) waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE03_NN COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> PROCESSES 3 LABELS longrun) waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE09_NN COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> PROCESSES 9 LABELS longrun) @@ -126,34 +126,34 @@ waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE03_SO COMMAND $<TARGET_FIL waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE09_SO COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> --syncShadowOwners PROCESSES 9 LABELS longrun) waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE27_SO COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> --syncShadowOwners PROCESSES 27) -waLBerla_compile_test( NAME PE_SYNCHRONIZATIONLARGEBODY FILES SynchronizationLargeBody.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_SYNCHRONIZATIONLARGEBODY FILES SynchronizationLargeBody.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_SYNCHRONIZATIONLARGEBODY01 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONLARGEBODY> ) waLBerla_execute_test( NAME PE_SYNCHRONIZATIONLARGEBODY03 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONLARGEBODY> PROCESSES 3 LABELS longrun) waLBerla_execute_test( NAME PE_SYNCHRONIZATIONLARGEBODY09 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONLARGEBODY> PROCESSES 9 LABELS longrun) waLBerla_execute_test( NAME PE_SYNCHRONIZATIONLARGEBODY27 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONLARGEBODY> PROCESSES 27) -waLBerla_compile_test( NAME PE_STATICTYPEIDS FILES SetBodyTypeIDs.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_STATICTYPEIDS FILES SetBodyTypeIDs.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_STATICTYPEIDS ) -waLBerla_compile_test( NAME PE_UNION FILES Union.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_UNION FILES Union.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_UNION ) -waLBerla_compile_test( NAME PE_UNIONBEHAVIOR FILES UnionBehavior.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_UNIONBEHAVIOR FILES UnionBehavior.cpp DEPENDS walberla::core ) if( WALBERLA_DOUBLE_ACCURACY ) waLBerla_execute_test( NAME PE_UNIONBEHAVIOR ) endif() -waLBerla_compile_test( NAME PE_RAYTRACING FILES Raytracing.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_RAYTRACING FILES Raytracing.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_RAYTRACING ) -waLBerla_compile_test( NAME PE_RAYTRACING_INTERSECTION FILES RaytracingIntersection.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_RAYTRACING_INTERSECTION FILES RaytracingIntersection.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_RAYTRACING_INTERSECTION ) -waLBerla_compile_test( NAME PE_RAYTRACING_SPHERE FILES RaytracingSphere.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_RAYTRACING_SPHERE FILES RaytracingSphere.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_RAYTRACING_SPHERE ) -waLBerla_compile_test( NAME PE_RAYTRACING_HASHGRIDS FILES RaytracingHashGrids.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_RAYTRACING_HASHGRIDS FILES RaytracingHashGrids.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_RAYTRACING_HASHGRIDS ) -waLBerla_compile_test( NAME PE_VOLUMEINERTIA FILES VolumeInertia.cpp DEPENDS core ) +waLBerla_compile_test( NAME PE_VOLUMEINERTIA FILES VolumeInertia.cpp DEPENDS walberla::core ) waLBerla_execute_test( NAME PE_VOLUMEINERTIA CONFIGURATIONS Release RelWithDbgInfo) diff --git a/tests/pe_coupling/CMakeLists.txt b/tests/pe_coupling/CMakeLists.txt index 81fc07d82..7adf21fa3 100644 --- a/tests/pe_coupling/CMakeLists.txt +++ b/tests/pe_coupling/CMakeLists.txt @@ -1,6 +1,6 @@ ################################################################################################### # -# Tests for pe_coupling module +# Tests for walberla::pe_coupling module # ################################################################################################### @@ -9,7 +9,7 @@ # Partially saturated cells method tests ################################################################################################### -waLBerla_compile_test( FILES partially_saturated_cells_method/DragForceSpherePSM.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES partially_saturated_cells_method/DragForceSpherePSM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME DragForceSpherePSMSC1W1FuncTest COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC1W1 --funcTest PROCESSES 1 ) waLBerla_execute_test( NAME DragForceSpherePSMSC1W1SingleTest COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC1W1 PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME DragForceSpherePSMSC1W1ParallelTest COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC1W1 PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) @@ -24,7 +24,7 @@ waLBerla_execute_test( NAME DragForceSpherePSMSC2W2SingleTest COMMAND $<TARGET waLBerla_execute_test( NAME DragForceSpherePSMSC3W2FuncTest COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC3W2 --funcTest PROCESSES 1 ) waLBerla_execute_test( NAME DragForceSpherePSMSC3W2SingleTest COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC3W2 PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES partially_saturated_cells_method/DragForceSpherePSMRefinement.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES partially_saturated_cells_method/DragForceSpherePSMRefinement.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC1W1FuncTest COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC1W1 --funcTest PROCESSES 1 ) waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC1W1SingleTest COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC1W1 PROCESSES 1 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC1W1ParallelTest COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC1W1 PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) @@ -34,7 +34,7 @@ waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC1W2SingleTest COMMAN waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC2W2SingleTest COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC2W2 PROCESSES 1 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC3W2SingleTest COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC3W2 PROCESSES 1 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES partially_saturated_cells_method/SegreSilberbergPSM.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES partially_saturated_cells_method/SegreSilberbergPSM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME SegreSilberbergPSMSC1W1FuncTest COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC1W1 --funcTest PROCESSES 9 ) waLBerla_execute_test( NAME SegreSilberbergPSMSC1W1Test COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC1W1 PROCESSES 18 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME SegreSilberbergPSMSC2W1FuncTest COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC2W1 --funcTest PROCESSES 9 ) @@ -48,7 +48,7 @@ waLBerla_execute_test( NAME SegreSilberbergPSMSC2W2Test COMMAND $<TARGET waLBerla_execute_test( NAME SegreSilberbergPSMSC3W2FuncTest COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC3W2 --funcTest PROCESSES 9 ) waLBerla_execute_test( NAME SegreSilberbergPSMSC3W2Test COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC3W2 PROCESSES 18 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES partially_saturated_cells_method/TorqueSpherePSM.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES partially_saturated_cells_method/TorqueSpherePSM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME TorqueSpherePSMSC1W1FuncTest COMMAND $<TARGET_FILE:TorqueSpherePSM> --funcTest --SC1W1 PROCESSES 1 ) waLBerla_execute_test( NAME TorqueSpherePSMSC1W1SingleTest COMMAND $<TARGET_FILE:TorqueSpherePSM> --SC1W1 PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME TorqueSpherePSMSC1W1ParallelTest COMMAND $<TARGET_FILE:TorqueSpherePSM> --SC1W1 PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) @@ -67,15 +67,15 @@ waLBerla_execute_test( NAME TorqueSpherePSMSC3W2SingleTest COMMAND $<TARGET_FI # Momentum exchange method tests ################################################################################################### -waLBerla_compile_test( FILES momentum_exchange_method/BodyAtBlockBoarderCheck.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES momentum_exchange_method/BodyAtBlockBoarderCheck.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME BodyAtBlockBoarderCheckTest1 COMMAND $<TARGET_FILE:BodyAtBlockBoarderCheck> 1 PROCESSES 8 ) waLBerla_execute_test( NAME BodyAtBlockBoarderCheckTest2 COMMAND $<TARGET_FILE:BodyAtBlockBoarderCheck> 2 PROCESSES 8 LABELS longrun ) waLBerla_execute_test( NAME BodyAtBlockBoarderCheckTest3 COMMAND $<TARGET_FILE:BodyAtBlockBoarderCheck> 3 PROCESSES 8 LABELS verylongrun ) -waLBerla_compile_test( FILES momentum_exchange_method/BodyMappingTest.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES momentum_exchange_method/BodyMappingTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME BodyMappingTest COMMAND $<TARGET_FILE:BodyMappingTest> PROCESSES 1 ) -waLBerla_compile_test( FILES momentum_exchange_method/DragForceSphereMEM.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES momentum_exchange_method/DragForceSphereMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME DragForceSphereMEMFuncTest COMMAND $<TARGET_FILE:DragForceSphereMEM> --funcTest PROCESSES 1 ) waLBerla_execute_test( NAME DragForceSphereMEMSingleTest COMMAND $<TARGET_FILE:DragForceSphereMEM> PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME DragForceSphereMEMParallelTest COMMAND $<TARGET_FILE:DragForceSphereMEM> PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) @@ -86,28 +86,28 @@ waLBerla_execute_test( NAME DragForceSphereMEMMRFuncTest COMMAND $<TARGET_F waLBerla_execute_test( NAME DragForceSphereMEMMRSingleTest COMMAND $<TARGET_FILE:DragForceSphereMEM> --MEMVariant MR PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME DragForceSphereMEMMRParallelTest COMMAND $<TARGET_FILE:DragForceSphereMEM> --MEMVariant MR PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES momentum_exchange_method/DragForceSphereMEMRefinement.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES momentum_exchange_method/DragForceSphereMEMRefinement.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME DragForceSphereMEMRefinementFuncTest COMMAND $<TARGET_FILE:DragForceSphereMEMRefinement> --funcTest PROCESSES 1 ) waLBerla_execute_test( NAME DragForceSphereMEMRefinementSingleTest COMMAND $<TARGET_FILE:DragForceSphereMEMRefinement> PROCESSES 4 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME DragForceSphereMEMRefinementParallelTest COMMAND $<TARGET_FILE:DragForceSphereMEMRefinement> PROCESSES 5 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME DragForceSphereMEMRefinementCLITest COMMAND $<TARGET_FILE:DragForceSphereMEMRefinement> --MO_CLI PROCESSES 4 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES momentum_exchange_method/GlobalBodyAsBoundaryMEMStaticRefinement.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES momentum_exchange_method/GlobalBodyAsBoundaryMEMStaticRefinement.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME GlobalBodyAsBoundaryMEMStaticRefinementTest COMMAND $<TARGET_FILE:GlobalBodyAsBoundaryMEMStaticRefinement> PROCESSES 1 ) -waLBerla_compile_test( FILES momentum_exchange_method/LubricationCorrectionMEM.cpp DEPENDS blockforest timeloop ) +waLBerla_compile_test( FILES momentum_exchange_method/LubricationCorrectionMEM.cpp DEPENDS walberla::blockforest walberla::timeloop ) waLBerla_execute_test( NAME LubricationCorrectionMEMFuncTest COMMAND $<TARGET_FILE:LubricationCorrectionMEM> --funcTest PROCESSES 3 ) waLBerla_execute_test( NAME LubricationCorrectionMEMSphereSphereTest COMMAND $<TARGET_FILE:LubricationCorrectionMEM> --split --fzyx --sphSphTest PROCESSES 6 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME LubricationCorrectionMEMSphereWallTest COMMAND $<TARGET_FILE:LubricationCorrectionMEM> --split --fzyx --sphWallTest PROCESSES 3 LABELS longrun verylongrun CONFIGURATIONS Release RelWithDbgInfo ) - -waLBerla_compile_test( FILES momentum_exchange_method/PeriodicParticleChannelMEM.cpp DEPENDS blockforest pe timeloop ) + +waLBerla_compile_test( FILES momentum_exchange_method/PeriodicParticleChannelMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME PeriodicParticleChannelMEMTest COMMAND $<TARGET_FILE:PeriodicParticleChannelMEM> --shortrun PROCESSES 4 LABELS longrun ) -waLBerla_compile_test( FILES momentum_exchange_method/TaylorCouetteFlowMEM.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES momentum_exchange_method/TaylorCouetteFlowMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME TaylorCouetteFlowMEMTest COMMAND $<TARGET_FILE:TaylorCouetteFlowMEM> --shortrun ) waLBerla_execute_test( NAME TaylorCouetteFlowMEMTest2 COMMAND $<TARGET_FILE:TaylorCouetteFlowMEM> PROCESSES 4 LABELS verylongrun) -waLBerla_compile_test( FILES momentum_exchange_method/SegreSilberbergMEM.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES momentum_exchange_method/SegreSilberbergMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME SegreSilberbergMEMSyncNextNeighbor COMMAND $<TARGET_FILE:SegreSilberbergMEM> --shortrun PROCESSES 9 ) waLBerla_execute_test( NAME SegreSilberbergMEMSyncShadowOwner COMMAND $<TARGET_FILE:SegreSilberbergMEM> --shortrun --syncShadowOwners PROCESSES 9 ) waLBerla_execute_test( NAME SegreSilberbergMEMTest COMMAND $<TARGET_FILE:SegreSilberbergMEM> PROCESSES 18 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) @@ -120,19 +120,19 @@ waLBerla_execute_test( NAME SegreSilberbergMEMEanReconTest COMMAND $<TARG waLBerla_execute_test( NAME SegreSilberbergMEMExtReconFuncTest COMMAND $<TARGET_FILE:SegreSilberbergMEM> --funcTest --extReconstructor PROCESSES 9 ) waLBerla_execute_test( NAME SegreSilberbergMEMExtReconTest COMMAND $<TARGET_FILE:SegreSilberbergMEM> --MO_CLI --extReconstructor PROCESSES 18 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEM.cpp DEPENDS timeloop ) +waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEM.cpp DEPENDS walberla::timeloop ) waLBerla_execute_test( NAME SettlingSphereMEMFuncTestSerial COMMAND $<TARGET_FILE:SettlingSphereMEM> --funcTest PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME SettlingSphereMEMFuncTestParallel COMMAND $<TARGET_FILE:SettlingSphereMEM> --funcTest PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo) -waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEMDynamicRefinement.cpp DEPENDS timeloop ) +waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEMDynamicRefinement.cpp DEPENDS walberla::timeloop ) waLBerla_execute_test( NAME SettlingSphereMEMDynamicRefinementFuncTestSerial COMMAND $<TARGET_FILE:SettlingSphereMEMDynamicRefinement> --funcTest PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo) waLBerla_execute_test( NAME SettlingSphereMEMDynamicRefinementFuncTestParallel COMMAND $<TARGET_FILE:SettlingSphereMEMDynamicRefinement> --funcTest PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo) -waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp DEPENDS timeloop ) +waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp DEPENDS walberla::timeloop ) waLBerla_execute_test( NAME SettlingSphereMEMStaticRefinementFuncTestSerial COMMAND $<TARGET_FILE:SettlingSphereMEMStaticRefinement> --funcTest PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo) waLBerla_execute_test( NAME SettlingSphereMEMStaticRefinementFuncTestParallel COMMAND $<TARGET_FILE:SettlingSphereMEMStaticRefinement> --funcTest PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo) -waLBerla_compile_test( FILES momentum_exchange_method/TorqueSphereMEM.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES momentum_exchange_method/TorqueSphereMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME TorqueSphereMEMFuncTest COMMAND $<TARGET_FILE:TorqueSphereMEM> --funcTest PROCESSES 1 ) waLBerla_execute_test( NAME TorqueSphereMEMSingleTest COMMAND $<TARGET_FILE:TorqueSphereMEM> PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME TorqueSphereMEMParallelTest COMMAND $<TARGET_FILE:TorqueSphereMEM> PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) @@ -143,7 +143,7 @@ waLBerla_execute_test( NAME TorqueSphereMEMMRFuncTest COMMAND $<TARGET_FILE waLBerla_execute_test( NAME TorqueSphereMEMMRSingleTest COMMAND $<TARGET_FILE:TorqueSphereMEM> --MO_MR PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo ) waLBerla_execute_test( NAME TorqueSphereMEMMRParallelTest COMMAND $<TARGET_FILE:TorqueSphereMEM> --MO_MR PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo ) -waLBerla_compile_test( FILES momentum_exchange_method/SquirmerTest.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES momentum_exchange_method/SquirmerTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME SquirmerShortTest COMMAND $<TARGET_FILE:SquirmerTest> --shortrun PROCESSES 1 ) waLBerla_execute_test( NAME SquirmerTest COMMAND $<TARGET_FILE:SquirmerTest> PROCESSES 1 CONFIGURATIONS Release RelWithDbgInfo ) @@ -151,28 +151,28 @@ waLBerla_execute_test( NAME SquirmerTest COMMAND $<TARGET_FILE:SquirmerTest> PRO # Discrete particle methods tests ################################################################################################### -waLBerla_compile_test( FILES discrete_particle_methods/SphereWallCollisionBehaviorDPM.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES discrete_particle_methods/SphereWallCollisionBehaviorDPM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME SphereWallCollisionBehaviorDPMFuncTest COMMAND $<TARGET_FILE:SphereWallCollisionBehaviorDPM> --funcTest PROCESSES 1 ) -waLBerla_compile_test( FILES discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME HinderedSettlingDynamicsDPMFuncTest COMMAND $<TARGET_FILE:HinderedSettlingDynamicsDPM> --funcTest PROCESSES 4 LABELS longrun CONFIGURATIONS RelWithDbgInfo ) ################################################################################################### # Geometry tests ################################################################################################### -waLBerla_compile_test( FILES geometry/PeIntersectionRatioTest.cpp DEPENDS pe ) +waLBerla_compile_test( FILES geometry/PeIntersectionRatioTest.cpp DEPENDS walberla::pe ) waLBerla_execute_test( NAME PeIntersectionRatioTest COMMAND $<TARGET_FILE:PeIntersectionRatioTest> PROCESSES 1 ) ################################################################################################### # Utility tests ################################################################################################### -waLBerla_compile_test( FILES utility/BodiesForceTorqueContainerTest.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES utility/BodiesForceTorqueContainerTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME BodiesForceTorqueContainerTest COMMAND $<TARGET_FILE:BodiesForceTorqueContainerTest> PROCESSES 1 ) waLBerla_execute_test( NAME BodiesForceTorqueContainerParallelTest COMMAND $<TARGET_FILE:BodiesForceTorqueContainerTest> PROCESSES 3 ) -waLBerla_compile_test( FILES utility/PeSubCyclingTest.cpp DEPENDS blockforest pe timeloop ) +waLBerla_compile_test( FILES utility/PeSubCyclingTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop ) waLBerla_execute_test( NAME PeSubCyclingTest COMMAND $<TARGET_FILE:PeSubCyclingTest> PROCESSES 1 ) waLBerla_execute_test( NAME PeSubCyclingParallelTest COMMAND $<TARGET_FILE:PeSubCyclingTest> PROCESSES 3 ) diff --git a/tests/postprocessing/CMakeLists.txt b/tests/postprocessing/CMakeLists.txt index ffe99cd52..73ac3b49c 100644 --- a/tests/postprocessing/CMakeLists.txt +++ b/tests/postprocessing/CMakeLists.txt @@ -1,6 +1,6 @@ ################################################################################################### # -# Tests for postprocessing module +# Tests for walberla::postprocessing module # ################################################################################################### diff --git a/tests/python_coupling/CMakeLists.txt b/tests/python_coupling/CMakeLists.txt index 4eec405aa..4086fea04 100644 --- a/tests/python_coupling/CMakeLists.txt +++ b/tests/python_coupling/CMakeLists.txt @@ -7,15 +7,15 @@ waLBerla_link_files_to_builddir( *.py ) if (WALBERLA_BUILD_WITH_PYTHON) - waLBerla_compile_test( FILES ConfigFromPythonTest.cpp DEPENDS blockforest field ) + waLBerla_compile_test( FILES ConfigFromPythonTest.cpp DEPENDS walberla::blockforest walberla::field ) waLBerla_execute_test( NAME ConfigFromPythonTest COMMAND $<TARGET_FILE:ConfigFromPythonTest> ${CMAKE_CURRENT_SOURCE_DIR}/ConfigFromPythonTest.py ) - - waLBerla_compile_test( FILES CallbackTest.cpp DEPENDS blockforest field ) + + waLBerla_compile_test( FILES CallbackTest.cpp DEPENDS walberla::blockforest walberla::field ) waLBerla_execute_test( NAME CallbackTest COMMAND $<TARGET_FILE:CallbackTest> ${CMAKE_CURRENT_SOURCE_DIR}/CallbackTest.py ) - waLBerla_compile_test( FILES FieldExportTest.cpp DEPENDS blockforest field ) + waLBerla_compile_test( FILES FieldExportTest.cpp DEPENDS walberla::blockforest walberla::field ) waLBerla_execute_test( NAME FieldExportTest COMMAND $<TARGET_FILE:FieldExportTest> ${CMAKE_CURRENT_SOURCE_DIR}/FieldExportTest.py ) diff --git a/tests/simd/CMakeLists.txt b/tests/simd/CMakeLists.txt index 03c6d9414..984f67fcc 100644 --- a/tests/simd/CMakeLists.txt +++ b/tests/simd/CMakeLists.txt @@ -1,6 +1,6 @@ ################################################################################################### # -# Tests for simd module +# Tests for walberla::simd module # ################################################################################################### diff --git a/tests/sqlite/CMakeLists.txt b/tests/sqlite/CMakeLists.txt index 21513d96b..f2eab8cb6 100644 --- a/tests/sqlite/CMakeLists.txt +++ b/tests/sqlite/CMakeLists.txt @@ -1,6 +1,6 @@ ################################################################################################### # -# Tests for sqlite module +# Tests for walberla::sqlite module # ################################################################################################### diff --git a/tests/stencil/CMakeLists.txt b/tests/stencil/CMakeLists.txt index 79db23bab..fad98fe4a 100644 --- a/tests/stencil/CMakeLists.txt +++ b/tests/stencil/CMakeLists.txt @@ -1,6 +1,6 @@ ################################################################################################### # -# Tests for stencil module +# Tests for walberla::stencil module # ################################################################################################### diff --git a/tests/timeloop/CMakeLists.txt b/tests/timeloop/CMakeLists.txt index e39b3223f..835ab9fe5 100644 --- a/tests/timeloop/CMakeLists.txt +++ b/tests/timeloop/CMakeLists.txt @@ -1,23 +1,19 @@ ################################################################################################### # -# Tests for timeloop module +# Tests for walberla::timeloop module # ################################################################################################### -waLBerla_compile_test( FILES MultipleSweepFailTest.cpp - DEPENDS blockforest ) -waLBerla_execute_test( NAME MultipleSweepFailTest ) -set_property( TEST MultipleSweepFailTest - PROPERTY WILL_FAIL TRUE ) +waLBerla_compile_test( FILES MultipleSweepFailTest.cpp DEPENDS walberla::blockforest ) +waLBerla_execute_test( NAME MultipleSweepFailTest ) +set_property( TEST MultipleSweepFailTest + PROPERTY WILL_FAIL TRUE ) -waLBerla_compile_test( FILES MultipleSweepTest.cpp - DEPENDS blockforest ) -waLBerla_execute_test( NAME MultipleSweepTest ) +waLBerla_compile_test( FILES MultipleSweepTest.cpp DEPENDS walberla::blockforest ) +waLBerla_execute_test( NAME MultipleSweepTest ) -waLBerla_compile_test( FILES TimeloopSweepManagementTest.cpp - DEPENDS blockforest ) -waLBerla_execute_test( NAME TimeloopSweepManagementTest ) +waLBerla_compile_test( FILES TimeloopSweepManagementTest.cpp DEPENDS walberla::blockforest ) +waLBerla_execute_test( NAME TimeloopSweepManagementTest ) -waLBerla_compile_test( FILES TimeloopAndSweepRegisterTest.cpp - DEPENDS blockforest field ) -waLBerla_execute_test( NAME TimeloopAndSweepRegisterTest ) \ No newline at end of file +waLBerla_compile_test( FILES TimeloopAndSweepRegisterTest.cpp DEPENDS walberla::blockforest walberla::field ) +waLBerla_execute_test( NAME TimeloopAndSweepRegisterTest ) \ No newline at end of file -- GitLab