Changeset 7698 for trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90

Timestamp:

2017-02-18T10:02:03+01:00 (7 years ago)

Author:

mocavero

Message:

update trunk with OpenMP parallelization

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90

@@ -70 +70 @@
       CALL wrk_alloc( jpi,jpj,jpk,   zavt_evd, zavm_evd ) 
       !
-      zavt_evd(:,:,:) = avt(:,:,:)           ! set avt prior to evd application
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
+      DO jk = 1, jpk
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               zavt_evd(ji,jj,jk) = avt(ji,jj,jk)           ! set avt prior to evd application
+            END DO
+         END DO
+      END DO 
       !
       SELECT CASE ( nn_evdm )
@@ -76 +83 @@
       CASE ( 1 )           ! enhance vertical eddy viscosity and diffusivity (if rn2<-1.e-12)
          !
-         zavm_evd(:,:,:) = avm(:,:,:)           ! set avm prior to evd application
+!$OMP PARALLEL
+!$OMP DO schedule(static) private(jk, jj, ji)
+         DO jk = 1, jpk
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  zavm_evd(ji,jj,jk) = avm(ji,jj,jk)           ! set avm prior to evd application
+               END DO
+            END DO
+         END DO 
          !
+!$OMP DO schedule(static) private(jk, jj, ji)
          DO jk = 1, jpkm1 
             DO jj = 2, jpj             ! no vector opt.
@@ -92 +108 @@
             END DO
          END DO 
+!$OMP END PARALLEL
          CALL lbc_lnk( avt , 'W', 1. )   ;   CALL lbc_lnk( avm , 'W', 1. )   ! Lateral boundary conditions
          CALL lbc_lnk( avmu, 'U', 1. )   ;   CALL lbc_lnk( avmv, 'V', 1. )
          !
-         zavm_evd(:,:,:) = avm(:,:,:) - zavm_evd(:,:,:)   ! change in avm due to evd
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
+         DO jk = 1, jpk
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  zavm_evd(ji,jj,jk) = avm(ji,jj,jk) - zavm_evd(ji,jj,jk)   ! change in avm due to evd
+               END DO
+            END DO
+         END DO 
          CALL iom_put( "avm_evd", zavm_evd )              ! output this change
          !
       CASE DEFAULT         ! enhance vertical eddy diffusivity only (if rn2<-1.e-12) 
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
          DO jk = 1, jpkm1
 !!!         WHERE( rn2(:,:,jk) <= -1.e-12 ) avt(:,:,jk) = tmask(:,:,jk) * avevd   ! agissant sur T SEUL! 
@@ -111 +136 @@
       END SELECT 
 
-      zavt_evd(:,:,:) = avt(:,:,:) - zavt_evd(:,:,:)   ! change in avt due to evd
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
+      DO jk = 1, jpk
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               zavt_evd(ji,jj,jk) = avt(ji,jj,jk) - zavt_evd(ji,jj,jk)   ! change in avt due to evd
+            END DO
+         END DO
+      END DO 
       CALL iom_put( "avt_evd", zavt_evd )              ! output this change
       IF( l_trdtra ) CALL trd_tra( kt, 'TRA', jp_tem, jptra_evd, zavt_evd )