obstacle -> shape

* cellspacepartition uses Obstacle now, so templating is not required.
* replacing references of Obstacle with Shape