On the roll motion of a ship with partially unbaffled and baffled tanks. Part II: numerical and experimental analysis