reorganize some code, TO DO:
1. fix CPDI 3D bug
2. fix CPDI2 2D bug
Merge branch 'master' of https://github.com/FeiZhu/Physika