Take more direct clipping of GeoClaw rpn2