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/TRA – 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/TRA
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • 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 
Note: See TracChangeset for help on using the changeset viewer.