New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 12377 for NEMO/trunk/cfgs/ORCA2_SAS_ICE – NEMO

Ignore:
Timestamp:
2020-02-12T15:39:06+01:00 (4 years 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:
2 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/cfgs/ORCA2_SAS_ICE/EXPREF/namelist_cfg

    r12206 r12377  
    6464&namsbc_blk   !   namsbc_blk  generic Bulk formula                      (ln_blk =T) 
    6565!----------------------------------------------------------------------- 
    66    ln_NCAR     = .true.   ! "NCAR"      algorithm   (Large and Yeager 2008) 
    67  
     66   !                    !  bulk algorithm : 
     67   ln_NCAR      = .true.    ! "NCAR"      algorithm   (Large and Yeager 2008) 
     68   ln_COARE_3p0 = .false.   ! "COARE 3.0" algorithm   (Fairall et al. 2003) 
     69   ln_COARE_3p6 = .false.   ! "COARE 3.6" algorithm   (Edson et al. 2013) 
     70   ln_ECMWF     = .false.   ! "ECMWF"     algorithm   (IFS cycle 31) 
     71      ! 
     72      rn_zqt      = 10.       !  Air temperature & humidity reference height (m) 
     73      rn_zu       = 10.       !  Wind vector reference height (m) 
     74      ln_Cd_L12   = .false.   !  air-ice drags = F(ice concentration) (Lupkes et al. 2012) 
     75      ln_Cd_L15   = .false.   !  air-ice drags = F(ice concentration) (Lupkes et al. 2015) 
     76      rn_pfac     = 1.        !  multiplicative factor for precipitation (total & snow) 
     77      rn_efac     = 1.        !  multiplicative factor for evaporation (0. or 1.) 
     78      rn_vfac     = 0.        !  multiplicative factor for ocean & ice velocity used to 
     79      !                       !  calculate the wind stress (0.=absolute or 1.=relative winds) 
     80      ln_skin_cs = .false.  !  use the cool-skin parameterization (only available in ECMWF and COARE algorithms) !LB 
     81      ln_skin_wl = .false.  !  use the warm-layer        "               "                    " 
     82      ! 
     83      ln_humi_sph = .true.     !  humidity specified below in "sn_humi" is specific humidity     [kg/kg] if .true. 
     84      ln_humi_dpt = .false.    !  humidity specified below in "sn_humi" is dew-point temperature   [K]   if .true. 
     85      ln_humi_rlh = .false.    !  humidity specified below in "sn_humi" is relative humidity       [%]   if .true. 
     86   ! 
    6887   cn_dir      = './'      !  root directory for the bulk data location 
    6988   !___________!_________________________!___________________!___________!_____________!________!___________!______________________________________!__________!_______________! 
     
    7998   sn_snow     = 'ncar_precip.15JUNE2009_fill',   -1.        , 'SNOW'    ,   .false.   , .true. , 'yearly'  , 'weights_core_orca2_bilinear_noc.nc' , ''       , '' 
    8099   sn_slp      = 'slp.15JUNE2009_fill'        ,    6.        , 'SLP'     ,   .false.   , .true. , 'yearly'  , 'weights_core_orca2_bilinear_noc.nc' , ''       , '' 
    81    sn_tdif     = 'taudif_core'                ,   24.        , 'taudif'  ,   .false.   , .true. , 'yearly'  , 'weights_core_orca2_bilinear_noc.nc' , ''       , '' 
    82100/ 
    83101!----------------------------------------------------------------------- 
     
    178196!!   namdiu       Cool skin and warm layer models                       (default: OFF) 
    179197!!   namflo       float parameters                                      (default: OFF) 
    180 !!   nam_diaharm  Harmonic analysis of tidal constituents               (default: OFF) 
    181198!!   nam_diadct   transports through some sections                      (default: OFF) 
    182199!!   nam_dia25h   25h Mean Output                                       (default: OFF) 
Note: See TracChangeset for help on using the changeset viewer.