coded step function in shallow_water
merged conflicts resolved