Changeset 7037 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90

Timestamp:

2016-10-18T15:32:04+02:00 (8 years ago)

Author:

mocavero

Message:

ORCA2_LIM_PISCES hybrid version update

File:

• branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) (17 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90

@@ -135 +135 @@
       z1_slpmax = 1._wp / rn_slpmax
       !
-
-!$OMP PARALLEL WORKSHARE
+!$OMP PARALLEL
+!$OMP WORKSHARE
+
       zww(:,:,:) = 0._wp
       zwz(:,:,:) = 0._wp
-!$OMP END PARALLEL WORKSHARE
-      !
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
+!$OMP END WORKSHARE NOWAIT
+      !
+!$OMP DO schedule(static) private(jk, jj, ji)
       DO jk = 1, jpk             !==   i- & j-gradient of density   ==!
          DO jj = 1, jpjm1
@@ -150 +151 @@
          END DO
       END DO
+!$OMP END DO NOWAIT
+!$OMP END PARALLEL
       IF( ln_zps ) THEN                           ! partial steps correction at the bottom ocean level
 !$OMP PARALLEL DO schedule(static) private(jj, ji)
@@ -169 +172 @@
       ENDIF
       !
+!$OMP PARALLEL
+!$OMP WORKSHARE
       zdzr(:,:,1) = 0._wp        !==   Local vertical density gradient at T-point   == !   (evaluated from N^2)
-!$OMP PARALLEL DO schedule(static) private(jk)
+!$OMP END WORKSHARE
+!$OMP DO schedule(static) private(jk)
       DO jk = 2, jpkm1
          !                                ! zdzr = d/dz(prd)= - ( prd ) / grav * mk(pn2) -- at t point
@@ -180 +186 @@
             &                 * ( pn2(:,:,jk) + pn2(:,:,jk+1) ) * ( 1._wp - 0.5_wp * tmask(:,:,jk+1) )
       END DO
+!$OMP END DO NOWAIT
+!$OMP END PARALLEL
       !
       !                          !==   Slopes just below the mixed layer   ==!
@@ -248 +256 @@
       !
       !                                            !* horizontal Shapiro filter
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
+!$OMP PARALLEL 
+!$OMP DO schedule(static) private(jk, jj, ji)
       DO jk = 2, jpkm1
          DO jj = 2, jpjm1, MAX(1, jpj-3)                        ! rows jj=2 and =jpjm1 only
@@ -288 +297 @@
          END DO
       END DO
+!$OMP END DO
 
 
@@ -293 +303 @@
       ! ===========================      | wslpj = mij( d/dj( prd ) / d/dz( prd )
       !
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji, zbw, zfk, zck, zbi, zbj, zai, zaj, zci, zcj)
+!$OMP DO schedule(static) private(jk, jj, ji, zbw, zfk, zck, zbi, zbj, zai, zaj, zci, zcj)
       DO jk = 2, jpkm1
          DO jj = 2, jpjm1
@@ -329 +339 @@
          END DO
       END DO
+!$OMP END DO NOWAIT
+!$OMP END PARALLEL
       CALL lbc_lnk( zwz, 'T', -1. )   ;    CALL lbc_lnk( zww, 'T', -1. )      ! lateral boundary conditions
       !
@@ -441 +453 @@
          !
          ip = jl   ;   jp = jl                ! guaranteed nonzero gradients ( absolute value larger than repsln)
-!$OMP PARALLEL DO schedule(static) private(jk,jj,ji,zdit,zdis,zdjt,zdjs,zdxrho_raw,zdyrho_raw)
          DO jk = 1, jpkm1                     ! done each pair of triad
             DO jj = 1, jpjm1                  ! NB: not masked ==>  a minimum value is set
@@ -458 +469 @@
          !
          IF( ln_zps .AND. l_grad_zps ) THEN     ! partial steps: correction of i- & j-grad on bottom
-!$OMP PARALLEL DO schedule(static) private(jj,ji,iku,zdit,zdis,zdxrho_raw,zdyrho_raw)
             DO jj = 1, jpjm1
                DO ji = 1, jpim1
@@ -690 +700 @@
       !
       !                                            !==   surface mixed layer mask   !
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji, ik)
+!$OMP PARALLEL
+!$OMP DO schedule(static) private(jk, jj, ji, ik)
       DO jk = 1, jpk                               ! =1 inside the mixed layer, =0 otherwise
          DO jj = 1, jpj
@@ -701 +712 @@
          END DO
       END DO
+!$OMP END DO NOWAIT
 
 
@@ -713 +725 @@
       !-----------------------------------------------------------------------
       !
-!$OMP PARALLEL DO schedule(static) private(jj, ji, iku, ikv, zbu, zbv, zau, zav, ik, ikm1, zbw, zci, zcj, zai, zaj, zbi, zbj) 
+!$OMP DO schedule(static) private(jj, ji, iku, ikv, zbu, zbv, zau, zav, ik, ikm1, zbw, zci, zcj, zai, zaj, zbi, zbj) 
       DO jj = 2, jpjm1
          DO ji = 2, jpim1
@@ -758 +770 @@
          END DO
       END DO
+!$OMP END DO NOWAIT
+!$OMP END PARALLEL
       !!gm this lbc_lnk should be useless....
       CALL lbc_lnk( uslpml , 'U', -1. )   ;   CALL lbc_lnk( vslpml , 'V', -1. )   ! lateral boundary cond. (sign change)
@@ -808 +822 @@
          ! ------------------------------
 
-!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)   
+!$OMP PARALLEL
+!$OMP DO schedule(static) private(jk, jj, ji)   
         DO jk = 1, jpk
            DO jj = 1, jpj
@@ -819 +834 @@
            END DO
         END DO
-!$OMP PARALLEL DO schedule(static) private(jj, ji)       
+!$OMP END DO NOWAIT
+!$OMP DO schedule(static) private(jj, ji)       
         DO jj = 1, jpj
             DO ji = 1, jpi
@@ -828 +844 @@
              END DO
         END DO
+!$OMP END DO NOWAIT
+!$OMP END PARALLEL
          
          !!gm I no longer understand this.....