Updates to EnergyPlot.C