Ignore:
Timestamp:
2020-06-26T10:26:32+02:00 (7 weeks ago)
Author:
gsamson
Message:

merge trunk@r13136 into ASINTER-06 branch; pass all SETTE tests; results identical to trunk@r13136; ticket #2419

Location:
NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement

    • Property svn:externals
      •  

        old new  
        88 
        99# SETTE 
        10 ^/utils/CI/sette@HEAD         sette 
         10^/utils/CI/sette@12931        sette 
  • NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement/cfgs/SHARED/namelist_ref

    r12749 r13159  
    259259!----------------------------------------------------------------------- 
    260260   !                    !  bulk algorithm : 
    261    ln_NCAR      = .false.   ! "NCAR"      algorithm   (Large and Yeager 2008) 
     261   ln_NCAR      = .true.    ! "NCAR"      algorithm   (Large and Yeager 2008) 
    262262   ln_COARE_3p0 = .false.   ! "COARE 3.0" algorithm   (Fairall et al. 2003) 
    263263   ln_COARE_3p6 = .false.   ! "COARE 3.6" algorithm   (Edson et al. 2013) 
     
    271271      rn_pfac    = 1.       !  multipl. factor for precipitation (total & snow) 
    272272      rn_efac    = 1.       !  multipl. factor for evaporation (0. or 1.) 
    273       rn_vfac    = 1.       !  multipl. factor for ocean & ice velocity 
     273      rn_vfac    = 0.       !  multipl. factor for ocean & ice velocity 
    274274      !                     !  used to calculate the wind stress 
    275275      !                     ! (0. => absolute or 1. => relative winds) 
     
    277277      ln_skin_wl = .false.  !  use the warm-layer parameterization 
    278278      !                     !   ==> only available in ECMWF and COARE algorithms 
    279       ln_humi_sph = .false. !  humidity "sn_humi" is specific humidity  [kg/kg] 
     279      ln_humi_sph = .true. !  humidity "sn_humi" is specific humidity  [kg/kg] 
    280280      ln_humi_dpt = .false. !  humidity "sn_humi" is dew-point temperature [K] 
    281281      ln_humi_rlh = .false. !  humidity "sn_humi" is relative humidity     [%] 
     
    11381138   !                       !                 = 3 as =2 with distinct dissipative an mixing length scale 
    11391139   ln_mxl0     = .true.    !  surface mixing length scale = F(wind stress) (T) or not (F) 
     1140      nn_mxlice    = 0        ! type of scaling under sea-ice 
     1141                              !    = 0 no scaling under sea-ice 
     1142                              !    = 1 scaling with constant sea-ice thickness 
     1143                              !    = 2  scaling with mean sea-ice thickness ( only with SI3 sea-ice model ) 
     1144                              !    = 3  scaling with maximum sea-ice thickness 
     1145      rn_mxlice   = 10.       ! max constant ice thickness value when scaling under sea-ice ( nn_mxlice=1) 
    11401146   rn_mxl0     =   0.04    !  surface  buoyancy lenght scale minimum value 
    11411147   ln_drg      = .false.   !  top/bottom friction added as boundary condition of TKE 
     
    13981404&namctl        !   Control prints                                       (default: OFF) 
    13991405!----------------------------------------------------------------------- 
    1400    sn_cfctl%l_glochk = .FALSE.    ! Range sanity checks are local (F) or global (T). Set T for debugging only 
    1401    sn_cfctl%l_allon  = .FALSE.    ! IF T activate all options. If F deactivate all unless l_config is T 
    1402      sn_cfctl%l_config = .TRUE.     ! IF .true. then control which reports are written with the following 
    1403        sn_cfctl%l_runstat = .TRUE.  ! switches and which areas produce reports with the proc integer settings. 
    1404        sn_cfctl%l_trcstat = .FALSE. ! The default settings for the proc integers should ensure 
    1405        sn_cfctl%l_oceout  = .FALSE. ! that  all areas report. 
    1406        sn_cfctl%l_layout  = .FALSE. ! 
    1407        sn_cfctl%l_prtctl  = .FALSE. ! 
    1408        sn_cfctl%l_prttrc  = .FALSE. ! 
    1409        sn_cfctl%l_oasout  = .FALSE. ! 
    1410        sn_cfctl%procmin   = 0       ! Minimum area number for reporting [default:0] 
    1411        sn_cfctl%procmax   = 1000000 ! Maximum area number for reporting [default:1000000] 
    1412        sn_cfctl%procincr  = 1       ! Increment for optional subsetting of areas [default:1] 
    1413        sn_cfctl%ptimincr  = 1       ! Timestep increment for writing time step progress info 
    1414    nn_print    =    0      !  level of print (0 no extra print) 
    1415    nn_ictls    =    0      !  start i indice of control sum (use to compare mono versus 
    1416    nn_ictle    =    0      !  end   i indice of control sum        multi processor runs 
    1417    nn_jctls    =    0      !  start j indice of control               over a subdomain) 
    1418    nn_jctle    =    0      !  end   j indice of control 
    1419    nn_isplt    =    1      !  number of processors in i-direction 
    1420    nn_jsplt    =    1      !  number of processors in j-direction 
    1421    ln_timing   = .false.   !  timing by routine write out in timing.output file 
    1422    ln_diacfl   = .false.   !  CFL diagnostics write out in cfl_diagnostics.ascii 
     1406   sn_cfctl%l_runstat = .TRUE.    ! switches and which areas produce reports with the proc integer settings. 
     1407   sn_cfctl%l_trcstat = .FALSE.   ! The default settings for the proc integers should ensure 
     1408   sn_cfctl%l_oceout  = .FALSE.   ! that  all areas report. 
     1409   sn_cfctl%l_layout  = .FALSE.   ! 
     1410   sn_cfctl%l_prtctl  = .FALSE.   ! 
     1411   sn_cfctl%l_prttrc  = .FALSE.   ! 
     1412   sn_cfctl%l_oasout  = .FALSE.   ! 
     1413   sn_cfctl%procmin   = 0         ! Minimum area number for reporting [default:0] 
     1414   sn_cfctl%procmax   = 1000000   ! Maximum area number for reporting [default:1000000] 
     1415   sn_cfctl%procincr  = 1         ! Increment for optional subsetting of areas [default:1] 
     1416   sn_cfctl%ptimincr  = 1         ! Timestep increment for writing time step progress info 
     1417   nn_print    =    0             !  level of print (0 no extra print) 
     1418   nn_ictls    =    0             !  start i indice of control sum (use to compare mono versus 
     1419   nn_ictle    =    0             !  end   i indice of control sum        multi processor runs 
     1420   nn_jctls    =    0             !  start j indice of control               over a subdomain) 
     1421   nn_jctle    =    0             !  end   j indice of control 
     1422   nn_isplt    =    1             !  number of processors in i-direction 
     1423   nn_jsplt    =    1             !  number of processors in j-direction 
     1424   ln_timing   = .false.          !  timing by routine write out in timing.output file 
     1425   ln_diacfl   = .false.          !  CFL diagnostics write out in cfl_diagnostics.ascii 
    14231426/ 
    14241427!----------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.