Changeset 7753 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.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/DYN/dynhpg.F90 (modified) (14 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

@@ -84 +84 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
-      INTEGER ::  jk, jj, ji
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztrdu, ztrdv
       !!----------------------------------------------------------------------
@@ -92 +91 @@
       IF( l_trddyn ) THEN                    ! Temporary saving of ua and va trends (l_trddyn)
          CALL wrk_alloc( jpi,jpj,jpk, ztrdu, ztrdv )
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
-         DO jk = 1, jpk
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  ztrdu(ji,jj,jk) = ua(ji,jj,jk)
-                  ztrdv(ji,jj,jk) = va(ji,jj,jk)
-               END DO
-            END DO
-         END DO
+         ztrdu(:,:,:) = ua(:,:,:)
+         ztrdv(:,:,:) = va(:,:,:)
       ENDIF
       !
@@ -113 +105 @@
       !
       IF( l_trddyn ) THEN      ! save the hydrostatic pressure gradient trends for momentum trend diagnostics
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
-         DO jk = 1, jpk
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  ztrdu(ji,jj,jk) = ua(ji,jj,jk) - ztrdu(ji,jj,jk)
-                  ztrdv(ji,jj,jk) = va(ji,jj,jk) - ztrdv(ji,jj,jk)
-               END DO
-            END DO
-         END DO
+         ztrdu(:,:,:) = ua(:,:,:) - ztrdu(:,:,:)
+         ztrdv(:,:,:) = va(:,:,:) - ztrdv(:,:,:)
          CALL trd_dyn( ztrdu, ztrdv, jpdyn_hpg, kt )
          CALL wrk_dealloc( jpi,jpj,jpk, ztrdu, ztrdv )
@@ -213 +198 @@
       ! 
       ! initialisation of ice shelf load
-      IF ( .NOT. ln_isfcav ) THEN
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               riceload(ji,jj)=0.0
-            END DO
-         END DO
-      END IF
+      IF ( .NOT. ln_isfcav ) riceload(:,:)=0.0
       IF (       ln_isfcav ) THEN
          CALL wrk_alloc( jpi,jpj, 2,  ztstop) 
@@ -234 +212 @@
          
          ! assume water displaced by the ice shelf is at T=-1.9 and S=34.4 (rude)
-!$OMP PARALLEL DO schedule(static) private(jj, ji)
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               ztstop(ji,jj,1)=-1.9_wp
-               ztstop(ji,jj,2)=34.4_wp
-            END DO
-         END DO
+         ztstop(:,:,1)=-1.9_wp ; ztstop(:,:,2)=34.4_wp
 
          ! compute density of the water displaced by the ice shelf 
@@ -254 +226 @@
          ! divided by 2 later
          ziceload = 0._wp
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(jj,ji,ikt,jk)
          DO jj = 1, jpj
             DO ji = 1, jpi
@@ -268 +238 @@
             END DO
          END DO
-!$OMP DO schedule(static) private(jj, ji)
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               riceload(ji,jj)=ziceload(ji,jj)  ! need to be saved for diaar5
-            END DO
-         END DO
-!$OMP END PARALLEL
+         riceload(:,:)=ziceload(:,:)  ! need to be saved for diaar5
 
          CALL wrk_dealloc( jpi,jpj, 2,  ztstop) 
@@ -318 +282 @@
 
       ! Surface value
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(ji,jj, zcoef1)
       DO jj = 2, jpjm1
          DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -335 +297 @@
       ! interior value (2=<jk=<jpkm1)
       DO jk = 2, jpkm1
-!$OMP DO schedule(static) private(ji,jj, zcoef1)
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -352 +313 @@
             END DO
          END DO
-!$OMP END DO NOWAIT
-      END DO
-!$OMP END PARALLEL
+      END DO
       !
       CALL wrk_dealloc( jpi,jpj,jpk,   zhpi, zhpj )
@@ -392 +351 @@
 
       !  Surface value (also valid in partial step case)
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(ji,jj,zcoef1)
       DO jj = 2, jpjm1
          DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -408 +365 @@
       ! interior value (2=<jk=<jpkm1)
       DO jk = 2, jpkm1
-!$OMP DO schedule(static) private(ji,jj, zcoef1)
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -428 +384 @@
 
       ! partial steps correction at the last level  (use gru & grv computed in zpshde.F90)
-!$OMP DO schedule(static) private(ji,jj,iku,ikv,zcoef2,zcoef3)
       DO jj = 2, jpjm1
          DO ji = 2, jpim1
@@ -449 +404 @@
          END DO
       END DO
-!$OMP END PARALLEL
       !
       CALL wrk_dealloc( jpi,jpj,jpk,   zhpi, zhpj )