redisgned shallowwater and time stepper