Redesigned model to allow CFD implementation.

This revision added the changes needed to separate convection and radiation.