Multiply by ypct in the computation of average value rather than modifying surface-specific quantity. This way, the surface-specific quantity keeps the same meaning throughout the procedure.