Changeset 7037 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

Timestamp:

2016-10-18T15:32:04+02:00 (8 years ago)

Author:

mocavero

Message:

ORCA2_LIM_PISCES hybrid version update

File:

• branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) (14 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

@@ -322 +322 @@
 
          IF( ln_sco ) THEN
+!$OMP PARALLEL WORKSHARE
             zwz(:,:) = zwz(:,:) / e3f_n(:,:,jk)
             zwx(:,:) = e2u(:,:) * e3u_n(:,:,jk) * un(:,:,jk)
             zwy(:,:) = e1v(:,:) * e3v_n(:,:,jk) * vn(:,:,jk)
+!$OMP END PARALLEL WORKSHARE
          ELSE
 !$OMP PARALLEL WORKSHARE
@@ -521 +523 @@
          SELECT CASE( nn_een_e3f )           ! == reciprocal of e3 at F-point
          CASE ( 0 )                                   ! original formulation  (masked averaging of e3t divided by 4)
+!$OMP PARALLEL DO private(jj,ji,ze3)
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
@@ -531 +534 @@
             END DO
          CASE ( 1 )                                   ! new formulation  (masked averaging of e3t divided by the sum of mask)
+!$OMP PARALLEL DO private(jj,ji,ze3,zmsk)
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
@@ -546 +550 @@
          SELECT CASE( kvor )                 !==  vorticity considered  ==!
          CASE ( np_COR )                           !* Coriolis (planetary vorticity)
+!$OMP PARALLEL DO private(jj,ji)
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
@@ -552 +557 @@
             END DO
          CASE ( np_RVO )                           !* relative vorticity
+!$OMP PARALLEL DO private(jj,ji)
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
@@ -560 +566 @@
             END DO
          CASE ( np_MET )                           !* metric term
+!$OMP PARALLEL DO private(jj,ji)
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
@@ -568 +575 @@
             END DO
          CASE ( np_CRV )                           !* Coriolis + relative vorticity
+!$OMP PARALLEL DO private(jj,ji)
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
@@ -576 +584 @@
             END DO
          CASE ( np_CME )                           !* Coriolis + metric
+!$OMP PARALLEL DO private(jj,ji)
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
@@ -589 +598 @@
          !
          IF( ln_dynvor_msk ) THEN          !==  mask/unmask vorticity ==!
+!$OMP PARALLEL DO private(jj,ji)
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
@@ -599 +609 @@
          !
          !                                   !==  horizontal fluxes  ==!
-         zwx(:,:) = e2u(:,:) * e3u_n(:,:,jk) * un(:,:,jk)
-         zwy(:,:) = e1v(:,:) * e3v_n(:,:,jk) * vn(:,:,jk)
+!$OMP PARALLEL DO private(jj,ji)
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               zwx(ji,jj) = e2u(ji,jj) * e3u_n(ji,jj,jk) * un(ji,jj,jk)
+               zwy(ji,jj) = e1v(ji,jj) * e3v_n(ji,jj,jk) * vn(ji,jj,jk)
+            END DO
+         END DO
 
          !                                   !==  compute and add the vorticity term trend  =!
@@ -611 +626 @@
                ztsw(ji,jj) = zwz(ji  ,jj-1) + zwz(ji-1,jj-1) + zwz(ji-1,jj  )
          END DO
+!$OMP PARALLEL
+!$OMP DO private(jj,ji)
          DO jj = 3, jpj
             DO ji = fs_2, jpi   ! vector opt. ok because we start at jj = 3
@@ -619 +636 @@
             END DO
          END DO
+!$OMP DO private(jj,ji,zua,zva)
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -628 +646 @@
                pva(ji,jj,jk) = pva(ji,jj,jk) + zva
             END DO  
-         END DO  
+         END DO 
+!$OMP END DO NOWAIT
+!$OMP END PARALLEL 
          !                                             ! ===============
       END DO                                           !   End of slab
@@ -683 +703 @@
       IF(lwp) WRITE(numout,*) '           namlbc: change fmask value in the angles (T)   ln_vorlat = ', ln_vorlat
       IF( ln_vorlat .AND. ( ln_dynvor_ene .OR. ln_dynvor_ens .OR. ln_dynvor_mix ) ) THEN
+!$OMP PARALLEL DO private(jk,jj,ji)
          DO jk = 1, jpk
             DO jj = 2, jpjm1