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 7646 for trunk/NEMOGCM/CONFIG/C1D_PAPA – NEMO

Ignore:
Timestamp:
2017-02-06T10:25:03+01:00 (7 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/C1D_PAPA/EXP00/namelist_cfg

    r6489 r7646  
    1818   cp_cfg      =  "papa"                 !  name of the configuration 
    1919   jp_cfg      =       1                 !  resolution of the configuration 
    20    jpidta      =       3                 !  1st lateral dimension ( >= jpi ) = 30*jp_cfg+2 
    21    jpjdta      =       3                 !  2nd    "         "    ( >= jpj ) = 20*jp_cfg+2  
    22    jpkdta      =      75                 !  number of levels      ( >= jpk ) 
    23    jpiglo      =       3                 !  1st dimension of global domain --> i  = jpidta 
    24    jpjglo      =       3                 !  2nd    -                  -    --> j  = jpjdta 
    25    jpizoom     =       1                 !  left bottom (i,j) indices of the zoom 
    26    jpjzoom     =       1                 !  in data domain indices 
     20!   jpidta      =       3                 !  1st lateral dimension ( >= jpi ) = 30*jp_cfg+2 
     21!   jpjdta      =       3                 !  2nd    "         "    ( >= jpj ) = 20*jp_cfg+2  
     22!   jpkdta      =      75                 !  number of levels      ( >= jpk ) 
     23!   jpiglo      =       3                 !  1st dimension of global domain --> i  = jpidta 
     24!   jpjglo      =       3                 !  2nd    -                  -    --> j  = jpjdta 
    2725   jperio      =       0                 !  lateral cond. type (between 0 and 6) 
    2826/ 
    … …  
    4341   nn_msh      =    0      !  create (=1) a mesh file or not (=0) 
    4442   rn_rdt      =  360.     !  time step for the dynamics  
    45    jphgr_msh   =       1                 !  type of horizontal mesh 
    4643   ppglam0     =    -150.0               !  longitude of first raw and column T-point (jphgr_msh = 1) 
    4744   ppgphi0     =      50.0               ! latitude  of first raw and column T-point (jphgr_msh = 1) 
    … …  
    9592/ 
    9693!----------------------------------------------------------------------- 
    97 &namsbc_ana    !   analytical surface boundary condition 
    98 !----------------------------------------------------------------------- 
    99 / 
    100 !----------------------------------------------------------------------- 
    10194&namsbc_flx    !   surface boundary condition : flux formulation 
    10295!----------------------------------------------------------------------- 
    10396/ 
    10497!----------------------------------------------------------------------- 
    105 &namsbc_clio   !   namsbc_clio  CLIO bulk formulae 
    106 !----------------------------------------------------------------------- 
    107 / 
    108 !----------------------------------------------------------------------- 
    109 &namsbc_core   !   namsbc_core  CORE bulk formulae 
     98&namsbc_blk   !   namsbc_blk  generic Bulk formula                      (ln_blk = T) 
    11099!----------------------------------------------------------------------- 
    111100!              !  file name  ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask ! 
    … …  
    119108   sn_prec     = 'forcing_PAPASTATION_1h' ,         1         , 'prec'    ,   .false.    , .false. , 'yearly' , '' , '', '' 
    120109   sn_snow     = 'forcing_PAPASTATION_1h' ,         1         , 'snow'    ,   .false.    , .false. , 'yearly' , '' , '', '' 
    121    rn_zqt      =  2.    !  air temperature and humidity referenced at 2m (T) instead 10m (F) 
    122 / 
    123 !----------------------------------------------------------------------- 
    124 &namsbc_mfs   !   namsbc_mfs  MFS bulk formulae 
    125 !----------------------------------------------------------------------- 
     110   sn_slp      = 'slp.15JUNE2009_fill'        ,         6         , 'SLP',        .false.    , .true. , 'yearly'  , 'weights_core_orca2_bilinear_noc.nc'  , ''       , '' 
     111 
     112   nn_bulk_algo = 1        !  Bulk algorithm to use to compute bulk transfer coefficients Cd, Ce and Ch 
     113                           !  1 => "NCAR" algorithm        (Large and Yeager, 2008) 
     114                           !  2 => "COARE 3.0" algorithm   (Fairall et al 2003) 
     115                           !  3 => "ECMWF" algorithm       (IFS cycle 31) 
     116                           !  4 => "COARE 3.5" algorithm   (Edson et al 2013) 
     117 
     118   rn_zqt      =  2.       !  Air temperature and humidity reference height (m) 
    126119/ 
    127120!----------------------------------------------------------------------- 
    … …  
    174167/ 
    175168!----------------------------------------------------------------------- 
    176 &nam_tide      !    tide parameters (#ifdef key_tide) 
    177 !----------------------------------------------------------------------- 
    178 / 
    179 !----------------------------------------------------------------------- 
    180 &nambdy        !  unstructured open boundaries                          ("key_bdy") 
    181 !----------------------------------------------------------------------- 
    182 / 
    183 !----------------------------------------------------------------------- 
    184 &nambdy_dta      !  open boundaries - external data           ("key_bdy") 
     169&nam_tide      !    tide parameters 
     170!----------------------------------------------------------------------- 
     171/ 
     172!----------------------------------------------------------------------- 
     173&nambdy        !  unstructured open boundaries                           
     174!----------------------------------------------------------------------- 
     175/ 
     176!----------------------------------------------------------------------- 
     177&nambdy_dta      !  open boundaries - external data            
    185178!----------------------------------------------------------------------- 
    186179/ 
Note: See TracChangeset for help on using the changeset viewer.