Improving and testing in-stream phosphorus cycling in SWAT+