Converted the basic water simulations into multi-pass, to prepare for more complicated water sim algorithms that needs multiple synchronizations