And the correct switch name for cross...
Merge branch 'chiel' of https://github.com/microhh/microhh into chiel

Conflicts:
	doc/input.tex