implementation of gradient upper condition
Merge branch 'master' into resistive

Conflicts:
	boundary_parker.f90