fix error in energy integration (introduced by splitting e->ebulk+egrad)
text1r: fix Makefile
text1r: rename variables
text1r: add self checking