Added pump heat calculation

Some restructuring while adding pump heat calculation.