Ignore:
Timestamp:
2020-02-12T15:39:06+01:00 (15 months ago)
Author:
acc
Message:

The big one. Merging all 2019 developments from the option 1 branch back onto the trunk.

This changeset reproduces 2019/dev_r11943_MERGE_2019 on the trunk using a 2-URL merge
onto a working copy of the trunk. I.e.:

svn merge —ignore-ancestry \

svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/trunk \
svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/branches/2019/dev_r11943_MERGE_2019 ./

The —ignore-ancestry flag avoids problems that may otherwise arise from the fact that
the merge history been trunk and branch may have been applied in a different order but
care has been taken before this step to ensure that all applicable fixes and updates
are present in the merge branch.

The trunk state just before this step has been branched to releases/release-4.0-HEAD
and that branch has been immediately tagged as releases/release-4.0.2. Any fixes
or additions in response to tickets on 4.0, 4.0.1 or 4.0.2 should be done on
releases/release-4.0-HEAD. From now on future 'point' releases (e.g. 4.0.2) will
remain unchanged with periodic releases as needs demand. Note release-4.0-HEAD is a
transitional naming convention. Future full releases, say 4.2, will have a release-4.2
branch which fulfills this role and the first point release (e.g. 4.2.0) will be made
immediately following the release branch creation.

2020 developments can be started from any trunk revision later than this one.

Location:
NEMO/trunk
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk

    • Property svn:externals
      •  

        old new  
        33^/utils/build/mk@HEAD         mk 
        44^/utils/tools@HEAD            tools 
        5 ^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
         5^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
        77^/vendors/IOIPSL@HEAD         ext/IOIPSL 
  • NEMO/trunk/doc/namelists/namctl

    r10601 r12377  
    22&namctl        !   Control prints                                       (default: OFF) 
    33!----------------------------------------------------------------------- 
    4    ln_ctl = .FALSE.                 ! Toggle all report printing on/off (T/F); Ignored if sn_cfctl%l_config is T 
     4   sn_cfctl%l_glochk = .FALSE.    ! Range sanity checks are local (F) or global (T). Set T for debugging only 
     5   sn_cfctl%l_allon  = .FALSE.    ! IF T activate all options. If F deactivate all unless l_config is T 
    56     sn_cfctl%l_config = .TRUE.     ! IF .true. then control which reports are written with the following 
    67       sn_cfctl%l_runstat = .FALSE. ! switches and which areas produce reports with the proc integer settings. 
     
    89       sn_cfctl%l_oceout  = .FALSE. ! that  all areas report. 
    910       sn_cfctl%l_layout  = .FALSE. ! 
    10        sn_cfctl%l_mppout  = .FALSE. ! 
    11        sn_cfctl%l_mpptop  = .FALSE. ! 
     11       sn_cfctl%l_prtctl  = .FALSE. ! 
     12       sn_cfctl%l_prttrc  = .FALSE. ! 
     13       sn_cfctl%l_oasout  = .FALSE. ! 
    1214       sn_cfctl%procmin   = 0       ! Minimum area number for reporting [default:0] 
    1315       sn_cfctl%procmax   = 1000000 ! Maximum area number for reporting [default:1000000] 
  • NEMO/trunk/doc/namelists/namsbc_blk

    r11703 r12377  
    11!----------------------------------------------------------------------- 
    2 &namsbc_blk    !   namsbc_blk  generic Bulk formula                     (ln_blk =T) 
     2&namsbc_blk    !   namsbc_blk  generic Bulk formula          (ln_blk =T) 
    33!----------------------------------------------------------------------- 
    44   !                    !  bulk algorithm : 
    5    ln_NCAR     = .false.   ! "NCAR"      algorithm   (Large and Yeager 2008) 
     5   ln_NCAR      = .true.    ! "NCAR"      algorithm   (Large and Yeager 2008) 
    66   ln_COARE_3p0 = .false.   ! "COARE 3.0" algorithm   (Fairall et al. 2003) 
    7    ln_COARE_3p5 = .false.   ! "COARE 3.5" algorithm   (Edson et al. 2013) 
    8    ln_ECMWF    = .false.   ! "ECMWF"     algorithm   (IFS cycle 31) 
     7   ln_COARE_3p6 = .false.   ! "COARE 3.6" algorithm   (Edson et al. 2013) 
     8   ln_ECMWF     = .false.   ! "ECMWF"     algorithm   (IFS cycle 45r1) 
    99      ! 
    10       rn_zqt      = 10.       !  Air temperature & humidity reference height (m) 
    11       rn_zu       = 10.       !  Wind vector reference height (m) 
    12       ln_Cd_L12   = .false.   !  air-ice drags = F(ice concentration) (Lupkes et al. 2012) 
    13       ln_Cd_L15   = .false.   !  air-ice drags = F(ice concentration) (Lupkes et al. 2015) 
    14       ln_taudif   = .false.   !  HF tau contribution: use "mean of stress module - module of the mean stress" data 
    15       rn_pfac     = 1.        !  multiplicative factor for precipitation (total & snow) 
    16       rn_efac     = 1.        !  multiplicative factor for evaporation (0. or 1.) 
    17       rn_vfac     = 0.        !  multiplicative factor for ocean & ice velocity used to 
    18       !                       !  calculate the wind stress (0.=absolute or 1.=relative winds) 
    19  
     10      rn_zqt     = 10.      !  Air temperature & humidity reference height (m) 
     11      rn_zu      = 10.      !  Wind vector reference height (m) 
     12      ln_Cd_L12  = .false.  !  air-ice drags = F(ice conc.) (Lupkes et al. 2012) 
     13      ln_Cd_L15  = .false.  !  air-ice drags = F(ice conc.) (Lupkes et al. 2015) 
     14      !                     !  - module of the mean stress" data 
     15      rn_pfac    = 1.       !  multipl. factor for precipitation (total & snow) 
     16      rn_efac    = 1.       !  multipl. factor for evaporation (0. or 1.) 
     17      rn_vfac    = 0.       !  multipl. factor for ocean & ice velocity  
     18      !                     !  used to calculate the wind stress 
     19      !                     ! (0. => absolute or 1. => relative winds) 
     20      ln_skin_cs = .false.  !  use the cool-skin parameterization 
     21      ln_skin_wl = .false.  !  use the warm-layer parameterization 
     22      !                     !   ==> only available in ECMWF and COARE algorithms 
     23      ln_humi_sph = .true.  !  humidity "sn_humi" is specific humidity  [kg/kg] 
     24      ln_humi_dpt = .false. !  humidity "sn_humi" is dew-point temperature [K] 
     25      ln_humi_rlh = .false. !  humidity "sn_humi" is relative humidity     [%] 
     26   ! 
    2027   cn_dir      = './'      !  root directory for the bulk data location 
    2128   !___________!_________________________!___________________!___________!_____________!________!___________!______________________________________!__________!_______________! 
     
    2835   sn_tair     = 't_10.15JUNE2009_fill'       ,    6.        , 'T_10_MOD',   .false.   , .true. , 'yearly'  , 'weights_core_orca2_bilinear_noc.nc' , ''       , '' 
    2936   sn_humi     = 'q_10.15JUNE2009_fill'       ,    6.        , 'Q_10_MOD',   .false.   , .true. , 'yearly'  , 'weights_core_orca2_bilinear_noc.nc' , ''       , '' 
     37   sn_hpgi     = 'NONE'                       ,   24.        , 'uhpg'    ,   .false.   , .false., 'monthly' , 'weights_ERAI3D_F128_2_ORCA2_bicubic', 'UG'     , '' 
     38   sn_hpgj     = 'NONE'                       ,   24.        , 'vhpg'    ,   .false.   , .false., 'monthly' , 'weights_ERAI3D_F128_2_ORCA2_bicubic', 'VG'     , '' 
    3039   sn_prec     = 'ncar_precip.15JUNE2009_fill',   -1.        , 'PRC_MOD1',   .false.   , .true. , 'yearly'  , 'weights_core_orca2_bilinear_noc.nc' , ''       , '' 
    3140   sn_snow     = 'ncar_precip.15JUNE2009_fill',   -1.        , 'SNOW'    ,   .false.   , .true. , 'yearly'  , 'weights_core_orca2_bilinear_noc.nc' , ''       , '' 
    3241   sn_slp      = 'slp.15JUNE2009_fill'        ,    6.        , 'SLP'     ,   .false.   , .true. , 'yearly'  , 'weights_core_orca2_bilinear_noc.nc' , ''       , '' 
    33    sn_tdif     = 'taudif_core'                ,   24         , 'taudif'  ,   .false.   , .true. , 'yearly'  , 'weights_core_orca2_bilinear_noc.nc' , ''       , '' 
    3442/ 
Note: See TracChangeset for help on using the changeset viewer.