Ignore:
Timestamp:
2018-11-08T11:48:53+01:00 (2 years ago)
Author:
francesca
Message:

alignment to the current version of the trunk

Location:
NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests
Files:
2 deleted
75 edited
9 copied

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/CANAL/EXPREF/context_nemo.xml

    r9572 r10289  
    3131    <domain_definition src="./domain_def_nemo.xml"/> 
    3232   
    33     <grid_definition>     
    34  
    35         <!--  --> 
    36        <grid id="grid_T_2D" > 
    37          <domain id="grid_T" /> 
    38        </grid> 
    39         <!--  --> 
    40        <grid id="grid_T_3D_ncatice" > 
    41          <domain id="grid_T" /> 
    42          <axis id="ncatice" /> 
    43        </grid> 
    44         <!--  --> 
    45        <grid id="grid_T_3D" > 
    46          <domain id="grid_T" /> 
    47          <axis id="deptht" /> 
    48        </grid> 
    49         <!--  --> 
    50        <grid id="grid_U_2D" > 
    51          <domain id="grid_U" /> 
    52        </grid> 
    53         <!--  --> 
    54        <grid id="grid_U_3D" > 
    55          <domain id="grid_U" /> 
    56          <axis id="depthu" /> 
    57        </grid> 
    58         <!--  --> 
    59        <grid id="grid_V_2D" > 
    60          <domain id="grid_V" /> 
    61        </grid> 
    62         <!--  --> 
    63        <grid id="grid_V_3D" > 
    64          <domain id="grid_V" /> 
    65          <axis id="depthv" /> 
    66        </grid> 
    67         <!--  --> 
    68        <grid id="grid_W_2D" > 
    69          <domain id="grid_W" /> 
    70        </grid> 
    71         <!--  --> 
    72        <grid id="grid_W_3D" > 
    73          <domain id="grid_W" /> 
    74          <axis id="depthw" /> 
    75        </grid> 
    76         <!--  --> 
    77        <grid id="grid_1point" > 
    78          <domain domain_ref="1point"/> 
    79        </grid> 
    80         <!--  --> 
    81        <grid id="grid_T_nfloat" > 
    82          <domain id="grid_T" /> 
    83          <axis id="nfloat" /> 
    84        </grid> 
    85         <!--  --> 
    86        <grid id="grid_EqT" > 
    87          <domain domain_ref="EqT" /> 
    88        </grid> 
    89         <!--  --> 
    90        <grid id="grid_znl_T_2D"> 
    91          <domain id="gznl" /> 
    92        </grid> 
    93         <!--  --> 
    94        <grid id="grid_znl_T_3D"> 
    95          <domain id="gznl" /> 
    96          <axis id="deptht" /> 
    97        </grid> 
    98         <!--  --> 
    99        <grid id="grid_znl_W_3D"> 
    100          <domain id="gznl" /> 
    101          <axis id="depthw" /> 
    102        </grid> 
    103  
    104       <grid id="grid_ptr_T_2D"> 
    105        <domain id="ptr" /> 
    106       </grid> 
    107  
    108       <grid id="grid_ptr_T_3D"> 
    109        <domain id="ptr" /> 
    110          <axis id="deptht" /> 
    111        </grid> 
    112  
    113       <grid id="grid_ptr_W_3D"> 
    114        <domain id="ptr" /> 
    115          <axis id="depthw" /> 
    116       </grid> 
    117  
    118     </grid_definition>    
     33    <grid_definition src="./grid_def_nemo.xml"/> 
    11934 
    12035</context> 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/CANAL/EXPREF/namelist_cfg

    r9718 r10289  
    3131   rn_ppgphi0  =    38.5   !  Reference latitude      [degrees] 
    3232   rn_u10      =      0.   !  10m wind speed              [m/s] 
    33      rn_windszx=   4000.   !  longitudinal wind extension   [km] 
    34      rn_windszy=   4000.   !  latitudinal wind extension    [km] 
     33     rn_windszx =   4000.   !  longitudinal wind extension   [km] 
     34     rn_windszy =   4000.   !  latitudinal wind extension    [km] 
    3535     rn_uofac  =      0.   !  Uoce multiplicative factor (0.:absolute or 1.:relative winds) 
    3636   rn_vtxmax   =      1.   !  initial vortex max current  [m/s] 
    3737   rn_uzonal   =      1.   !  initial zonal current       [m/s] 
    38      rn_ujetszx=   4000.   !  longitudinal jet extension   [km] 
    39      rn_ujetszy=   4000.   !  latitudinal jet extension    [km] 
     38     rn_ujetszx =   4000.   !  longitudinal jet extension   [km] 
     39     rn_ujetszy =   4000.   !  latitudinal jet extension    [km] 
    4040   nn_botcase  =      0    !  bottom definition (0:flat, 1:bump) 
    4141   nn_initcase =      1    !  initial condition case (0:rest, 1:zonal current, 2:current shear, 3: gaussian zonal current, 
     
    182182   ln_dynadv_vec = .false. !  vector form (T) or flux form (F) 
    183183      nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    184    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     184   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    185185   ln_dynadv_ubs = .true.  !  flux form - 3rd order UBS      scheme 
    186186/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/CANAL/MY_SRC/diawri.F90

    • Property svn:keywords set to Id
    r9652 r10289  
    7979#  include "vectopt_loop_substitute.h90" 
    8080   !!---------------------------------------------------------------------- 
    81    !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    82    !! $Id: diawri.F90 9124 2017-12-19 08:26:25Z gm $ 
    83    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     81   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
     82   !! $Id$ 
     83   !! Software governed by the CeCILL license (see ./LICENSE) 
    8484   !!---------------------------------------------------------------------- 
    8585CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/CANAL/MY_SRC/domvvl.F90

    • Property svn:keywords set to Id
    r9403 r10289  
    6464#  include "vectopt_loop_substitute.h90" 
    6565   !!---------------------------------------------------------------------- 
    66    !! NEMO/OPA 3.7 , NEMO-Consortium (2015)  
    67    !! $Id: domvvl.F90 9190 2018-01-06 14:18:23Z gm $ 
    68    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     66   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
     67   !! $Id$ 
     68   !! Software governed by the CeCILL license (see ./LICENSE) 
    6969   !!---------------------------------------------------------------------- 
    7070CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/CANAL/MY_SRC/stpctl.F90

    • Property svn:keywords set to Id
    r9441 r10289  
    3434   INTEGER  ::   idrun, idtime, idssh, idu, ids, istatus 
    3535   !!---------------------------------------------------------------------- 
    36    !! NEMO/OPA 4.0 , NEMO Consortium (2017) 
    37    !! $Id: stpctl.F90 9210 2018-01-11 15:41:21Z gm $ 
    38    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
     36   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
     37   !! $Id$ 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/CANAL/MY_SRC/trazdf.F90

    • Property svn:keywords set to Id
    r9403 r10289  
    3838#  include "vectopt_loop_substitute.h90" 
    3939   !!---------------------------------------------------------------------- 
    40    !! NEMO/OPA 4.0 , NEMO Consortium (2017) 
    41    !! $Id: trazdf.F90 9124 2017-12-19 08:26:25Z gm $ 
    42    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     40   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
     41   !! $Id$ 
     42   !! Software governed by the CeCILL license (see ./LICENSE) 
    4343   !!---------------------------------------------------------------------- 
    4444CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/CANAL/MY_SRC/usrdef_hgr.F90

    • Property svn:keywords set to Id
    r9403 r10289  
    2727 
    2828   !!---------------------------------------------------------------------- 
    29    !! NEMO/OPA 4.0, NEMO Consortium (2016) 
     29   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3030   !! $Id$  
    31    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     31   !! Software governed by the CeCILL license (see ./LICENSE) 
    3232   !!---------------------------------------------------------------------- 
    3333CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/CANAL/MY_SRC/usrdef_istate.F90

    • Property svn:keywords set to Id
    r9412 r10289  
    2929 
    3030   !!---------------------------------------------------------------------- 
    31    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     31   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3232   !! $Id$  
    33    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     33   !! Software governed by the CeCILL license (see ./LICENSE) 
    3434   !!---------------------------------------------------------------------- 
    3535CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/CANAL/MY_SRC/usrdef_nam.F90

    • Property svn:keywords set to Id
    r9403 r10289  
    5252 
    5353   !!---------------------------------------------------------------------- 
    54    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     54   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5555   !! $Id$  
    56    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     56   !! Software governed by the CeCILL license (see ./LICENSE) 
    5757   !!---------------------------------------------------------------------- 
    5858CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/CANAL/MY_SRC/usrdef_sbc.F90

    • Property svn:keywords set to Id
    r9659 r10289  
    3434#  include "vectopt_loop_substitute.h90" 
    3535   !!---------------------------------------------------------------------- 
    36    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     36   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$ 
    38    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/CANAL/MY_SRC/usrdef_zgr.F90

    • Property svn:keywords set to Id
    r9403 r10289  
    3434#  include "vectopt_loop_substitute.h90" 
    3535   !!---------------------------------------------------------------------- 
    36    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     36   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$ 
    38    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS              
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/EXPREF/1_namelist_cfg

    r9794 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44!!               ICEDYN (SAS BIPERIODIC) configuration                !! 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/EXPREF/context_nemo.xml

    r9572 r10289  
    4343    <domain_definition src="./domain_def_nemo.xml"/> 
    4444   
    45     <grid_definition>     
    46  
    47         <!--  --> 
    48        <grid id="grid_T_2D" > 
    49          <domain id="grid_T" /> 
    50        </grid> 
    51         <!--  --> 
    52        <grid id="grid_T_3D_ncatice" > 
    53          <domain id="grid_T" /> 
    54          <axis id="ncatice" /> 
    55        </grid> 
    56         <!--  --> 
    57        <grid id="grid_T_3D" > 
    58          <domain id="grid_T" /> 
    59          <axis id="deptht" /> 
    60        </grid> 
    61         <!--  --> 
    62        <grid id="grid_U_2D" > 
    63          <domain id="grid_U" /> 
    64        </grid> 
    65         <!--  --> 
    66        <grid id="grid_U_3D" > 
    67          <domain id="grid_U" /> 
    68          <axis id="depthu" /> 
    69        </grid> 
    70         <!--  --> 
    71        <grid id="grid_V_2D" > 
    72          <domain id="grid_V" /> 
    73        </grid> 
    74         <!--  --> 
    75        <grid id="grid_V_3D" > 
    76          <domain id="grid_V" /> 
    77          <axis id="depthv" /> 
    78        </grid> 
    79         <!--  --> 
    80        <grid id="grid_W_2D" > 
    81          <domain id="grid_W" /> 
    82        </grid> 
    83         <!--  --> 
    84        <grid id="grid_W_3D" > 
    85          <domain id="grid_W" /> 
    86          <axis id="depthw" /> 
    87        </grid> 
    88         <!--  --> 
    89        <grid id="grid_1point" > 
    90          <domain domain_ref="1point"/> 
    91        </grid> 
    92         <!--  --> 
    93        <grid id="grid_T_nfloat" > 
    94          <domain id="grid_T" /> 
    95          <axis id="nfloat" /> 
    96        </grid> 
    97         <!--  --> 
    98        <grid id="grid_EqT" > 
    99          <domain domain_ref="EqT" /> 
    100        </grid> 
    101         <!--  --> 
    102        <grid id="grid_znl_T_2D"> 
    103          <domain id="gznl" /> 
    104        </grid> 
    105         <!--  --> 
    106        <grid id="grid_znl_T_3D"> 
    107          <domain id="gznl" /> 
    108          <axis id="deptht" /> 
    109        </grid> 
    110         <!--  --> 
    111        <grid id="grid_znl_W_3D"> 
    112          <domain id="gznl" /> 
    113          <axis id="depthw" /> 
    114        </grid> 
    115  
    116       <grid id="grid_ptr_T_2D"> 
    117        <domain id="ptr" /> 
    118       </grid> 
    119  
    120       <grid id="grid_ptr_T_3D"> 
    121        <domain id="ptr" /> 
    122          <axis id="deptht" /> 
    123        </grid> 
    124  
    125       <grid id="grid_ptr_W_3D"> 
    126        <domain id="ptr" /> 
    127          <axis id="depthw" /> 
    128       </grid> 
    129  
    130     </grid_definition>    
     45    <grid_definition src="./grid_def_nemo.xml"/> 
    13146 
    13247</context> 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/EXPREF/namelist_cfg

    r9794 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : overwrite default values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : overwrite default values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44!!               ICEDYN (SAS BIPERIODIC) configuration                !! 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/EXPREF/namelist_ice_cfg

    r9801 r10289  
    9595   sn_tmi = 'initice'                 , -12 ,'tmi'   ,  .false.  , .true., 'yearly'  , '' , '', '' 
    9696   sn_smi = 'initice'                 , -12 ,'smi'   ,  .false.  , .true., 'yearly'  , '' , '', '' 
    97    cn_dir='./' 
     97   cn_dir ='./' 
    9898/ 
    9999!------------------------------------------------------------------------------ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/MY_SRC/usrdef_hgr.F90

    • Property svn:keywords set to Id
    r9794 r10289  
    2727 
    2828   !!---------------------------------------------------------------------- 
    29    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
    30    !! $Id:$  
    31    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     29   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
     30   !! $Id$  
     31   !! Software governed by the CeCILL license (see ./LICENSE) 
    3232   !!---------------------------------------------------------------------- 
    3333CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/MY_SRC/usrdef_nam.F90

    • Property svn:keywords set to Id
    r9794 r10289  
    3434 
    3535   !!---------------------------------------------------------------------- 
    36    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     36   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$  
    38    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 
     
    6161      REAL(wp)::   zlx, zly  ! Local scalars 
    6262      !! 
    63       NAMELIST/namusr_def/ ln_zco, rn_dx, rn_dy, ln_corio, rn_ppgphi0 
     63      NAMELIST/namusr_def/ rn_dx, rn_dy, ln_corio, rn_ppgphi0 
    6464      !!---------------------------------------------------------------------- 
    6565      ! 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/MY_SRC/usrdef_sbc.F90

    • Property svn:keywords set to Id
    r9789 r10289  
    3636#  include "vectopt_loop_substitute.h90" 
    3737   !!---------------------------------------------------------------------- 
    38    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     38   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3939   !! $Id$ 
    40    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     40   !! Software governed by the CeCILL license (see ./LICENSE) 
    4141   !!---------------------------------------------------------------------- 
    4242CONTAINS 
     
    132132      emp_oce  (:,:)   = emp_oce(:,:) - sprecip(:,:) * (1._wp - zsnw(:,:) ) 
    133133      qevap_ice(:,:,:) =   0._wp 
    134       qprec_ice(:,:)   =   rhosn * ( sst_m(:,:) * cpic - lfus ) * tmask(:,:,1) !  in J/m3 
     134      qprec_ice(:,:)   =   rhos * ( sst_m(:,:) * rcpi - rLfus ) * tmask(:,:,1) !  in J/m3 
    135135      qemp_oce (:,:)   = - emp_oce(:,:) * sst_m(:,:) * rcp 
    136       qemp_ice (:,:)   =   sprecip(:,:) * zsnw * ( sst_m(:,:) * cpic - lfus ) * tmask(:,:,1) ! solid precip (only) 
     136      qemp_ice (:,:)   =   sprecip(:,:) * zsnw * ( sst_m(:,:) * rcpi - rLfus ) * tmask(:,:,1) ! solid precip (only) 
    137137 
    138138      ! total fluxes 
     
    146146      ! 
    147147      WHERE    ( phs(:,:,:) <= 0._wp .AND. phi(:,:,:) <  0.1_wp )       ! linear decrease from hi=0 to 10cm   
    148          qsr_ice_tr(:,:,:) = qsr_ice(:,:,:) * ( zfr1 + zfr2 * ( 1._wp - phi(:,:,:) * 10._wp ) ) 
     148         qtr_ice_top(:,:,:) = qsr_ice(:,:,:) * ( zfr1 + zfr2 * ( 1._wp - phi(:,:,:) * 10._wp ) ) 
    149149      ELSEWHERE( phs(:,:,:) <= 0._wp .AND. phi(:,:,:) >= 0.1_wp )       ! constant (zfr1) when hi>10cm 
    150          qsr_ice_tr(:,:,:) = qsr_ice(:,:,:) * zfr1 
     150         qtr_ice_top(:,:,:) = qsr_ice(:,:,:) * zfr1 
    151151      ELSEWHERE                                                         ! zero when hs>0 
    152          qsr_ice_tr(:,:,:) = 0._wp  
     152         qtr_ice_top(:,:,:) = 0._wp  
    153153      END WHERE 
    154154           
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/MY_SRC/usrdef_zgr.F90

    • Property svn:keywords set to Id
    r9789 r10289  
    2828#  include "vectopt_loop_substitute.h90" 
    2929   !!---------------------------------------------------------------------- 
    30    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     30   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3131   !! $Id$ 
    32    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     32   !! Software governed by the CeCILL license (see ./LICENSE) 
    3333   !!---------------------------------------------------------------------- 
    3434CONTAINS              
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ISOMIP/EXPREF/context_nemo.xml

    r9572 r10289  
    3131    <domain_definition src="./domain_def_nemo.xml"/> 
    3232   
    33     <grid_definition>     
    34  
    35         <!--  --> 
    36        <grid id="grid_T_2D" > 
    37          <domain id="grid_T" /> 
    38        </grid> 
    39         <!--  --> 
    40        <grid id="grid_T_3D_ncatice" > 
    41          <domain id="grid_T" /> 
    42          <axis id="ncatice" /> 
    43        </grid> 
    44         <!--  --> 
    45        <grid id="grid_T_3D" > 
    46          <domain id="grid_T" /> 
    47          <axis id="deptht" /> 
    48        </grid> 
    49         <!--  --> 
    50        <grid id="grid_U_2D" > 
    51          <domain id="grid_U" /> 
    52        </grid> 
    53         <!--  --> 
    54        <grid id="grid_U_3D" > 
    55          <domain id="grid_U" /> 
    56          <axis id="depthu" /> 
    57        </grid> 
    58         <!--  --> 
    59        <grid id="grid_V_2D" > 
    60          <domain id="grid_V" /> 
    61        </grid> 
    62         <!--  --> 
    63        <grid id="grid_V_3D" > 
    64          <domain id="grid_V" /> 
    65          <axis id="depthv" /> 
    66        </grid> 
    67         <!--  --> 
    68        <grid id="grid_W_2D" > 
    69          <domain id="grid_W" /> 
    70        </grid> 
    71         <!--  --> 
    72        <grid id="grid_W_3D" > 
    73          <domain id="grid_W" /> 
    74          <axis id="depthw" /> 
    75        </grid> 
    76         <!--  --> 
    77        <grid id="grid_1point" > 
    78          <domain domain_ref="1point"/> 
    79        </grid> 
    80         <!--  --> 
    81        <grid id="grid_T_nfloat" > 
    82          <domain id="grid_T" /> 
    83          <axis id="nfloat" /> 
    84        </grid> 
    85         <!--  --> 
    86        <grid id="grid_EqT" > 
    87          <domain domain_ref="EqT" /> 
    88        </grid> 
    89         <!--  --> 
    90        <grid id="grid_znl_T_2D"> 
    91          <domain id="gznl" /> 
    92        </grid> 
    93         <!--  --> 
    94        <grid id="grid_znl_T_3D"> 
    95          <domain id="gznl" /> 
    96          <axis id="deptht" /> 
    97        </grid> 
    98         <!--  --> 
    99        <grid id="grid_znl_W_3D"> 
    100          <domain id="gznl" /> 
    101          <axis id="depthw" /> 
    102        </grid> 
    103  
    104       <grid id="grid_ptr_T_2D"> 
    105        <domain id="ptr" /> 
    106       </grid> 
    107  
    108       <grid id="grid_ptr_T_3D"> 
    109        <domain id="ptr" /> 
    110          <axis id="deptht" /> 
    111        </grid> 
    112  
    113       <grid id="grid_ptr_W_3D"> 
    114        <domain id="ptr" /> 
    115          <axis id="depthw" /> 
    116       </grid> 
    117  
    118     </grid_definition>    
     33    <grid_definition src="./grid_def_nemo.xml"/> 
    11934 
    12035</context> 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ISOMIP/EXPREF/namelist_cfg

    r9743 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : overwrite default values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : overwrite default values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44!!                         ISOMIP configuration                       !! 
     
    140140   ln_lin     = .false.    !      linear  drag: Cd = Cd0 Uc0                   &   namdrg_top) 
    141141   ln_non_lin = .true.     !  non-linear  drag: Cd = Cd0 |U| 
    142    ln_loglayer= .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
     142   ln_loglayer = .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
    143143   ! 
    144144   ln_drgimp  = .false.    !  implicit top/bottom friction flag 
     
    153153   rn_z0      =  3.0e-3    !  roughness [m] (ln_loglayer=T) 
    154154   ln_boost   = .false.    !  =T regional boost of Cd0 ; =F constant 
    155       rn_boost=  50.          !  local boost factor  [-] 
     155      rn_boost =  50.          !  local boost factor  [-] 
    156156/ 
    157157!----------------------------------------------------------------------- 
     
    164164   rn_z0      =  3.e-3    !  roughness [m] (ln_loglayer=T) 
    165165   ln_boost   = .false.   !  =T regional boost of Cd0 ; =F constant 
    166       rn_boost=  50.         !  local boost factor  [-] 
     166      rn_boost =  50.         !  local boost factor  [-] 
    167167/ 
    168168!!====================================================================== 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ISOMIP/MY_SRC/usrdef_hgr.F90

    • Property svn:keywords set to Id
    r9089 r10289  
    2828 
    2929   !!---------------------------------------------------------------------- 
    30    !! NEMO/OPA 4.0 , NEMO Consortium (2017) 
     30   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3131   !! $Id$  
    32    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     32   !! Software governed by the CeCILL license (see ./LICENSE) 
    3333   !!---------------------------------------------------------------------- 
    3434CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ISOMIP/MY_SRC/usrdef_istate.F90

    • Property svn:keywords set to Id
    r7715 r10289  
    2727 
    2828   !!---------------------------------------------------------------------- 
    29    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     29   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3030   !! $Id$  
    31    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     31   !! Software governed by the CeCILL license (see ./LICENSE) 
    3232   !!---------------------------------------------------------------------- 
    3333CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ISOMIP/MY_SRC/usrdef_nam.F90

    • Property svn:keywords set to Id
    r9089 r10289  
    3636 
    3737   !!---------------------------------------------------------------------- 
    38    !! NEMO/OPA 4.0 , NEMO Consortium (2017) 
     38   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3939   !! $Id$  
    40    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     40   !! Software governed by the CeCILL license (see ./LICENSE) 
    4141   !!---------------------------------------------------------------------- 
    4242CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ISOMIP/MY_SRC/usrdef_sbc.F90

    • Property svn:keywords set to Id
    r9659 r10289  
    3535#  include "vectopt_loop_substitute.h90" 
    3636   !!---------------------------------------------------------------------- 
    37    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     37   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3838   !! $Id$ 
    39    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     39   !! Software governed by the CeCILL license (see ./LICENSE) 
    4040   !!---------------------------------------------------------------------- 
    4141CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ISOMIP/MY_SRC/usrdef_zgr.F90

    • Property svn:keywords set to Id
    r9135 r10289  
    3333#  include "vectopt_loop_substitute.h90" 
    3434   !!---------------------------------------------------------------------- 
    35    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     35   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3636   !! $Id$ 
    37    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     37   !! Software governed by the CeCILL license (see ./LICENSE) 
    3838   !!---------------------------------------------------------------------- 
    3939CONTAINS              
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/EXPREF/context_nemo.xml

    r9572 r10289  
    3131    <domain_definition src="./domain_def_nemo.xml"/> 
    3232   
    33     <grid_definition>     
    34  
    35         <!--  --> 
    36        <grid id="grid_T_2D" > 
    37          <domain id="grid_T" /> 
    38        </grid> 
    39         <!--  --> 
    40        <grid id="grid_T_3D_ncatice" > 
    41          <domain id="grid_T" /> 
    42          <axis id="ncatice" /> 
    43        </grid> 
    44         <!--  --> 
    45        <grid id="grid_T_3D" > 
    46          <domain id="grid_T" /> 
    47          <axis id="deptht" /> 
    48        </grid> 
    49         <!--  --> 
    50        <grid id="grid_U_2D" > 
    51          <domain id="grid_U" /> 
    52        </grid> 
    53         <!--  --> 
    54        <grid id="grid_U_3D" > 
    55          <domain id="grid_U" /> 
    56          <axis id="depthu" /> 
    57        </grid> 
    58         <!--  --> 
    59        <grid id="grid_V_2D" > 
    60          <domain id="grid_V" /> 
    61        </grid> 
    62         <!--  --> 
    63        <grid id="grid_V_3D" > 
    64          <domain id="grid_V" /> 
    65          <axis id="depthv" /> 
    66        </grid> 
    67         <!--  --> 
    68        <grid id="grid_W_2D" > 
    69          <domain id="grid_W" /> 
    70        </grid> 
    71         <!--  --> 
    72        <grid id="grid_W_3D" > 
    73          <domain id="grid_W" /> 
    74          <axis id="depthw" /> 
    75        </grid> 
    76         <!--  --> 
    77        <grid id="grid_1point" > 
    78          <domain domain_ref="1point"/> 
    79        </grid> 
    80         <!--  --> 
    81        <grid id="grid_T_nfloat" > 
    82          <domain id="grid_T" /> 
    83          <axis id="nfloat" /> 
    84        </grid> 
    85         <!--  --> 
    86        <grid id="grid_EqT" > 
    87          <domain domain_ref="EqT" /> 
    88        </grid> 
    89         <!--  --> 
    90        <grid id="grid_znl_T_2D"> 
    91          <domain id="gznl" /> 
    92        </grid> 
    93         <!--  --> 
    94        <grid id="grid_znl_T_3D"> 
    95          <domain id="gznl" /> 
    96          <axis id="deptht" /> 
    97        </grid> 
    98         <!--  --> 
    99        <grid id="grid_znl_W_3D"> 
    100          <domain id="gznl" /> 
    101          <axis id="depthw" /> 
    102        </grid> 
    103  
    104       <grid id="grid_ptr_T_2D"> 
    105        <domain id="ptr" /> 
    106       </grid> 
    107  
    108       <grid id="grid_ptr_T_3D"> 
    109        <domain id="ptr" /> 
    110          <axis id="deptht" /> 
    111        </grid> 
    112  
    113       <grid id="grid_ptr_W_3D"> 
    114        <domain id="ptr" /> 
    115          <axis id="depthw" /> 
    116       </grid> 
    117  
    118     </grid_definition>    
     33    <grid_definition src="./grid_def_nemo.xml"/> 
    11934 
    12035</context> 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_cen2_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    2626   ln_read_cfg = .false.   !  (=T) read the domain configuration file 
    2727      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    28    ln_write_cfg= .false.   !  (=T) create the domain configuration file 
     28   ln_write_cfg = .false.   !  (=T) create the domain configuration file 
    2929/ 
    3030!----------------------------------------------------------------------- 
     
    116116   ln_dynadv_vec = .false. !  vector form (T) or flux form (F) 
    117117   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    118    ln_dynadv_cen2= .true.  !  flux form - 2nd order centered scheme 
     118   ln_dynadv_cen2 = .true.  !  flux form - 2nd order centered scheme 
    119119   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
    120120/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg

    r9743 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : overwrite default values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : overwrite default values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44!!                    LOCK EXCHANGE configuration                     !! 
     
    4040   ln_read_cfg = .false.   !  (=T) read the domain configuration file 
    4141      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    42    ln_write_cfg= .false.   !  (=T) create the domain configuration file 
     42   ln_write_cfg = .false.   !  (=T) create the domain configuration file 
    4343/ 
    4444!----------------------------------------------------------------------- 
     
    188188   ln_dynadv_vec = .false. !  vector form (T) or flux form (F) 
    189189   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    190    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     190   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    191191   ln_dynadv_ubs = .true.  !  flux form - 3rd order UBS      scheme 
    192192/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_eenH_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    2626   ln_read_cfg = .false.   !  (=T) read the domain configuration file 
    2727      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    28    ln_write_cfg= .false.   !  (=T) create the domain configuration file 
     28   ln_write_cfg = .false.   !  (=T) create the domain configuration file 
    2929/ 
    3030!----------------------------------------------------------------------- 
     
    116116   ln_dynadv_vec = .true.  !  vector form (T) or flux form (F) 
    117117   nn_dynkeg     = 1       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    118    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     118   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    119119   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
    120120/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_een_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    2626   ln_read_cfg = .false.   !  (=T) read the domain configuration file 
    2727      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    28    ln_write_cfg= .false.   !  (=T) create the domain configuration file 
     28   ln_write_cfg = .false.   !  (=T) create the domain configuration file 
    2929/ 
    3030!----------------------------------------------------------------------- 
     
    116116   ln_dynadv_vec = .true.  !  vector form (T) or flux form (F) 
    117117   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    118    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     118   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    119119   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
    120120/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ene_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    2626   ln_read_cfg = .false.   !  (=T) read the domain configuration file 
    2727      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    28    ln_write_cfg= .false.   !  (=T) create the domain configuration file 
     28   ln_write_cfg = .false.   !  (=T) create the domain configuration file 
    2929/ 
    3030!----------------------------------------------------------------------- 
     
    116116   ln_dynadv_vec = .true.  !  vector form (T) or flux form (F) 
    117117   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    118    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     118   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    119119   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
    120120/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ens_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    2626   ln_read_cfg = .false.   !  (=T) read the domain configuration file 
    2727      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    28    ln_write_cfg= .false.   !  (=T) create the domain configuration file 
     28   ln_write_cfg = .false.   !  (=T) create the domain configuration file 
    2929/ 
    3030!----------------------------------------------------------------------- 
     
    116116   ln_dynadv_vec = .true.  !  vector form (T) or flux form (F) 
    117117   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    118    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     118   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    119119   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
    120120/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_cen2_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    2626   ln_read_cfg = .false.   !  (=T) read the domain configuration file 
    2727      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    28    ln_write_cfg= .false.   !  (=T) create the domain configuration file 
     28   ln_write_cfg = .false.   !  (=T) create the domain configuration file 
    2929/ 
    3030!----------------------------------------------------------------------- 
     
    116116   ln_dynadv_vec = .false. !  vector form (T) or flux form (F) 
    117117   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    118    ln_dynadv_cen2= .true.  !  flux form - 2nd order centered scheme 
     118   ln_dynadv_cen2 = .true.  !  flux form - 2nd order centered scheme 
    119119   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
    120120/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_ubs_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    2626   ln_read_cfg = .false.   !  (=T) read the domain configuration file 
    2727      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    28    ln_write_cfg= .false.   !  (=T) create the domain configuration file 
     28   ln_write_cfg = .false.   !  (=T) create the domain configuration file 
    2929/ 
    3030!----------------------------------------------------------------------- 
     
    116116   ln_dynadv_vec = .false. !  vector form (T) or flux form (F) 
    117117   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    118    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     118   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    119119   ln_dynadv_ubs = .true.  !  flux form - 3rd order UBS      scheme 
    120120/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_eenH_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    2626   ln_read_cfg = .false.   !  (=T) read the domain configuration file 
    2727      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    28    ln_write_cfg= .false.   !  (=T) create the domain configuration file 
     28   ln_write_cfg = .false.   !  (=T) create the domain configuration file 
    2929/ 
    3030!----------------------------------------------------------------------- 
     
    116116   ln_dynadv_vec = .true.  !  vector form (T) or flux form (F) 
    117117   nn_dynkeg     = 1       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    118    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     118   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    119119   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
    120120/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_een_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    2626   ln_read_cfg = .false.   !  (=T) read the domain configuration file 
    2727      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    28    ln_write_cfg= .false.   !  (=T) create the domain configuration file 
     28   ln_write_cfg = .false.   !  (=T) create the domain configuration file 
    2929/ 
    3030!----------------------------------------------------------------------- 
     
    116116   ln_dynadv_vec = .true.  !  vector form (T) or flux form (F) 
    117117   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    118    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     118   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    119119   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
    120120/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ene_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    2626   ln_read_cfg = .false.   !  (=T) read the domain configuration file 
    2727      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    28    ln_write_cfg= .false.   !  (=T) create the domain configuration file 
     28   ln_write_cfg = .false.   !  (=T) create the domain configuration file 
    2929/ 
    3030!----------------------------------------------------------------------- 
     
    116116   ln_dynadv_vec = .true.  !  vector form (T) or flux form (F) 
    117117   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    118    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     118   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    119119   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
    120120/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ens_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    2626   ln_read_cfg = .false.   !  (=T) read the domain configuration file 
    2727      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    28    ln_write_cfg= .false.   !  (=T) create the domain configuration file 
     28   ln_write_cfg = .false.   !  (=T) create the domain configuration file 
    2929/ 
    3030!----------------------------------------------------------------------- 
     
    116116   ln_dynadv_vec = .true.  !  vector form (T) or flux form (F) 
    117117   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    118    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     118   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    119119   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
    120120/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/MY_SRC/usrdef_hgr.F90

    • Property svn:keywords set to Id
    r9124 r10289  
    2727 
    2828   !!---------------------------------------------------------------------- 
    29    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     29   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3030   !! $Id$  
    31    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     31   !! Software governed by the CeCILL license (see ./LICENSE) 
    3232   !!---------------------------------------------------------------------- 
    3333CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/MY_SRC/usrdef_istate.F90

    • Property svn:keywords set to Id
    r6923 r10289  
    2626 
    2727   !!---------------------------------------------------------------------- 
    28    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     28   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2929   !! $Id$  
    30    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     30   !! Software governed by the CeCILL license (see ./LICENSE) 
    3131   !!---------------------------------------------------------------------- 
    3232CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/MY_SRC/usrdef_nam.F90

    • Property svn:keywords set to Id
    r7239 r10289  
    3232 
    3333   !!---------------------------------------------------------------------- 
    34    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     34   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3535   !! $Id$  
    36    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     36   !! Software governed by the CeCILL license (see ./LICENSE) 
    3737   !!---------------------------------------------------------------------- 
    3838CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/MY_SRC/usrdef_sbc.F90

    • Property svn:keywords set to Id
    r9659 r10289  
    3434#  include "vectopt_loop_substitute.h90" 
    3535   !!---------------------------------------------------------------------- 
    36    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     36   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$ 
    38    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/LOCK_EXCHANGE/MY_SRC/usrdef_zgr.F90

    • Property svn:keywords set to Id
    r9135 r10289  
    3030#  include "vectopt_loop_substitute.h90" 
    3131   !!---------------------------------------------------------------------- 
    32    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     32   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3333   !! $Id$ 
    34    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     34   !! Software governed by the CeCILL license (see ./LICENSE) 
    3535   !!---------------------------------------------------------------------- 
    3636CONTAINS              
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/OVERFLOW/EXPREF/context_nemo.xml

    r9572 r10289  
    3131    <domain_definition src="./domain_def_nemo.xml"/> 
    3232   
    33     <grid_definition>     
    34  
    35         <!--  --> 
    36        <grid id="grid_T_2D" > 
    37          <domain id="grid_T" /> 
    38        </grid> 
    39         <!--  --> 
    40        <grid id="grid_T_3D_ncatice" > 
    41          <domain id="grid_T" /> 
    42          <axis id="ncatice" /> 
    43        </grid> 
    44         <!--  --> 
    45        <grid id="grid_T_3D" > 
    46          <domain id="grid_T" /> 
    47          <axis id="deptht" /> 
    48        </grid> 
    49         <!--  --> 
    50        <grid id="grid_U_2D" > 
    51          <domain id="grid_U" /> 
    52        </grid> 
    53         <!--  --> 
    54        <grid id="grid_U_3D" > 
    55          <domain id="grid_U" /> 
    56          <axis id="depthu" /> 
    57        </grid> 
    58         <!--  --> 
    59        <grid id="grid_V_2D" > 
    60          <domain id="grid_V" /> 
    61        </grid> 
    62         <!--  --> 
    63        <grid id="grid_V_3D" > 
    64          <domain id="grid_V" /> 
    65          <axis id="depthv" /> 
    66        </grid> 
    67         <!--  --> 
    68        <grid id="grid_W_2D" > 
    69          <domain id="grid_W" /> 
    70        </grid> 
    71         <!--  --> 
    72        <grid id="grid_W_3D" > 
    73          <domain id="grid_W" /> 
    74          <axis id="depthw" /> 
    75        </grid> 
    76         <!--  --> 
    77        <grid id="grid_1point" > 
    78          <domain domain_ref="1point"/> 
    79        </grid> 
    80         <!--  --> 
    81        <grid id="grid_T_nfloat" > 
    82          <domain id="grid_T" /> 
    83          <axis id="nfloat" /> 
    84        </grid> 
    85         <!--  --> 
    86        <grid id="grid_EqT" > 
    87          <domain domain_ref="EqT" /> 
    88        </grid> 
    89         <!--  --> 
    90        <grid id="grid_znl_T_2D"> 
    91          <domain id="gznl" /> 
    92        </grid> 
    93         <!--  --> 
    94        <grid id="grid_znl_T_3D"> 
    95          <domain id="gznl" /> 
    96          <axis id="deptht" /> 
    97        </grid> 
    98         <!--  --> 
    99        <grid id="grid_znl_W_3D"> 
    100          <domain id="gznl" /> 
    101          <axis id="depthw" /> 
    102        </grid> 
    103  
    104       <grid id="grid_ptr_T_2D"> 
    105        <domain id="ptr" /> 
    106       </grid> 
    107  
    108       <grid id="grid_ptr_T_3D"> 
    109        <domain id="ptr" /> 
    110          <axis id="deptht" /> 
    111        </grid> 
    112  
    113       <grid id="grid_ptr_W_3D"> 
    114        <domain id="ptr" /> 
    115          <axis id="depthw" /> 
    116       </grid> 
    117  
    118     </grid_definition>    
     33    <grid_definition src="./grid_def_nemo.xml"/> 
    11934 
    12035</context> 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/OVERFLOW/EXPREF/namelist_sco_FCT2_flux_cen-ahm1000_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    7474   ln_lin     = .false.    !      linear  drag: Cd = Cd0 Uc0                   &   namdrg_top) 
    7575   ln_non_lin = .false.    !  non-linear  drag: Cd = Cd0 |U| 
    76    ln_loglayer= .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
     76   ln_loglayer = .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
    7777   ! 
    7878   ln_drgimp  = .true.     !  implicit top/bottom friction flag 
     
    125125   ln_dynadv_vec = .false. !  vector form (T) or flux form (F) 
    126126   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    127    ln_dynadv_cen2= .true.  !  flux form - 2nd order centered scheme 
     127   ln_dynadv_cen2 = .true.  !  flux form - 2nd order centered scheme 
    128128   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
    129129/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/OVERFLOW/EXPREF/namelist_sco_FCT2_flux_ubs_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    7474   ln_lin     = .false.    !      linear  drag: Cd = Cd0 Uc0                   &   namdrg_top) 
    7575   ln_non_lin = .false.    !  non-linear  drag: Cd = Cd0 |U| 
    76    ln_loglayer= .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
     76   ln_loglayer = .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
    7777   ! 
    7878   ln_drgimp  = .true.     !  implicit top/bottom friction flag 
     
    125125   ln_dynadv_vec = .false. !  vector form (T) or flux form (F) 
    126126   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    127    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     127   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    128128   ln_dynadv_ubs = .true.  !  flux form - 3rd order UBS      scheme 
    129129/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/OVERFLOW/EXPREF/namelist_sco_FCT4_flux_cen-ahm1000_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    3939&namtsd    !   data : Temperature  & Salinity 
    4040!----------------------------------------------------------------------- 
    41    ln_tsd_init   = .false.   !  Initialisation of ocean T & S with T &S input data (T) or not (F) 
    42    ln_tsd_tradmp = .false.   !  damping of ocean T & S toward T &S input data (T) or not (F) 
    4341/ 
    4442!----------------------------------------------------------------------- 
     
    7674   ln_lin     = .false.    !      linear  drag: Cd = Cd0 Uc0                   &   namdrg_top) 
    7775   ln_non_lin = .false.    !  non-linear  drag: Cd = Cd0 |U| 
    78    ln_loglayer= .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
     76   ln_loglayer = .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
    7977   ! 
    8078   ln_drgimp  = .true.     !  implicit top/bottom friction flag 
     
    127125   ln_dynadv_vec = .false. !  vector form (T) or flux form (F) 
    128126   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    129    ln_dynadv_cen2= .true.  !  flux form - 2nd order centered scheme 
     127   ln_dynadv_cen2 = .true.  !  flux form - 2nd order centered scheme 
    130128   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
    131129/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/OVERFLOW/EXPREF/namelist_sco_FCT4_flux_ubs_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    3939&namtsd    !   data : Temperature  & Salinity 
    4040!----------------------------------------------------------------------- 
    41    ln_tsd_init   = .false.   !  Initialisation of ocean T & S with T &S input data (T) or not (F) 
    42    ln_tsd_tradmp = .false.   !  damping of ocean T & S toward T &S input data (T) or not (F) 
    4341/ 
    4442!----------------------------------------------------------------------- 
     
    7674   ln_lin     = .false.    !      linear  drag: Cd = Cd0 Uc0                   &   namdrg_top) 
    7775   ln_non_lin = .false.    !  non-linear  drag: Cd = Cd0 |U| 
    78    ln_loglayer= .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
     76   ln_loglayer = .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
    7977   ! 
    8078   ln_drgimp  = .true.     !  implicit top/bottom friction flag 
     
    127125   ln_dynadv_vec = .false. !  vector form (T) or flux form (F) 
    128126   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    129    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     127   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    130128   ln_dynadv_ubs = .true.  !  flux form - 3rd order UBS      scheme 
    131129/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/OVERFLOW/EXPREF/namelist_zps_FCT2_flux_ubs_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    7474   ln_lin     = .false.    !      linear  drag: Cd = Cd0 Uc0                   &   namdrg_top) 
    7575   ln_non_lin = .false.    !  non-linear  drag: Cd = Cd0 |U| 
    76    ln_loglayer= .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
     76   ln_loglayer = .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
    7777   ! 
    7878   ln_drgimp  = .true.     !  implicit top/bottom friction flag 
     
    125125   ln_dynadv_vec = .false. !  vector form (T) or flux form (F) 
    126126   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    127    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     127   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    128128   ln_dynadv_ubs = .true.  !  flux form - 3rd order UBS      scheme 
    129129/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg

    r9743 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : overwrite default values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : overwrite default values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44!!                        OVERFLOW configuration                      !! 
     
    118118   ln_lin     = .false.    !      linear  drag: Cd = Cd0 Uc0                   &   namdrg_top) 
    119119   ln_non_lin = .false.    !  non-linear  drag: Cd = Cd0 |U| 
    120    ln_loglayer= .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
     120   ln_loglayer = .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
    121121   ! 
    122122   ln_drgimp  = .true.     !  implicit top/bottom friction flag 
     
    192192   ln_dynadv_vec = .false. !  vector form (T) or flux form (F) 
    193193   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    194    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     194   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    195195   ln_dynadv_ubs = .true.  !  flux form - 3rd order UBS      scheme 
    196196/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_vect_een_cfg

    r9527 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44! 
     
    7474   ln_lin     = .false.    !      linear  drag: Cd = Cd0 Uc0                   &   namdrg_top) 
    7575   ln_non_lin = .false.    !  non-linear  drag: Cd = Cd0 |U| 
    76    ln_loglayer= .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
     76   ln_loglayer = .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
    7777   ! 
    7878   ln_drgimp  = .true.     !  implicit top/bottom friction flag 
     
    125125   ln_dynadv_vec = .true. !  vector form (T) or flux form (F) 
    126126   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    127    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     127   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    128128   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
    129129/ 
     
    137137!----------------------------------------------------------------------- 
    138138   ln_dynvor_ene = .false. !  enstrophy conserving scheme 
    139    ln_dynvor_ens = .true. !  energy conserving scheme 
     139   ln_dynvor_ens = .false. !  energy conserving scheme 
    140140   ln_dynvor_mix = .false. !  mixed scheme 
    141141   ln_dynvor_een = .true. !  energy & enstrophy scheme 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/OVERFLOW/MY_SRC/usrdef_hgr.F90

    • Property svn:keywords set to Id
    r9124 r10289  
    2727 
    2828   !!---------------------------------------------------------------------- 
    29    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     29   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3030   !! $Id$  
    31    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     31   !! Software governed by the CeCILL license (see ./LICENSE) 
    3232   !!---------------------------------------------------------------------- 
    3333CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/OVERFLOW/MY_SRC/usrdef_istate.F90

    • Property svn:keywords set to Id
    r6923 r10289  
    2626 
    2727   !!---------------------------------------------------------------------- 
    28    !! NEMO/OPA 3.7 , NEMO Consortium (2014) 
     28   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2929   !! $Id$  
    30    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     30   !! Software governed by the CeCILL license (see ./LICENSE) 
    3131   !!---------------------------------------------------------------------- 
    3232CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/OVERFLOW/MY_SRC/usrdef_nam.F90

    • Property svn:keywords set to Id
    r7200 r10289  
    3333 
    3434   !!---------------------------------------------------------------------- 
    35    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     35   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3636   !! $Id$  
    37    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     37   !! Software governed by the CeCILL license (see ./LICENSE) 
    3838   !!---------------------------------------------------------------------- 
    3939CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/OVERFLOW/MY_SRC/usrdef_sbc.F90

    • Property svn:keywords set to Id
    r9659 r10289  
    3434#  include "vectopt_loop_substitute.h90" 
    3535   !!---------------------------------------------------------------------- 
    36    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     36   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$ 
    38    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/OVERFLOW/MY_SRC/usrdef_zgr.F90

    • Property svn:keywords set to Id
    r9135 r10289  
    3232#  include "vectopt_loop_substitute.h90" 
    3333   !!---------------------------------------------------------------------- 
    34    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     34   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3535   !! $Id$ 
    36    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     36   !! Software governed by the CeCILL license (see ./LICENSE) 
    3737   !!---------------------------------------------------------------------- 
    3838CONTAINS              
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/VORTEX/EXPREF/1_context_nemo.xml

    r9572 r10289  
    3131    <domain_definition src="./domain_def_nemo.xml"/> 
    3232   
    33     <grid_definition>     
    34  
    35         <!--  --> 
    36        <grid id="grid_T_2D" > 
    37          <domain id="grid_T" /> 
    38        </grid> 
    39         <!--  --> 
    40        <grid id="grid_T_3D_ncatice" > 
    41          <domain id="grid_T" /> 
    42          <axis id="ncatice" /> 
    43        </grid> 
    44         <!--  --> 
    45        <grid id="grid_T_3D" > 
    46          <domain id="grid_T" /> 
    47          <axis id="deptht" /> 
    48        </grid> 
    49         <!--  --> 
    50        <grid id="grid_U_2D" > 
    51          <domain id="grid_U" /> 
    52        </grid> 
    53         <!--  --> 
    54        <grid id="grid_U_3D" > 
    55          <domain id="grid_U" /> 
    56          <axis id="depthu" /> 
    57        </grid> 
    58         <!--  --> 
    59        <grid id="grid_V_2D" > 
    60          <domain id="grid_V" /> 
    61        </grid> 
    62         <!--  --> 
    63        <grid id="grid_V_3D" > 
    64          <domain id="grid_V" /> 
    65          <axis id="depthv" /> 
    66        </grid> 
    67         <!--  --> 
    68        <grid id="grid_W_2D" > 
    69          <domain id="grid_W" /> 
    70        </grid> 
    71         <!--  --> 
    72        <grid id="grid_W_3D" > 
    73          <domain id="grid_W" /> 
    74          <axis id="depthw" /> 
    75        </grid> 
    76         <!--  --> 
    77        <grid id="grid_1point" > 
    78          <domain domain_ref="1point"/> 
    79        </grid> 
    80         <!--  --> 
    81        <grid id="grid_T_nfloat" > 
    82          <domain id="grid_T" /> 
    83          <axis id="nfloat" /> 
    84        </grid> 
    85         <!--  --> 
    86        <grid id="grid_EqT" > 
    87          <domain domain_ref="EqT" /> 
    88        </grid> 
    89         <!--  --> 
    90        <grid id="grid_znl_T_2D"> 
    91          <domain id="gznl" /> 
    92        </grid> 
    93         <!--  --> 
    94        <grid id="grid_znl_T_3D"> 
    95          <domain id="gznl" /> 
    96          <axis id="deptht" /> 
    97        </grid> 
    98         <!--  --> 
    99        <grid id="grid_znl_W_3D"> 
    100          <domain id="gznl" /> 
    101          <axis id="depthw" /> 
    102        </grid> 
    103  
    104       <grid id="grid_ptr_T_2D"> 
    105        <domain id="ptr" /> 
    106       </grid> 
    107  
    108       <grid id="grid_ptr_T_3D"> 
    109        <domain id="ptr" /> 
    110          <axis id="deptht" /> 
    111        </grid> 
    112  
    113       <grid id="grid_ptr_W_3D"> 
    114        <domain id="ptr" /> 
    115          <axis id="depthw" /> 
    116       </grid> 
    117  
    118     </grid_definition>    
    119  
     33    <grid_definition src="./grid_def_nemo.xml"/> 
     34     
    12035</context> 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/VORTEX/EXPREF/1_namelist_cfg

    r9718 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44!!                         VORTEX configuration                       !! 
     
    187187   ln_dynadv_vec = .false. !  vector form (T) or flux form (F) 
    188188   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    189    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     189   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    190190   ln_dynadv_ubs = .true.  !  flux form - 3rd order UBS      scheme 
    191191/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/VORTEX/EXPREF/context_nemo.xml

    r9572 r10289  
    3131    <domain_definition src="./domain_def_nemo.xml"/> 
    3232   
    33     <grid_definition>     
    34  
    35         <!--  --> 
    36        <grid id="grid_T_2D" > 
    37          <domain id="grid_T" /> 
    38        </grid> 
    39         <!--  --> 
    40        <grid id="grid_T_3D_ncatice" > 
    41          <domain id="grid_T" /> 
    42          <axis id="ncatice" /> 
    43        </grid> 
    44         <!--  --> 
    45        <grid id="grid_T_3D" > 
    46          <domain id="grid_T" /> 
    47          <axis id="deptht" /> 
    48        </grid> 
    49         <!--  --> 
    50        <grid id="grid_U_2D" > 
    51          <domain id="grid_U" /> 
    52        </grid> 
    53         <!--  --> 
    54        <grid id="grid_U_3D" > 
    55          <domain id="grid_U" /> 
    56          <axis id="depthu" /> 
    57        </grid> 
    58         <!--  --> 
    59        <grid id="grid_V_2D" > 
    60          <domain id="grid_V" /> 
    61        </grid> 
    62         <!--  --> 
    63        <grid id="grid_V_3D" > 
    64          <domain id="grid_V" /> 
    65          <axis id="depthv" /> 
    66        </grid> 
    67         <!--  --> 
    68        <grid id="grid_W_2D" > 
    69          <domain id="grid_W" /> 
    70        </grid> 
    71         <!--  --> 
    72        <grid id="grid_W_3D" > 
    73          <domain id="grid_W" /> 
    74          <axis id="depthw" /> 
    75        </grid> 
    76         <!--  --> 
    77        <grid id="grid_1point" > 
    78          <domain domain_ref="1point"/> 
    79        </grid> 
    80         <!--  --> 
    81        <grid id="grid_T_nfloat" > 
    82          <domain id="grid_T" /> 
    83          <axis id="nfloat" /> 
    84        </grid> 
    85         <!--  --> 
    86        <grid id="grid_EqT" > 
    87          <domain domain_ref="EqT" /> 
    88        </grid> 
    89         <!--  --> 
    90        <grid id="grid_znl_T_2D"> 
    91          <domain id="gznl" /> 
    92        </grid> 
    93         <!--  --> 
    94        <grid id="grid_znl_T_3D"> 
    95          <domain id="gznl" /> 
    96          <axis id="deptht" /> 
    97        </grid> 
    98         <!--  --> 
    99        <grid id="grid_znl_W_3D"> 
    100          <domain id="gznl" /> 
    101          <axis id="depthw" /> 
    102        </grid> 
    103  
    104       <grid id="grid_ptr_T_2D"> 
    105        <domain id="ptr" /> 
    106       </grid> 
    107  
    108       <grid id="grid_ptr_T_3D"> 
    109        <domain id="ptr" /> 
    110          <axis id="deptht" /> 
    111        </grid> 
    112  
    113       <grid id="grid_ptr_W_3D"> 
    114        <domain id="ptr" /> 
    115          <axis id="depthw" /> 
    116       </grid> 
    117  
    118     </grid_definition>    
     33    <grid_definition src="./grid_def_nemo.xml"/> 
    11934 
    12035</context> 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/VORTEX/EXPREF/namelist_cfg

    r9743 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : overwrite default values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : overwrite default values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44!!                         VORTEX configuration                       !! 
     
    178178   ln_dynadv_vec = .false. !  vector form (T) or flux form (F) 
    179179   nn_dynkeg     = 0       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction 
    180    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     180   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    181181   ln_dynadv_ubs = .true.  !  flux form - 3rd order UBS      scheme 
    182182/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/VORTEX/MY_SRC/domvvl.F90

    • Property svn:keywords set to Id
    r9729 r10289  
    6464#  include "vectopt_loop_substitute.h90" 
    6565   !!---------------------------------------------------------------------- 
    66    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
    67    !! $Id: domvvl.F90 9598 2018-05-15 22:47:16Z nicolasmartin $ 
    68    !! Software governed by the CeCILL licence     (./LICENSE) 
     66   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
     67   !! $Id$ 
     68   !! Software governed by the CeCILL license (see ./LICENSE) 
    6969   !!---------------------------------------------------------------------- 
    7070CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/VORTEX/MY_SRC/usrdef_hgr.F90

    • Property svn:keywords set to Id
    r9124 r10289  
    2727 
    2828   !!---------------------------------------------------------------------- 
    29    !! NEMO/OPA 4.0, NEMO Consortium (2016) 
     29   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3030   !! $Id$  
    31    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     31   !! Software governed by the CeCILL license (see ./LICENSE) 
    3232   !!---------------------------------------------------------------------- 
    3333CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/VORTEX/MY_SRC/usrdef_istate.F90

    • Property svn:keywords set to Id
    r9255 r10289  
    2929 
    3030   !!---------------------------------------------------------------------- 
    31    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     31   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3232   !! $Id$  
    33    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     33   !! Software governed by the CeCILL license (see ./LICENSE) 
    3434   !!---------------------------------------------------------------------- 
    3535CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/VORTEX/MY_SRC/usrdef_nam.F90

    • Property svn:keywords set to Id
    r8703 r10289  
    3434 
    3535   !!---------------------------------------------------------------------- 
    36    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     36   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$  
    38    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/VORTEX/MY_SRC/usrdef_sbc.F90

    • Property svn:keywords set to Id
    r9659 r10289  
    3333#  include "vectopt_loop_substitute.h90" 
    3434   !!---------------------------------------------------------------------- 
    35    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     35   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3636   !! $Id$ 
    37    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     37   !! Software governed by the CeCILL license (see ./LICENSE) 
    3838   !!---------------------------------------------------------------------- 
    3939CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/VORTEX/MY_SRC/usrdef_zgr.F90

    • Property svn:keywords set to Id
    r9125 r10289  
    3232#  include "vectopt_loop_substitute.h90" 
    3333   !!---------------------------------------------------------------------- 
    34    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     34   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3535   !! $Id$ 
    36    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     36   !! Software governed by the CeCILL license (see ./LICENSE) 
    3737   !!---------------------------------------------------------------------- 
    3838CONTAINS              
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/WAD/EXPREF/context_nemo.xml

    r9572 r10289  
    3131    <domain_definition src="./domain_def_nemo.xml"/> 
    3232   
    33     <grid_definition>     
    34  
    35         <!--  --> 
    36        <grid id="grid_T_2D" > 
    37          <domain id="grid_T" /> 
    38        </grid> 
    39         <!--  --> 
    40        <grid id="grid_T_3D_ncatice" > 
    41          <domain id="grid_T" /> 
    42          <axis id="ncatice" /> 
    43        </grid> 
    44         <!--  --> 
    45        <grid id="grid_T_3D" > 
    46          <domain id="grid_T" /> 
    47          <axis id="deptht" /> 
    48        </grid> 
    49         <!--  --> 
    50        <grid id="grid_U_2D" > 
    51          <domain id="grid_U" /> 
    52        </grid> 
    53         <!--  --> 
    54        <grid id="grid_U_3D" > 
    55          <domain id="grid_U" /> 
    56          <axis id="depthu" /> 
    57        </grid> 
    58         <!--  --> 
    59        <grid id="grid_V_2D" > 
    60          <domain id="grid_V" /> 
    61        </grid> 
    62         <!--  --> 
    63        <grid id="grid_V_3D" > 
    64          <domain id="grid_V" /> 
    65          <axis id="depthv" /> 
    66        </grid> 
    67         <!--  --> 
    68        <grid id="grid_W_2D" > 
    69          <domain id="grid_W" /> 
    70        </grid> 
    71         <!--  --> 
    72        <grid id="grid_W_3D" > 
    73          <domain id="grid_W" /> 
    74          <axis id="depthw" /> 
    75        </grid> 
    76         <!--  --> 
    77        <grid id="grid_1point" > 
    78          <domain domain_ref="1point"/> 
    79        </grid> 
    80         <!--  --> 
    81        <grid id="grid_T_nfloat" > 
    82          <domain id="grid_T" /> 
    83          <axis id="nfloat" /> 
    84        </grid> 
    85         <!--  --> 
    86        <grid id="grid_EqT" > 
    87          <domain domain_ref="EqT" /> 
    88        </grid> 
    89         <!--  --> 
    90        <grid id="grid_znl_T_2D"> 
    91          <domain id="gznl" /> 
    92        </grid> 
    93         <!--  --> 
    94        <grid id="grid_znl_T_3D"> 
    95          <domain id="gznl" /> 
    96          <axis id="deptht" /> 
    97        </grid> 
    98         <!--  --> 
    99        <grid id="grid_znl_W_3D"> 
    100          <domain id="gznl" /> 
    101          <axis id="depthw" /> 
    102        </grid> 
    103  
    104       <grid id="grid_ptr_T_2D"> 
    105        <domain id="ptr" /> 
    106       </grid> 
    107  
    108       <grid id="grid_ptr_T_3D"> 
    109        <domain id="ptr" /> 
    110          <axis id="deptht" /> 
    111        </grid> 
    112  
    113       <grid id="grid_ptr_W_3D"> 
    114        <domain id="ptr" /> 
    115          <axis id="depthw" /> 
    116       </grid> 
    117  
    118     </grid_definition>    
     33    <grid_definition src="./grid_def_nemo.xml"/> 
    11934 
    12035</context> 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/WAD/EXPREF/namelist_cfg

    r9743 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : overwrite default values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : overwrite default values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44!!                      Wetting & Drying configuration                !! 
     
    2020&namusr_def    !    Wetting and Drying TEST CASE 
    2121!----------------------------------------------------------------------- 
    22    rn_dx       = 1000.0    ! horizontal resolution 
     22   rn_dx       = 1500.0    ! horizontal resolution 
    2323   rn_dz       = 1.0       ! vertical   resolution 
    2424   nn_wad_test = 1         ! ??? 
     
    3838/ 
    3939!----------------------------------------------------------------------- 
     40&namdom        !   time and space domain 
     41!----------------------------------------------------------------------- 
     42   ln_linssh   = .false.   !  =T  linear free surface  ==>>  model level are fixed in time 
     43   ! 
     44   ln_meshmask = .true.    !  create (>0) a mesh file or not (=0) 
     45   rn_rdt      =    18.    !  time step for the dynamics  
     46/ 
     47!----------------------------------------------------------------------- 
    4048&namcfg        !   parameters of the configuration                      (default: user defined GYRE) 
    4149!----------------------------------------------------------------------- 
    4250   ln_read_cfg = .false.   !  (=T) read the domain configuration file 
    4351      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    44    ln_write_cfg= .true.    !  (=T) create the domain configuration file 
    45 / 
    46 !----------------------------------------------------------------------- 
    47 &namdom        !   time and space domain 
    48 !----------------------------------------------------------------------- 
    49    ln_linssh   = .false.   !  =T  linear free surface  ==>>  model level are fixed in time 
    50    ! 
    51    ln_meshmask = .true.    !  create (>0) a mesh file or not (=0) 
    52    rn_rdt      =    18.    !  time step for the dynamics  
     52   ln_write_cfg = .true.    !  (=T) create the domain configuration file 
    5353/ 
    5454!----------------------------------------------------------------------- 
     
    5858   ln_wd_dl    = .true.    ! T/F activation of directional limiter 
    5959   ln_wd_dl_bc = .true.    ! T/F Directional limiteer Baroclinic option 
    60    ln_wd_dl_rmp= .true.    ! T/F Turn on directional limiter ramp 
     60   ln_wd_dl_rmp = .true.    ! T/F Turn on directional limiter ramp 
    6161   rn_wdmin0   =  0.30     ! depth at which WaD starts 
    6262   rn_wdmin1   =  0.2      ! Minimum wet depth on dried cells 
     
    103103/ 
    104104!----------------------------------------------------------------------- 
    105 &namsbc_rnf    !   runoffs namelist surface boundary condition          (ln_rnf =T) 
    106 !----------------------------------------------------------------------- 
    107    ln_rnf_mouth = .false.   !  specific treatment at rivers mouths 
    108 / 
    109 !----------------------------------------------------------------------- 
    110105&namsbc_ssr    !   surface boundary condition : sea surface restoring   (ln_ssr =T) 
    111106!----------------------------------------------------------------------- 
     
    113108   rn_deds     =   -27.7   !  magnitude of the damping on salinity   [mm/day] 
    114109   ln_sssr_bnd =   .false. !  flag to bound erp term (associated with nn_sssr=2) 
     110/ 
     111!----------------------------------------------------------------------- 
     112&namsbc_rnf    !   runoffs namelist surface boundary condition          (ln_rnf =T) 
     113!----------------------------------------------------------------------- 
     114   ln_rnf_mouth = .false.   !  specific treatment at rivers mouths 
    115115/ 
    116116!!====================================================================== 
     
    205205&namdrg        !   top/bottom drag coefficient                          (default: NO selection) 
    206206!----------------------------------------------------------------------- 
    207    ln_loglayer= .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
     207   ln_loglayer = .false.    !  logarithmic drag: Cd = vkarmn/log(z/z0) |U| 
     208   ln_lin      = .true.    !      linear  drag: Cd = Cd0 Uc0                   &   namdrg_top) 
     209   ln_non_lin  = .false.   !  non-linear  drag: Cd = Cd0 |U| 
    208210/ 
    209211!----------------------------------------------------------------------- 
     
    220222   rn_z0      =  3.e-3    !  roughness [m] (ln_loglayer=T) 
    221223   ln_boost   = .false.   !  =T regional boost of Cd0 ; =F constant 
    222       rn_boost=  50.         !  local boost factor  [-] 
     224      rn_boost =  50.         !  local boost factor  [-] 
    223225/ 
    224226!----------------------------------------------------------------------- 
     
    314316   ln_dynadv_vec = .true. !  vector form - 2nd centered scheme 
    315317     nn_dynkeg     = 0        ! grad(KE) scheme: =0   C2  ;  =1   Hollingsworth correction 
    316    ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme 
     318   ln_dynadv_cen2 = .false. !  flux form - 2nd order centered scheme 
    317319   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
    318320/ 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/WAD/MY_SRC/bdyini.F90

    • Property svn:keywords set to Id
    r9659 r10289  
    4444   INTEGER, DIMENSION(jp_nseg) ::   jpjnob, jpindt, jpinft, npckgn   ! 
    4545   INTEGER, DIMENSION(jp_nseg) ::   jpjsob, jpisdt, jpisft, npckgs   ! 
    46  
    4746   !!---------------------------------------------------------------------- 
    48    !! NEMO/OPA 3.7 , NEMO Consortium (2015) 
    49    !! $Id: bdyini.F90 7421 2016-12-01 17:10:41Z flavoni $  
    50    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     47   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
     48   !! $Id$  
     49   !! Software governed by the CeCILL license (see ./LICENSE) 
    5150   !!---------------------------------------------------------------------- 
    5251CONTAINS 
     
    8685      IF(lwm) WRITE ( numond, nambdy ) 
    8786 
     87      IF( .NOT. Agrif_Root() ) ln_bdy = .FALSE.   ! forced for Agrif children 
     88       
    8889      ! ----------------------------------------- 
    8990      ! unstructured open boundaries use control 
     
    112113   END SUBROUTINE bdy_init 
    113114 
    114     
     115 
    115116   SUBROUTINE bdy_segs 
    116117      !!---------------------------------------------------------------------- 
     
    124125      !! ** Input   :  bdy_init.nc, input file for unstructured open boundaries 
    125126      !!----------------------------------------------------------------------       
    126  
    127       ! local variables 
    128       !------------------- 
    129127      INTEGER  ::   ib_bdy, ii, ij, ik, igrd, ib, ir, iseg ! dummy loop indices 
    130128      INTEGER  ::   icount, icountr, ibr_max, ilen1, ibm1  ! local integers 
     
    146144      INTEGER :: com_east_b, com_west_b, com_south_b, com_north_b  ! Flags for boundaries receiving 
    147145      INTEGER :: iw_b(4), ie_b(4), is_b(4), in_b(4)                ! Arrays for neighbours coordinates 
    148       REAL(wp), DIMENSION(jpi,jpj)      ::   zfmask  ! temporary fmask array excluding coastal boundary condition (shlat) 
     146      REAL(wp), TARGET, DIMENSION(jpi,jpj) ::   zfmask  ! temporary fmask array excluding coastal boundary condition (shlat) 
    149147      !! 
    150148      CHARACTER(LEN=1)                     ::   ctypebdy   !     -        -  
     
    345343 
    346344#if defined key_si3 
    347         IF(lwp) WRITE(numout,*) 'Boundary conditions for sea ice:  ' 
    348         SELECT CASE( cn_ice(ib_bdy) )                   
    349           CASE('none') 
     345         IF(lwp) WRITE(numout,*) 'Boundary conditions for sea ice:  ' 
     346         SELECT CASE( cn_ice(ib_bdy) )                   
     347         CASE('none') 
    350348             IF(lwp) WRITE(numout,*) '      no open boundary condition'         
    351              dta_bdy(ib_bdy)%ll_a_i  = .false. 
    352              dta_bdy(ib_bdy)%ll_ht_i = .false. 
    353              dta_bdy(ib_bdy)%ll_ht_s = .false. 
    354           CASE('frs') 
     349             dta_bdy(ib_bdy)%ll_a_i = .false. 
     350             dta_bdy(ib_bdy)%ll_h_i = .false. 
     351             dta_bdy(ib_bdy)%ll_h_s = .false. 
     352         CASE('frs') 
    355353             IF(lwp) WRITE(numout,*) '      Flow Relaxation Scheme' 
    356              dta_bdy(ib_bdy)%ll_a_i  = .true. 
    357              dta_bdy(ib_bdy)%ll_ht_i = .true. 
    358              dta_bdy(ib_bdy)%ll_ht_s = .true. 
    359           CASE DEFAULT   ;   CALL ctl_stop( 'unrecognised value for cn_ice' ) 
    360         END SELECT 
     354             dta_bdy(ib_bdy)%ll_a_i = .true. 
     355             dta_bdy(ib_bdy)%ll_h_i = .true. 
     356             dta_bdy(ib_bdy)%ll_h_s = .true. 
     357         CASE DEFAULT   ;   CALL ctl_stop( 'unrecognised value for cn_ice' ) 
     358         END SELECT 
    361359        IF( cn_ice(ib_bdy) /= 'none' ) THEN  
    362360           SELECT CASE( nn_ice_dta(ib_bdy) )                   !  
     
    374372        IF(lwp) WRITE(numout,*) '      Width of relaxation zone = ', nn_rimwidth(ib_bdy) 
    375373        IF(lwp) WRITE(numout,*) 
    376  
    377       ENDDO 
    378  
    379      IF (nb_bdy .gt. 0) THEN 
     374         ! 
     375      END DO 
     376 
     377     IF( nb_bdy > 0 ) THEN 
    380378        IF( ln_vol ) THEN                     ! check volume conservation (nn_volctl value) 
    381379          IF(lwp) WRITE(numout,*) 'Volume correction applied at open boundaries' 
     
    417415 
    418416      DO ib_bdy = 1, nb_bdy 
    419          ! 
     417 
    420418         IF( .NOT. ln_coords_file(ib_bdy) ) THEN ! Work out size of global arrays from namelist parameters 
    421             ! 
     419  
    422420            icount = icount + 1 
    423421            ! No REWIND here because may need to read more than one nambdy_index namelist. 
     
    494492            DO igrd = 1, jpbgrd 
    495493               id_dummy = iom_varid( inum, 'nbi'//cgrid(igrd), kdimsz=kdimsz )   
    496                !clem nblendta(igrd,ib_bdy) = kdimsz(1) 
    497                !clem jpbdtau = MAX(jpbdtau, kdimsz(1)) 
    498494               nblendta(igrd,ib_bdy) = MAXVAL(kdimsz) 
    499495               jpbdtau = MAX(jpbdtau, MAXVAL(kdimsz)) 
     
    885881                  IF( nbrdta(ib,igrd,ib_bdy) == 1 )   icountr = icountr+1 
    886882               ENDIF 
    887             ENDDO 
     883            END DO 
    888884            idx_bdy(ib_bdy)%nblenrim(igrd) = icountr !: length of rim boundary data on each proc 
    889885            idx_bdy(ib_bdy)%nblen   (igrd) = icount  !: length of boundary data on each proc         
    890          ENDDO  ! igrd 
     886         END DO  ! igrd 
    891887 
    892888         ! Allocate index arrays for this boundary set 
    893889         !-------------------------------------------- 
    894890         ilen1 = MAXVAL( idx_bdy(ib_bdy)%nblen(:) ) 
    895          ALLOCATE( idx_bdy(ib_bdy)%nbi   (ilen1,jpbgrd) ) 
    896          ALLOCATE( idx_bdy(ib_bdy)%nbj   (ilen1,jpbgrd) ) 
    897          ALLOCATE( idx_bdy(ib_bdy)%nbr   (ilen1,jpbgrd) ) 
    898          ALLOCATE( idx_bdy(ib_bdy)%nbd   (ilen1,jpbgrd) ) 
    899          ALLOCATE( idx_bdy(ib_bdy)%nbdout(ilen1,jpbgrd) ) 
    900          ALLOCATE( idx_bdy(ib_bdy)%nbmap (ilen1,jpbgrd) ) 
    901          ALLOCATE( idx_bdy(ib_bdy)%nbw   (ilen1,jpbgrd) ) 
    902          ALLOCATE( idx_bdy(ib_bdy)%flagu (ilen1,jpbgrd) ) 
    903          ALLOCATE( idx_bdy(ib_bdy)%flagv (ilen1,jpbgrd) ) 
     891         ALLOCATE( idx_bdy(ib_bdy)%nbi   (ilen1,jpbgrd) ,   & 
     892            &      idx_bdy(ib_bdy)%nbj   (ilen1,jpbgrd) ,   & 
     893            &      idx_bdy(ib_bdy)%nbr   (ilen1,jpbgrd) ,   & 
     894            &      idx_bdy(ib_bdy)%nbd   (ilen1,jpbgrd) ,   & 
     895            &      idx_bdy(ib_bdy)%nbdout(ilen1,jpbgrd) ,   & 
     896            &      idx_bdy(ib_bdy)%nbmap (ilen1,jpbgrd) ,   & 
     897            &      idx_bdy(ib_bdy)%nbw   (ilen1,jpbgrd) ,   & 
     898            &      idx_bdy(ib_bdy)%flagu (ilen1,jpbgrd) ,   & 
     899            &      idx_bdy(ib_bdy)%flagv (ilen1,jpbgrd) ) 
    904900 
    905901         ! Dispatch mapping indices and discrete distances on each processor 
     
    11141110         END DO  
    11151111 
    1116       ENDDO 
     1112      END DO 
    11171113 
    11181114      ! ------------------------------------------------------ 
     
    11271123      bdytmask(:,:) = ssmask(:,:) 
    11281124 
    1129       IF( ln_mask_file ) THEN 
    1130          CALL iom_open( cn_mask_file, inum ) 
    1131          CALL iom_get ( inum, jpdom_data, 'bdy_msk', bdytmask(:,:) ) 
    1132          CALL iom_close( inum ) 
    1133  
    1134          ! Derive mask on U and V grid from mask on T grid 
    1135          bdyumask(:,:) = 0._wp 
    1136          bdyvmask(:,:) = 0._wp 
    1137          DO ij=1, jpjm1 
    1138             DO ii=1, jpim1 
    1139                bdyumask(ii,ij) = bdytmask(ii,ij) * bdytmask(ii+1, ij ) 
    1140                bdyvmask(ii,ij) = bdytmask(ii,ij) * bdytmask(ii  ,ij+1)   
    1141             END DO 
     1125      ! Derive mask on U and V grid from mask on T grid 
     1126 
     1127      bdyumask(:,:) = 0._wp 
     1128      bdyvmask(:,:) = 0._wp 
     1129      DO ij = 1, jpjm1 
     1130         DO ii = 1, jpim1 
     1131            bdyumask(ii,ij) = bdytmask(ii,ij) * bdytmask(ii+1, ij ) 
     1132            bdyvmask(ii,ij) = bdytmask(ii,ij) * bdytmask(ii  ,ij+1)   
    11421133         END DO 
    1143          CALL lbc_lnk( bdyumask(:,:), 'U', 1. )   ;   CALL lbc_lnk( bdyvmask(:,:), 'V', 1. )      ! Lateral boundary cond. 
    1144  
    1145       ENDIF ! ln_mask_file=.TRUE. 
    1146        
    1147       IF( .NOT.ln_mask_file ) THEN 
    1148          ! If .not. ln_mask_file then we need to derive mask on U and V grid from mask on T grid here. 
    1149          bdyumask(:,:) = 0._wp 
    1150          bdyvmask(:,:) = 0._wp 
    1151          DO ij = 1, jpjm1 
    1152             DO ii = 1, jpim1 
    1153                bdyumask(ii,ij) = bdytmask(ii,ij) * bdytmask(ii+1, ij ) 
    1154                bdyvmask(ii,ij) = bdytmask(ii,ij) * bdytmask(ii  ,ij+1)   
    1155             END DO 
    1156          END DO 
    1157          CALL lbc_lnk( bdyumask(:,:), 'U', 1. )   ;   CALL lbc_lnk( bdyvmask(:,:), 'V', 1. )      ! Lateral boundary cond. 
    1158       ENDIF 
     1134      END DO 
     1135      CALL lbc_lnk_multi( bdyumask, 'U', 1. , bdyvmask, 'V', 1. )   ! Lateral boundary cond.  
    11591136 
    11601137      ! bdy masks are now set to zero on boundary points: 
     
    11781155        DO ib = 1, idx_bdy(ib_bdy)%nblenrim(igrd) 
    11791156          bdyvmask(idx_bdy(ib_bdy)%nbi(ib,igrd), idx_bdy(ib_bdy)%nbj(ib,igrd)) = 0._wp 
    1180         ENDDO 
    1181       ENDDO 
     1157        END DO 
     1158      END DO 
    11821159 
    11831160      ! For the flagu/flagv calculation below we require a version of fmask without 
    11841161      ! the land boundary condition (shlat) included: 
     1162      zfmask(:,:) = 0 
    11851163      DO ij = 2, jpjm1 
    11861164         DO ii = 2, jpim1 
     
    11911169 
    11921170      ! Lateral boundary conditions 
    1193       CALL lbc_lnk( zfmask       , 'F', 1. ) 
    1194       CALL lbc_lnk( fmask        , 'F', 1. )   ;   CALL lbc_lnk( bdytmask(:,:), 'T', 1. ) 
    1195       CALL lbc_lnk( bdyumask(:,:), 'U', 1. )   ;   CALL lbc_lnk( bdyvmask(:,:), 'V', 1. ) 
    1196  
     1171      CALL lbc_lnk( zfmask, 'F', 1. )  
     1172      CALL lbc_lnk_multi( bdyumask, 'U', 1. , bdyvmask, 'V', 1., bdytmask, 'T', 1. ) 
    11971173      DO ib_bdy = 1, nb_bdy       ! Indices and directions of rim velocity components 
    11981174 
     
    12061182         ! flagu =  1 : u is normal to the boundary and is direction is inward 
    12071183   
    1208          DO igrd = 1,jpbgrd  
     1184         DO igrd = 1, jpbgrd  
    12091185            SELECT CASE( igrd ) 
    12101186               CASE( 1 )   ;   pmask => umask   (:,:,1)   ;   i_offset = 0 
     
    13101286      !-------- 
    13111287      IF( nb_bdy>0 )   DEALLOCATE( nbidta, nbjdta, nbrdta ) 
    1312       ! 
    13131288      ! 
    13141289   END SUBROUTINE bdy_segs 
     
    16901665   END SUBROUTINE bdy_ctl_seg 
    16911666 
     1667 
    16921668   SUBROUTINE bdy_ctl_corn( ib1, ib2 ) 
    16931669      !!---------------------------------------------------------------------- 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/WAD/MY_SRC/usrdef_hgr.F90

    • Property svn:keywords set to Id
    r9124 r10289  
    77   !! User defined :   mesh and Coriolis parameter of a user configuration 
    88   !!====================================================================== 
    9    !! History :  NEMO  ! 2016-08  (S. Flavoni, G. Madec)  Original code 
     9   !! History :  4.0 ! 2016-03  (S. Flavoni)  
    1010   !!---------------------------------------------------------------------- 
    1111 
     
    2727 
    2828   !!---------------------------------------------------------------------- 
    29    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     29   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3030   !! $Id$  
    31    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     31   !! Software governed by the CeCILL license (see ./LICENSE) 
    3232   !!---------------------------------------------------------------------- 
    3333CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/WAD/MY_SRC/usrdef_istate.F90

    • Property svn:keywords set to Id
    r9024 r10289  
    77   !! User defined : set the initial state of a user configuration 
    88   !!====================================================================== 
    9    !! History :  NEMO ! 2016-03  (S. Flavoni, G. Madec) Original code 
     9   !! History :  4.0 ! 2016-03  (S. Flavoni) Original code 
    1010   !!---------------------------------------------------------------------- 
    1111 
     
    2424   PRIVATE 
    2525 
    26    PUBLIC   usr_def_istate   ! called by istate.F90 
     26   PUBLIC   usr_def_istate   ! called in istate.F90 
    2727 
    2828   !!---------------------------------------------------------------------- 
    29    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     29   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3030   !! $Id$  
    31    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     31   !! Software governed by the CeCILL license (see ./LICENSE) 
    3232   !!---------------------------------------------------------------------- 
    3333CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/WAD/MY_SRC/usrdef_nam.F90

    • Property svn:keywords set to Id
    r7616 r10289  
    77   !! User defined : set the domain characteristics of a user configuration 
    88   !!====================================================================== 
    9    !! History :  NEMO ! 2016-03  (S. Flavoni, G. Madec)  Original code 
     9   !! History :  4.0 ! 2016-03  (S. Flavoni, G. Madec)  Original code 
    1010   !!---------------------------------------------------------------------- 
    1111 
     
    3333 
    3434   !!---------------------------------------------------------------------- 
    35    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     35   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3636   !! $Id$  
    37    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     37   !! Software governed by the CeCILL license (see ./LICENSE) 
    3838   !!---------------------------------------------------------------------- 
    3939CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/WAD/MY_SRC/usrdef_sbc.F90

    • Property svn:keywords set to Id
    r9659 r10289  
    3434#  include "vectopt_loop_substitute.h90" 
    3535   !!---------------------------------------------------------------------- 
    36    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     36   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$ 
    38    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 
  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/WAD/MY_SRC/usrdef_zgr.F90

    • Property svn:keywords set to Id
    r9135 r10289  
    77   !! Ocean domain : user defined vertical coordinate system  
    88   !!====================================================================== 
    9    !! History :  4.0  ! 2016-08  (G. Madec, S. Flavoni)  Original code 
     9   !! History :  4.0  ! 2016-06  (G. Madec)  Original code 
    1010   !!---------------------------------------------------------------------- 
    1111 
    1212   !!---------------------------------------------------------------------- 
    1313   !!   usr_def_zgr   : user defined vertical coordinate system (required) 
    14    !!       zgr_z1d   : reference 1D z-coordinate  
     14   !!       zgr_z     : reference 1D z-coordinate  
    1515   !!--------------------------------------------------------------------- 
    1616   USE oce            ! ocean variables 
     
    2727   PRIVATE 
    2828 
    29    PUBLIC   usr_def_zgr   ! called by domzgr.F90 
    30  
    31   !! * Substitutions 
     29   PUBLIC   usr_def_zgr        ! called by domzgr.F90 
     30 
     31   !! * Substitutions 
    3232#  include "vectopt_loop_substitute.h90" 
    3333   !!---------------------------------------------------------------------- 
    34    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     34   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3535   !! $Id$ 
    36    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     36   !! Software governed by the CeCILL license (see ./LICENSE) 
    3737   !!---------------------------------------------------------------------- 
    3838CONTAINS              
     
    4141      &                    pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d  ,    &   ! 1D reference vertical coordinate 
    4242      &                    pdept , pdepw ,                             &   ! 3D t & w-points depth 
    43       &                    pe3t  , pe3u  , pe3v , pe3f ,               &   ! vertical scale factors 
    44       &                    pe3w  , pe3uw , pe3vw,                      &   !     -      -      - 
     43      &                    pe3t  , pe3u  , pe3v   , pe3f ,             &   ! vertical scale factors 
     44      &                    pe3w  , pe3uw , pe3vw         ,             &   !     -      -      - 
    4545      &                    k_top  , k_bot    )                             ! top & bottom ocean level 
    4646      !!--------------------------------------------------------------------- 
     
    255255      END DO 
    256256      !      
    257       CALL zgr_z1d( pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d )   ! Reference z-coordinate system 
     257      CALL zgr_z( pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d )   ! Reference z-coordinate system 
    258258      ! 
    259259      ! 
     
    334334 
    335335 
    336    SUBROUTINE zgr_z1d( pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d )   ! 1D reference vertical coordinate 
    337       !!---------------------------------------------------------------------- 
    338       !!                   ***  ROUTINE zgr_z1d  *** 
     336   SUBROUTINE zgr_z( pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d )   ! 1D reference vertical coordinate 
     337      !!---------------------------------------------------------------------- 
     338      !!                   ***  ROUTINE zgr_z  *** 
    339339      !! 
    340340      !! ** Purpose :   set the depth of model levels and the resulting  
     
    363363      IF(lwp) THEN                         ! Parameter print 
    364364         WRITE(numout,*) 
    365          WRITE(numout,*) '    zgr_z1d : Reference vertical z-coordinates: uniform dz = ', rn_dz 
     365         WRITE(numout,*) '    zgr_z : Reference vertical z-coordinates: uniform dz = ', rn_dz 
    366366         WRITE(numout,*) '    ~~~~~~~' 
    367367      ENDIF 
     
    385385      ENDIF 
    386386      ! 
    387    END SUBROUTINE zgr_z1d 
     387   END SUBROUTINE zgr_z 
    388388    
    389389   !!====================================================================== 
Note: See TracChangeset for help on using the changeset viewer.