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

trunk/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -105 +105 @@
       !! ** Purpose :      passive tracers inventories at initialsation phase
       !!----------------------------------------------------------------------
-      INTEGER ::  jk, jn, jj, ji    ! dummy loop indices
+      INTEGER ::  jk, jn    ! dummy loop indices
       CHARACTER (len=25) :: charout
       !!----------------------------------------------------------------------
       !                                                              ! masked grid volume
-!$OMP PARALLEL
-!$OMP 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
-      !
-!$OMP DO schedule(static) private(jn)
-      DO jn = 1, jptra
-         trai(jn) = 0._wp                                               ! initial content of all tracers
-      END DO
-!$OMP END PARALLEL
       !                                                              ! total volume of the ocean 
       areatot = glob_sum( cvol(:,:,:) )
       !
+      trai(:) = 0._wp                                                   ! initial content of all tracers
       DO jn = 1, jptra
          trai(jn) = trai(jn) + glob_sum( trn(:,:,:,jn) * cvol(:,:,:)   )
@@ -231 +220 @@
       USE trcdta          ! initialisation from files
       !
-      INTEGER :: jn, jl, jk, jj, ji   ! dummy loop indices
+      INTEGER :: jn, jl   ! dummy loop indices
       !!----------------------------------------------------------------------
       !
@@ -265 +254 @@
         ENDIF
         !
-!$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
-                    trb(ji,jj,jk,jn) = trn(ji,jj,jk,jn)
-                 END DO
-              END DO
-           END DO
-        END DO
+        trb(:,:,:,:) = trn(:,:,:,:)
         ! 
       ENDIF
  
-!$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
-                  tra(ji,jj,jk,jn) = 0._wp
-               END DO
-            END DO
-         END DO
-      END DO
+      tra(:,:,:,:) = 0._wp
       !                                                         ! Partial top/bottom cell: GRADh(trn)
    END SUBROUTINE trc_ini_state