Changeset 7753 for trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90

Timestamp:

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

Author:

mocavero

Message:

Reverting trunk to remove OpenMP

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90

@@ -76 +76 @@
       IF( l_trdtrc )  THEN
          CALL wrk_alloc( jpi,jpj,jpk,jptra,   ztrtrd )
-!$OMP PARALLEL DO schedule(static) private(jn,jk,jj,ji)
-         DO jn = 1, jptra
-            DO jk = 1, jpk
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     ztrtrd(ji,jj,jk,jn)  = tra(ji,jj,jk,jn)
-                  END DO
-               END DO
-            END DO
-         END DO
+         ztrtrd(:,:,:,:)  = tra(:,:,:,:)
       ENDIF
       !                                  !* set the lateral diffusivity coef. for passive tracer      
       CALL wrk_alloc( jpi,jpj,jpk,   zahu, zahv )
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(jk,jj,ji)
-      DO jk = 1, jpk
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               zahu(ji,jj,jk) = rldf * ahtu(ji,jj,jk) 
-               zahv(ji,jj,jk) = rldf * ahtv(ji,jj,jk)
-            END DO
-         END DO
-      END DO
+      zahu(:,:,:) = rldf * ahtu(:,:,:) 
+      zahv(:,:,:) = rldf * ahtv(:,:,:)
       !                                  !* Enhanced zonal diffusivity coefficent in the equatorial domain
-!$OMP DO schedule(static) private(jk,jj,ji,zdep)
       DO jk= 1, jpk
          DO jj = 1, jpj
@@ -111 +93 @@
          END DO
       END DO
-!$OMP END DO NOWAIT
-!$OMP END PARALLEL
       !
       SELECT CASE ( nldf )                     !* compute lateral mixing trend and add it to the general trend
@@ -132 +112 @@
       IF( l_trdtrc )   THEN                    ! send the trends for further diagnostics
         DO jn = 1, jptra
-!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
-           DO jk = 1, jpk
-              DO jj = 1, jpj
-                 DO ji = 1, jpi
-                    ztrtrd(ji,jj,jk,jn) = tra(ji,jj,jk,jn) - ztrtrd(ji,jj,jk,jn)
-                 END DO
-              END DO
-           END DO
+           ztrtrd(:,:,:,jn) = tra(:,:,:,jn) - ztrtrd(:,:,:,jn)
            CALL trd_tra( kt, 'TRC', jn, jptra_ldf, ztrtrd(:,:,:,jn) )
         END DO