Bug fixes in patch/cohort fusion

Bug 1 was creating infiniti's when dividing by extremely low patch areas, fixed.
Bug 2 was enabling fusion mean diagnostic variables during patch fusion when it was not appropriate (i.e. when those variables were not non-zero.  In some cases we used simple thermodynamics to update various quantities and was creating model crashes.