Fix Integrate
Merge branch 'master' of https://github.com/cider-team-mercury/mercury
Added to layer conduction model and realistic heating