1. fix CPDI2 dirichlet particle move bug
2. remove modified CPDI2