A Groundwater and Runoff Formulation for Weather and Climate Models