Merge branch '29-zdftke-and-zdfgls-nn_ice-0' into 'branch_4.2'

Ice thickness dependent roughness in GLS and TKE

See merge request !49 (merged)

(cherry picked from commit 7c412688)

79aab267 Ice thickness dependent roughness in GLS and TKE

Closes #33 (closed)