rewritten MaterialHeatAux and Convection Aux/Kernels to better model coolant