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

trunk/NEMOGCM/NEMO/TOP_SRC/trcstp.F90

@@ -37 +37 @@
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.3 , NEMO Consortium (2010)
-   !! $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  ! dummy loop indices
+      INTEGER               ::  jk, jn  ! dummy loop indices
       REAL(wp)              ::  ztrai
       CHARACTER (len=25)    ::  charout 
@@ -70 +70 @@
       !
       IF( .NOT.ln_linssh ) THEN                                           ! update ocean volume due to ssh temporal evolution
-!$OMP PARALLEL DO schedule(static) private(jk,jj,ji)
          DO jk = 1, jpk
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  cvol(ji,jj,jk) = e1e2t(ji,jj) * e3t_n(ji,jj,jk) * tmask(ji,jj,jk)
-               END DO
-            END DO
+            cvol(:,:,jk) = e1e2t(:,:) * e3t_n(:,:,jk) * tmask(:,:,jk)
          END DO
          areatot         = glob_sum( cvol(:,:,:) )
@@ -92 +87 @@
          ENDIF
          !
-         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
-                     tra(ji,jj,jk,jn) = 0._wp
-                  END DO
-               END DO
-            END DO
-         END DO
+         tra(:,:,:,:) = 0.e0
          !
                                    CALL trc_rst_opn  ( kt )       ! Open tracer restart file