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

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

@@ -61 +61 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
-      INTEGER ::   jk, jj, ji
       !
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztrdu, ztrdv
@@ -70 +69 @@
       IF( l_trddyn )   THEN                      ! temporary save of momentum 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
 
@@ -90 +82 @@
 
       IF( l_trddyn ) THEN                        ! save the horizontal 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) - 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_ldf, kt )
          CALL wrk_dealloc( jpi,jpj,jpk,   ztrdu, ztrdv )