Change velocity field to array
Merge branch 'ChangeVelocityFieldToArray'