Changeset 7037 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.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/TRA/trabbl.F90 (modified) (11 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90

@@ -146 +146 @@
 
       IF( l_trdtra )   THEN                      ! send the trends for further diagnostics
+!$OMP PARALLEL WORKSHARE
          ztrdt(:,:,:) = tsa(:,:,:,jp_tem) - ztrdt(:,:,:)
          ztrds(:,:,:) = tsa(:,:,:,jp_sal) - ztrds(:,:,:)
+!$OMP END PARALLEL WORKSHARE
          CALL trd_tra( kt, 'TRA', jp_tem, jptra_bbl, ztrdt )
          CALL trd_tra( kt, 'TRA', jp_sal, jptra_bbl, ztrds )
@@ -195 +197 @@
       DO jn = 1, kjpt                                     ! tracer loop
          !                                                ! ===========
+!$OMP PARALLEL DO schedule(static) private(jj,ji,ik)
          DO jj = 1, jpj
             DO ji = 1, jpi
@@ -202 +205 @@
          END DO
          !               
+!$OMP PARALLEL DO schedule(static) private(jj,ji,ik)
          DO jj = 2, jpjm1                                    ! Compute the trend
             DO ji = 2, jpim1
@@ -357 +361 @@
       ENDIF
       !                                        !* bottom variables (T, S, alpha, beta, depth, velocity)
+!$OMP PARALLEL DO schedule(static) private(jj,ji,ik)
       DO jj = 1, jpj
          DO ji = 1, jpi
@@ -374 +379 @@
       IF( nn_bbl_ldf == 1 ) THEN          !   diffusive bbl   !
          !                                !-------------------!
+!$OMP PARALLEL DO schedule(static) private(jj,ji,za,zb,zgdrho,zsign)
          DO jj = 1, jpjm1                      ! (criteria for non zero flux: grad(rho).grad(h) < 0 )
             DO ji = 1, fs_jpim1   ! vector opt.
@@ -406 +412 @@
          !
          CASE( 1 )                                   != use of upper velocity
+!$OMP PARALLEL DO schedule(static) private(jj,ji,za,zb,zgdrho,zsign,zsigna)
             DO jj = 1, jpjm1                                 ! criteria: grad(rho).grad(h)<0  and grad(rho).grad(h)<0
                DO ji = 1, fs_jpim1   ! vector opt.
@@ -437 +444 @@
          CASE( 2 )                                 != bbl velocity = F( delta rho )
             zgbbl = grav * rn_gambbl
+!$OMP PARALLEL DO schedule(static) private(jj,ji,iid,iis,ikud,ikus,za,zb,zgdrho,ijd,ijs,ikvd,ikvs)
             DO jj = 1, jpjm1                            ! criteria: rho_up > rho_down
                DO ji = 1, fs_jpim1   ! vector opt.
@@ -533 +541 @@
 
       !                             !* vertical index of  "deep" bottom u- and v-points
+!$OMP PARALLEL DO schedule(static) private(jj,ji)
       DO jj = 1, jpjm1                    ! (the "shelf" bottom k-indices are mbku and mbkv)
          DO ji = 1, jpim1
@@ -547 +556 @@
                                         !* sign of grad(H) at u- and v-points
       mgrhu(jpi,:) = 0   ;   mgrhu(:,jpj) = 0   ;   mgrhv(jpi,:) = 0   ;   mgrhv(:,jpj) = 0
+!$OMP PARALLEL DO schedule(static) private(jj,ji)
       DO jj = 1, jpjm1
          DO ji = 1, jpim1
@@ -554 +564 @@
       END DO
 
+!$OMP PARALLEL DO schedule(static) private(jj,ji)
       DO jj = 1, jpjm1              !* bbl thickness at u- (v-) point
          DO ji = 1, jpim1                 ! minimum of top & bottom e3u_0 (e3v_0)
@@ -563 +574 @@
 
       !                             !* masked diffusive flux coefficients
+!$OMP PARALLEL WORKSHARE
       ahu_bbl_0(:,:) = rn_ahtbbl * e2_e1u(:,:) * e3u_bbl_0(:,:) * umask(:,:,1)
       ahv_bbl_0(:,:) = rn_ahtbbl * e1_e2v(:,:) * e3v_bbl_0(:,:) * vmask(:,:,1)
+!$OMP END PARALLEL WORKSHARE