energies-13-00825-v2.pdf