Fix a typo in merge_constraints. Add a get_distance_function for irregular shaped domains.
Some more work on the Orkney steady case.

--HG--
rename : examples/orkney_steady/orkney_steady.py => examples/orkney_steady/sw.py
merge from trunk