Changeset 7753 for trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.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/trczdf.F90 (modified) (4 diffs)

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

@@ -40 +40 @@
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.7 , NEMO Consortium (2015)
-   !! $Id$
+   !! $Id$ 
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -53 +53 @@
       INTEGER, INTENT( in ) ::  kt      ! ocean time-step index
       !
-      INTEGER               ::  jk, jn, jj, ji
+      INTEGER               ::  jk, jn
       CHARACTER (len=22)    :: charout
       REAL(wp), POINTER, DIMENSION(:,:,:,:) ::   ztrtrd   ! 4D workspace
@@ -62 +62 @@
       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
 
@@ -81 +72 @@
       IF( l_trdtrc )   THEN                      ! save the vertical diffusive trends for further diagnostics
          DO jn = 1, jptra
-!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
             DO jk = 1, jpkm1
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     ztrtrd(ji,jj,jk,jn) = ( ( tra(ji,jj,jk,jn) - trb(ji,jj,jk,jn) ) / r2dttrc ) - ztrtrd(ji,jj,jk,jn)
-                  END DO
-               END DO
+               ztrtrd(:,:,jk,jn) = ( ( tra(:,:,jk,jn) - trb(:,:,jk,jn) ) / r2dttrc ) - ztrtrd(:,:,jk,jn)
             END DO
             CALL trd_tra( kt, 'TRC', jn, jptra_zdf, ztrtrd(:,:,:,jn) )