What do you call a scientist who studys the ocean?

A scientist who studies the ocean is called an Oceanographer or a marine scientist.