Shanchen

This new commit reverts particle/fluid coupling to the "old" style, for backward compatibility.
In addition, there is a small fix, that corrects some wrong code left by mistake after debug.