Reordering calculations in project

Moving calculation of e earlier, so that it can be used in calculation
of starvation mortality.