shallow_watter updates
shallow_water updated with precondition - merge conflicts fixed