Freshwater processes for CH and GB have unexpected inputs

The freshwater processes for CH and GB have unexpected inputs. IT affects various processes in GB and CH that have M_WATR as input.