1. Paul Scherrer Institut, General Energy Research Department, LEM, CH-5232 Villigen PSI, Switzerland, and Swiss Federal Institute of Technology at Lausanne, School of Architecture, Civil and Environmental Engineering, ISTE, CH-1015 Lausanne, Switzerland