Add z-pinch geometry

[HanneThienpondt]

When the geometry clean-up has been debugged I will include the z-pinch into it. I added Michael Barnes as an assignee just so you will receive an email when the merge has been completed. We should also add some automated tests to check the z-pinch.