Geological oceanography, or marine geology, is the study of the geology of the ocean floor including plate tectonics and paleoceanography.
Physical oceanography, or marine physics, studies the ocean's physical attributes including temperature-salinity structure, mixing, surface waves, internal waves, surface tides, internal tides, and currents.