Modify 1st-order upwind scheme
Merge branch 'u1'