Revised solar collector models.