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

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

@@ -101 +101 @@
          !
          ALLOCATE( xind(jpi,jpj,jpk), STAT=ierr )
+!$OMP PARALLEL WORKSHARE 
          xind(:,:,:) = 1._wp              ! set equal to 1 where up-stream is not needed
+!$OMP END PARALLEL WORKSHARE 
          !
          IF( ld_msc_ups ) THEN            ! define the upstream indicator (if asked)
             ALLOCATE( upsmsk(jpi,jpj), STAT=ierr )
+!$OMP PARALLEL
+!$OMP WORKSHARE 
             upsmsk(:,:) = 0._wp                             ! not upstream by default
+!$OMP END WORKSHARE 
             !
+!$OMP DO schedule(static) private(jk)
             DO jk = 1, jpkm1
                xind(:,:,jk) = 1._wp                              &                 ! =>1 where up-stream is not needed
@@ -112 +118 @@
                   &                 upsmsk(:,:)                ) * tmask(:,:,jk)   ! =>0 in some user defined area
             END DO
+!$OMP END DO NOWAIT
+!$OMP END PARALLEL
          ENDIF 
          !
@@ -121 +129 @@
          !
          !                                !-- first guess of the slopes
+!$OMP PARALLEL
+!$OMP WORKSHARE
          zwx(:,:,jpk) = 0._wp                   ! bottom values
-         zwy(:,:,jpk) = 0._wp  
+         zwy(:,:,jpk) = 0._wp
+!$OMP END WORKSHARE
+!$OMP DO schedule(static) private(jk, jj, ji)
          DO jk = 1, jpkm1                       ! interior values
             DO jj = 1, jpjm1      
@@ -131 +143 @@
            END DO
          END DO
+!$OMP END DO NOWAIT
+!$OMP END PARALLEL
          CALL lbc_lnk( zwx, 'U', -1. )          ! lateral boundary conditions   (changed sign)
          CALL lbc_lnk( zwy, 'V', -1. )
          !                                !-- Slopes of tracer
+!$OMP PARALLEL
+!$OMP WORKSHARE
          zslpx(:,:,jpk) = 0._wp                 ! bottom values
          zslpy(:,:,jpk) = 0._wp
+!$OMP END WORKSHARE
+!$OMP DO schedule(static) private(jk, jj, ji)
          DO jk = 1, jpkm1                       ! interior values
             DO jj = 2, jpj
@@ -147 +165 @@
          END DO
          !
+!$OMP DO schedule(static) private(jk, jj, ji)
          DO jk = 1, jpkm1                 !-- Slopes limitation
             DO jj = 2, jpj
@@ -160 +179 @@
          END DO
          !
+!$OMP DO schedule(static) private(jk, jj, ji, z0u, zalpha, zu, zv, zzwx, zzwy, z0v)
          DO jk = 1, jpkm1                 !-- MUSCL horizontal advective fluxes
             DO jj = 2, jpjm1
@@ -180 +200 @@
             END DO
          END DO
+!$OMP END DO NOWAIT
+!$OMP END PARALLEL
          CALL lbc_lnk( zwx, 'U', -1. )   ;   CALL lbc_lnk( zwy, 'V', -1. )   ! lateral boundary conditions   (changed sign)
          !
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
          DO jk = 1, jpkm1                 !-- Tracer advective trend
             DO jj = 2, jpjm1      
@@ -206 +229 @@
          !
          !                                !-- first guess of the slopes
+!$OMP PARALLEL 
+!$OMP WORKSHARE
          zwx(:,:, 1 ) = 0._wp                   ! surface & bottom boundary conditions
          zwx(:,:,jpk) = 0._wp
+!$OMP END WORKSHARE
+!$OMP DO schedule(static) private(jk)
          DO jk = 2, jpkm1                       ! interior values
             zwx(:,:,jk) = tmask(:,:,jk) * ( ptb(:,:,jk-1,jn) - ptb(:,:,jk,jn) )
          END DO
          !                                !-- Slopes of tracer
+!$OMP END DO NOWAIT
+!$OMP WORKSHARE
          zslpx(:,:,1) = 0._wp                   ! surface values
+!$OMP END WORKSHARE
+!$OMP DO schedule(static) private(jk, jj, ji)
          DO jk = 2, jpkm1                       ! interior value
             DO jj = 1, jpj
@@ -221 +252 @@
             END DO
          END DO
+!$OMP DO schedule(static) private(jk, jj, ji)
          DO jk = 2, jpkm1                 !-- Slopes limitation
             DO jj = 1, jpj                      ! interior values
@@ -230 +262 @@
             END DO
          END DO
+!$OMP DO schedule(static) private(jk, jj, ji, z0w, zalpha, zw, zzwx, zzwy)
          DO jk = 1, jpk-2                 !-- vertical advective flux
             DO jj = 2, jpjm1      
@@ -242 +275 @@
             END DO
          END DO
+!$OMP END DO NOWAIT
+!$OMP END PARALLEL
          IF( ln_linssh ) THEN                   ! top values, linear free surface only
             IF( ln_isfcav ) THEN                      ! ice-shelf cavities (top of the ocean)
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
                DO jj = 1, jpj
                   DO ji = 1, jpi
@@ -250 +286 @@
                END DO   
             ELSE                                      ! no cavities: only at the ocean surface
+!$OMP PARALLEL WORKSHARE
                zwx(:,:,1) = pwn(:,:,1) * ptb(:,:,1,jn)
+!$OMP END PARALLEL WORKSHARE
             ENDIF
          ENDIF
          !
+!$OMP PARALLEL DO schedule(static) private(jk, jj, ji)
          DO jk = 1, jpkm1                 !-- vertical advective trend
             DO jj = 2, jpjm1