changed flux calculation to be based on energy total rather than enthalpy total.  this will account for potential energy better if I ever add it to the 1D case