Added calculation of cell centroids and face areas.