Changeset 9176 for branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.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/ZDF/zdftmx.F90 (modified) (13 diffs)

branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90

@@ -111 +111 @@
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   ztpc         ! scalar workspace
-      REAL(wp), POINTER, DIMENSION(:,:) ::   zkz
+      REAL(wp), DIMENSION(jpi,jpj) ::   zkz
       !!----------------------------------------------------------------------
       !
       IF( nn_timing == 1 )  CALL timing_start('zdf_tmx')
       !
-      CALL wrk_alloc( jpi,jpj, zkz )
+!     CALL wrk_alloc( jpi,jpj, zkz )
 
       !                          ! ----------------------- !
@@ -128 +128 @@
          zkz(:,:) = zkz(:,:) + fse3w(:,:,jk) * MAX( 0.e0, rn2(:,:,jk) ) * rau0 * zav_tide(:,:,jk) * wmask(:,:,jk)
       END DO
-
       DO jj = 1, jpj                !* Here zkz should be equal to en_tmx ==> multiply by en_tmx/zkz to recover en_tmx
          DO ji = 1, jpi
@@ -134 +133 @@
          END DO
       END DO
-
       DO jk = 2, jpkm1     !* Mutiply by zkz to recover en_tmx, BUT bound by 30/6 ==> zav_tide bound by 300 cm2/s
          DO jj = 1, jpj                !* Here zkz should be equal to en_tmx ==> multiply by en_tmx/zkz to recover en_tmx
@@ -142 +140 @@
          END DO
       END DO
-
       IF( kt == nit000 ) THEN       !* check at first time-step: diagnose the energy consumed by zav_tide
          ztpc = 0.e0
@@ -166 +163 @@
       !                          !   Update  mixing coefs  !                          
       !                          ! ----------------------- !
+!$OMP PARALLEL DO
       DO jk = 2, jpkm1              !* update momentum & tracer diffusivity with tidal mixing
          DO jj = 1, jpj                !* Here zkz should be equal to en_tmx ==> multiply by en_tmx/zkz to recover en_tmx
@@ -174 +172 @@
          END DO
       END DO
-      
+!$OMP PARALLEL DO
       DO jk = 2, jpkm1              !* update momentum & tracer diffusivity with tidal mixing
          DO jj = 2, jpjm1
@@ -190 +188 @@
       IF(ln_ctl)   CALL prt_ctl(tab3d_1=zav_tide , clinfo1=' tmx - av_tide: ', tab3d_2=avt, clinfo2=' avt: ', ovlap=1, kdim=jpk)
       !
-      CALL wrk_dealloc( jpi,jpj, zkz )
+!     CALL wrk_dealloc( jpi,jpj, zkz )
       !
       IF( nn_timing == 1 )  CALL timing_stop('zdf_tmx')
@@ -222 +220 @@
       INTEGER  ::   ji, jj, jk    ! dummy loop indices
       REAL(wp) ::   zcoef, ztpc   ! temporary scalar
-      REAL(wp), DIMENSION(:,:)  , POINTER ::   zkz                        ! 2D workspace
-      REAL(wp), DIMENSION(:,:)  , POINTER ::   zsum1 , zsum2 , zsum       !  -      -
+      REAL(wp), DIMENSION(jpi, jpj)  ::   zkz                        ! 2D workspace
+      REAL(wp), DIMENSION(jpi, jpj)  ::   zsum1 , zsum2 , zsum       !  -      -
       REAL(wp), DIMENSION(:,:,:), POINTER ::   zempba_3d_1, zempba_3d_2   ! 3D workspace
       REAL(wp), DIMENSION(:,:,:), POINTER ::   zempba_3d  , zdn2dz        !  -      -
@@ -231 +229 @@
       IF( nn_timing == 1 )  CALL timing_start('tmx_itf')
       !
-      CALL wrk_alloc( jpi,jpj, zkz, zsum1 , zsum2 , zsum )
+!     CALL wrk_alloc( jpi,jpj, zkz, zsum1 , zsum2 , zsum )
       CALL wrk_alloc( jpi,jpj,jpk, zempba_3d_1, zempba_3d_2, zempba_3d, zdn2dz, zavt_itf )
 
@@ -237 +235 @@
       zempba_3d_1(:,:,jpk) = 0.e0
       zempba_3d_2(:,:,jpk) = 0.e0
+!$OMP PARALLEL DO
       DO jk = 1, jpkm1             
          zdn2dz     (:,:,jk) = rn2(:,:,jk) - rn2(:,:,jk+1)           ! Vertical profile of dN2/dz
-!CDIR NOVERRCHK
          zempba_3d_1(:,:,jk) = SQRT(  MAX( 0.e0, rn2(:,:,jk) )  )    !    -        -    of N
          zempba_3d_2(:,:,jk) =        MAX( 0.e0, rn2(:,:,jk) )       !    -        -    of N^2
@@ -257 +255 @@
          END DO
       END DO
-
       DO jk= 1, jpk
          DO jj = 1, jpj
@@ -313 +310 @@
 
       !                             ! Update pav with the ITF mixing coefficient
+!$OMP PARALLEL DO
       DO jk = 2, jpkm1
          pav(:,:,jk) = pav     (:,:,jk) * ( 1.e0 - mask_itf(:,:) )   &
@@ -318 +316 @@
       END DO
       !
-      CALL wrk_dealloc( jpi,jpj, zkz, zsum1 , zsum2 , zsum )
+!     CALL wrk_dealloc( jpi,jpj, zkz, zsum1 , zsum2 , zsum )
       CALL wrk_dealloc( jpi,jpj,jpk, zempba_3d_1, zempba_3d_2, zempba_3d, zdn2dz, zavt_itf )
       !