Merging with ner version
syncing with the others
got the correct version of navier_stokes_solver.m