Changeset 7753 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90

Timestamp:

2017-03-03T12:46:59+01:00 (7 years ago)

Author:

mocavero

Message:

Reverting trunk to remove OpenMP

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) (6 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90

@@ -77 +77 @@
       IF( l_trddyn )   THEN         ! Save ua and va trends
          CALL wrk_alloc( jpi, jpj, jpk, ztrdu, ztrdv ) 
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
-        DO jk = 1, jpk
-           DO jj = 1, jpj
-              DO ji = 1, jpi
-                 ztrdu(ji,jj,jk) = ua(ji,jj,jk)
-                 ztrdv(ji,jj,jk) = va(ji,jj,jk)
-              END DO
-           END DO
-        END DO
+         ztrdu(:,:,:) = ua(:,:,:) 
+         ztrdv(:,:,:) = va(:,:,:) 
       ENDIF
       
-!$OMP PARALLEL
       DO jk = 2, jpkm1              ! Vertical momentum advection at level w and u- and v- vertical
-!$OMP DO schedule(static) private(jj, ji)
          DO jj = 2, jpj                   ! vertical fluxes 
             DO ji = fs_2, jpi             ! vector opt.
@@ -96 +87 @@
             END DO
          END DO
-!$OMP DO schedule(static) private(jj, ji)
          DO jj = 2, jpjm1                 ! vertical momentum advection at w-point
             DO ji = fs_2, fs_jpim1        ! vector opt.
@@ -104 +94 @@
          END DO   
       END DO
-!$OMP END PARALLEL
       !
       ! Surface and bottom advective fluxes set to zero
       IF ( ln_isfcav ) THEN
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1           ! vector opt.
@@ -118 +106 @@
          END DO
       ELSE
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
          DO jj = 2, jpjm1        
             DO ji = fs_2, fs_jpim1           ! vector opt.
@@ -129 +116 @@
       END IF
 
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zua, zva)
       DO jk = 1, jpkm1              ! Vertical momentum advection at u- and v-points
          DO jj = 2, jpjm1
@@ -144 +130 @@
 
       IF( l_trddyn ) THEN           ! save the vertical advection trends for diagnostic
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
-           DO jk = 1, jpk
-              DO jj = 1, jpj
-                 DO ji = 1, jpi
-                    ztrdu(ji,jj,jk) = ua(ji,jj,jk) - ztrdu(ji,jj,jk)
-                    ztrdv(ji,jj,jk) = va(ji,jj,jk) - ztrdv(ji,jj,jk)
-                 END DO
-              END DO
-           END DO
+         ztrdu(:,:,:) = ua(:,:,:) - ztrdu(:,:,:)
+         ztrdv(:,:,:) = va(:,:,:) - ztrdv(:,:,:)
          CALL trd_dyn( ztrdu, ztrdv, jpdyn_zad, kt )
          CALL wrk_dealloc( jpi, jpj, jpk, ztrdu, ztrdv )