A new model of shoaling and breaking waves. Part 2. Run-up and two-dimensional waves | Publicación