Clone of energy-material transition model v20

Changes to V19: calculation of energy investments set on base and additional materials, not materials as a fraction of a total