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

add missing _wp to geo2ocean.F90

See merge request !52

(cherry picked from commit 18e3f78a)

4832a3ac add missing _wp to geo2ocean.F90

Allow an AGRIF zoom to run without a sea ice model even if the parent does have one.

Closes #30

See merge request nemo/nemo!51

(cherry picked from commit 362370a8)

a4f81f0d Allow an AGRIF zoom to run without ice

Prevent from using nn_mxlice==(2,3) without a sea-ice model (nn_ice==0)

fix run.stat writing logical for monoproc case
force prt_ctl + run.stat flushing when using monoproc

Remove 0.5 factor on zmod, already accounted for in ztx zty

Remove silly change on mbku/mbkv/mbkf at the surface: this is useless
and is not compatible with 1 layer configurations (e.g. SWG and
ICE_AGRIF). Revert changes to namelists in ICE_AGRIF

Fix istate.F90 to avoid access to unallocated arrays in the SWE case. This change enables the SWG configuration to pass SETTE tests

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)