introduced identical and consistent options computing inner energy in function or base properties. Note that results still differ. 

git-svn-id: https://svn.modelica.org/projects/Modelica/trunk@6828 7ce873d0-865f-4ce7-a662-4bb36ea78beb