Effects of upstream sharp edge square and diamond cylinders on the FIV of a circular cylinder