renamed energy functions (no longer energy per domain) and removed block comment of old code from config.h