Skip to content
Snippets Groups Projects
Commit bd3c984f authored by Martin Schönherr's avatar Martin Schönherr :speech_balloon:
Browse files

Merge branch 'develop' into RefactorParameter

# Conflicts:
#	apps/gpu/WTG_RUB/WTG_RUB.cpp
#	src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/BGKPlus/BGKPlusCompSP27.cu
#	src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantAll4/CumulantAll4CompSP27.cu
#	src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/CumulantK17CompChim.cu
#	src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/Cumulant1hSP27/Cumulant1hIncompSP27.cu
parents 147ac7fe 42f7a35e
No related branches found
No related tags found
1 merge request!256Kernel names changed
Showing
with 82 additions and 54 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment