Changeset 9176 for branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90

Timestamp:

2018-01-04T13:30:03+01:00 (6 years ago)

Author:

andmirek

Message:

#2001: OMP directives

File:

• branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) (15 diffs)

branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90

@@ -108 +108 @@
       REAL(wp) ::  zmskv, zabe2, zcof2, zcoef4   !   -      -
       REAL(wp) ::  zcoef0, zbtr, ztra            !   -      -
-      REAL(wp), POINTER, DIMENSION(:,:  ) ::  z2d
+      REAL(wp), DIMENSION(jpi,jpj  ) ::  z2d
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  zdkt, zdk1t, zdit, zdjt, ztfw 
       !!----------------------------------------------------------------------
@@ -114 +114 @@
       IF( nn_timing == 1 )  CALL timing_start('tra_ldf_iso')
       !
-      CALL wrk_alloc( jpi, jpj,      z2d ) 
+!     CALL wrk_alloc( jpi, jpj,      z2d ) 
       CALL wrk_alloc( jpi, jpj, jpk, zdit, zdjt, ztfw, zdkt, zdk1t ) 
       !
@@ -137 +137 @@
 
          ! Horizontal tracer gradient 
+!$OMP PARALLEL DO
          DO jk = 1, jpkm1
             DO jj = 1, jpjm1
@@ -145 +146 @@
             END DO
          END DO
+!$OMP END PARALLEL DO
 
          ! partial cell correction
          IF( ln_zps ) THEN      ! partial steps correction at the last ocean level 
+!$OMP PARALLEL DO
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
@@ -157 +160 @@
          ENDIF
          IF( ln_zps .AND. ln_isfcav ) THEN      ! partial steps correction at the first wet level beneath a cavity
+!$OMP PARALLEL DO
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
@@ -173 +177 @@
          ! 
          ! interior value 
+!$OMP PARALLEL DO
          DO jk = 2, jpkm1               
             DO jj = 1, jpj
@@ -182 +187 @@
             END DO
          END DO
+!$OMP END PARALLEL DO
          ! surface boundary condition: zdkt(jk=1)=zdkt(jk=2)
          zdk1t(:,:,1) = ( ptb(:,:,1,jn  ) - ptb(:,:,2,jn) ) * wmask(:,:,2)
          zdkt (:,:,1) = zdk1t(:,:,1)
          IF ( ln_isfcav ) THEN
+!$OMP PARALLEL DO PRIVATE(ikt)
             DO jj = 1, jpj
                DO ji = 1, jpi   ! vector opt.
@@ -193 +200 @@
                END DO
             END DO
+!$OMP END PARALLEL DO
          END IF
 
          ! 2. Horizontal fluxes
          ! --------------------   
+!$OMP PARALLEL DO PRIVATE(zabe1, zabe2, zmsku, zmskv, zcof1, zcof2, zbtr, ztra)
          DO jk = 1, jpkm1
             DO jj = 1 , jpjm1
@@ -233 +242 @@
          END DO                                        !   End of slab  
          !                                             ! ===============
+!$OMP END PARALLEL DO
          !
          ! "Poleward" diffusive heat or salt transports (T-S case only)
@@ -245 +255 @@
            IF( cdtype == 'TRA' .AND. jn == jp_tem  ) THEN
                z2d(:,:) = 0._wp 
+!$OMP PARALLEL DO REDUCTION(+:z2d)
                DO jk = 1, jpkm1
                   DO jj = 2, jpjm1
@@ -252 +263 @@
                   END DO
                END DO
+
                z2d(:,:) = - rau0_rcp * z2d(:,:)     ! note sign is reversed to give down-gradient diffusive transports (#1043)
+
                CALL lbc_lnk( z2d, 'U', -1. )
                CALL iom_put( "udiff_heattr", z2d )                  ! heat transport in i-direction
                !
                z2d(:,:) = 0._wp 
+!$OMP PARALLEL DO REDUCTION(+:z2d)
                DO jk = 1, jpkm1
                   DO jj = 2, jpjm1
@@ -264 +278 @@
                   END DO
                END DO
+
                z2d(:,:) = - rau0_rcp * z2d(:,:)     ! note sign is reversed to give down-gradient diffusive transports (#1043)
                CALL lbc_lnk( z2d, 'V', -1. )
@@ -286 +301 @@
          
          ! interior (2=<jk=<jpk-1)
+!$OMP PARALLEL DO PRIVATE(zcoef0, zmsku, zmskv, zcoef3, zcoef4 )
          DO jk = 2, jpkm1
             DO jj = 2, jpjm1
@@ -306 +322 @@
             END DO
          END DO
-         
+!$OMP END PARALLEL DO         
          
          ! I.5 Divergence of vertical fluxes added to the general tracer trend
          ! -------------------------------------------------------------------
+!$OMP PARALLEL DO PRIVATE(zbtr, ztra)
          DO jk = 1, jpkm1
             DO jj = 2, jpjm1
@@ -319 +336 @@
             END DO
          END DO
+!$OMP END PARALLEL DO
          !
       END DO
       !
-      CALL wrk_dealloc( jpi, jpj, z2d ) 
+!     CALL wrk_dealloc( jpi, jpj, z2d ) 
       CALL wrk_dealloc( jpi, jpj, jpk, zdit, zdjt, ztfw, zdkt, zdk1t ) 
       !