Incorporating macropore flow into FOCUS PEC models