diff --git a/apps/showcases/PhaseFieldAllenCahn/CMakeLists.txt b/apps/showcases/PhaseFieldAllenCahn/CMakeLists.txt index ed6d22966d3b63e776d5a1a02642cf1f4cf7bd07..9084c99a814c65c5ab6fefe54b1ad5ff0213282c 100644 --- a/apps/showcases/PhaseFieldAllenCahn/CMakeLists.txt +++ b/apps/showcases/PhaseFieldAllenCahn/CMakeLists.txt @@ -1,6 +1,4 @@ -if ( NOT WALBERLA_BUILD_WITH_CUDA) add_subdirectory( CPU ) -endif() if ( WALBERLA_BUILD_WITH_CUDA) add_subdirectory( GPU ) diff --git a/apps/showcases/PhaseFieldAllenCahn/CPU/CMakeLists.txt b/apps/showcases/PhaseFieldAllenCahn/CPU/CMakeLists.txt index b155b2f5b06877094acf351dfe8cad8fc6d8eac0..0e8f653f7601a82c69862e8631a4b5d033cce38f 100644 --- a/apps/showcases/PhaseFieldAllenCahn/CPU/CMakeLists.txt +++ b/apps/showcases/PhaseFieldAllenCahn/CPU/CMakeLists.txt @@ -13,7 +13,7 @@ waLBerla_generate_target_from_python(NAME PhaseFieldCodeGenCPU stream_hydro.cpp stream_hydro.h GenDefines.h) -waLBerla_add_executable(NAME multiphase +waLBerla_add_executable(NAME multiphaseCPU FILES multiphase.cpp PythonExports.cpp InitializerFunctions.cpp contact.cpp CalculateNormals.cpp multiphase_codegen.py DEPENDS blockforest core field postprocessing lbm geometry timeloop gui PhaseFieldCodeGenCPU) diff --git a/apps/showcases/PhaseFieldAllenCahn/CPU/multiphase_codegen.py b/apps/showcases/PhaseFieldAllenCahn/CPU/multiphase_codegen.py index 2175114e8eaf544f87609642570c026395269d33..497e00299d059134feb49a845850daf05e3463fb 100644 --- a/apps/showcases/PhaseFieldAllenCahn/CPU/multiphase_codegen.py +++ b/apps/showcases/PhaseFieldAllenCahn/CPU/multiphase_codegen.py @@ -164,24 +164,24 @@ with CodeGeneration() as ctx: if not ctx.optimize_for_localhost: cpu_vec = {'instruction_set': None} - generate_sweep(ctx, 'initialize_phase_field_distributions', h_updates) - generate_sweep(ctx, 'initialize_velocity_based_distributions', g_updates) + generate_sweep(ctx, 'initialize_phase_field_distributions', h_updates, target='cpu') + generate_sweep(ctx, 'initialize_velocity_based_distributions', g_updates, target='cpu') generate_sweep(ctx, 'phase_field_LB_step', phase_field_LB_step, field_swaps=[(h, h_tmp)], inner_outer_split=True, - cpu_vectorize_info=cpu_vec) - generate_boundary(ctx, 'phase_field_LB_NoSlip', NoSlip(), method_phase) + cpu_vectorize_info=cpu_vec, target='cpu') + generate_boundary(ctx, 'phase_field_LB_NoSlip', NoSlip(), method_phase, target='cpu') generate_sweep(ctx, 'hydro_LB_step', hydro_LB_step, inner_outer_split=True, - cpu_vectorize_info=cpu_vec) - generate_boundary(ctx, 'hydro_LB_NoSlip', NoSlip(), method_hydro) + cpu_vectorize_info=cpu_vec, target='cpu') + generate_boundary(ctx, 'hydro_LB_NoSlip', NoSlip(), method_hydro, target='cpu') generate_sweep(ctx, 'stream_hydro', stream_hydro, field_swaps=[(g, g_tmp)], inner_outer_split=True, - cpu_vectorize_info=cpu_vec) + cpu_vectorize_info=cpu_vec, target='cpu') ctx.write_file("GenDefines.h", info_header) diff --git a/apps/showcases/PhaseFieldAllenCahn/GPU/CMakeLists.txt b/apps/showcases/PhaseFieldAllenCahn/GPU/CMakeLists.txt index e2982ff9355663358789d257de9d679c3264e098..c65a87749aee1bfe721d738b1cb7aac751c29648 100644 --- a/apps/showcases/PhaseFieldAllenCahn/GPU/CMakeLists.txt +++ b/apps/showcases/PhaseFieldAllenCahn/GPU/CMakeLists.txt @@ -16,7 +16,7 @@ waLBerla_generate_target_from_python(NAME PhaseFieldCodeGenGPU PackInfo_velocity_based_distributions.cu PackInfo_velocity_based_distributions.h GenDefines.h) -waLBerla_add_executable(NAME multiphase +waLBerla_add_executable(NAME multiphaseGPU FILES multiphase.cpp PythonExports.cpp InitializerFunctions.cpp CalculateNormals.cpp contact.cu multiphase_codegen.py DEPENDS blockforest core cuda field postprocessing lbm geometry timeloop gui PhaseFieldCodeGenGPU)