Zero wave resistance for ships moving in shallow channels at supercritical speeds. Part 2. Improved theory and model experiment