Merge branch '563-possible-conservation-issue-during-ice-advection' into 'main'

Resolve "possible conservation issue during ice advection"

Closes #563 (closed)

See merge request !740 (merged)

(cherry picked from commit 77b50947)

1e5dc6e2 debug conservation issue with ice advection when cfl>0.5. There is still a... d120472a additions