Modified the shallow water model to use the built-in non-linear solver in Firedrake. Also updated the tests accordingly.