1. - Removed EXPLICIT_ENERGY_EQN compiler flag from Makefile and replaced functionality with 'energy_integration' parameter
2. - Updated many script test files