On the Roll Motion of a Ship with Partially Filled Unbaffled and Baffled Tanks: Part 2: Numerical and Experimental Analysis