Changeset 7753 for trunk/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_zgr.F90

Timestamp:

2017-03-03T12:46:59+01:00 (7 years ago)

Author:

mocavero

Message:

Reverting trunk to remove OpenMP

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_zgr.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_zgr.F90

@@ -199 +199 @@
       !
       REAL(wp), DIMENSION(jpi,jpj) ::   z2d   ! 2D local workspace
-
-      INTEGER  ::   ji, jj
       !!----------------------------------------------------------------------
       !
@@ -208 +206 @@
       IF(lwp) WRITE(numout,*) '       GYRE case : closed flat box ocean without ocean cavities'
       !
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            z2d(ji,jj) = REAL( jpkm1 , wp )          ! flat bottom
-         END DO
-      END DO
+      z2d(:,:) = REAL( jpkm1 , wp )          ! flat bottom
       !
       CALL lbc_lnk( z2d, 'T', 1. )           ! set surrounding land to zero (here jperio=0 ==>> closed)
       !
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            k_bot(ji,jj) = INT( z2d(ji,jj) )           ! =jpkm1 over the ocean point, =0 elsewhere
-            !
-            k_top(ji,jj) = MIN( 1 , k_bot(ji,jj) )     ! = 1    over the ocean point, =0 elsewhere
-         END DO
-      END DO
+      k_bot(:,:) = INT( z2d(:,:) )           ! =jpkm1 over the ocean point, =0 elsewhere
+      !
+      k_top(:,:) = MIN( 1 , k_bot(:,:) )     ! = 1    over the ocean point, =0 elsewhere
       !
    END SUBROUTINE zgr_msk_top_bot
@@ -246 +234 @@
       REAL(wp), DIMENSION(:,:,:), INTENT(  out) ::   pe3w , pe3uw, pe3vw         !    -       -      -
       !
-      INTEGER  ::   ji, jj, jk
+      INTEGER  ::   jk
       !!----------------------------------------------------------------------
       !
       IF( nn_timing == 1 )  CALL timing_start('zgr_zco')
       !
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
       DO jk = 1, jpk
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               pdept(ji,jj,jk) = pdept_1d(jk)
-               pdepw(ji,jj,jk) = pdepw_1d(jk)
-               pe3t (ji,jj,jk) = pe3t_1d (jk)
-               pe3u (ji,jj,jk) = pe3t_1d (jk)
-               pe3v (ji,jj,jk) = pe3t_1d (jk)
-               pe3f (ji,jj,jk) = pe3t_1d (jk)
-               pe3w (ji,jj,jk) = pe3w_1d (jk)
-               pe3uw(ji,jj,jk) = pe3w_1d (jk)
-               pe3vw(ji,jj,jk) = pe3w_1d (jk)
-            END DO
-         END DO
+         pdept(:,:,jk) = pdept_1d(jk)
+         pdepw(:,:,jk) = pdepw_1d(jk)
+         pe3t (:,:,jk) = pe3t_1d (jk)
+         pe3u (:,:,jk) = pe3t_1d (jk)
+         pe3v (:,:,jk) = pe3t_1d (jk)
+         pe3f (:,:,jk) = pe3t_1d (jk)
+         pe3w (:,:,jk) = pe3w_1d (jk)
+         pe3uw(:,:,jk) = pe3w_1d (jk)
+         pe3vw(:,:,jk) = pe3w_1d (jk)
       END DO
       !