SOLAR PLUS STORAGE IN A COMPREHENSIVE ECONOMIC