Two-dimensional advection around an annulus

On a mapped grid, as specified in mapc2p.f and mapc2p.py.