Confusing energy parts with self-consistent D4

[awvwgk]

The D4 energy is currently collected from a selfconsistent, pairwise and a non-selfconsistent, ATM contribution. The selfconsistent part is included in the electronic energy, while the dispersion energy shows both contribution. Therefore, the parts do not add up completely which is confusing.

A better representation for the energy parts is needed accounting for all energy parts.