CFD:fixed the bug, some polishing still required