# Conflicts:
# apps/cpu/Applications.cmake
# apps/cpu/ViskomatXL/viskomat.cfg

# Conflicts:
#	apps/cpu/Applications.cmake
#	apps/cpu/ViskomatXL/viskomat.cfg

# Conflicts:
#	apps/cpu/Applications.cmake
#	src/cpu/VirtualFluidsCore/CMakeLists.txt

Corrected stress correction and a different way to implement the force externally from the kernel. Initial conditions for jet.

Conflicts:
	apps/cpu/RisingBubble2D/RisingBubble2D.cpp

Now MultiphasePressureFilterLBMKernel pressure update is also corrected (wrong fiel in previous commit).

corrects pressure update in MultiphaseTwoPhaseFieldsPressureFilterLBMKernel, MultiphasePressureFilterCompressibleAirLBMKernel and MultiphasePressureFilterCompressibleAirLBMKernel. MultiphasePressureFilterCompressibleAirLBMKernel is not yet different from MultiphasePressureFilterCompressibleAirLBMKernel and hence not yet compressible.