#1473. Temporary development branch to improve performance/simplification and orthogonality of the ice shelf code with the other parts of the code.