Changeset 7753 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.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/dynzdf.F90 (modified) (3 diffs)

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

@@ -53 +53 @@
       !!
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
-      INTEGER  ::   ji, jj, jk   ! dummy loop indices
       !
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztrdu, ztrdv
@@ -67 +66 @@
       IF( l_trddyn )   THEN                      ! temporary save of ta and sa 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
 
@@ -86 +78 @@
 
       IF( l_trddyn )   THEN                      ! save the vertical diffusive trends for further diagnostics
-!$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) - ub(ji,jj,jk) ) / r2dt - ztrdu(ji,jj,jk)
-                  ztrdv(ji,jj,jk) = ( va(ji,jj,jk) - vb(ji,jj,jk) ) / r2dt - ztrdv(ji,jj,jk)
-               END DO
-            END DO
-         END DO
+         ztrdu(:,:,:) = ( ua(:,:,:) - ub(:,:,:) ) / r2dt - ztrdu(:,:,:)
+         ztrdv(:,:,:) = ( va(:,:,:) - vb(:,:,:) ) / r2dt - ztrdv(:,:,:)
          CALL trd_dyn( ztrdu, ztrdv, jpdyn_zdf, kt )
          CALL wrk_dealloc( jpi, jpj, jpk, ztrdu, ztrdv )