fixed compiling errors
Merge compiles, but there seems to be a problem in the way the pressure tensor is passed to object in fluid in the GPU case.