clean code and fix fluid-solid forward simulation

This modification will generate difference results when compared with the old code.