added new argument in calling macro
fixed bug. cannot use arrays with && and ||
various cahnges to calculation and added litter pool
bug fix
moved class 52 into forest type