Ignore:
Timestamp:
2017-02-06T10:25:03+01:00 (5 years ago)
Author:
timgraham
Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge —reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/namelist_cfg

    r7212 r7646  
    99   cn_exp      =  "ORCA2"  !  experience name 
    1010   nn_it000    =       1   !  first time step 
    11    nn_itend    =     300   !  last  time step (std 5475) 
    12 / 
    13 !----------------------------------------------------------------------- 
    14 &namcfg        !   parameters of the configuration 
    15 !----------------------------------------------------------------------- 
    16    cp_cfg      =  "orca"               !  name of the configuration 
    17    jp_cfg      =       2               !  resolution of the configuration 
    18    jpidta      =     182               !  1st lateral dimension ( >= jpi ) 
    19    jpjdta      =     149               !  2nd    "         "    ( >= jpj ) 
    20    jpkdta      =      31               !  number of levels      ( >= jpk ) 
    21    jpiglo      =     182               !  1st dimension of global domain --> i =jpidta 
    22    jpjglo      =     149               !  2nd    -                  -    --> j  =jpjdta 
    23    jpizoom     =       1               !  left bottom (i,j) indices of the zoom 
    24    jpjzoom     =       1               !  in data domain indices 
    25    jperio      =       4               !  lateral cond. type (between 0 and 6) 
     11   nn_itend    =    5475   !  last  time step (std 5475) 
     12/ 
     13!----------------------------------------------------------------------- 
     14&namcfg     !   parameters of the configuration 
     15!----------------------------------------------------------------------- 
     16   ln_read_cfg = .true.    !  (=T) read the domain configuration file 
     17      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
     18      cn_domcfg = "ORCA_R2_zps_domcfg"    ! domain configuration filename 
    2619/ 
    2720!----------------------------------------------------------------------- 
     
    3326&namdom        !   space and time domain (bathymetry, mesh, timestep) 
    3427!----------------------------------------------------------------------- 
    35    jphgr_msh   =       0               !  type of horizontal mesh 
    36    ppglam0     =  999999.0             !  longitude of first raw and column T-point (jphgr_msh = 1) 
    37    ppgphi0     =  999999.0             ! latitude  of first raw and column T-point (jphgr_msh = 1) 
    38    ppe1_deg    =  999999.0             !  zonal      grid-spacing (degrees) 
    39    ppe2_deg    =  999999.0             !  meridional grid-spacing (degrees) 
    40    ppe1_m      =  999999.0             !  zonal      grid-spacing (degrees) 
    41    ppe2_m      =  999999.0             !  meridional grid-spacing (degrees) 
    42    ppsur       =   -4762.96143546300   !  ORCA r4, r2 and r05 coefficients 
    43    ppa0        =     255.58049070440   ! (default coefficients) 
    44    ppa1        =     245.58132232490   ! 
    45    ppkth       =      21.43336197938   ! 
    46    ppacr       =       3.0             ! 
    47    ppdzmin     =  999999.              !  Minimum vertical spacing 
    48    pphmax      =  999999.              !  Maximum depth 
    49    ldbletanh   =  .FALSE.              !  Use/do not use double tanf function for vertical coordinates 
    50    ppa2        =  999999.              !  Double tanh function parameters 
    51    ppkth2      =  999999.              ! 
    52    ppacr2      =  999999.              ! 
     28   ln_linssh   = .false.   !  =T  linear free surface  ==>>  model level are fixed in time 
     29   ! 
     30   nn_msh      =    0      !  create (>0) a mesh file or not (=0) 
     31   ! 
    5332/ 
    5433!----------------------------------------------------------------------- 
     
    6443&namsbc        !   Surface Boundary Condition (surface module) 
    6544!----------------------------------------------------------------------- 
    66 / 
    67 !----------------------------------------------------------------------- 
    68 &namsbc_core   !   namsbc_core  CORE bulk formulae 
    69 !----------------------------------------------------------------------- 
     45   ln_blk      = .true.    !  Bulk formulation                          (T => fill namsbc_blk ) 
     46/ 
     47!----------------------------------------------------------------------- 
     48&namsbc_blk   !   namsbc_blk  Bulk formulae 
     49!----------------------------------------------------------------------- 
     50   ln_NCAR     = .true.   ! "NCAR"      algorithm   (Large and Yeager 2008) 
    7051/ 
    7152!----------------------------------------------------------------------- 
     
    200181/ 
    201182!----------------------------------------------------------------------- 
    202 &namtra_dmp    !   tracer: T & S newtonian damping 
     183&namtra_dmp    !   tracer: T & S newtonian damping                      (default: NO) 
    203184!----------------------------------------------------------------------- 
    204185/ 
     
    219200&namdyn_hpg    !   Hydrostatic pressure gradient option 
    220201!----------------------------------------------------------------------- 
    221    ln_hpg_sco  = .true.    !  s-coordinate (standard jacobian formulation) 
    222    ln_hpg_zps  = .false.   !  z-coordinate - partial steps (interpolation) 
     202   ln_hpg_sco  = .true.   !  s-coordinate (standard jacobian formulation) 
    223203/ 
    224204!----------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.