Update edm.r and energy report.Rmd