changed variable names, ready for implementation of inlet outlet bc
bug fix: dirichlet, neumann, wall and neighbour bc implemented