added jacobi iteration and gradient subtraction
merged with velocity grid changes