Now exporting energyTypes.
sfModel, cdModel now in place.
Changed to iGDP everywhere (from iY).