merge of single-layer energy budget code into trunk. code for supply term effect on stomatal conductance switched off for now