Using CFD calculations to improve predictions of ship manoeuvres