Refactored _advect_field() to reduce complexity and remove risk of mismatching conditions / coordinates.
Refactored _advect_field() to reduce complexity and remove risk of mismatching conditions / coordinates.

fionaRust/improver,fionaRust/improver,metoppv/improver,metoppv/improver