Merge branch '29-prevent-from-using-specific-sea-ice-boundary-conditions-in-zdftke-and-zdfgls-if-nn_ice-0-i-e-no' into 'main'

Resolve "Prevent from using specific sea ice boundary conditions in zdftke and zdfgls if nn_ice=0 (i.e. no ice model but key_si3 || key_cice)"

Closes #29

See merge request nemo/nemo!54

(cherry picked from commit 1d65bcb9)

bc83a255  Changed def. opt. for roughness to "no ice" case

Set default surface roughness option for gls and tke to nn_mxlice=0
(instead of 2), i.e. "no ice" case. Switched on the option in reference
configurations that do have sea-ice.

This reverts commit b6f56da1, reversing
changes made to 32318db1.

Guillaume Samson authored 3 years ago and Sebastien Masson committed 3 years ago

new expression to compute air and surface potential temperatures in bulk formulae (old ticket #2632)