change y to z
boundary condition
Merge branch 'convert'

Conflicts:
	initial_jet.f90