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

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 10843 for NEMO/branches/UKMO/dev_r10037_GPU/src/OCE – NEMO

Ignore:
Timestamp:
2019-04-05T16:01:32+02:00 (5 years ago)
Author:
andmirek
Message:

ticket #2197 merge with dev_r9950_GO8_package at 10320

Location:
NEMO/branches/UKMO/dev_r10037_GPU/src/OCE
Files:
236 edited
6 copied

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ASM/asmbkg.F90

    r9950 r10843  
    4848   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4949   !! $Id$ 
    50    !! Software governed by the CeCILL licence     (./LICENSE) 
     50   !! Software governed by the CeCILL license (see ./LICENSE) 
    5151   !!---------------------------------------------------------------------- 
    5252CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ASM/asminc.F90

    r9950 r10843  
    9898   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    9999   !! $Id$ 
    100    !! Software governed by the CeCILL licence     (./LICENSE) 
     100   !! Software governed by the CeCILL license (see ./LICENSE) 
    101101   !!---------------------------------------------------------------------- 
    102102CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ASM/asmpar.F90

    r9950 r10843  
    2525   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2626   !! $Id$ 
    27    !! Software governed by the CeCILL licence (./LICENSE) 
     27   !! Software governed by the CeCILL license (see ./LICENSE) 
    2828   !!====================================================================== 
    2929END MODULE asmpar 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/BDY/bdy_oce.F90

    r9950 r10843  
    142142   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    143143   !! $Id$ 
    144    !! Software governed by the CeCILL licence     (./LICENSE) 
     144   !! Software governed by the CeCILL license (see ./LICENSE) 
    145145   !!---------------------------------------------------------------------- 
    146146CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/BDY/bdydta.F90

    r9950 r10843  
    6060   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    6161   !! $Id$ 
    62    !! Software governed by the CeCILL licence (./LICENSE) 
     62   !! Software governed by the CeCILL license (see ./LICENSE) 
    6363   !!---------------------------------------------------------------------- 
    6464CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/BDY/bdydyn.F90

    r9950 r10843  
    3333   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3434   !! $Id$ 
    35    !! Software governed by the CeCILL licence (./LICENSE) 
     35   !! Software governed by the CeCILL license (see ./LICENSE) 
    3636   !!---------------------------------------------------------------------- 
    3737CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/BDY/bdydyn2d.F90

    r9950 r10843  
    3232   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3333   !! $Id$ 
    34    !! Software governed by the CeCILL licence (./LICENSE) 
     34   !! Software governed by the CeCILL license (see ./LICENSE) 
    3535   !!---------------------------------------------------------------------- 
    3636CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/BDY/bdydyn3d.F90

    r9950 r10843  
    2828   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2929   !! $Id$ 
    30    !! Software governed by the CeCILL licence (./LICENSE) 
     30   !! Software governed by the CeCILL license (see ./LICENSE) 
    3131   !!---------------------------------------------------------------------- 
    3232CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/BDY/bdyice.F90

    r9950 r10843  
    4242   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4343   !! $Id$ 
    44    !! Software governed by the CeCILL licence (./LICENSE) 
     44   !! Software governed by the CeCILL license (see ./LICENSE) 
    4545   !!---------------------------------------------------------------------- 
    4646CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/BDY/bdyini.F90

    r9950 r10843  
    4747   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4848   !! $Id$ 
    49    !! Software governed by the CeCILL licence     (./LICENSE) 
     49   !! Software governed by the CeCILL license (see ./LICENSE) 
    5050   !!---------------------------------------------------------------------- 
    5151CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/BDY/bdylib.F90

    r9950 r10843  
    2929   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3030   !! $Id$ 
    31    !! Software governed by the CeCILL licence (./LICENSE) 
     31   !! Software governed by the CeCILL license (see ./LICENSE) 
    3232   !!---------------------------------------------------------------------- 
    3333CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/BDY/bdytides.F90

    r9950 r10843  
    4848   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4949   !! $Id$ 
    50    !! Software governed by the CeCILL licence (./LICENSE) 
     50   !! Software governed by the CeCILL license (see ./LICENSE) 
    5151   !!---------------------------------------------------------------------- 
    5252CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/BDY/bdytra.F90

    r9950 r10843  
    3535   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3636   !! $Id$ 
    37    !! Software governed by the CeCILL licence (./LICENSE) 
     37   !! Software governed by the CeCILL license (see ./LICENSE) 
    3838   !!---------------------------------------------------------------------- 
    3939CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/BDY/bdyvol.F90

    r9950 r10843  
    2929   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3030   !! $Id$ 
    31    !! Software governed by the CeCILL licence (./LICENSE) 
     31   !! Software governed by the CeCILL license (see ./LICENSE) 
    3232   !!---------------------------------------------------------------------- 
    3333CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/C1D/c1d.F90

    r9950 r10843  
    3131 
    3232   !!---------------------------------------------------------------------- 
    33    !! NEMO/C1D 3.7 , NEMO Consortium (2018) 
     33   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3434   !! $Id$ 
    35    !! Software governed by the CeCILL licence     (./LICENSE) 
     35   !! Software governed by the CeCILL license (see ./LICENSE) 
    3636   !!====================================================================== 
    3737CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/C1D/dtauvd.F90

    r9950 r10843  
    3434   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3535   !! $Id$ 
    36    !! Software governed by the CeCILL licence     (./LICENSE) 
     36   !! Software governed by the CeCILL license (see ./LICENSE) 
    3737   !!---------------------------------------------------------------------- 
    3838CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/C1D/dyncor_c1d.F90

    r9950 r10843  
    3333#  include "vectopt_loop_substitute.h90" 
    3434   !!---------------------------------------------------------------------- 
    35    !! NEMO/C1D 3.7 , NEMO Consortium (2018) 
     35   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3636   !! $Id$ 
    37    !! Software governed by the CeCILL licence     (./LICENSE) 
     37   !! Software governed by the CeCILL license (see ./LICENSE) 
    3838   !!---------------------------------------------------------------------- 
    3939CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/C1D/dyndmp.F90

    r9950 r10843  
    4747   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4848   !! $Id$ 
    49    !! Software governed by the CeCILL licence     (./LICENSE) 
     49   !! Software governed by the CeCILL license (see ./LICENSE) 
    5050   !!---------------------------------------------------------------------- 
    5151CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/C1D/step_c1d.F90

    r9950 r10843  
    2828 
    2929   !!---------------------------------------------------------------------- 
    30    !! NEMO/C1D 3.7 , NEMO Consortium (2018) 
     30   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3131   !! $Id$ 
    32    !! Software governed by the CeCILL licence     (./LICENSE) 
     32   !! Software governed by the CeCILL license (see ./LICENSE) 
    3333   !!---------------------------------------------------------------------- 
    3434CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/CRS/crs.F90

    r9950 r10843  
    156156   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    157157   !! $Id$ 
    158    !! Software governed by the CeCILL licence     (./LICENSE) 
     158   !! Software governed by the CeCILL license (see ./LICENSE) 
    159159   !!---------------------------------------------------------------------- 
    160160CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/CRS/crsdom.F90

    r9950 r10843  
    5555   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5656   !! $Id$ 
    57    !! Software governed by the CeCILL licence     (./LICENSE) 
     57   !! Software governed by the CeCILL license (see ./LICENSE) 
    5858   !!---------------------------------------------------------------------- 
    5959CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/CRS/crsdomwri.F90

    r9950 r10843  
    2828   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2929   !! $Id$ 
    30    !! Software governed by the CeCILL licence     (./LICENSE) 
     30   !! Software governed by the CeCILL license (see ./LICENSE) 
    3131   !!---------------------------------------------------------------------- 
    3232CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/CRS/crsfld.F90

    r9950 r10843  
    3636   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$ 
    38    !! Software governed by the CeCILL licence     (./LICENSE) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/CRS/crsini.F90

    r9950 r10843  
    3131   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3232   !! $Id$ 
    33    !! Software governed by the CeCILL licence     (./LICENSE) 
     33   !! Software governed by the CeCILL license (see ./LICENSE) 
    3434   !!---------------------------------------------------------------------- 
    3535CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/CRS/crslbclnk.F90

    r9950 r10843  
    2323   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2424   !! $Id$ 
    25    !! Software governed by the CeCILL licence     (./LICENSE) 
     25   !! Software governed by the CeCILL license (see ./LICENSE) 
    2626   !!---------------------------------------------------------------------- 
    2727CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DIA/dia25h.F90

    r9950 r10843  
    3434   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3535   !! $Id$ 
    36    !! Software governed by the CeCILL licence     (./LICENSE) 
     36   !! Software governed by the CeCILL license (see ./LICENSE) 
    3737   !!---------------------------------------------------------------------- 
    3838CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DIA/diaar5.F90

    r9950 r10843  
    4343   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4444   !! $Id$ 
    45    !! Software governed by the CeCILL licence     (./LICENSE) 
     45   !! Software governed by the CeCILL license (see ./LICENSE) 
    4646   !!---------------------------------------------------------------------- 
    4747CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DIA/diacfl.F90

    r9950 r10843  
    3939#  include "vectopt_loop_substitute.h90" 
    4040   !!---------------------------------------------------------------------- 
    41    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     41   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4242   !! $Id$ 
    43    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
     43   !! Software governed by the CeCILL license (see ./LICENSE) 
    4444   !!---------------------------------------------------------------------- 
    4545CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DIA/diadct.F90

    r9950 r10843  
    100100   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    101101   !! $Id$ 
    102    !! Software governed by the CeCILL licence     (./LICENSE) 
     102   !! Software governed by the CeCILL license (see ./LICENSE) 
    103103   !!---------------------------------------------------------------------- 
    104104CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DIA/diaharm.F90

    r9950 r10843  
    5757   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5858   !! $Id$ 
    59    !! Software governed by the CeCILL licence     (./LICENSE) 
     59   !! Software governed by the CeCILL license (see ./LICENSE) 
    6060   !!---------------------------------------------------------------------- 
    6161CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DIA/diahsb.F90

    r9950 r10843  
    5454   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5555   !! $Id$ 
    56    !! Software governed by the CeCILL licence     (./LICENSE) 
     56   !! Software governed by the CeCILL license (see ./LICENSE) 
    5757   !!---------------------------------------------------------------------- 
    5858CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DIA/diahth.F90

    r9950 r10843  
    4343   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4444   !! $Id$ 
    45    !! Software governed by the CeCILL licence     (./LICENSE) 
     45   !! Software governed by the CeCILL license (see ./LICENSE) 
    4646   !!---------------------------------------------------------------------- 
    4747CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DIA/dianam.F90

    r9950 r10843  
    2525   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2626   !! $Id$ 
    27    !! Software governed by the CeCILL licence (./LICENSE) 
     27   !! Software governed by the CeCILL license (see ./LICENSE) 
    2828   !!---------------------------------------------------------------------- 
    2929 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DIA/diaptr.F90

    r9950 r10843  
    6767   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    6868   !! $Id$ 
    69    !! Software governed by the CeCILL licence     (./LICENSE) 
     69   !! Software governed by the CeCILL license (see ./LICENSE) 
    7070   !!---------------------------------------------------------------------- 
    7171CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DIA/diatmb.F90

    r9950 r10843  
    2323   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2424   !! $Id$ 
    25    !! Software governed by the CeCILL licence     (./LICENSE) 
     25   !! Software governed by the CeCILL license (see ./LICENSE) 
    2626   !!---------------------------------------------------------------------- 
    2727CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DIA/diawri.F90

    r9950 r10843  
    8181   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    8282   !! $Id$ 
    83    !! Software governed by the CeCILL licence     (./LICENSE) 
     83   !! Software governed by the CeCILL license (see ./LICENSE) 
    8484   !!---------------------------------------------------------------------- 
    8585CONTAINS 
     
    125125      ! Output of initial vertical scale factor 
    126126      CALL iom_put("e3t_0", e3t_0(:,:,:) ) 
    127       CALL iom_put("e3u_0", e3t_0(:,:,:) ) 
    128       CALL iom_put("e3v_0", e3t_0(:,:,:) ) 
     127      CALL iom_put("e3u_0", e3u_0(:,:,:) ) 
     128      CALL iom_put("e3v_0", e3v_0(:,:,:) ) 
    129129      ! 
    130130      CALL iom_put( "e3t" , e3t_n(:,:,:) ) 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DIU/cool_skin.F90

    r9950 r10843  
    4444#  include "vectopt_loop_substitute.h90" 
    4545   !!---------------------------------------------------------------------- 
    46    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     46   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4747   !! $Id$ 
    48    !! Software governed by the CeCILL licence     (./LICENSE) 
     48   !! Software governed by the CeCILL license (see ./LICENSE) 
    4949   !!----------------------------------------------------------------------    
    5050   CONTAINS  
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DIU/step_diu.F90

    r9950 r10843  
    2525   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2626   !! $Id$ 
    27    !! Software governed by the CeCILL licence     (./LICENSE) 
     27   !! Software governed by the CeCILL license (see ./LICENSE) 
    2828   !!---------------------------------------------------------------------- 
    2929 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/closea.F90

    r9950 r10843  
    6666   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    6767   !! $Id$ 
    68    !! Software governed by the CeCILL licence     (./LICENSE) 
     68   !! Software governed by the CeCILL license (see ./LICENSE) 
    6969   !!---------------------------------------------------------------------- 
    7070CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/daymod.F90

    r9950 r10843  
    4646   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4747   !! $Id$ 
    48    !! Software governed by the CeCILL licence     (./LICENSE) 
     48   !! Software governed by the CeCILL license (see ./LICENSE) 
    4949   !!---------------------------------------------------------------------- 
    5050CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/depth_e3.F90

    r9598 r10843  
    4141   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4242   !! $Id$ 
    43    !! Software governed by the CeCILL licence     (./LICENSE) 
     43   !! Software governed by the CeCILL license (see ./LICENSE) 
    4444   !!---------------------------------------------------------------------- 
    4545CONTAINS              
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/dom_oce.F90

    r9950 r10843  
    216216   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    217217   !! $Id$ 
    218    !! Software governed by the CeCILL licence     (./LICENSE) 
     218   !! Software governed by the CeCILL license (see ./LICENSE) 
    219219   !!---------------------------------------------------------------------- 
    220220CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/domain.F90

    r9950 r10843  
    5454   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5555   !! $Id$ 
    56    !! Software governed by the CeCILL licence        (./LICENSE) 
     56   !! Software governed by the CeCILL license (see ./LICENSE) 
    5757   !!------------------------------------------------------------------------- 
    5858CONTAINS 
     
    292292         &             nn_it000, nn_itend , nn_date0    , nn_time0     , nn_leapy  , nn_istate ,     & 
    293293         &             nn_stock, nn_write , ln_mskland  , ln_clobber   , nn_chunksz, nn_euler  ,     & 
    294          &             ln_cfmeta, ln_iscpl, ln_xios_read, nn_wxios 
     294         &             ln_cfmeta, ln_iscpl, ln_xios_read, nn_wxios, ln_rstdate 
    295295      NAMELIST/namdom/ ln_linssh, rn_isfhmin, rn_rdt, rn_atfp, ln_crs, ln_meshmask 
    296296#if defined key_netcdf4 
     
    338338         WRITE(numout,*) '      frequency of output file        nn_write        = ', nn_write 
    339339         WRITE(numout,*) '      mask land points                ln_mskland      = ', ln_mskland 
     340         WRITE(numout,*) '      date-stamp restart files        ln_rstdate = ', ln_rstdate 
    340341         WRITE(numout,*) '      additional CF standard metadata ln_cfmeta       = ', ln_cfmeta 
    341342         WRITE(numout,*) '      overwrite an existing file      ln_clobber      = ', ln_clobber 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/domhgr.F90

    r9950 r10843  
    4141   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4242   !! $Id$ 
    43    !! Software governed by the CeCILL licence     (./LICENSE) 
     43   !! Software governed by the CeCILL license (see ./LICENSE) 
    4444   !!---------------------------------------------------------------------- 
    4545CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/dommsk.F90

    r9950 r10843  
    4848   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4949   !! $Id$ 
    50    !! Software governed by the CeCILL licence     (./LICENSE) 
     50   !! Software governed by the CeCILL license (see ./LICENSE) 
    5151   !!---------------------------------------------------------------------- 
    5252CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/domngb.F90

    r9950 r10843  
    2323   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2424   !! $Id$ 
    25    !! Software governed by the CeCILL licence     (./LICENSE) 
     25   !! Software governed by the CeCILL license (see ./LICENSE) 
    2626   !!---------------------------------------------------------------------- 
    2727CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/domvvl.F90

    r9950 r10843  
    6464#  include "vectopt_loop_substitute.h90" 
    6565   !!---------------------------------------------------------------------- 
    66    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     66   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    6767   !! $Id$ 
    68    !! Software governed by the CeCILL licence     (./LICENSE) 
     68   !! Software governed by the CeCILL license (see ./LICENSE) 
    6969   !!---------------------------------------------------------------------- 
    7070CONTAINS 
     
    234234               END DO 
    235235            END DO 
    236             IF( cn_cfg == "orca" .AND. nn_cfg == 3 ) THEN   ! ORCA2: Suppress ztilde in the Foxe Basin for ORCA2 
    237                ii0 = 103   ;   ii1 = 111        
    238                ij0 = 128   ;   ij1 = 135   ;    
    239                frq_rst_e3t( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) =  0.0_wp 
    240                frq_rst_hdv( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) =  1.e0_wp / rdt 
     236            IF( cn_cfg == "orca" .OR. cn_cfg == "ORCA" ) THEN 
     237               IF( nn_cfg == 3 ) THEN   ! ORCA2: Suppress ztilde in the Foxe Basin for ORCA2 
     238                  ii0 = 103   ;   ii1 = 111        
     239                  ij0 = 128   ;   ij1 = 135   ;    
     240                  frq_rst_e3t( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) =  0.0_wp 
     241                  frq_rst_hdv( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) =  1.e0_wp / rdt 
     242               ENDIF 
    241243            ENDIF 
    242244         ENDIF 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/domwri.F90

    r9950 r10843  
    3636   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$ 
    38    !! Software governed by the CeCILL licence     (./LICENSE) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/domzgr.F90

    r9950 r10843  
    4848   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4949   !! $Id$ 
    50    !! Software governed by the CeCILL licence     (./LICENSE) 
     50   !! Software governed by the CeCILL license (see ./LICENSE) 
    5151   !!---------------------------------------------------------------------- 
    5252CONTAINS        
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/dtatsd.F90

    r9950 r10843  
    3838   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3939   !! $Id$ 
    40    !! Software governed by the CeCILL licence     (./LICENSE) 
     40   !! Software governed by the CeCILL license (see ./LICENSE) 
    4141   !!---------------------------------------------------------------------- 
    4242CONTAINS 
     
    150150      ! 
    151151      !                                   !==   ORCA_R2 configuration and T & S damping   ==!  
    152       IF( cn_cfg == "orca" .AND. nn_cfg == 2 .AND. ln_tsd_dmp ) THEN    ! some hand made alterations 
    153          ! 
    154          ij0 = 101   ;   ij1 = 109                       ! Reduced T & S in the Alboran Sea 
    155          ii0 = 141   ;   ii1 = 155 
    156          DO jj = mj0(ij0), mj1(ij1) 
    157             DO ji = mi0(ii0), mi1(ii1) 
    158                sf_tsd(jp_tem)%fnow(ji,jj,13:13) = sf_tsd(jp_tem)%fnow(ji,jj,13:13) - 0.20_wp 
    159                sf_tsd(jp_tem)%fnow(ji,jj,14:15) = sf_tsd(jp_tem)%fnow(ji,jj,14:15) - 0.35_wp 
    160                sf_tsd(jp_tem)%fnow(ji,jj,16:25) = sf_tsd(jp_tem)%fnow(ji,jj,16:25) - 0.40_wp 
    161                ! 
    162                sf_tsd(jp_sal)%fnow(ji,jj,13:13) = sf_tsd(jp_sal)%fnow(ji,jj,13:13) - 0.15_wp 
    163                sf_tsd(jp_sal)%fnow(ji,jj,14:15) = sf_tsd(jp_sal)%fnow(ji,jj,14:15) - 0.25_wp 
    164                sf_tsd(jp_sal)%fnow(ji,jj,16:17) = sf_tsd(jp_sal)%fnow(ji,jj,16:17) - 0.30_wp 
    165                sf_tsd(jp_sal)%fnow(ji,jj,18:25) = sf_tsd(jp_sal)%fnow(ji,jj,18:25) - 0.35_wp 
     152      IF( cn_cfg == "orca" .OR. cn_cfg == "ORCA" ) THEN 
     153         IF( nn_cfg == 2 .AND. ln_tsd_dmp ) THEN    ! some hand made alterations 
     154            ! 
     155            ij0 = 101   ;   ij1 = 109                       ! Reduced T & S in the Alboran Sea 
     156            ii0 = 141   ;   ii1 = 155 
     157            DO jj = mj0(ij0), mj1(ij1) 
     158               DO ji = mi0(ii0), mi1(ii1) 
     159                  sf_tsd(jp_tem)%fnow(ji,jj,13:13) = sf_tsd(jp_tem)%fnow(ji,jj,13:13) - 0.20_wp 
     160                  sf_tsd(jp_tem)%fnow(ji,jj,14:15) = sf_tsd(jp_tem)%fnow(ji,jj,14:15) - 0.35_wp 
     161                  sf_tsd(jp_tem)%fnow(ji,jj,16:25) = sf_tsd(jp_tem)%fnow(ji,jj,16:25) - 0.40_wp 
     162                  ! 
     163                  sf_tsd(jp_sal)%fnow(ji,jj,13:13) = sf_tsd(jp_sal)%fnow(ji,jj,13:13) - 0.15_wp 
     164                  sf_tsd(jp_sal)%fnow(ji,jj,14:15) = sf_tsd(jp_sal)%fnow(ji,jj,14:15) - 0.25_wp 
     165                  sf_tsd(jp_sal)%fnow(ji,jj,16:17) = sf_tsd(jp_sal)%fnow(ji,jj,16:17) - 0.30_wp 
     166                  sf_tsd(jp_sal)%fnow(ji,jj,18:25) = sf_tsd(jp_sal)%fnow(ji,jj,18:25) - 0.35_wp 
     167               END DO 
    166168            END DO 
    167          END DO 
    168          ij0 =  87   ;   ij1 =  96                          ! Reduced temperature in Red Sea 
    169          ii0 = 148   ;   ii1 = 160 
    170          sf_tsd(jp_tem)%fnow( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ,  4:10 ) = 7.0_wp 
    171          sf_tsd(jp_tem)%fnow( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 11:13 ) = 6.5_wp 
    172          sf_tsd(jp_tem)%fnow( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 14:20 ) = 6.0_wp 
     169            ij0 =  87   ;   ij1 =  96                          ! Reduced temperature in Red Sea 
     170            ii0 = 148   ;   ii1 = 160 
     171            sf_tsd(jp_tem)%fnow( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ,  4:10 ) = 7.0_wp 
     172            sf_tsd(jp_tem)%fnow( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 11:13 ) = 6.5_wp 
     173            sf_tsd(jp_tem)%fnow( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 14:20 ) = 6.0_wp 
     174         ENDIF 
    173175      ENDIF 
    174176!!gm end 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/iscplhsb.F90

    r9950 r10843  
    3636   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$ 
    38    !! Software governed by the CeCILL licence     (./LICENSE) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/iscplini.F90

    r9950 r10843  
    3838   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3939   !! $Id$ 
    40    !! Software governed by the CeCILL licence     (./LICENSE) 
     40   !! Software governed by the CeCILL license (see ./LICENSE) 
    4141   !!---------------------------------------------------------------------- 
    4242CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/iscplrst.F90

    r9950 r10843  
    3636   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$ 
    38    !! Software governed by the CeCILL licence     (./LICENSE) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/istate.F90

    r9950 r10843  
    4747   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4848   !! $Id$ 
    49    !! Software governed by the CeCILL licence     (./LICENSE) 
     49   !! Software governed by the CeCILL license (see ./LICENSE) 
    5050   !!---------------------------------------------------------------------- 
    5151CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DOM/phycst.F90

    r9950 r10843  
    6969   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7070   !! $Id$ 
    71    !! Software governed by the CeCILL licence (./LICENSE) 
     71   !! Software governed by the CeCILL license (see ./LICENSE) 
    7272   !!---------------------------------------------------------------------- 
    7373    
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/divhor.F90

    r9950 r10843  
    4444   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4545   !! $Id$ 
    46    !! Software governed by the CeCILL licence     (./LICENSE) 
     46   !! Software governed by the CeCILL license (see ./LICENSE) 
    4747   !!---------------------------------------------------------------------- 
    4848CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynadv.F90

    r9950 r10843  
    4949   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5050   !! $Id$ 
    51    !! Software governed by the CeCILL licence     (./LICENSE) 
     51   !! Software governed by the CeCILL license (see ./LICENSE) 
    5252   !!---------------------------------------------------------------------- 
    5353CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynadv_cen2.F90

    r9950 r10843  
    3131   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3232   !! $Id$ 
    33    !! Software governed by the CeCILL licence     (./LICENSE) 
     33   !! Software governed by the CeCILL license (see ./LICENSE) 
    3434   !!---------------------------------------------------------------------- 
    3535CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynadv_ubs.F90

    r9950 r10843  
    3737   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3838   !! $Id$ 
    39    !! Software governed by the CeCILL licence     (./LICENSE) 
     39   !! Software governed by the CeCILL license (see ./LICENSE) 
    4040   !!---------------------------------------------------------------------- 
    4141CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynhpg.F90

    r9950 r10843  
    7777   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7878   !! $Id$ 
    79    !! Software governed by the CeCILL licence     (./LICENSE) 
     79   !! Software governed by the CeCILL license (see ./LICENSE) 
    8080   !!---------------------------------------------------------------------- 
    8181CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynkeg.F90

    r9950 r10843  
    4040   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4141   !! $Id$ 
    42    !! Software governed by the CeCILL licence     (./LICENSE) 
     42   !! Software governed by the CeCILL license (see ./LICENSE) 
    4343   !!---------------------------------------------------------------------- 
    4444CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynldf.F90

    r9950 r10843  
    3939   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4040   !! $Id$ 
    41    !! Software governed by the CeCILL licence     (./LICENSE) 
     41   !! Software governed by the CeCILL license (see ./LICENSE) 
    4242   !!---------------------------------------------------------------------- 
    4343CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynldf_iso.F90

    r9950 r10843  
    4545   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4646   !! $Id$ 
    47    !! Software governed by the CeCILL licence     (./LICENSE) 
     47   !! Software governed by the CeCILL license (see ./LICENSE) 
    4848   !!---------------------------------------------------------------------- 
    4949CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynldf_lap_blp.F90

    r9950 r10843  
    3131   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3232   !! $Id$ 
    33    !! Software governed by the CeCILL licence     (./LICENSE) 
     33   !! Software governed by the CeCILL license (see ./LICENSE) 
    3434   !!---------------------------------------------------------------------- 
    3535CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynnxt.F90

    r9950 r10843  
    6060   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    6161   !! $Id$ 
    62    !! Software governed by the CeCILL licence     (./LICENSE) 
     62   !! Software governed by the CeCILL license (see ./LICENSE) 
    6363   !!---------------------------------------------------------------------- 
    6464CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynspg.F90

    r9950 r10843  
    4949   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5050   !! $Id$ 
    51    !! Software governed by the CeCILL licence     (./LICENSE) 
     51   !! Software governed by the CeCILL license (see ./LICENSE) 
    5252   !!---------------------------------------------------------------------- 
    5353CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynspg_exp.F90

    r9950 r10843  
    3434   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3535   !! $Id$ 
    36    !! Software governed by the CeCILL licence     (./LICENSE) 
     36   !! Software governed by the CeCILL license (see ./LICENSE) 
    3737   !!---------------------------------------------------------------------- 
    3838CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynspg_ts.F90

    r9950 r10843  
    9090   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    9191   !! $Id$ 
    92    !! Software governed by the CeCILL licence     (./LICENSE) 
     92   !! Software governed by the CeCILL license (see ./LICENSE) 
    9393   !!---------------------------------------------------------------------- 
    9494CONTAINS 
     
    11141114                            &   ) * ssvmask(ji,jj) 
    11151115  
    1116 !jth implicit bottom friction: 
    1117                   IF ( ll_wd ) THEN ! revert to explicit for bit comparison tests in non wad runs 
    1118                      ua_e(ji,jj) =  ua_e(ji,jj) /(1.0 -   rdtbt * zCdU_u(ji,jj) * hur_e(ji,jj)) 
    1119                      va_e(ji,jj) =  va_e(ji,jj) /(1.0 -   rdtbt * zCdU_v(ji,jj) * hvr_e(ji,jj)) 
    1120                   ENDIF 
    1121  
    11221116               END DO 
    11231117            END DO 
     
    11441138                            &               +    hv_n(ji,jj)  * zv_frc(ji,jj) ) & 
    11451139                            &   ) * zhvra 
     1140               END DO 
     1141            END DO 
     1142         ENDIF 
     1143!jth implicit bottom friction: 
     1144         IF ( ll_wd ) THEN ! revert to explicit for bit comparison tests in non wad runs 
     1145            DO jj = 2, jpjm1 
     1146               DO ji = fs_2, fs_jpim1   ! vector opt. 
     1147                     ua_e(ji,jj) =  ua_e(ji,jj) /(1.0 -   rdtbt * zCdU_u(ji,jj) * hur_e(ji,jj)) 
     1148                     va_e(ji,jj) =  va_e(ji,jj) /(1.0 -   rdtbt * zCdU_v(ji,jj) * hvr_e(ji,jj)) 
    11461149               END DO 
    11471150            END DO 
     
    13931396      IF( TRIM(cdrw) == 'READ' ) THEN        ! Read/initialise  
    13941397         !                                   ! --------------- 
    1395          IF( ln_rstart .AND. ln_bt_fw ) THEN    !* Read the restart file 
     1398         IF( ln_rstart .AND. ln_bt_fw .AND. (neuler/=0) ) THEN    !* Read the restart file 
    13961399            CALL iom_get( numror, jpdom_autoglo, 'ub2_b'  , ub2_b  (:,:), ldxios = lrxios )    
    13971400            CALL iom_get( numror, jpdom_autoglo, 'vb2_b'  , vb2_b  (:,:), ldxios = lrxios )  
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynvor.F90

    r9950 r10843  
    9292   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    9393   !! $Id$ 
    94    !! Software governed by the CeCILL licence     (./LICENSE) 
     94   !! Software governed by the CeCILL license (see ./LICENSE) 
    9595   !!---------------------------------------------------------------------- 
    9696CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynzad.F90

    r10011 r10843  
    3232   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3333   !! $Id$ 
    34    !! Software governed by the CeCILL licence     (./LICENSE) 
     34   !! Software governed by the CeCILL license (see ./LICENSE) 
    3535   !!---------------------------------------------------------------------- 
    3636CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/dynzdf.F90

    r9950 r10843  
    4141   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4242   !! $Id$ 
    43    !! Software governed by the CeCILL licence (./LICENSE) 
     43   !! Software governed by the CeCILL license (see ./LICENSE) 
    4444   !!---------------------------------------------------------------------- 
    4545CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/DYN/sshwzv.F90

    r9950 r10843  
    4848   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4949   !! $Id$ 
    50    !! Software governed by the CeCILL licence     (./LICENSE) 
     50   !! Software governed by the CeCILL license (see ./LICENSE) 
    5151   !!---------------------------------------------------------------------- 
    5252CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/FLO/flo4rk.F90

    r9950 r10843  
    3131   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3232   !! $Id$ 
    33    !! Software governed by the CeCILL licence     (./LICENSE) 
     33   !! Software governed by the CeCILL license (see ./LICENSE) 
    3434   !!---------------------------------------------------------------------- 
    3535CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/FLO/flo_oce.F90

    r9950 r10843  
    5252   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5353   !! $Id$ 
    54    !! Software governed by the CeCILL licence     (./LICENSE) 
     54   !! Software governed by the CeCILL license (see ./LICENSE) 
    5555   !!---------------------------------------------------------------------- 
    5656CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/FLO/floats.F90

    r9950 r10843  
    3535   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3636   !! $Id$ 
    37    !! Software governed by the CeCILL licence     (./LICENSE) 
     37   !! Software governed by the CeCILL license (see ./LICENSE) 
    3838   !!---------------------------------------------------------------------- 
    3939CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/FLO/floblk.F90

    r9950 r10843  
    2525   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2626   !! $Id$ 
    27    !! Software governed by the CeCILL licence     (./LICENSE) 
     27   !! Software governed by the CeCILL license (see ./LICENSE) 
    2828   !!---------------------------------------------------------------------- 
    2929CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/FLO/flodom.F90

    r9950 r10843  
    4040   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4141   !! $Id$ 
    42    !! Software governed by the CeCILL licence     (./LICENSE) 
     42   !! Software governed by the CeCILL license (see ./LICENSE) 
    4343   !!---------------------------------------------------------------------- 
    4444CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/FLO/florst.F90

    r9950 r10843  
    2929   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3030   !! $Id$ 
    31    !! Software governed by the CeCILL licence     (./LICENSE) 
     31   !! Software governed by the CeCILL license (see ./LICENSE) 
    3232   !!---------------------------------------------------------------------- 
    3333CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/FLO/flowri.F90

    r9950 r10843  
    4040   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4141   !! $Id$ 
    42    !! Software governed by the CeCILL licence     (./LICENSE) 
     42   !! Software governed by the CeCILL license (see ./LICENSE) 
    4343   !!---------------------------------------------------------------------- 
    4444CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ICB/icb_oce.F90

    r9950 r10843  
    148148   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    149149   !! $Id$ 
    150    !! Software governed by the CeCILL licence     (./LICENSE) 
     150   !! Software governed by the CeCILL license (see ./LICENSE) 
    151151   !!---------------------------------------------------------------------- 
    152152CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ICB/icbclv.F90

    r9950 r10843  
    3434   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3535   !! $Id$ 
    36    !! Software governed by the CeCILL licence     (./LICENSE) 
     36   !! Software governed by the CeCILL license (see ./LICENSE) 
    3737   !!---------------------------------------------------------------------- 
    3838CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ICB/icbdia.F90

    r10011 r10843  
    9292   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    9393   !! $Id$ 
    94    !! Software governed by the CeCILL licence     (./LICENSE) 
     94   !! Software governed by the CeCILL license (see ./LICENSE) 
    9595   !!---------------------------------------------------------------------- 
    9696CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ICB/icbdyn.F90

    r9950 r10843  
    2727   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2828   !! $Id$ 
    29    !! Software governed by the CeCILL licence     (./LICENSE) 
     29   !! Software governed by the CeCILL license (see ./LICENSE) 
    3030   !!---------------------------------------------------------------------- 
    3131CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ICB/icbini.F90

    r9950 r10843  
    4242   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4343   !! $Id$ 
    44    !! Software governed by the CeCILL licence     (./LICENSE) 
     44   !! Software governed by the CeCILL license (see ./LICENSE) 
    4545   !!---------------------------------------------------------------------- 
    4646CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ICB/icblbc.F90

    r9950 r10843  
    6666   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    6767   !! $Id$ 
    68    !! Software governed by the CeCILL licence     (./LICENSE) 
     68   !! Software governed by the CeCILL license (see ./LICENSE) 
    6969   !!---------------------------------------------------------------------- 
    7070CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ICB/icbrst.F90

    r9950 r10843  
    2525   USE netcdf         ! netcdf routines for IO 
    2626   USE iom 
     27   USE ioipsl, ONLY : ju2ymds    ! for calendar 
    2728   USE icb_oce        ! define iceberg arrays 
    2829   USE icbutl         ! iceberg utility routines 
     
    4647   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4748   !! $Id$ 
    48    !! Software governed by the CeCILL licence     (./LICENSE) 
     49   !! Software governed by the CeCILL license (see ./LICENSE) 
    4950   !!---------------------------------------------------------------------- 
    5051CONTAINS 
     
    6061      INTEGER                      ::   idim, ivar, iatt 
    6162      INTEGER                      ::   jn, iunlim_dim, ibergs_in_file 
    62       INTEGER                      ::   ii,ij,iclass 
     63      INTEGER                      ::   ii, ij, iclass, ibase_err, imax_icb 
    6364      REAL(wp), DIMENSION(nkounts) ::   zdata       
    6465      LOGICAL                      ::   ll_found_restart 
     
    7778      CALL iom_open( TRIM(cl_path)//cl_filename, ncid ) 
    7879 
     80      imax_icb = 0 
    7981      IF( iom_file(ncid)%iduld .GE. 0) THEN 
    8082 
     
    9698               CALL iom_get( ncid, jpdom_unknown, 'number'       , zdata(:) , ktime=jn, kstart=(/1/), kcount=(/nkounts/) ) 
    9799               localberg%number(:) = INT(zdata(:)) 
     100               imax_icb = MAX( imax_icb, INT(zdata(1)) ) 
    98101               CALL iom_get( ncid, 'mass_scaling' , localberg%mass_scaling, ktime=jn ) 
    99102               CALL iom_get( ncid, 'lon'          , localpt%lon           , ktime=jn ) 
     
    129132      CALL iom_get( ncid, jpdom_unknown, 'kount' , zdata(:) ) 
    130133      num_bergs(:) = INT(zdata(:)) 
    131  
    132       ! Sanity check 
     134      ! Close file 
     135      CALL iom_close( ncid ) 
     136      ! 
     137 
     138      ! Sanity checks 
    133139      jn = icb_utl_count() 
    134140      IF ( lwp .AND. nn_verbose_level >= 0 )   & 
     
    142148         &                                    ' bergs in the restart file and', jn,' bergs have been read' 
    143149      ! 
    144       ! Finish up 
    145       CALL iom_close( ncid ) 
     150      ! Confirm that all areas have a suitable base for assigning new iceberg 
     151      ! numbers. This will not be the case if restarting from a collated dataset 
     152      ! (even if using the same processor decomposition) 
     153      ! 
     154      ibase_err = 0 
     155      IF( num_bergs(1) < 0 .AND. num_bergs(1) /= narea - jpnij ) THEN 
     156         ! If this area has never calved a new berg then the base should be 
     157         ! set to narea - jpnij. If it is negative but something else then 
     158         ! a new base will be needed to guarantee unique, future iceberg numbers 
     159         ibase_err = 1 
     160      ELSEIF( MOD( num_bergs(1) - narea , jpnij ) /= 0 ) THEN 
     161         ! If this area has a base which is not in the set {narea + N*jpnij} 
     162         ! for positive integers N then a new base will be needed to guarantee  
     163         ! unique, future iceberg numbers 
     164         ibase_err = 1 
     165      ENDIF 
     166      IF( lk_mpp ) THEN 
     167         CALL mpp_sum(ibase_err) 
     168      ENDIF 
     169      IF( ibase_err > 0 ) THEN 
     170         !  
     171         ! A new base is needed. The only secure solution is to set bases such that 
     172         ! all future icebergs numbers will be greater than the current global maximum 
     173         IF( lk_mpp ) THEN 
     174            CALL mpp_max(imax_icb) 
     175         ENDIF 
     176         num_bergs(1) = imax_icb - jpnij + narea 
     177      ENDIF 
    146178      ! 
    147179      IF( lwp .AND. nn_verbose_level >= 0 )  WRITE(numout,'(a)') 'icebergs, icb_rst_read: completed' 
     
    159191      INTEGER ::   jn   ! dummy loop index 
    160192      INTEGER ::   ix_dim, iy_dim, ik_dim, in_dim 
    161       CHARACTER(len=256)     :: cl_path 
    162       CHARACTER(len=256)     :: cl_filename 
     193      INTEGER             ::   iyear, imonth, iday 
     194      REAL (wp)           ::   zsec 
     195      REAL (wp)           ::   zfjulday 
     196      CHARACTER(len=256)  :: cl_path 
     197      CHARACTER(len=256)  :: cl_filename 
     198      CHARACTER(LEN=20)   ::   clkt     ! ocean time-step deine as a character 
    163199      TYPE(iceberg), POINTER :: this 
    164200      TYPE(point)  , POINTER :: pt 
     
    175211         cl_path = TRIM(cn_ocerst_outdir) 
    176212         IF( cl_path(LEN_TRIM(cl_path):) /= '/' ) cl_path = TRIM(cl_path) // '/' 
     213         IF ( ln_rstdate ) THEN 
     214            zfjulday = fjulday + rdt / rday 
     215            IF( ABS(zfjulday - REAL(NINT(zfjulday),wp)) < 0.1 / rday )   zfjulday = REAL(NINT(zfjulday),wp)   ! avoid truncation error 
     216            CALL ju2ymds( zfjulday, iyear, imonth, iday, zsec )            
     217            WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday 
     218         ELSE 
     219            IF( kt > 999999999 ) THEN   ;   WRITE(clkt, *       ) kt 
     220            ELSE                        ;   WRITE(clkt, '(i8.8)') kt 
     221            ENDIF 
     222         ENDIF 
    177223         IF( lk_mpp ) THEN 
    178             WRITE(cl_filename,'(A,"_icebergs_",I8.8,"_restart_",I4.4,".nc")') TRIM(cexper), kt, narea-1 
     224            WRITE(cl_filename,'(A,"_icebergs_",A,"_restart_",I4.4,".nc")') TRIM(cexper), TRIM(ADJUSTL(clkt)), narea-1 
    179225         ELSE 
    180             WRITE(cl_filename,'(A,"_icebergs_",I8.8,"_restart.nc")') TRIM(cexper), kt 
     226            WRITE(cl_filename,'(A,"_icebergs_",A,"_restart.nc")') TRIM(cexper), TRIM(ADJUSTL(clkt)) 
    181227         ENDIF 
    182228         IF ( lwp .AND. nn_verbose_level >= 0) WRITE(numout,'(2a)') 'icebergs, write_restart: creating ',  & 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ICB/icbstp.F90

    r9950 r10843  
    4848   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4949   !! $Id$ 
    50    !! Software governed by the CeCILL licence     (./LICENSE) 
     50   !! Software governed by the CeCILL license (see ./LICENSE) 
    5151   !!---------------------------------------------------------------------- 
    5252CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ICB/icbthm.F90

    r10011 r10843  
    3333   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3434   !! $Id$ 
    35    !! Software governed by the CeCILL licence     (./LICENSE) 
     35   !! Software governed by the CeCILL license (see ./LICENSE) 
    3636   !!---------------------------------------------------------------------- 
    3737CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ICB/icbtrj.F90

    r9950 r10843  
    4949   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5050   !! $Id$ 
    51    !! Software governed by the CeCILL licence     (./LICENSE) 
     51   !! Software governed by the CeCILL license (see ./LICENSE) 
    5252   !!---------------------------------------------------------------------- 
    5353CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ICB/icbutl.F90

    r9950 r10843  
    4848   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4949   !! $Id$ 
    50    !! Software governed by the CeCILL licence     (./LICENSE) 
     50   !! Software governed by the CeCILL license (see ./LICENSE) 
    5151   !!---------------------------------------------------------------------- 
    5252CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/IOM/in_out_manager.F90

    r9950 r10843  
    4040   INTEGER, DIMENSION(10) :: nn_stocklist  !: restart dump times 
    4141   LOGICAL       ::   ln_mskland       !: mask land points in NetCDF outputs (costly: + ~15%) 
     42   LOGICAL       ::   ln_rstdate       !: T=> stamp output restart files with date instead of timestep 
    4243   LOGICAL       ::   ln_cfmeta        !: output additional data to netCDF files required for compliance with the CF metadata standard 
    4344   LOGICAL       ::   ln_clobber       !: clobber (overwrite) an existing file 
     
    160161   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    161162   !! $Id$ 
    162    !! Software governed by the CeCILL licence     (./LICENSE) 
     163   !! Software governed by the CeCILL license (see ./LICENSE) 
    163164   !!===================================================================== 
    164165END MODULE in_out_manager 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/IOM/iom.F90

    r10032 r10843  
    4343   USE ioipsl, ONLY :  ju2ymds    ! for calendar 
    4444   USE crs             ! Grid coarsening 
     45#if defined key_top 
     46   USE trc, ONLY    :  profsed 
     47#endif 
    4548   USE lib_fortran  
    4649   USE diurnal_bulk, ONLY : ln_diurnal_only, ln_diurnal 
     
    8790   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    8891   !! $Id$ 
    89    !! Software governed by the CeCILL licence (./LICENSE) 
     92   !! Software governed by the CeCILL license (see ./LICENSE) 
    9093   !!---------------------------------------------------------------------- 
    9194CONTAINS 
     
    193196      ! vertical grid definition 
    194197      IF(.NOT.llrst_context) THEN 
    195           CALL iom_set_axis_attr( "deptht", paxis = gdept_1d ) 
    196           CALL iom_set_axis_attr( "depthu", paxis = gdept_1d ) 
    197           CALL iom_set_axis_attr( "depthv", paxis = gdept_1d ) 
    198           CALL iom_set_axis_attr( "depthw", paxis = gdepw_1d ) 
     198          CALL iom_set_axis_attr( "deptht",  paxis = gdept_1d ) 
     199          CALL iom_set_axis_attr( "depthu",  paxis = gdept_1d ) 
     200          CALL iom_set_axis_attr( "depthv",  paxis = gdept_1d ) 
     201          CALL iom_set_axis_attr( "depthw",  paxis = gdepw_1d ) 
    199202 
    200203          ! Add vertical grid bounds 
     
    206209          zw_bnds(2,1:jpkm1  ) = gdepw_1d(jkmin:jpk) 
    207210          zw_bnds(2,jpk:     ) = gdepw_1d(jpk) + e3t_1d(jpk) 
    208           CALL iom_set_axis_attr( "deptht", bounds=zt_bnds ) 
    209           CALL iom_set_axis_attr( "depthu", bounds=zt_bnds ) 
    210           CALL iom_set_axis_attr( "depthv", bounds=zt_bnds ) 
    211           CALL iom_set_axis_attr( "depthw", bounds=zw_bnds ) 
     211          CALL iom_set_axis_attr( "deptht", bounds=zw_bnds ) 
     212          CALL iom_set_axis_attr( "depthu", bounds=zw_bnds ) 
     213          CALL iom_set_axis_attr( "depthv", bounds=zw_bnds ) 
     214          CALL iom_set_axis_attr( "depthw", bounds=zt_bnds ) 
    212215          ! 
    213216# if defined key_floats 
     
    219222          CALL iom_set_axis_attr( "nstrait", (/ (REAL(ji,wp), ji=1,4) /) ) 
    220223# endif 
     224#if defined key_top 
     225          CALL iom_set_axis_attr( "profsed", paxis = profsed ) 
     226#endif 
    221227          CALL iom_set_axis_attr( "icbcla", class_num ) 
    222228          CALL iom_set_axis_attr( "iax_20C", (/ REAL(20,wp) /) ) 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/IOM/iom_def.F90

    r9950 r10843  
    8585   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    8686   !! $Id$ 
    87    !! Software governed by the CeCILL licence (./LICENSE) 
     87   !! Software governed by the CeCILL license (see ./LICENSE) 
    8888   !!====================================================================== 
    8989END MODULE iom_def 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/IOM/iom_nf90.F90

    r9950 r10843  
    4848   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4949   !! $Id$ 
    50    !! Software governed by the CeCILL licence (./LICENSE) 
     50   !! Software governed by the CeCILL license (see ./LICENSE) 
    5151   !!---------------------------------------------------------------------- 
    5252CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/IOM/prtctl.F90

    r9950 r10843  
    3737   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3838   !! $Id$ 
    39    !! Software governed by the CeCILL licence     (./LICENSE) 
     39   !! Software governed by the CeCILL license (see ./LICENSE) 
    4040   !!---------------------------------------------------------------------- 
    4141CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/IOM/restart.F90

    r9950 r10843  
    2727   USE in_out_manager  ! I/O manager 
    2828   USE iom             ! I/O module 
     29   USE ioipsl, ONLY : ju2ymds    ! for calendar 
    2930   USE diurnal_bulk 
    3031 
     
    4243   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4344   !! $Id$ 
    44    !! Software governed by the CeCILL licence     (./LICENSE) 
     45   !! Software governed by the CeCILL license (see ./LICENSE) 
    4546   !!---------------------------------------------------------------------- 
    4647CONTAINS 
     
    5859      INTEGER, INTENT(in) ::   kt     ! ocean time-step 
    5960      !! 
     61      INTEGER             ::   iyear, imonth, iday 
     62      REAL (wp)           ::   zsec 
     63      REAL (wp)           ::   zfjulday 
    6064      CHARACTER(LEN=20)   ::   clkt     ! ocean time-step deine as a character 
    6165      CHARACTER(LEN=50)   ::   clname   ! ocean output restart file name 
     
    8791         IF( nitrst <= nitend .AND. nitrst > 0 ) THEN  
    8892            ! beware of the format used to write kt (default is i8.8, that should be large enough...) 
    89             IF( nitrst > 999999999 ) THEN   ;   WRITE(clkt, *       ) nitrst 
    90             ELSE                            ;   WRITE(clkt, '(i8.8)') nitrst 
     93            IF ( ln_rstdate ) THEN 
     94               zfjulday = fjulday + rdt / rday 
     95               IF( ABS(zfjulday - REAL(NINT(zfjulday),wp)) < 0.1 / rday )   zfjulday = REAL(NINT(zfjulday),wp)   ! avoid truncation error 
     96               CALL ju2ymds( zfjulday, iyear, imonth, iday, zsec )            
     97               WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday 
     98            ELSE 
     99               IF( nitrst > 999999999 ) THEN   ;   WRITE(clkt, *       ) nitrst 
     100               ELSE                            ;   WRITE(clkt, '(i8.8)') nitrst 
     101               ENDIF 
    91102            ENDIF 
    92103            ! create the file 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/LBC/lbclnk.F90

    r9950 r10843  
    5353   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5454   !! $Id$ 
    55    !! Software governed by the CeCILL licence     (./LICENSE) 
     55   !! Software governed by the CeCILL license (see ./LICENSE) 
    5656   !!---------------------------------------------------------------------- 
    5757CONTAINS 
     
    9090   ! 
    9191   INTERFACE lbc_bdy_lnk 
    92       MODULE PROCEDURE lbc_bdy_lnk_2d, lbc_bdy_lnk_3d 
     92      MODULE PROCEDURE lbc_bdy_lnk_2d, lbc_bdy_lnk_3d, lbc_bdy_lnk_4d 
    9393   END INTERFACE 
    9494   ! 
     
    105105   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    106106   !! $Id$ 
    107    !! Software governed by the CeCILL licence     (./LICENSE) 
     107   !! Software governed by the CeCILL license (see ./LICENSE) 
    108108   !!---------------------------------------------------------------------- 
    109109CONTAINS 
     
    173173 
    174174   !!---------------------------------------------------------------------- 
    175    !!                   ***  routine lbc_bdy_lnk_(2,3)d  *** 
     175   !!                   ***  routine lbc_bdy_lnk_(2,3,4)d  *** 
    176176   !! 
    177177   !!   wrapper rountine to 'lbc_lnk_3d'. This wrapper is used 
     
    179179   !!---------------------------------------------------------------------- 
    180180    
     181   SUBROUTINE lbc_bdy_lnk_4d( pt4d, cd_type, psgn, ib_bdy ) 
     182      !!---------------------------------------------------------------------- 
     183      REAL(wp), DIMENSION(:,:,:,:), INTENT(inout) ::   pt4d      ! 4D array on which the lbc is applied 
     184      CHARACTER(len=1)            , INTENT(in   ) ::   cd_type   ! nature of pt4d grid-points 
     185      REAL(wp)                    , INTENT(in   ) ::   psgn      ! sign used across north fold  
     186      INTEGER                     , INTENT(in   ) ::   ib_bdy    ! BDY boundary set 
     187      !!---------------------------------------------------------------------- 
     188      CALL lbc_lnk_4d( pt4d, cd_type, psgn) 
     189   END SUBROUTINE lbc_bdy_lnk_4d 
     190 
    181191   SUBROUTINE lbc_bdy_lnk_3d( pt3d, cd_type, psgn, ib_bdy ) 
    182192      !!---------------------------------------------------------------------- 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/LBC/lbcnfd.F90

    r9950 r10843  
    5858   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5959   !! $Id$ 
    60    !! Software governed by the CeCILL licence     (./LICENSE) 
     60   !! Software governed by the CeCILL license (see ./LICENSE) 
    6161   !!---------------------------------------------------------------------- 
    6262CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/LBC/lib_mpp.F90

    r9950 r10843  
    172172   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    173173   !! $Id$ 
    174    !! Software governed by the CeCILL licence     (./LICENSE) 
     174   !! Software governed by the CeCILL license (see ./LICENSE) 
    175175   !!---------------------------------------------------------------------- 
    176176CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/LBC/mppini.F90

    r9950 r10843  
    3939   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4040   !! $Id$ 
    41    !! Software governed by the CeCILL licence     (./LICENSE) 
     41   !! Software governed by the CeCILL license (see ./LICENSE) 
    4242   !!---------------------------------------------------------------------- 
    4343CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/LDF/ldfc1d_c2d.F90

    r9950 r10843  
    3333   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3434   !! $Id$ 
    35    !! Software governed by the CeCILL licence     (./LICENSE) 
     35   !! Software governed by the CeCILL license (see ./LICENSE) 
    3636   !!---------------------------------------------------------------------- 
    3737CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/LDF/ldfdyn.F90

    r9950 r10843  
    7777   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7878   !! $Id$ 
    79    !! Software governed by the CeCILL licence     (./LICENSE) 
     79   !! Software governed by the CeCILL license (see ./LICENSE) 
    8080   !!---------------------------------------------------------------------- 
    8181CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/LDF/ldfslp.F90

    r9950 r10843  
    7777   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7878   !! $Id$ 
    79    !! Software governed by the CeCILL licence     (./LICENSE) 
     79   !! Software governed by the CeCILL license (see ./LICENSE) 
    8080   !!---------------------------------------------------------------------- 
    8181CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/LDF/ldftra.F90

    r9950 r10843  
    9898   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    9999   !! $Id$ 
    100    !! Software governed by the CeCILL licence     (./LICENSE) 
     100   !! Software governed by the CeCILL license (see ./LICENSE) 
    101101   !!---------------------------------------------------------------------- 
    102102CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/ddatetoymdhms.h90

    r9950 r10843  
    22   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    33   !! $Id$ 
    4    !! Software governed by the CeCILL licence (./LICENSE) 
     4   !! Software governed by the CeCILL license (see ./LICENSE) 
    55   !!---------------------------------------------------------------------- 
    66 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/diaobs.F90

    r9950 r10843  
    9999   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    100100   !! $Id$ 
    101    !! Software governed by the CeCILL licence (./LICENSE) 
     101   !! Software governed by the CeCILL license (see ./LICENSE) 
    102102   !!---------------------------------------------------------------------- 
    103103CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/find_obs_proc.h90

    r9950 r10843  
    22   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    33   !! $Id$ 
    4    !! Software governed by the CeCILL licence (./LICENSE) 
     4   !! Software governed by the CeCILL license (see ./LICENSE) 
    55   !!---------------------------------------------------------------------- 
    66 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/grt_cir_dis.h90

    r9950 r10843  
    22   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    33   !! $Id$ 
    4    !! Software governed by the CeCILL licence (./LICENSE) 
     4   !! Software governed by the CeCILL license (see ./LICENSE) 
    55   !!---------------------------------------------------------------------- 
    66 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/grt_cir_dis_saa.h90

    r9950 r10843  
    22   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    33   !! $Id$ 
    4    !! Software governed by the CeCILL licence (./LICENSE) 
     4   !! Software governed by the CeCILL license (see ./LICENSE) 
    55   !!---------------------------------------------------------------------- 
    66 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/linquad.h90

    r9950 r10843  
    22   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    33   !! $Id$ 
    4    !! Software governed by the CeCILL licence (./LICENSE) 
     4   !! Software governed by the CeCILL license (see ./LICENSE) 
    55   !!---------------------------------------------------------------------- 
    66 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/maxdist.h90

    r9950 r10843  
    22   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    33   !! $Id$ 
    4    !! Software governed by the CeCILL licence (./LICENSE) 
     4   !! Software governed by the CeCILL license (see ./LICENSE) 
    55   !!---------------------------------------------------------------------- 
    66 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/mpp_map.F90

    r9950 r10843  
    2828   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2929   !! $Id$ 
    30    !! Software governed by the CeCILL licence     (./LICENSE) 
     30   !! Software governed by the CeCILL license (see ./LICENSE) 
    3131   !!---------------------------------------------------------------------- 
    3232CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_averg_h2d.F90

    r9950 r10843  
    4646   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4747   !! $Id$ 
    48    !! Software governed by the CeCILL licence (./LICENSE) 
     48   !! Software governed by the CeCILL license (see ./LICENSE) 
    4949   !!---------------------------------------------------------------------- 
    5050 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_const.F90

    r9950 r10843  
    77   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    88   !! $Id$ 
    9    !! Software governed by the CeCILL licence (./LICENSE) 
     9   !! Software governed by the CeCILL license (see ./LICENSE) 
    1010   !!---------------------------------------------------------------------- 
    1111 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_conv.F90

    r9950 r10843  
    3737   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3838   !! $Id$ 
    39    !! Software governed by the CeCILL licence (./LICENSE) 
     39   !! Software governed by the CeCILL license (see ./LICENSE) 
    4040   !!---------------------------------------------------------------------- 
    4141 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_conv_functions.h90

    r9950 r10843  
    22   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    33   !! $Id$ 
    4    !! Software governed by the CeCILL licence (./LICENSE) 
     4   !! Software governed by the CeCILL license (see ./LICENSE) 
    55   !!---------------------------------------------------------------------- 
    66 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_fbm.F90

    r9950 r10843  
    130130   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    131131   !! $Id$ 
    132    !! Software governed by the CeCILL licence (./LICENSE) 
     132   !! Software governed by the CeCILL license (see ./LICENSE) 
    133133   !!---------------------------------------------------------------------- 
    134134 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_grid.F90

    r9950 r10843  
    8888   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    8989   !! $Id$ 
    90    !! Software governed by the CeCILL licence (./LICENSE) 
     90   !! Software governed by the CeCILL license (see ./LICENSE) 
    9191   !!---------------------------------------------------------------------- 
    9292 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_inter_h2d.F90

    r9950 r10843  
    4949   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5050   !! $Id$ 
    51    !! Software governed by the CeCILL licence (./LICENSE) 
     51   !! Software governed by the CeCILL license (see ./LICENSE) 
    5252   !!---------------------------------------------------------------------- 
    5353 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_inter_sup.F90

    r9950 r10843  
    2929   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3030   !! $Id$ 
    31    !! Software governed by the CeCILL licence (./LICENSE) 
     31   !! Software governed by the CeCILL license (see ./LICENSE) 
    3232   !!---------------------------------------------------------------------- 
    3333 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_inter_z1d.F90

    r9950 r10843  
    2727   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2828   !! $Id$ 
    29    !! Software governed by the CeCILL licence (./LICENSE) 
     29   !! Software governed by the CeCILL license (see ./LICENSE) 
    3030   !!---------------------------------------------------------------------- 
    3131 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_level_search.h90

    r9950 r10843  
    22   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    33   !! $Id$ 
    4    !! Software governed by the CeCILL licence (./LICENSE) 
     4   !! Software governed by the CeCILL license (see ./LICENSE) 
    55   !!---------------------------------------------------------------------- 
    66 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_mpp.F90

    r9950 r10843  
    4040   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4141   !! $Id$ 
    42    !! Software governed by the CeCILL licence     (./LICENSE) 
     42   !! Software governed by the CeCILL license (see ./LICENSE) 
    4343   !!---------------------------------------------------------------------- 
    4444CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_oper.F90

    r9950 r10843  
    3434   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3535   !! $Id$ 
    36    !! Software governed by the CeCILL licence (./LICENSE) 
     36   !! Software governed by the CeCILL license (see ./LICENSE) 
    3737   !!---------------------------------------------------------------------- 
    3838CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_prep.F90

    r9950 r10843  
    3636   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$ 
    38    !! Software governed by the CeCILL licence (./LICENSE) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_profiles.F90

    r9950 r10843  
    88   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    99   !! $Id$ 
    10    !! Software governed by the CeCILL licence (./LICENSE) 
     10   !! Software governed by the CeCILL license (see ./LICENSE) 
    1111   !!---------------------------------------------------------------------- 
    1212 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_profiles_def.F90

    r9950 r10843  
    192192   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    193193   !! $Id$ 
    194    !! Software governed by the CeCILL licence (./LICENSE) 
     194   !! Software governed by the CeCILL license (see ./LICENSE) 
    195195   !!---------------------------------------------------------------------- 
    196196 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_read_altbias.F90

    r9950 r10843  
    4444   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4545   !! $Id$ 
    46    !! Software governed by the CeCILL licence (./LICENSE) 
     46   !! Software governed by the CeCILL license (see ./LICENSE) 
    4747   !!---------------------------------------------------------------------- 
    4848 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_read_prof.F90

    r9950 r10843  
    3838   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3939   !! $Id$ 
    40    !! Software governed by the CeCILL licence (./LICENSE) 
     40   !! Software governed by the CeCILL license (see ./LICENSE) 
    4141   !!---------------------------------------------------------------------- 
    4242 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_read_surf.F90

    r9950 r10843  
    3333   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3434   !! $Id$ 
    35    !! Software governed by the CeCILL licence (./LICENSE) 
     35   !! Software governed by the CeCILL license (see ./LICENSE) 
    3636   !!---------------------------------------------------------------------- 
    3737 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_readmdt.F90

    r9950 r10843  
    4040   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4141   !! $Id$ 
    42    !! Software governed by the CeCILL licence     (./LICENSE) 
     42   !! Software governed by the CeCILL license (see ./LICENSE) 
    4343   !!---------------------------------------------------------------------- 
    4444CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_rot_vel.F90

    r9950 r10843  
    3131   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3232   !! $Id$ 
    33    !! Software governed by the CeCILL licence (./LICENSE) 
     33   !! Software governed by the CeCILL license (see ./LICENSE) 
    3434   !!---------------------------------------------------------------------- 
    3535 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_sort.F90

    r9950 r10843  
    2323   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2424   !! $Id$ 
    25    !! Software governed by the CeCILL licence (./LICENSE) 
     25   !! Software governed by the CeCILL license (see ./LICENSE) 
    2626   !!---------------------------------------------------------------------- 
    2727 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_surf_def.F90

    r9950 r10843  
    116116   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    117117   !! $Id$ 
    118    !! Software governed by the CeCILL licence (./LICENSE) 
     118   !! Software governed by the CeCILL license (see ./LICENSE) 
    119119   !!---------------------------------------------------------------------- 
    120120 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_types.F90

    r9950 r10843  
    5050   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5151   !! $Id$ 
    52    !! Software governed by the CeCILL licence (./LICENSE) 
     52   !! Software governed by the CeCILL license (see ./LICENSE) 
    5353   !!---------------------------------------------------------------------- 
    5454 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_utils.F90

    r9950 r10843  
    3737   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3838   !! $Id$ 
    39    !! Software governed by the CeCILL licence (./LICENSE) 
     39   !! Software governed by the CeCILL license (see ./LICENSE) 
    4040   !!---------------------------------------------------------------------- 
    4141 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obs_write.F90

    r9950 r10843  
    4949   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5050   !! $Id$ 
    51    !! Software governed by the CeCILL licence (./LICENSE) 
     51   !! Software governed by the CeCILL license (see ./LICENSE) 
    5252   !!---------------------------------------------------------------------- 
    5353 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obsinter_h2d.h90

    r9950 r10843  
    22   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    33   !! $Id$ 
    4    !! Software governed by the CeCILL licence (./LICENSE) 
     4   !! Software governed by the CeCILL license (see ./LICENSE) 
    55   !!---------------------------------------------------------------------- 
    66 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/obsinter_z1d.h90

    r9950 r10843  
    22   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    33   !! $Id$ 
    4    !! Software governed by the CeCILL licence (./LICENSE) 
     4   !! Software governed by the CeCILL license (see ./LICENSE) 
    55   !!---------------------------------------------------------------------- 
    66 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/OBS/str_c_to_for.h90

    r9950 r10843  
    22   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    33   !! $Id$ 
    4    !! Software governed by the CeCILL licence (./LICENSE) 
     4   !! Software governed by the CeCILL license (see ./LICENSE) 
    55   !!---------------------------------------------------------------------- 
    66 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/cpl_oasis3.F90

    r9950 r10843  
    6969   INTEGER, PUBLIC, PARAMETER ::   nmaxcat=5    ! Maximum number of coupling fields 
    7070   INTEGER, PUBLIC, PARAMETER ::   nmaxcpl=5    ! Maximum number of coupling fields 
     71   LOGICAL, PARAMETER         ::   ltmp_wapatch = .TRUE.   ! patch to restore wraparound rows in cpl_send, cpl_rcv, cpl_define   
     72   INTEGER                    ::   nldi_save, nlei_save 
     73   INTEGER                    ::   nldj_save, nlej_save 
    7174    
    7275   TYPE, PUBLIC ::   FLD_CPL               !: Type for coupling field information 
     
    8790   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    8891   !! $Id$ 
    89    !! Software governed by the CeCILL licence     (./LICENSE) 
     92   !! Software governed by the CeCILL license (see ./LICENSE) 
    9093   !!---------------------------------------------------------------------- 
    9194CONTAINS 
     
    145148      !!-------------------------------------------------------------------- 
    146149 
     150      ! patch to restore wraparound rows in cpl_send, cpl_rcv, cpl_define 
     151      IF ( ltmp_wapatch ) THEN 
     152         nldi_save = nldi   ;   nlei_save = nlei 
     153         nldj_save = nldj   ;   nlej_save = nlej 
     154         IF( nimpp           ==      1 ) nldi = 1 
     155         IF( nimpp + jpi - 1 == jpiglo ) nlei = jpi 
     156         IF( njmpp           ==      1 ) nldj = 1 
     157         IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj 
     158      ENDIF  
    147159      IF(lwp) WRITE(numout,*) 
    148160      IF(lwp) WRITE(numout,*) 'cpl_define : initialization in coupled ocean/atmosphere case' 
     
    296308      IF( nerror /= OASIS_Ok )   CALL oasis_abort ( ncomp_id, 'cpl_define', 'Failure in oasis_enddef') 
    297309      ! 
     310      IF ( ltmp_wapatch ) THEN 
     311         nldi = nldi_save   ;   nlei = nlei_save 
     312         nldj = nldj_save   ;   nlej = nlej_save 
     313      ENDIF 
    298314   END SUBROUTINE cpl_define 
    299315    
     
    313329      INTEGER                                   ::   jc,jm     ! local loop index 
    314330      !!-------------------------------------------------------------------- 
     331      ! patch to restore wraparound rows in cpl_send, cpl_rcv, cpl_define 
     332      IF ( ltmp_wapatch ) THEN 
     333         nldi_save = nldi   ;   nlei_save = nlei 
     334         nldj_save = nldj   ;   nlej_save = nlej 
     335         IF( nimpp           ==      1 ) nldi = 1 
     336         IF( nimpp + jpi - 1 == jpiglo ) nlei = jpi 
     337         IF( njmpp           ==      1 ) nldj = 1 
     338         IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj 
     339      ENDIF 
    315340      ! 
    316341      ! snd data to OASIS3 
     
    341366         ENDDO 
    342367      ENDDO 
     368      IF ( ltmp_wapatch ) THEN 
     369         nldi = nldi_save   ;   nlei = nlei_save 
     370         nldj = nldj_save   ;   nlej = nlej_save 
     371      ENDIF 
    343372      ! 
    344373    END SUBROUTINE cpl_snd 
     
    361390      LOGICAL                                   ::   llaction, llfisrt 
    362391      !!-------------------------------------------------------------------- 
     392      ! patch to restore wraparound rows in cpl_send, cpl_rcv, cpl_define 
     393      IF ( ltmp_wapatch ) THEN 
     394         nldi_save = nldi   ;   nlei_save = nlei 
     395         nldj_save = nldj   ;   nlej_save = nlej 
     396      ENDIF 
    363397      ! 
    364398      ! receive local data from OASIS3 on every process 
     
    367401      ! 
    368402      DO jc = 1, srcv(kid)%nct 
     403         IF ( ltmp_wapatch ) THEN 
     404            IF( nimpp           ==      1 ) nldi = 1 
     405            IF( nimpp + jpi - 1 == jpiglo ) nlei = jpi 
     406            IF( njmpp           ==      1 ) nldj = 1 
     407            IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj 
     408         ENDIF 
    369409         llfisrt = .TRUE. 
    370410 
     
    408448         ENDDO 
    409449 
     450         IF ( ltmp_wapatch ) THEN 
     451            nldi = nldi_save   ;   nlei = nlei_save 
     452            nldj = nldj_save   ;   nlej = nlej_save 
     453         ENDIF 
    410454         !--- Fill the overlap areas and extra hallows (mpp) 
    411455         !--- check periodicity conditions (all cases) 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/cyclone.F90

    r9950 r10843  
    3939#  include "vectopt_loop_substitute.h90" 
    4040   !!---------------------------------------------------------------------- 
    41    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     41   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4242   !! $Id$ 
    43    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
     43   !! Software governed by the CeCILL license (see ./LICENSE) 
    4444   !!---------------------------------------------------------------------- 
    4545 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/fldread.F90

    r9950 r10843  
    125125   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    126126   !! $Id$ 
    127    !! Software governed by the CeCILL licence     (./LICENSE) 
     127   !! Software governed by the CeCILL license (see ./LICENSE) 
    128128   !!---------------------------------------------------------------------- 
    129129CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/geo2ocean.F90

    r9950 r10843  
    5555   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5656   !! $Id$ 
    57    !! Software governed by the CeCILL licence     (./LICENSE) 
     57   !! Software governed by the CeCILL license (see ./LICENSE) 
    5858   !!---------------------------------------------------------------------- 
    5959CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/ocealb.F90

    r9950 r10843  
    2222   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2323   !! $Id$ 
    24    !! Software governed by the CeCILL licence     (./LICENSE) 
     24   !! Software governed by the CeCILL license (see ./LICENSE) 
    2525   !!---------------------------------------------------------------------- 
    2626CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbc_ice.F90

    r9950 r10843  
    109109   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    110110   !! $Id$ 
    111    !! Software governed by the CeCILL licence     (./LICENSE) 
     111   !! Software governed by the CeCILL license (see ./LICENSE) 
    112112   !!---------------------------------------------------------------------- 
    113113CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbc_oce.F90

    r9950 r10843  
    154154   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    155155   !! $Id$ 
    156    !! Software governed by the CeCILL licence     (./LICENSE) 
     156   !! Software governed by the CeCILL license (see ./LICENSE) 
    157157   !!---------------------------------------------------------------------- 
    158158CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbcapr.F90

    r9950 r10843  
    4141 
    4242   !!---------------------------------------------------------------------- 
    43    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     43   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4444   !! $Id$ 
    45    !! Software governed by the CeCILL licence     (./LICENSE) 
     45   !! Software governed by the CeCILL license (see ./LICENSE) 
    4646   !!---------------------------------------------------------------------- 
    4747CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbcblk.F90

    r9950 r10843  
    136136   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    137137   !! $Id$ 
    138    !! Software governed by the CeCILL licence     (./LICENSE) 
     138   !! Software governed by the CeCILL license (see ./LICENSE) 
    139139   !!---------------------------------------------------------------------- 
    140140CONTAINS 
     
    239239      !drag coefficient read from wave model definable only with mfs bulk formulae and core  
    240240         ELSEIF (ln_cdgw .AND. .NOT. ln_NCAR )       THEN        
    241              CALL ctl_stop( 'drag coefficient read from wave model definable only with mfs bulk formulae and core') 
     241             CALL ctl_stop( 'drag coefficient read from wave model definable only with NCAR and CORE bulk formulae') 
    242242         ELSEIF (ln_stcor .AND. .NOT. ln_sdw)                             THEN 
    243243             CALL ctl_stop( 'Stokes-Coriolis term calculated only if activated Stokes Drift ln_sdw=T') 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbcblk_algo_ncar.F90

    r9570 r10843  
    149149      Ch = 1.e-3*sqrt_Cd_n10*(18.*stab + 32.7*(1. - stab)) 
    150150      stab = sqrt_Cd_n10   ! Temporaty array !!! stab == SQRT(Cd) 
     151  
     152      IF( ln_cdgw )   Cen = Ce  ; Chn = Ch 
    151153 
    152154      !! Initializing values at z_u with z_t values: 
     
    186188         IF( ln_cdgw ) THEN      ! surface wave case 
    187189            stab = vkarmn / ( vkarmn / sqrt_Cd_n10 - ztmp2 )  ! (stab == SQRT(Cd)) 
    188             Cd      = stab * stab 
     190            Cd   = stab * stab 
     191            ztmp0 = (LOG(zu/10.) - zpsi_h_u) / vkarmn / sqrt_Cd_n10 
     192            ztmp2 = stab / sqrt_Cd_n10   ! (stab == SQRT(Cd)) 
     193            ztmp1 = 1. + Chn * ztmp0      
     194            Ch    = Chn * ztmp2 / ztmp1  ! L&Y 2004 eq. (10b) 
     195            ztmp1 = 1. + Cen * ztmp0 
     196            Ce    = Cen * ztmp2 / ztmp1  ! L&Y 2004 eq. (10c) 
     197 
    189198         ELSE 
    190199            ! Update neutral wind speed at 10m and neutral Cd at 10m (L&Y 2004 eq. 9a)... 
     
    205214            Cd      = ztmp0 / ( ztmp1*ztmp1 ) 
    206215            stab = SQRT( Cd ) ! Temporary array !!! (stab == SQRT(Cd)) 
    207          ENDIF 
    208  
    209          ztmp0 = (LOG(zu/10.) - zpsi_h_u) / vkarmn / sqrt_Cd_n10 
    210          ztmp2 = stab / sqrt_Cd_n10   ! (stab == SQRT(Cd)) 
    211          ztmp1 = 1. + Cx_n10*ztmp0    ! (Cx_n10 == Ch_n10) 
    212          Ch  = Cx_n10*ztmp2 / ztmp1   ! L&Y 2004 eq. (10b) 
    213  
    214          Cx_n10  = 1.e-3 * (34.6 * sqrt_Cd_n10)  ! L&Y 2004 eq. (6b)    ! Cx_n10 == Ce_n10 
    215          Cen(:,:) = Cx_n10 
    216          ztmp1 = 1. + Cx_n10*ztmp0 
    217          Ce  = Cx_n10*ztmp2 / ztmp1  ! L&Y 2004 eq. (10c) 
     216 
     217            ztmp0 = (LOG(zu/10.) - zpsi_h_u) / vkarmn / sqrt_Cd_n10 
     218            ztmp2 = stab / sqrt_Cd_n10   ! (stab == SQRT(Cd)) 
     219            ztmp1 = 1. + Cx_n10*ztmp0    ! (Cx_n10 == Ch_n10) 
     220            Ch  = Cx_n10*ztmp2 / ztmp1   ! L&Y 2004 eq. (10b) 
     221 
     222            Cx_n10  = 1.e-3 * (34.6 * sqrt_Cd_n10)  ! L&Y 2004 eq. (6b)    ! Cx_n10 == Ce_n10 
     223            Cen(:,:) = Cx_n10 
     224            ztmp1 = 1. + Cx_n10*ztmp0 
     225            Ce  = Cx_n10*ztmp2 / ztmp1  ! L&Y 2004 eq. (10c) 
     226            ENDIF 
    218227         ! 
    219228      END DO 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbccpl.F90

    r9950 r10843  
    202202   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    203203   !! $Id$ 
    204    !! Software governed by the CeCILL licence     (./LICENSE) 
     204   !! Software governed by the CeCILL license (see ./LICENSE) 
    205205   !!---------------------------------------------------------------------- 
    206206CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbcdcy.F90

    r9950 r10843  
    3131 
    3232   !!---------------------------------------------------------------------- 
    33    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     33   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3434   !! $Id$ 
    35    !! Software governed by the CeCILL licence     (./LICENSE) 
     35   !! Software governed by the CeCILL license (see ./LICENSE) 
    3636   !!---------------------------------------------------------------------- 
    3737CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbcflx.F90

    r9950 r10843  
    4040#  include "vectopt_loop_substitute.h90" 
    4141   !!---------------------------------------------------------------------- 
    42    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     42   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4343   !! $Id$ 
    44    !! Software governed by the CeCILL licence     (./LICENSE) 
     44   !! Software governed by the CeCILL license (see ./LICENSE) 
    4545   !!---------------------------------------------------------------------- 
    4646CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbcfwb.F90

    r9950 r10843  
    4444   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4545   !! $Id$ 
    46    !! Software governed by the CeCILL licence     (./LICENSE) 
     46   !! Software governed by the CeCILL license (see ./LICENSE) 
    4747   !!---------------------------------------------------------------------- 
    4848CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbcice_cice.F90

    r9950 r10843  
    8989 
    9090   !!---------------------------------------------------------------------- 
    91    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     91   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    9292   !! $Id$ 
    93    !! Software governed by the CeCILL licence     (./LICENSE) 
     93   !! Software governed by the CeCILL license (see ./LICENSE) 
    9494   !!---------------------------------------------------------------------- 
    9595CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbcice_if.F90

    r9950 r10843  
    3838   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3939   !! $Id$ 
    40    !! Software governed by the CeCILL licence     (./LICENSE) 
     40   !! Software governed by the CeCILL license (see ./LICENSE) 
    4141   !!---------------------------------------------------------------------- 
    4242CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbcisf.F90

    r9950 r10843  
    7171   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7272   !! $Id$ 
    73    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
     73   !! Software governed by the CeCILL license (see ./LICENSE) 
    7474   !!---------------------------------------------------------------------- 
    7575CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbcmod.F90

    r9950 r10843  
    6969 
    7070   !!---------------------------------------------------------------------- 
    71    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     71   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7272   !! $Id$ 
    73    !! Software governed by the CeCILL licence     (./LICENSE) 
     73   !! Software governed by the CeCILL license (see ./LICENSE) 
    7474   !!---------------------------------------------------------------------- 
    7575CONTAINS 
     
    157157         WRITE(numout,*) '               wave modified ocean stress component ln_tauw       = ', ln_tauw 
    158158         WRITE(numout,*) '               Stokes coriolis term                 ln_stcor      = ', ln_stcor 
    159          WRITE(numout,*) '               neutral drag coefficient (CORE, MFS) ln_cdgw       = ', ln_cdgw 
    160       ENDIF 
    161       ! 
     159         WRITE(numout,*) '               neutral drag coefficient (CORE,NCAR) ln_cdgw       = ', ln_cdgw 
     160      ENDIF 
     161      ! 
     162      IF( .NOT.ln_wave ) THEN 
     163         ln_sdw = .false. ; ln_cdgw = .false. ; ln_tauwoc = .false. ; ln_tauw = .false. ; ln_stcor = .false. 
     164      ENDIF  
    162165      IF( ln_sdw ) THEN 
    163166         IF( .NOT.(nn_sdrift==jp_breivik_2014 .OR. nn_sdrift==jp_li_2017 .OR. nn_sdrift==jp_peakfr) ) & 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbcrnf.F90

    r9950 r10843  
    7171   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7272   !! $Id$ 
    73    !! Software governed by the CeCILL licence     (./LICENSE) 
     73   !! Software governed by the CeCILL license (see ./LICENSE) 
    7474   !!---------------------------------------------------------------------- 
    7575CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbcssm.F90

    r9950 r10843  
    3434   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3535   !! $Id$ 
    36    !! Software governed by the CeCILL licence     (./LICENSE) 
     36   !! Software governed by the CeCILL license (see ./LICENSE) 
    3737   !!---------------------------------------------------------------------- 
    3838CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbcssr.F90

    r9950 r10843  
    4949   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5050   !! $Id$ 
    51    !! Software governed by the CeCILL licence     (./LICENSE) 
     51   !! Software governed by the CeCILL license (see ./LICENSE) 
    5252   !!---------------------------------------------------------------------- 
    5353CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbctide.F90

    r9950 r10843  
    3535   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3636   !! $Id$ 
    37    !! Software governed by the CeCILL licence     (./LICENSE) 
     37   !! Software governed by the CeCILL license (see ./LICENSE) 
    3838   !!---------------------------------------------------------------------- 
    3939CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/sbcwave.F90

    r10011 r10843  
    7474#  include "vectopt_loop_substitute.h90" 
    7575   !!---------------------------------------------------------------------- 
    76    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     76   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7777   !! $Id$ 
    78    !! Software governed by the CeCILL licence     (./LICENSE) 
     78   !! Software governed by the CeCILL license (see ./LICENSE) 
    7979   !!---------------------------------------------------------------------- 
    8080CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/tide_mod.F90

    r9950 r10843  
    3434 
    3535   !!---------------------------------------------------------------------- 
    36    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     36   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$ 
    38    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/tideini.F90

    r9950 r10843  
    4141   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4242   !! $Id$ 
    43    !! Software governed by the CeCILL licence     (./LICENSE) 
     43   !! Software governed by the CeCILL license (see ./LICENSE) 
    4444   !!---------------------------------------------------------------------- 
    4545CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/SBC/updtide.F90

    r9950 r10843  
    2323   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2424   !! $Id$ 
    25    !! Software governed by the CeCILL licence     (./LICENSE) 
     25   !! Software governed by the CeCILL license (see ./LICENSE) 
    2626   !!---------------------------------------------------------------------- 
    2727CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/STO/stopar.F90

    r9950 r10843  
    115115   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    116116   !! $Id$ 
    117    !! Software governed by the CeCILL licence     (./LICENSE) 
     117   !! Software governed by the CeCILL license (see ./LICENSE) 
    118118   !!---------------------------------------------------------------------- 
    119119CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/STO/stopts.F90

    r9950 r10843  
    3030   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3131   !! $Id$ 
    32    !! Software governed by the CeCILL licence     (./LICENSE) 
     32   !! Software governed by the CeCILL license (see ./LICENSE) 
    3333   !!---------------------------------------------------------------------- 
    3434CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/STO/storng.F90

    r9950 r10843  
    6060   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    6161   !! $Id$ 
    62    !! Software governed by the CeCILL licence     (./LICENSE) 
     62   !! Software governed by the CeCILL license (see ./LICENSE) 
    6363   !!---------------------------------------------------------------------- 
    6464CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/eosbn2.F90

    r9950 r10843  
    182182   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    183183   !! $Id$ 
    184    !! Software governed by the CeCILL licence     (./LICENSE) 
     184   !! Software governed by the CeCILL license (see ./LICENSE) 
    185185   !!---------------------------------------------------------------------- 
    186186CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/traadv.F90

    r9950 r10843  
    7171   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7272   !! $Id$ 
    73    !! Software governed by the CeCILL licence     (./LICENSE) 
     73   !! Software governed by the CeCILL license (see ./LICENSE) 
    7474   !!---------------------------------------------------------------------- 
    7575CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/traadv_cen.F90

    r9950 r10843  
    4040   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4141   !! $Id$ 
    42    !! Software governed by the CeCILL licence     (./LICENSE) 
     42   !! Software governed by the CeCILL license (see ./LICENSE) 
    4343   !!---------------------------------------------------------------------- 
    4444CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/traadv_fct.F90

    r10032 r10843  
    4848   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4949   !! $Id$ 
    50    !! Software governed by the CeCILL licence     (./LICENSE) 
     50   !! Software governed by the CeCILL license (see ./LICENSE) 
    5151   !!---------------------------------------------------------------------- 
    5252CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/traadv_mus.F90

    r9950 r10843  
    5050   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5151   !! $Id$ 
    52    !! Software governed by the CeCILL licence     (./LICENSE) 
     52   !! Software governed by the CeCILL license (see ./LICENSE) 
    5353   !!---------------------------------------------------------------------- 
    5454CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/traadv_qck.F90

    r9950 r10843  
    4343   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4444   !! $Id$ 
    45    !! Software governed by the CeCILL licence     (./LICENSE) 
     45   !! Software governed by the CeCILL license (see ./LICENSE) 
    4646   !!---------------------------------------------------------------------- 
    4747CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/traadv_ubs.F90

    r9950 r10843  
    4242   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4343   !! $Id$ 
    44    !! Software governed by the CeCILL licence     (./LICENSE) 
     44   !! Software governed by the CeCILL license (see ./LICENSE) 
    4545   !!---------------------------------------------------------------------- 
    4646CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/trabbc.F90

    r9950 r10843  
    4747   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4848   !! $Id$ 
    49    !! Software governed by the CeCILL licence     (./LICENSE) 
     49   !! Software governed by the CeCILL license (see ./LICENSE) 
    5050   !!---------------------------------------------------------------------- 
    5151CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/trabbl.F90

    r9950 r10843  
    7171   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7272   !! $Id$ 
    73    !! Software governed by the CeCILL licence     (./LICENSE) 
     73   !! Software governed by the CeCILL license (see ./LICENSE) 
    7474   !!---------------------------------------------------------------------- 
    7575CONTAINS 
     
    513513      IF( tra_bbl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'tra_bbl_init : unable to allocate arrays' ) 
    514514      ! 
    515       IF( nn_bbl_adv == 1 )    WRITE(numout,*) '       * Advective BBL using upper velocity' 
    516       IF( nn_bbl_adv == 2 )    WRITE(numout,*) '       * Advective BBL using velocity = F( delta rho)' 
     515      IF(lwp) THEN 
     516         IF( nn_bbl_adv == 1 )    WRITE(numout,*) '       * Advective BBL using upper velocity' 
     517         IF( nn_bbl_adv == 2 )    WRITE(numout,*) '       * Advective BBL using velocity = F( delta rho)' 
     518      ENDIF 
    517519      ! 
    518520      !                             !* vertical index of  "deep" bottom u- and v-points 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/tradmp.F90

    r9950 r10843  
    5656   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5757   !! $Id$ 
    58    !! Software governed by the CeCILL licence     (./LICENSE) 
     58   !! Software governed by the CeCILL license (see ./LICENSE) 
    5959   !!---------------------------------------------------------------------- 
    6060CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/traldf.F90

    r9950 r10843  
    4343   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4444   !! $Id$ 
    45    !! Software governed by the CeCILL licence     (./LICENSE) 
     45   !! Software governed by the CeCILL license (see ./LICENSE) 
    4646   !!---------------------------------------------------------------------- 
    4747CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/traldf_iso.F90

    r9950 r10843  
    4444   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4545   !! $Id$ 
    46    !! Software governed by the CeCILL licence     (./LICENSE) 
     46   !! Software governed by the CeCILL license (see ./LICENSE) 
    4747   !!---------------------------------------------------------------------- 
    4848CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/traldf_lap_blp.F90

    r9950 r10843  
    4141   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4242   !! $Id$ 
    43    !! Software governed by the CeCILL licence     (./LICENSE) 
     43   !! Software governed by the CeCILL license (see ./LICENSE) 
    4444   !!---------------------------------------------------------------------- 
    4545CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/traldf_triad.F90

    r9950 r10843  
    4444   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4545   !! $Id$ 
    46    !! Software governed by the CeCILL licence     (./LICENSE) 
     46   !! Software governed by the CeCILL license (see ./LICENSE) 
    4747   !!---------------------------------------------------------------------- 
    4848CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/tramle.F90

    r9950 r10843  
    5252   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5353   !! $Id$ 
    54    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
     54   !! Software governed by the CeCILL license (see ./LICENSE) 
    5555   !!---------------------------------------------------------------------- 
    5656CONTAINS 
     
    9797      !                                                ! compute from the 10m density to deal with the diurnal cycle 
    9898      inml_mle(:,:) = mbkt(:,:) + 1                    ! init. to number of ocean w-level (T-level + 1) 
    99       DO jk = jpkm1, nlb10, -1                         ! from the bottom to nlb10 (10m) 
    100          DO jj = 1, jpj 
    101             DO ji = 1, jpi                             ! index of the w-level at the ML based 
    102                IF( rhop(ji,jj,jk) > rhop(ji,jj,nla10) + rn_rho_c_mle )   inml_mle(ji,jj) = jk      ! Mixed layer 
    103             END DO 
    104          END DO 
    105       END DO 
     99      IF ( nla10 > 0 ) THEN                            ! avoid case where first level is thicker than 10m 
     100         DO jk = jpkm1, nlb10, -1                      ! from the bottom to nlb10 (10m) 
     101            DO jj = 1, jpj 
     102               DO ji = 1, jpi                          ! index of the w-level at the ML based 
     103                  IF( rhop(ji,jj,jk) > rhop(ji,jj,nla10) + rn_rho_c_mle )   inml_mle(ji,jj) = jk      ! Mixed layer 
     104               END DO 
     105            END DO 
     106         END DO 
     107      ENDIF 
    106108      ikmax = MIN( MAXVAL( inml_mle(:,:) ), jpkm1 )                  ! max level of the computation 
    107109      ! 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/tranpc.F90

    r9950 r10843  
    3838   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3939   !! $Id$ 
    40    !! Software governed by the CeCILL licence     (./LICENSE) 
     40   !! Software governed by the CeCILL license (see ./LICENSE) 
    4141   !!---------------------------------------------------------------------- 
    4242CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/tranxt.F90

    r9950 r10843  
    5858#  include "vectopt_loop_substitute.h90" 
    5959   !!---------------------------------------------------------------------- 
    60    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     60   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    6161   !! $Id$ 
    62    !! Software governed by the CeCILL licence     (./LICENSE) 
     62   !! Software governed by the CeCILL license (see ./LICENSE) 
    6363   !!---------------------------------------------------------------------- 
    6464CONTAINS 
     
    291291         ztrd_atf(:,:,:,:) = 0.0_wp 
    292292      ENDIF 
    293       zfact = 1._wp / r2dt 
     293      zfact = 1._wp / p2dt 
    294294      zfact1 = atfp * p2dt 
    295295      zfact2 = zfact1 * r1_rau0 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/traqsr.F90

    r9950 r10843  
    7171   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7272   !! $Id$ 
    73    !! Software governed by the CeCILL licence     (./LICENSE) 
     73   !! Software governed by the CeCILL license (see ./LICENSE) 
    7474   !!---------------------------------------------------------------------- 
    7575CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/trasbc.F90

    r9950 r10843  
    4848   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4949   !! $Id$ 
    50    !! Software governed by the CeCILL licence     (./LICENSE) 
     50   !! Software governed by the CeCILL license (see ./LICENSE) 
    5151   !!---------------------------------------------------------------------- 
    5252CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/trazdf.F90

    r9950 r10843  
    4040   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4141   !! $Id$ 
    42    !! Software governed by the CeCILL licence     (./LICENSE) 
     42   !! Software governed by the CeCILL license (see ./LICENSE) 
    4343   !!---------------------------------------------------------------------- 
    4444CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/zpshde.F90

    r9950 r10843  
    3535   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3636   !! $Id$ 
    37    !! Software governed by the CeCILL licence     (./LICENSE) 
     37   !! Software governed by the CeCILL license (see ./LICENSE) 
    3838   !!---------------------------------------------------------------------- 
    3939CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRD/trd_oce.F90

    r9950 r10843  
    7878   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7979   !! $Id$ 
    80    !! Software governed by the CeCILL licence     (./LICENSE) 
     80   !! Software governed by the CeCILL license (see ./LICENSE) 
    8181   !!====================================================================== 
    8282END MODULE trd_oce 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRD/trddyn.F90

    r9950 r10843  
    4040   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4141   !! $Id$ 
    42    !! Software governed by the CeCILL licence     (./LICENSE) 
     42   !! Software governed by the CeCILL license (see ./LICENSE) 
    4343   !!---------------------------------------------------------------------- 
    4444CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRD/trdglo.F90

    r9950 r10843  
    5555   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5656   !! $Id$ 
    57    !! Software governed by the CeCILL licence     (./LICENSE) 
     57   !! Software governed by the CeCILL license (see ./LICENSE) 
    5858   !!---------------------------------------------------------------------- 
    5959CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRD/trdini.F90

    r9950 r10843  
    3030   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3131   !! $Id$ 
    32    !! Software governed by the CeCILL licence     (./LICENSE) 
     32   !! Software governed by the CeCILL license (see ./LICENSE) 
    3333   !!---------------------------------------------------------------------- 
    3434CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRD/trdken.F90

    r9950 r10843  
    4444   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4545   !! $Id$ 
    46    !! Software governed by the CeCILL licence     (./LICENSE) 
     46   !! Software governed by the CeCILL license (see ./LICENSE) 
    4747   !!---------------------------------------------------------------------- 
    4848CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRD/trdmxl.F90

    r9950 r10843  
    7171   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7272   !! $Id$ 
    73    !! Software governed by the CeCILL licence     (./LICENSE) 
     73   !! Software governed by the CeCILL license (see ./LICENSE) 
    7474   !!---------------------------------------------------------------------- 
    7575CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRD/trdmxl_oce.F90

    r9950 r10843  
    8484   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    8585   !! $Id$ 
    86    !! Software governed by the CeCILL licence     (./LICENSE) 
     86   !! Software governed by the CeCILL license (see ./LICENSE) 
    8787   !!---------------------------------------------------------------------- 
    8888CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRD/trdmxl_rst.F90

    r9950 r10843  
    2828   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2929   !! $Id$ 
    30    !! Software governed by the CeCILL licence (./LICENSE) 
     30   !! Software governed by the CeCILL license (see ./LICENSE) 
    3131   !!--------------------------------------------------------------------------------- 
    3232CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRD/trdpen.F90

    r9950 r10843  
    4040   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4141   !! $Id$ 
    42    !! Software governed by the CeCILL licence     (./LICENSE) 
     42   !! Software governed by the CeCILL license (see ./LICENSE) 
    4343   !!---------------------------------------------------------------------- 
    4444CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRD/trdtra.F90

    r10037 r10843  
    4545   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4646   !! $Id$ 
    47    !! Software governed by the CeCILL licence     (./LICENSE) 
     47   !! Software governed by the CeCILL license (see ./LICENSE) 
    4848   !!---------------------------------------------------------------------- 
    4949CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRD/trdtrc.F90

    r9950 r10843  
    1919   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2020   !! $Id$ 
    21    !! Software governed by the CeCILL licence (./LICENSE) 
     21   !! Software governed by the CeCILL license (see ./LICENSE) 
    2222   !!====================================================================== 
    2323END MODULE trdtrc 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRD/trdvor.F90

    r9950 r10843  
    6060   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    6161   !! $Id$ 
    62    !! Software governed by the CeCILL licence     (./LICENSE) 
     62   !! Software governed by the CeCILL license (see ./LICENSE) 
    6363   !!---------------------------------------------------------------------- 
    6464CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRD/trdvor_oce.F90

    r9950 r10843  
    3030   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3131   !! $Id$ 
    32    !! Software governed by the CeCILL licence     (./LICENSE) 
     32   !! Software governed by the CeCILL license (see ./LICENSE) 
    3333   !!====================================================================== 
    3434END MODULE trdvor_oce 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/USR/usrdef_fmask.F90

    r9950 r10843  
    3131   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3232   !! $Id$ 
    33    !! Software governed by the CeCILL licence     (./LICENSE) 
     33   !! Software governed by the CeCILL license (see ./LICENSE) 
    3434   !!---------------------------------------------------------------------- 
    3535CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/USR/usrdef_hgr.F90

    r9950 r10843  
    2929   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3030   !! $Id$ 
    31    !! Software governed by the CeCILL licence     (./LICENSE) 
     31   !! Software governed by the CeCILL license (see ./LICENSE) 
    3232   !!---------------------------------------------------------------------- 
    3333CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/USR/usrdef_istate.F90

    r9950 r10843  
    2727   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2828   !! $Id$ 
    29    !! Software governed by the CeCILL licence     (./LICENSE) 
     29   !! Software governed by the CeCILL license (see ./LICENSE) 
    3030   !!---------------------------------------------------------------------- 
    3131CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/USR/usrdef_nam.F90

    r9950 r10843  
    3333   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3434   !! $Id$ 
    35    !! Software governed by the CeCILL licence     (./LICENSE) 
     35   !! Software governed by the CeCILL license (see ./LICENSE) 
    3636   !!---------------------------------------------------------------------- 
    3737CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/USR/usrdef_sbc.F90

    r9950 r10843  
    3535   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3636   !! $Id$ 
    37    !! Software governed by the CeCILL licence     (./LICENSE) 
     37   !! Software governed by the CeCILL license (see ./LICENSE) 
    3838   !!---------------------------------------------------------------------- 
    3939CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/USR/usrdef_zgr.F90

    r9950 r10843  
    3434   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3535   !! $Id$ 
    36    !! Software governed by the CeCILL licence     (./LICENSE) 
     36   !! Software governed by the CeCILL license (see ./LICENSE) 
    3737   !!---------------------------------------------------------------------- 
    3838CONTAINS              
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ZDF/zdf_oce.F90

    r9950 r10843  
    5454   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5555   !! $Id$ 
    56    !! Software governed by the CeCILL licence     (./LICENSE) 
     56   !! Software governed by the CeCILL license (see ./LICENSE) 
    5757   !!---------------------------------------------------------------------- 
    5858CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ZDF/zdfddm.F90

    r9950 r10843  
    3434   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3535   !! $Id$ 
    36    !! Software governed by the CeCILL licence     (./LICENSE) 
     36   !! Software governed by the CeCILL license (see ./LICENSE) 
    3737   !!---------------------------------------------------------------------- 
    3838CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ZDF/zdfdrg.F90

    r9950 r10843  
    7777   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7878   !! $Id$ 
    79    !! Software governed by the CeCILL licence     (./LICENSE) 
     79   !! Software governed by the CeCILL license (see ./LICENSE) 
    8080   !!---------------------------------------------------------------------- 
    8181CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ZDF/zdfevd.F90

    r9950 r10843  
    3434   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3535   !! $Id$ 
    36    !! Software governed by the CeCILL licence     (./LICENSE) 
     36   !! Software governed by the CeCILL license (see ./LICENSE) 
    3737   !!---------------------------------------------------------------------- 
    3838CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ZDF/zdfgls.F90

    r9950 r10843  
    108108   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    109109   !! $Id$ 
    110    !! Software governed by the CeCILL licence     (./LICENSE) 
     110   !! Software governed by the CeCILL license (see ./LICENSE) 
    111111   !!---------------------------------------------------------------------- 
    112112CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ZDF/zdfiwm.F90

    r9950 r10843  
    5353   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5454   !! $Id$ 
    55    !! Software governed by the CeCILL licence     (./LICENSE) 
     55   !! Software governed by the CeCILL license (see ./LICENSE) 
    5656   !!---------------------------------------------------------------------- 
    5757CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ZDF/zdfmxl.F90

    r9950 r10843  
    1515   USE trc_oce  , ONLY: l_offline         ! ocean space and time domain variables 
    1616   USE zdf_oce        ! ocean vertical physics 
     17   USE eosbn2         ! for zdf_mxl_zint 
    1718   ! 
    1819   USE in_out_manager ! I/O manager 
     
    3132   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hmlp    !: mixed layer depth  (rho=rho0+zdcrit) [m]   (used by LDF) 
    3233   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hmlpt   !: depth of the last T-point inside the mixed layer [m] (used by LDF) 
    33  
     34   REAL(wp), PUBLIC, ALLOCATABLE,       DIMENSION(:,:) ::   hmld_zint  !: vertically-interpolated mixed layer depth   [m] 
     35   REAL(wp), PUBLIC, ALLOCATABLE,       DIMENSION(:,:) ::   htc_mld    ! Heat content of hmld_zint 
     36   LOGICAL, PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)    :: ll_found   ! Is T_b to be found by interpolation ? 
     37   LOGICAL, PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:)  :: ll_belowml ! Flag points below mixed layer when ll_found=F 
    3438   REAL(wp), PUBLIC ::   rho_c = 0.01_wp    !: density criterion for mixed layer depth 
    3539   REAL(wp)         ::   avt_c = 5.e-4_wp   ! Kz criterion for the turbocline depth 
     40 
     41   TYPE, PUBLIC :: MXL_ZINT   !: Structure for MLD defs 
     42      INTEGER   :: mld_type   ! mixed layer type      
     43      REAL(wp)  :: zref       ! depth of initial T_ref 
     44      REAL(wp)  :: dT_crit    ! Critical temp diff 
     45      REAL(wp)  :: iso_frac   ! Fraction of rn_dT_crit  
     46   END TYPE MXL_ZINT 
    3647 
    3748   !!---------------------------------------------------------------------- 
    3849   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3950   !! $Id$ 
    40    !! Software governed by the CeCILL licence     (./LICENSE) 
     51   !! Software governed by the CeCILL license (see ./LICENSE) 
    4152   !!---------------------------------------------------------------------- 
    4253CONTAINS 
     
    4859      zdf_mxl_alloc = 0      ! set to zero if no array to be allocated 
    4960      IF( .NOT. ALLOCATED( nmln ) ) THEN 
    50          ALLOCATE( nmln(jpi,jpj), hmld(jpi,jpj), hmlp(jpi,jpj), hmlpt(jpi,jpj), STAT= zdf_mxl_alloc ) 
     61         ALLOCATE( nmln(jpi,jpj), hmld(jpi,jpj), hmlp(jpi,jpj), hmlpt(jpi,jpj), hmld_zint(jpi,jpj),     & 
     62   &          htc_mld(jpi,jpj), ll_found(jpi,jpj), ll_belowml(jpi,jpj,jpk), STAT= zdf_mxl_alloc )          
    5163         ! 
    5264         IF( lk_mpp             )   CALL mpp_sum ( zdf_mxl_alloc ) 
     
    137149      ENDIF 
    138150      ! 
     151      ! Vertically-interpolated mixed-layer depth diagnostic 
     152      CALL zdf_mxl_zint( kt ) 
     153      ! 
    139154      IF(ln_ctl)   CALL prt_ctl( tab2d_1=REAL(nmln,wp), clinfo1=' nmln : ', tab2d_2=hmlp, clinfo2=' hmlp : ' ) 
    140155      ! 
    141156   END SUBROUTINE zdf_mxl 
     157 
     158   SUBROUTINE zdf_mxl_zint_mld( sf )  
     159      !!----------------------------------------------------------------------------------  
     160      !!                    ***  ROUTINE zdf_mxl_zint_mld  ***  
     161      !                                                                         
     162      !   Calculate vertically-interpolated mixed layer depth diagnostic.  
     163      !             
     164      !   This routine can calculate the mixed layer depth diagnostic suggested by 
     165      !   Kara et al, 2000, JGR, 105, 16803, but is more general and can calculate 
     166      !   vertically-interpolated mixed-layer depth diagnostics with other parameter 
     167      !   settings set in the namzdf_mldzint namelist.   
     168      !  
     169      !   If mld_type=1 the mixed layer depth is calculated as the depth at which the   
     170      !   density has increased by an amount equivalent to a temperature difference of   
     171      !   0.8C at the surface.  
     172      !  
     173      !   For other values of mld_type the mixed layer is calculated as the depth at   
     174      !   which the temperature differs by 0.8C from the surface temperature.   
     175      !                                                                         
     176      !   David Acreman, Daley Calvert                                       
     177      !  
     178      !!-----------------------------------------------------------------------------------  
     179 
     180      TYPE(MXL_ZINT), INTENT(in)  :: sf 
     181 
     182      ! Diagnostic criteria 
     183      INTEGER   :: nn_mld_type   ! mixed layer type      
     184      REAL(wp)  :: rn_zref       ! depth of initial T_ref 
     185      REAL(wp)  :: rn_dT_crit    ! Critical temp diff 
     186      REAL(wp)  :: rn_iso_frac   ! Fraction of rn_dT_crit used 
     187 
     188      ! Local variables 
     189      REAL(wp), PARAMETER :: zepsilon = 1.e-30          ! local small value 
     190      INTEGER, DIMENSION(jpi,jpj) :: ikmt          ! number of active tracer levels  
     191      INTEGER, DIMENSION(jpi,jpj) :: ik_ref        ! index of reference level  
     192      INTEGER, DIMENSION(jpi,jpj) :: ik_iso        ! index of last uniform temp level  
     193      REAL, DIMENSION(jpi,jpj,jpk)  :: zT            ! Temperature or density  
     194      REAL, DIMENSION(jpi,jpj)    :: ppzdep        ! depth for use in calculating d(rho)  
     195      REAL, DIMENSION(jpi,jpj)    :: zT_ref        ! reference temperature  
     196      REAL    :: zT_b                                   ! base temperature  
     197      REAL, DIMENSION(jpi,jpj,jpk)  :: zdTdz         ! gradient of zT  
     198      REAL, DIMENSION(jpi,jpj,jpk)  :: zmoddT        ! Absolute temperature difference  
     199      REAL    :: zdz                                    ! depth difference  
     200      REAL    :: zdT                                    ! temperature difference  
     201      REAL, DIMENSION(jpi,jpj)    :: zdelta_T      ! difference critereon  
     202      REAL, DIMENSION(jpi,jpj)    :: zRHO1, zRHO2  ! Densities  
     203      INTEGER :: ji, jj, jk                             ! loop counter  
     204 
     205      !!-------------------------------------------------------------------------------------  
     206      !   
     207      ! Unpack structure 
     208      nn_mld_type = sf%mld_type 
     209      rn_zref     = sf%zref 
     210      rn_dT_crit  = sf%dT_crit 
     211      rn_iso_frac = sf%iso_frac 
     212 
     213      ! Set the mixed layer depth criterion at each grid point  
     214      IF( nn_mld_type == 0 ) THEN 
     215         zdelta_T(:,:) = rn_dT_crit 
     216         zT(:,:,:) = rhop(:,:,:) 
     217      ELSE IF( nn_mld_type == 1 ) THEN 
     218         ppzdep(:,:)=0.0  
     219         call eos ( tsn(:,:,1,:), ppzdep(:,:), zRHO1(:,:) )  
     220! Use zT temporarily as a copy of tsn with rn_dT_crit added to SST  
     221! [assumes number of tracers less than number of vertical levels]  
     222         zT(:,:,1:jpts)=tsn(:,:,1,1:jpts)  
     223         zT(:,:,jp_tem)=zT(:,:,1)+rn_dT_crit  
     224         CALL eos( zT(:,:,1:jpts), ppzdep(:,:), zRHO2(:,:) )  
     225         zdelta_T(:,:) = abs( zRHO1(:,:) - zRHO2(:,:) ) * rau0  
     226         ! RHO from eos (2d version) doesn't calculate north or east halo:  
     227         CALL lbc_lnk( zdelta_T, 'T', 1. )  
     228         zT(:,:,:) = rhop(:,:,:)  
     229      ELSE  
     230         zdelta_T(:,:) = rn_dT_crit                       
     231         zT(:,:,:) = tsn(:,:,:,jp_tem)                            
     232      END IF  
     233 
     234      ! Calculate the gradient of zT and absolute difference for use later  
     235      DO jk = 1 ,jpk-2  
     236         zdTdz(:,:,jk)  =    ( zT(:,:,jk+1) - zT(:,:,jk) ) / e3w_n(:,:,jk+1)  
     237         zmoddT(:,:,jk) = abs( zT(:,:,jk+1) - zT(:,:,jk) )  
     238      END DO  
     239 
     240      ! Find density/temperature at the reference level (Kara et al use 10m).           
     241      ! ik_ref is the index of the box centre immediately above or at the reference level  
     242      ! Find rn_zref in the array of model level depths and find the ref     
     243      ! density/temperature by linear interpolation.                                    
     244      DO jk = jpkm1, 2, -1  
     245         WHERE ( gdept_n(:,:,jk) > rn_zref )  
     246           ik_ref(:,:) = jk - 1  
     247           zT_ref(:,:) = zT(:,:,jk-1) + zdTdz(:,:,jk-1) * ( rn_zref - gdept_n(:,:,jk-1) )  
     248         END WHERE  
     249      END DO  
     250 
     251      ! If the first grid box centre is below the reference level then use the  
     252      ! top model level to get zT_ref  
     253      WHERE ( gdept_n(:,:,1) > rn_zref )   
     254         zT_ref = zT(:,:,1)  
     255         ik_ref = 1  
     256      END WHERE  
     257 
     258      ! The number of active tracer levels is 1 less than the number of active w levels  
     259      ikmt(:,:) = mbkt(:,:) - 1  
     260 
     261      ! Initialize / reset 
     262      ll_found(:,:) = .false. 
     263 
     264      IF ( rn_iso_frac - zepsilon > 0. ) THEN 
     265         ! Search for a uniform density/temperature region where adjacent levels           
     266         ! differ by less than rn_iso_frac * deltaT.                                       
     267         ! ik_iso is the index of the last level in the uniform layer   
     268         ! ll_found indicates whether the mixed layer depth can be found by interpolation  
     269         ik_iso(:,:)   = ik_ref(:,:)  
     270         DO jj = 1, nlcj  
     271            DO ji = 1, nlci  
     272!CDIR NOVECTOR  
     273               DO jk = ik_ref(ji,jj), ikmt(ji,jj)-1  
     274                  IF ( zmoddT(ji,jj,jk) > ( rn_iso_frac * zdelta_T(ji,jj) ) ) THEN  
     275                     ik_iso(ji,jj)   = jk  
     276                     ll_found(ji,jj) = ( zmoddT(ji,jj,jk) > zdelta_T(ji,jj) )  
     277                     EXIT  
     278                  END IF  
     279               END DO  
     280            END DO  
     281         END DO  
     282 
     283         ! Use linear interpolation to find depth of mixed layer base where possible  
     284         hmld_zint(:,:) = rn_zref  
     285         DO jj = 1, jpj  
     286            DO ji = 1, jpi  
     287               IF (ll_found(ji,jj) .and. tmask(ji,jj,1) == 1.0) THEN  
     288                  zdz =  abs( zdelta_T(ji,jj) / zdTdz(ji,jj,ik_iso(ji,jj)) )  
     289                  hmld_zint(ji,jj) = gdept_n(ji,jj,ik_iso(ji,jj)) + zdz  
     290               END IF  
     291            END DO  
     292         END DO  
     293      END IF 
     294 
     295      ! If ll_found = .false. then calculate MLD using difference of zdelta_T     
     296      ! from the reference density/temperature  
     297  
     298! Prevent this section from working on land points  
     299      WHERE ( tmask(:,:,1) /= 1.0 )  
     300         ll_found = .true.  
     301      END WHERE  
     302  
     303      DO jk=1, jpk  
     304         ll_belowml(:,:,jk) = abs( zT(:,:,jk) - zT_ref(:,:) ) >= zdelta_T(:,:)   
     305      END DO  
     306  
     307! Set default value where interpolation cannot be used (ll_found=false)   
     308      DO jj = 1, jpj  
     309         DO ji = 1, jpi  
     310            IF ( .not. ll_found(ji,jj) )  hmld_zint(ji,jj) = gdept_n(ji,jj,ikmt(ji,jj))  
     311         END DO  
     312      END DO  
     313 
     314      DO jj = 1, jpj  
     315         DO ji = 1, jpi  
     316!CDIR NOVECTOR  
     317            DO jk = ik_ref(ji,jj)+1, ikmt(ji,jj)  
     318               IF ( ll_found(ji,jj) ) EXIT  
     319               IF ( ll_belowml(ji,jj,jk) ) THEN                 
     320                  zT_b = zT_ref(ji,jj) + zdelta_T(ji,jj) * SIGN(1.0, zdTdz(ji,jj,jk-1) )  
     321                  zdT  = zT_b - zT(ji,jj,jk-1)                                       
     322                  zdz  = zdT / zdTdz(ji,jj,jk-1)                                        
     323                  hmld_zint(ji,jj) = gdept_n(ji,jj,jk-1) + zdz  
     324                  EXIT                                                    
     325               END IF  
     326            END DO  
     327         END DO  
     328      END DO  
     329 
     330      hmld_zint(:,:) = hmld_zint(:,:)*tmask(:,:,1)  
     331      !   
     332   END SUBROUTINE zdf_mxl_zint_mld 
     333 
     334   SUBROUTINE zdf_mxl_zint_htc( kt ) 
     335      !!---------------------------------------------------------------------- 
     336      !!                  ***  ROUTINE zdf_mxl_zint_htc  *** 
     337      !!  
     338      !! ** Purpose :    
     339      !! 
     340      !! ** Method  :    
     341      !!---------------------------------------------------------------------- 
     342 
     343      INTEGER, INTENT(in) ::   kt   ! ocean time-step index 
     344 
     345      INTEGER :: ji, jj, jk 
     346      INTEGER :: ikmax 
     347      REAL(wp) :: zc, zcoef 
     348      ! 
     349      INTEGER,  ALLOCATABLE, DIMENSION(:,:) ::   ilevel 
     350      REAL(wp), ALLOCATABLE, DIMENSION(:,:) ::   zthick_0, zthick 
     351 
     352      !!---------------------------------------------------------------------- 
     353 
     354      IF( .NOT. ALLOCATED(ilevel) ) THEN 
     355         ALLOCATE( ilevel(jpi,jpj), zthick_0(jpi,jpj), & 
     356         &         zthick(jpi,jpj), STAT=ji ) 
     357         IF( lk_mpp  )   CALL mpp_sum(ji) 
     358         IF( ji /= 0 )   CALL ctl_stop( 'STOP', 'zdf_mxl_zint_htc : unable to allocate arrays' ) 
     359      ENDIF 
     360 
     361      ! Find last whole model T level above the MLD 
     362      ilevel(:,:)   = 0 
     363      zthick_0(:,:) = 0._wp 
     364 
     365      DO jk = 1, jpkm1   
     366         DO jj = 1, jpj 
     367            DO ji = 1, jpi                     
     368               zthick_0(ji,jj) = zthick_0(ji,jj) + e3t_n(ji,jj,jk) 
     369               IF( zthick_0(ji,jj) < hmld_zint(ji,jj) )   ilevel(ji,jj) = jk 
     370            END DO 
     371         END DO 
     372         WRITE(numout,*) 'zthick_0(jk =',jk,') =',zthick_0(2,2) 
     373         WRITE(numout,*) 'gdepw_n(jk+1 =',jk+1,') =',gdepw_n(2,2,jk+1) 
     374      END DO 
     375 
     376      ! Surface boundary condition 
     377      IF( ln_linssh ) THEN  ;   zthick(:,:) = sshn(:,:)   ;   htc_mld(:,:) = tsn(:,:,1,jp_tem) * sshn(:,:) * tmask(:,:,1)    
     378      ELSE                  ;   zthick(:,:) = 0._wp       ;   htc_mld(:,:) = 0._wp                                    
     379      ENDIF 
     380 
     381      ! Deepest whole T level above the MLD 
     382      ikmax = MIN( MAXVAL( ilevel(:,:) ), jpkm1 ) 
     383 
     384      ! Integration down to last whole model T level 
     385      DO jk = 1, ikmax 
     386         DO jj = 1, jpj 
     387            DO ji = 1, jpi 
     388               zc = e3t_n(ji,jj,jk) * REAL( MIN( MAX( 0, ilevel(ji,jj) - jk + 1 ) , 1  )  )    ! 0 below ilevel 
     389               zthick(ji,jj) = zthick(ji,jj) + zc 
     390               htc_mld(ji,jj) = htc_mld(ji,jj) + zc * tsn(ji,jj,jk,jp_tem) * tmask(ji,jj,jk) 
     391            END DO 
     392         END DO 
     393      END DO 
     394 
     395      ! Subsequent partial T level 
     396      zthick(:,:) = hmld_zint(:,:) - zthick(:,:)   !   remaining thickness to reach MLD 
     397 
     398      DO jj = 1, jpj 
     399         DO ji = 1, jpi 
     400            htc_mld(ji,jj) = htc_mld(ji,jj) + tsn(ji,jj,ilevel(ji,jj)+1,jp_tem)  &  
     401      &                      * MIN( e3t_n(ji,jj,ilevel(ji,jj)+1), zthick(ji,jj) ) * tmask(ji,jj,ilevel(ji,jj)+1) 
     402         END DO 
     403      END DO 
     404 
     405      WRITE(numout,*) 'htc_mld(after) =',htc_mld(2,2) 
     406 
     407      ! Convert to heat content 
     408      zcoef = rau0 * rcp 
     409      htc_mld(:,:) = zcoef * htc_mld(:,:) 
     410 
     411   END SUBROUTINE zdf_mxl_zint_htc 
     412 
     413   SUBROUTINE zdf_mxl_zint( kt ) 
     414      !!---------------------------------------------------------------------- 
     415      !!                  ***  ROUTINE zdf_mxl_zint  *** 
     416      !!  
     417      !! ** Purpose :    
     418      !! 
     419      !! ** Method  :    
     420      !!---------------------------------------------------------------------- 
     421 
     422      INTEGER, INTENT(in) ::   kt   ! ocean time-step index 
     423 
     424      INTEGER :: ios 
     425      INTEGER :: jn 
     426 
     427      INTEGER :: nn_mld_diag = 0    ! number of diagnostics 
     428 
     429      CHARACTER(len=1) :: cmld 
     430 
     431      TYPE(MXL_ZINT) :: sn_mld1, sn_mld2, sn_mld3, sn_mld4, sn_mld5 
     432      TYPE(MXL_ZINT), SAVE, DIMENSION(5) ::   mld_diags 
     433 
     434      NAMELIST/namzdf_mldzint/ nn_mld_diag, sn_mld1, sn_mld2, sn_mld3, sn_mld4, sn_mld5 
     435 
     436      !!---------------------------------------------------------------------- 
     437       
     438      IF( kt == nit000 ) THEN 
     439         REWIND( numnam_ref )              ! Namelist namzdf_mldzint in reference namelist  
     440         READ  ( numnam_ref, namzdf_mldzint, IOSTAT = ios, ERR = 901) 
     441901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_mldzint in reference namelist', lwp ) 
     442 
     443         REWIND( numnam_cfg )              ! Namelist namzdf_mldzint in configuration namelist  
     444         READ  ( numnam_cfg, namzdf_mldzint, IOSTAT = ios, ERR = 902 ) 
     445902      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_mldzint in configuration namelist', lwp ) 
     446         IF(lwm) WRITE ( numond, namzdf_mldzint ) 
     447 
     448         IF( nn_mld_diag > 5 )   CALL ctl_stop( 'STOP', 'zdf_mxl_ini: Specify no more than 5 MLD definitions' ) 
     449 
     450         mld_diags(1) = sn_mld1 
     451         mld_diags(2) = sn_mld2 
     452         mld_diags(3) = sn_mld3 
     453         mld_diags(4) = sn_mld4 
     454         mld_diags(5) = sn_mld5 
     455 
     456         IF( lwp .AND. (nn_mld_diag > 0) ) THEN 
     457            WRITE(numout,*) '=============== Vertically-interpolated mixed layer ================' 
     458            WRITE(numout,*) '(Diagnostic number, nn_mld_type, rn_zref, rn_dT_crit, rn_iso_frac)' 
     459            DO jn = 1, nn_mld_diag 
     460               WRITE(numout,*) 'MLD criterion',jn,':' 
     461               WRITE(numout,*) '    nn_mld_type =', mld_diags(jn)%mld_type 
     462               WRITE(numout,*) '    rn_zref ='    , mld_diags(jn)%zref 
     463               WRITE(numout,*) '    rn_dT_crit =' , mld_diags(jn)%dT_crit 
     464               WRITE(numout,*) '    rn_iso_frac =', mld_diags(jn)%iso_frac 
     465            END DO 
     466            WRITE(numout,*) '====================================================================' 
     467         ENDIF 
     468      ENDIF 
     469 
     470      IF( nn_mld_diag > 0 ) THEN 
     471         DO jn = 1, nn_mld_diag 
     472            WRITE(cmld,'(I1)') jn 
     473            IF( iom_use( "mldzint_"//cmld ) .OR. iom_use( "mldhtc_"//cmld ) ) THEN 
     474               CALL zdf_mxl_zint_mld( mld_diags(jn) ) 
     475 
     476               IF( iom_use( "mldzint_"//cmld ) ) THEN 
     477                  CALL iom_put( "mldzint_"//cmld, hmld_zint(:,:) ) 
     478               ENDIF 
     479 
     480               IF( iom_use( "mldhtc_"//cmld ) )  THEN 
     481                  CALL zdf_mxl_zint_htc( kt ) 
     482                  CALL iom_put( "mldhtc_"//cmld , htc_mld(:,:)   ) 
     483               ENDIF 
     484            ENDIF 
     485         END DO 
     486      ENDIF 
     487 
     488   END SUBROUTINE zdf_mxl_zint 
    142489 
    143490   !!====================================================================== 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ZDF/zdfosm.F90

    r9598 r10843  
    106106   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    107107   !! $Id$ 
    108    !! Software governed by the CeCILL licence     (./LICENSE) 
     108   !! Software governed by the CeCILL license (see ./LICENSE) 
    109109   !!---------------------------------------------------------------------- 
    110110CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ZDF/zdfphy.F90

    r9950 r10843  
    5757   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5858   !! $Id$ 
    59    !! Software governed by the CeCILL licence     (./LICENSE) 
     59   !! Software governed by the CeCILL license (see ./LICENSE) 
    6060   !!---------------------------------------------------------------------- 
    6161CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ZDF/zdfric.F90

    r9950 r10843  
    5454   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5555   !! $Id$ 
    56    !! Software governed by the CeCILL licence     (./LICENSE) 
     56   !! Software governed by the CeCILL license (see ./LICENSE) 
    5757   !!---------------------------------------------------------------------- 
    5858CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ZDF/zdfsh2.F90

    r9950 r10843  
    2424   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2525   !! $Id$ 
    26    !! Software governed by the CeCILL licence     (./LICENSE) 
     26   !! Software governed by the CeCILL license (see ./LICENSE) 
    2727   !!---------------------------------------------------------------------- 
    2828CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ZDF/zdfswm.F90

    r9950 r10843  
    2828 
    2929   !!---------------------------------------------------------------------- 
    30    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     30   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3131   !! $Id$ 
    32    !! Software governed by the CeCILL licence     (./LICENSE) 
     32   !! Software governed by the CeCILL license (see ./LICENSE) 
    3333   !!---------------------------------------------------------------------- 
    3434CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/ZDF/zdftke.F90

    r9950 r10843  
    9393   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    9494   !! $Id$ 
    95    !! Software governed by the CeCILL licence     (./LICENSE) 
     95   !! Software governed by the CeCILL license (see ./LICENSE) 
    9696   !!---------------------------------------------------------------------- 
    9797CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/lib_cray.f90

    r9950 r10843  
    55 
    66!  wheneq 
    7 !!---------------------------------------------------------------------- 
    8 !!  OPA 9.0 , NEMO Consortium (2018)  
    9 !! $Id$ 
    10 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    11 !!---------------------------------------------------------------------- 
     7   !!---------------------------------------------------------------------- 
     8   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
     9   !! $Id$ 
     10   !! Software governed by the CeCILL license (see ./LICENSE) 
     11   !!---------------------------------------------------------------------- 
    1212SUBROUTINE lib_cray 
    1313      WRITE(*,*) 'lib_cray: You should not have seen this print! error?' 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/lib_fortran.F90

    r9950 r10843  
    5858   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5959   !! $Id$ 
    60    !! Software governed by the CeCILL licence     (./LICENSE) 
     60   !! Software governed by the CeCILL license (see ./LICENSE) 
    6161   !!---------------------------------------------------------------------- 
    6262CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/module_example

    r9950 r10843  
    5353   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5454   !! $Id: module_example 9598 2018-05-15 22:47:16Z nicolasmartin $  
    55    !! Software governed by the CeCILL licence     (./LICENSE) 
     55   !! Software governed by the CeCILL license (see ./LICENSE) 
    5656   !!---------------------------------------------------------------------- 
    5757CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/nemo.f90

    r9950 r10843  
    1313   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    1414   !! $Id$ 
    15    !! Software governed by the CeCILL licence     (./LICENSE) 
     15   !! Software governed by the CeCILL license (see ./LICENSE) 
    1616   !!---------------------------------------------------------------------- 
    1717   ! 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/nemogcm.F90

    r9950 r10843  
    105105   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    106106   !! $Id$ 
    107    !! Software governed by the CeCILL licence     (./LICENSE) 
     107   !! Software governed by the CeCILL license (see ./LICENSE) 
    108108   !!---------------------------------------------------------------------- 
    109109CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/oce.F90

    r9950 r10843  
    7070   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7171   !! $Id$ 
    72    !! Software governed by the CeCILL licence     (./LICENSE) 
     72   !! Software governed by the CeCILL license (see ./LICENSE) 
    7373   !!---------------------------------------------------------------------- 
    7474CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/par_kind.F90

    r9950 r10843  
    3636   !! NEMO 3.3 , NEMO Consortium (2018) 
    3737   !! $Id$ 
    38    !! Software governed by the CeCILL licence     (./LICENSE) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040END MODULE par_kind 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/par_oce.F90

    r9950 r10843  
    7979   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    8080   !! $Id$ 
    81    !! Software governed by the CeCILL licence (./LICENSE) 
     81   !! Software governed by the CeCILL license (see ./LICENSE) 
    8282   !!====================================================================== 
    8383END MODULE par_oce 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/step.F90

    r9950 r10843  
    4848   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4949   !! $Id$ 
    50    !! Software governed by the CeCILL licence     (./LICENSE) 
     50   !! Software governed by the CeCILL license (see ./LICENSE) 
    5151   !!---------------------------------------------------------------------- 
    5252CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/step_oce.F90

    r9950 r10843  
    112112   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    113113   !! $Id$ 
    114    !! Software governed by the CeCILL licence     (./LICENSE) 
     114   !! Software governed by the CeCILL license (see ./LICENSE) 
    115115   !!====================================================================== 
    116116END MODULE step_oce 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/stpctl.F90

    r9950 r10843  
    3636   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$ 
    38    !! Software governed by the CeCILL licence (./LICENSE) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/timing.F90

    r9950 r10843  
    7979   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    8080   !! $Id$ 
    81    !! Software governed by the CeCILL licence     (./LICENSE) 
     81   !! Software governed by the CeCILL license (see ./LICENSE) 
    8282   !!---------------------------------------------------------------------- 
    8383CONTAINS 
     
    491491      END DO       
    492492 
    493          WRITE(*,*) 'ARPDBG: timing: done gathers' 
    494        
    495493      IF( narea == 1 ) THEN     
    496494         ! Compute some stats 
     
    515513         END DO 
    516514 
    517          WRITE(*,*) 'ARPDBG: timing: done computing stats' 
    518        
    519515         ! reorder the averaged list by CPU time       
    520516         s_wrk => NULL() 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/trc_oce.F90

    r9950 r10843  
    4646   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4747   !! $Id$ 
    48    !! Software governed by the CeCILL licence     (./LICENSE) 
     48   !! Software governed by the CeCILL license (see ./LICENSE) 
    4949   !!---------------------------------------------------------------------- 
    5050CONTAINS 
  • NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/vectopt_loop_substitute.h90

    r9950 r10843  
    88   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    99   !! $Id$ 
    10    !! Software governed by the CeCILL licence (./LICENSE) 
     10   !! Software governed by the CeCILL license (see ./LICENSE) 
    1111   !!---------------------------------------------------------------------- 
    1212#if defined key_vectopt_loop 
Note: See TracChangeset for help on using the changeset viewer.