Spiral Waves in Circular and Spherical Geometries