src/lbm/constants/D3Q27.h · e1370a41f7a4d0083b9534f233221a8c2de26c42 · iRMB / VirtualFluids

2 years ago

Merge branch 'develop' of https://git.rz.tu-bs.de/irmb/VirtualFluids_dev into develop · 1cd93f7f

Kutscher authored 2 years ago

# Conflicts:
#	CMake/cmake_config_files/BOMBADIL.config.cmake
#	src/cpu/VirtualFluidsCore/CMakeLists.txt
#	src/cpu/VirtualFluidsCore/LBM/D3Q27System.h
#	src/lbm/constants/D3Q27.h

1cd93f7f

History

Merge branch 'develop' of https://git.rz.tu-bs.de/irmb/VirtualFluids_dev into develop

Kutscher authored 2 years ago

# Conflicts:
#	CMake/cmake_config_files/BOMBADIL.config.cmake
#	src/cpu/VirtualFluidsCore/CMakeLists.txt
#	src/cpu/VirtualFluidsCore/LBM/D3Q27System.h
#	src/lbm/constants/D3Q27.h