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

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

@@ -46 +46 @@
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.3 , NEMO Consortium (2010)
-   !! $Id$
+   !! $Id$ 
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -77 +77 @@
       INTEGER, INTENT( in ) ::   kt     ! ocean time-step index
       !
-      INTEGER  ::   jk, jn, jj, ji   ! dummy loop indices
+      INTEGER  ::   jk, jn   ! dummy loop indices
       REAL(wp) ::   zfact            ! temporary scalar
       CHARACTER (len=22) :: charout
@@ -101 +101 @@
       IF( l_trdtrc )  THEN             ! trends: store now fields before the Asselin filter application
          CALL wrk_alloc( jpi, jpj, jpk, jptra, ztrdt )
-!$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
-                     ztrdt(ji,jj,jk,jn)  = trn(ji,jj,jk,jn)
-                  END DO
-               END DO
-            END DO
-         END DO
+         ztrdt(:,:,:,:)  = trn(:,:,:,:)
       ENDIF
       !                                ! Leap-Frog + Asselin filter time stepping
       IF( neuler == 0 .AND. kt == nittrc000 ) THEN    ! Euler time-stepping at first time-step (only swap)
-!$OMP PARALLEL DO schedule(static) private(jn,jk,jj,ji)
          DO jn = 1, jptra
             DO jk = 1, jpkm1
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     trn(ji,jj,jk,jn) = tra(ji,jj,jk,jn)
-                  END DO
-               END DO
+               trn(:,:,jk,jn) = tra(:,:,jk,jn)
             END DO
          END DO
@@ -141 +127 @@
             DO jk = 1, jpkm1
                zfact = 1._wp / r2dttrc  
-!$OMP PARALLEL DO schedule(static) private(jj,ji)
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     ztrdt(ji,jj,jk,jn) = ( trb(ji,jj,jk,jn) - ztrdt(ji,jj,jk,jn) ) * zfact
-                  END DO
-               END DO
+               ztrdt(:,:,jk,jn) = ( trb(:,:,jk,jn) - ztrdt(:,:,jk,jn) ) * zfact 
                CALL trd_tra( kt, 'TRC', jn, jptra_atf, ztrdt )
             END DO