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 14644 for NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/DIA/diaptr.F90 – NEMO

Ignore:
Timestamp:
2021-03-26T15:33:49+01:00 (3 years ago)
Author:
sparonuz
Message:

Merge trunk -r14642:HEAD

Location:
NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final

    • Property svn:externals

      •  

        old new  
        99 
        1010# SETTE 
        11 ^/utils/CI/sette_wave@13990         sette 
         11^/utils/CI/sette@14244        sette 

  • NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/DIA/diaptr.F90

    r14090 r14644  
    382382            zts(:,:,:,:) = 0._wp 
    383383 
    384             DO_3D( 1, 0, 1, 1, 1, jpkm1 ) 
     384            DO_3D( 1, 1, 1, 0, 1, jpkm1 ) 
    385385               zvfc = e1v(ji,jj) * e3v(ji,jj,jk,Kmm) 
    386386               zmask(ji,jj,jk)      = vmask(ji,jj,jk)      * zvfc 
    … …  
    437437            zts(:,:,:,:) = 0._wp 
    438438 
    439             DO_3D( 1, 0, 1, 1, 1, jpkm1 ) 
     439            DO_3D( 1, 1, 1, 0, 1, jpkm1 ) 
    440440               zvfc = e1v(ji,jj) * e3v(ji,jj,jk,Kmm) 
    441441               zts(ji,jj,jk,jp_tem) = (ts(ji,jj,jk,jp_tem,Kmm)+ts(ji,jj+1,jk,jp_tem,Kmm)) * 0.5 * zvfc  !Tracers averaged onto V grid 
    … …  
    578578      REAL(wp), DIMENSION(A1Dj(nn_hls),nbasin), INTENT(in)            ::  pva    ! 
    579579      INTEGER                                               ::  jj 
    580 #if defined key_mpp_mpi 
     580#if ! defined key_mpi_off 
    581581      INTEGER, DIMENSION(1)           ::  ish1d 
    582582      INTEGER, DIMENSION(2)           ::  ish2d 
    … …  
    588588      END DO 
    589589 
    590 #if defined key_mpp_mpi 
     590#if ! defined key_mpi_off 
    591591      IF( ntile == 0 .OR. ntile == nijtile ) THEN 
    592592         ish1d(1) = jpj*nbasin 
    … …  
    614614      REAL(wp), DIMENSION(A1Dj(nn_hls),jpk,nbasin), INTENT(in)        ::  pva    ! 
    615615      INTEGER                                               ::  jj, jk 
    616 #if defined key_mpp_mpi 
     616#if ! defined key_mpi_off 
    617617      INTEGER, DIMENSION(1)              ::  ish1d 
    618618      INTEGER, DIMENSION(3)              ::  ish3d 
    … …  
    626626      END DO 
    627627 
    628 #if defined key_mpp_mpi 
     628#if ! defined key_mpi_off 
    629629      IF( ntile == 0 .OR. ntile == nijtile ) THEN 
    630630         ish1d(1) = jpj*jpk*nbasin 
Note: See TracChangeset for help on using the changeset viewer.