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

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

@@ -47 +47 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       !! 
-      INTEGER  ::   jk, ji, jj       ! dummy loop indexes
+      INTEGER  ::   ji, jj       ! dummy loop indexes
       INTEGER  ::   ikbu, ikbv   ! local integers
       REAL(wp) ::   zm1_2dt      ! local scalar
@@ -65 +65 @@
         IF( l_trddyn ) THEN      ! trends: store the input 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 schedule(static) private(jj, ji, ikbu, ikbv)
         DO jj = 2, jpjm1
            DO ji = 2, jpim1
@@ -90 +82 @@
         !
         IF( ln_isfcav ) THEN        ! ocean cavities
-!$OMP PARALLEL DO schedule(static) private(jj, ji, ikbu, ikbv)
            DO jj = 2, jpjm1
               DO ji = 2, jpim1
@@ -108 +99 @@
         !
         IF( l_trddyn ) THEN      ! trends: send trends to trddyn 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_bfr, kt )
            CALL wrk_dealloc( jpi,jpj,jpk,   ztrdu, ztrdv )