added subdomains for boundary_val; vtk outputs in main
removed conflicts in main and parallel