Revised solar collector model. Changed control of tank.