diff --git a/cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml b/cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml index 87b0d3b2c41627901934387958845a9ac578a9ab..ee852b6043d294582fe869594d56dc18367495c5 100644 --- a/cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml +++ b/cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml @@ -27,7 +27,6 @@ <!-- Files definition --> <file_definition src="./file_def_nemo-oce.xml"/> <!-- NEMO ocean dynamics --> - <file_definition src="./file_def_nemo-ice.xml"/> <!-- NEMO ocean sea ice --> <file_definition src="./file_def_nemo-innerttrc.xml"/> <!-- NEMO ocean inert passive tracer --> <!-- Axis definition --> diff --git a/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg b/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg index fb7cc82244b1e374e61e1f2418b52c68aa5c4b0f..0b63dd2e3ffe09a0e6eaaaad18d6350fa8b5eec8 100644 --- a/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg +++ b/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg @@ -85,7 +85,7 @@ ! Type of air-sea fluxes ln_blk = .true. ! Bulk formulation (T => fill namsbc_blk ) ! Sea-ice : - nn_ice = 2 ! =0 no ice boundary condition + nn_ice = 0 ! =0 no ice boundary condition ! ! =1 use observed ice-cover ( => fill namsbc_iif ) ! ! =2 or 3 for SI3 and CICE, respectively ! Misc. options of sbc : @@ -361,6 +361,9 @@ !----------------------------------------------------------------------- &namzdf_tke ! turbulent eddy kinetic dependent vertical diffusion (ln_zdftke =T) !----------------------------------------------------------------------- + ln_mxl0 = .true. ! surface mixing length scale = F(wind stress) (T) or not (F) + nn_mxlice = 0 ! type of scaling under sea-ice + ! ! = 0 no scaling under sea-ice / !!====================================================================== !! *** Diagnostics namelists *** !! diff --git a/src/OCE/SBC/sbcmod.F90 b/src/OCE/SBC/sbcmod.F90 index 12fcf66de2b078cee02db66343c3973a9b21b0e9..86ec97aa162262e15022d46b070d7ea933179bd1 100644 --- a/src/OCE/SBC/sbcmod.F90 +++ b/src/OCE/SBC/sbcmod.F90 @@ -39,6 +39,7 @@ MODULE sbcmod USE sbcice_if ! surface boundary condition: ice-if sea-ice model #if defined key_si3 USE icestp ! surface boundary condition: SI3 sea-ice model + USE ice #endif USE sbcice_cice ! surface boundary condition: CICE sea-ice model USE sbccpl ! surface boundary condition: coupled formulation @@ -325,8 +326,14 @@ CONTAINS IF( ln_apr_dyn ) CALL sbc_apr_init ! Atmo Pressure Forcing initialization ! #if defined key_si3 - IF( lk_agrif .AND. nn_ice == 0 ) THEN ! allocate ice arrays in case agrif + ice-model + no-ice in child grid - IF( sbc_ice_alloc() /= 0 ) CALL ctl_stop('STOP', 'sbc_ice_alloc : unable to allocate arrays' ) + IF( nn_ice == 0 ) THEN +#if defined key_agrif + ! allocate ice arrays in case agrif + ice-model + no-ice in child grid + jpl = 1 ; nlay_i = 1 ; nlay_s = 1 + IF( sbc_ice_alloc() /= 0 ) CALL ctl_stop('STOP', 'sbc_ice_alloc : unable to allocate arrays' ) + CALL Agrif_Declare_Var_ice ! " " " " " Sea ice +#endif + ELSEIF( nn_ice == 2 ) THEN CALL ice_init( Kbb, Kmm, Kaa ) ! ICE initialization ENDIF