Energy research in the 7th framework programme