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

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

@@ -31 +31 @@
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.3 , NEMO Consortium (2010)
-   !! $Id$
+   !! $Id$ 
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -61 +61 @@
       IF( l_trdtrc )  THEN
          CALL wrk_alloc( jpi, jpj, jpk, jptra, ztrtrd ) ! temporary save of trends
-!$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
 
@@ -97 +88 @@
       IF( l_trdtrc )   THEN                      ! save the horizontal diffusive 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_bbl, ztrtrd(:,:,:,jn) )
         END DO