Changed calculation of energetics model to be calculated in terms of inn...

...er core mass instead of radius.