Non rigid registration of shapes via diffeomorphic point matching and clustering