Response of the urban boundary layer to heat addition and surface roughness