fix energy/dissipation computation
malcolm's routines acted only on the fluid domain, now we compute both entire domain and fluid only