During the secondment of ESR5, a numerical wave-flume was implemented in the developed code. The wave-maker uses analytical/theoretical solutions of 2nd and 5th order Stokes waves and 5th order Cnoidal waves. Validation of the numerical wave-flume was performed against a number of test cases (“Propagating Stokes and Cnoidal waves”, “2nd order Standing wave”). In addition, the researcher attended two courses (“Turbulent flows” and “Hydrodynamics of Marine Structures”).