Changeset 7037 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/TRD

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/TRD/trdtra.F90 (modified) (5 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90

@@ -99 +99 @@
          CASE( jptra_yad )   ;   CALL trd_tra_adv( ptrd, pun, ptra, 'Y', trdty ) 
          CASE( jptra_zad )   ;   CALL trd_tra_adv( ptrd, pun, ptra, 'Z', trdt  ) 
-         CASE( jptra_bbc,    &        ! qsr, bbc: on temperature only, send to trd_tra_mng
-            &  jptra_qsr )   ;   trdt(:,:,:) = ptrd(:,:,:) * tmask(:,:,:)
-                                 ztrds(:,:,:) = 0._wp
-                                 CALL trd_tra_mng( trdt, ztrds, ktrd, kt )
+         CASE( jptra_bbc, jptra_qsr ) ! qsr, bbc: on temperature only, send to trd_tra_mng
+!$OMP PARALLEL WORKSHARE
+               trdt(:,:,:) = ptrd(:,:,:) * tmask(:,:,:)
+               ztrds(:,:,:) = 0._wp
+!$OMP END PARALLEL WORKSHARE
+               CALL trd_tra_mng( trdt, ztrds, ktrd, kt )
          CASE DEFAULT                 ! other trends: masked trends
+!$OMP PARALLEL WORKSHARE
             trdt(:,:,:) = ptrd(:,:,:) * tmask(:,:,:)              ! mask & store
+!$OMP END PARALLEL WORKSHARE
          END SELECT
          !
@@ -124 +128 @@
             CALL wrk_alloc( jpi, jpj, jpk, zwt, zws, ztrdt )
             !
+!$OMP PARALLEL WORKSHARE
             zwt(:,:, 1 ) = 0._wp   ;   zws(:,:, 1 ) = 0._wp            ! vertical diffusive fluxes
             zwt(:,:,jpk) = 0._wp   ;   zws(:,:,jpk) = 0._wp
+!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jk)
             DO jk = 2, jpk
                zwt(:,:,jk) =   avt(:,:,jk) * ( tsa(:,:,jk-1,jp_tem) - tsa(:,:,jk,jp_tem) ) / e3w_n(:,:,jk) * tmask(:,:,jk)
@@ -131 +138 @@
             END DO
             !
+!$OMP PARALLEL WORKSHARE
             ztrdt(:,:,jpk) = 0._wp   ;   ztrds(:,:,jpk) = 0._wp
+!$OMP END PARALLEL WORKSHARE
+!$OMP PARALLEL DO schedule(static) private(jk)
             DO jk = 1, jpkm1
                ztrdt(:,:,jk) = ( zwt(:,:,jk) - zwt(:,:,jk+1) ) / e3t_n(:,:,jk)
@@ -141 +151 @@
             !
          CASE DEFAULT                 ! other trends: mask and send T & S trends to trd_tra_mng
+!$OMP PARALLEL WORKSHARE
             ztrds(:,:,:) = ptrd(:,:,:) * tmask(:,:,:)
+!$OMP END PARALLEL WORKSHARE
             CALL trd_tra_mng( trdt, ztrds, ktrd, kt )  
          END SELECT
@@ -154 +166 @@
          CASE( jptra_zad )   ;   CALL trd_tra_adv( ptrd , pun , ptra, 'Z', ztrds ) 
          CASE DEFAULT                 ! other trends: just masked 
+!$OMP PARALLEL WORKSHARE
                                  ztrds(:,:,:) = ptrd(:,:,:) * tmask(:,:,:)
+!$OMP END PARALLEL WORKSHARE
          END SELECT
          !                            ! send trend to trd_trc