Simulations of ion velocity distribution functions taking into account both elastic and charge exchange collisions