Historical analysis of energy intensity of Spain : from a "conventional view" to an "integrated assesment"