Revised Solar Fan and Envelope

New code from Guilio was inserted to make the calculation of the boolean
intersection and boolean union faster.