Merge branch...
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
Showing
- cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg 3 additions, 2 deletionscfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg
- cfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg 4 additions, 0 deletionscfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg
- cfgs/AGRIF_DEMO/EXPREF/3_namelist_cfg 4 additions, 0 deletionscfgs/AGRIF_DEMO/EXPREF/3_namelist_cfg
- cfgs/AGRIF_DEMO/EXPREF/namelist_cfg 4 additions, 0 deletionscfgs/AGRIF_DEMO/EXPREF/namelist_cfg
- cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg 4 additions, 0 deletionscfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg
- cfgs/SHARED/namelist_ref 2 additions, 2 deletionscfgs/SHARED/namelist_ref
- cfgs/WED025/EXPREF/namelist_cfg 4 additions, 0 deletionscfgs/WED025/EXPREF/namelist_cfg
- doc/namelists/namzdf_tke 1 addition, 1 deletiondoc/namelists/namzdf_tke
- src/OCE/ZDF/zdfgls.F90 5 additions, 3 deletionssrc/OCE/ZDF/zdfgls.F90
- src/OCE/ZDF/zdftke.F90 4 additions, 2 deletionssrc/OCE/ZDF/zdftke.F90
Loading
Please register or sign in to comment