Changeset 7037 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.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/LIM_SRC_2/limmsh_2.F90 (modified) (7 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.F90

@@ -135 +135 @@
       !----------------------------------------
       !                                                       ! akappa
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
       DO jj = 2, jpj
-         zd1d2(:,jj) = e1v(:,jj) - e1v(:,jj-1)
+         DO ji = 1, jpi
+            zd1d2(ji,jj) = e1v(ji,jj) - e1v(ji,jj-1)
+         END DO
       END DO
       CALL lbc_lnk( zd1d2, 'T', -1. )
 
-      DO ji = 2, jpi
-         zd2d1(ji,:) = e2u(ji,:) - e2u(ji-1,:)
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 2, jpi
+            zd2d1(ji,jj) = e2u(ji,jj) - e2u(ji-1,jj)
+         END DO
       END DO
       CALL lbc_lnk( zd2d1, 'T', -1. )
 
+!$OMP PARALLEL
+!$OMP WORKSHARE
       akappa(:,:,1,1) =        1.0 / ( 2.0 * e1t(:,:) )
       akappa(:,:,1,2) = zd1d2(:,:) / ( 4.0 * e1t(:,:) * e2t(:,:) )
       akappa(:,:,2,1) = zd2d1(:,:) / ( 4.0 * e1t(:,:) * e2t(:,:) )
       akappa(:,:,2,2) =        1.0 / ( 2.0 * e2t(:,:) )
+!$OMP END WORKSHARE NOWAIT
       
       !                                                      ! weights (wght)
+!$OMP DO schedule(static) private(jj,ji,zusden)
       DO jj = 2, jpj
          DO ji = 2, jpi
@@ -161 +171 @@
          END DO
       END DO
+!$OMP END DO NOWAIT
+!$OMP END PARALLEL
       CALL lbc_lnk( wght(:,:,1,1), 'I', 1. )      ! CAUTION: even with the lbc_lnk at ice U-V-point
       CALL lbc_lnk( wght(:,:,1,2), 'I', 1. )      ! the value of wght at jpj is wrong
@@ -168 +180 @@
       ! metric coefficients for sea ice dynamic (EVP rheology)
       !----------------------------------------
+!$OMP PARALLEL DO schedule(static) private(jj,ji,zusden)
       DO jj = 1, jpjm1                                       ! weights (wght) at F-points
          DO ji = 1, jpim1
@@ -186 +199 @@
 
 #if defined key_lim2_vp
+!$OMP PARALLEL DO schedule(static) private(jj,ji,zh1p,zh2p,zusden,zusden2,zd1d2p,zd2d1p)
       DO jj = 2, jpj
          DO ji = 2, jpi   ! NO vector opt.
@@ -259 +273 @@
       !----------------------------
       
+!$OMP PARALLEL WORKSHARE      
       tms(:,:) = tmask(:,:,1)      ! ice T-point  : use surface tmask
 
+!$OMP END PARALLEL WORKSHARE
 #if defined key_lim2_vp
       ! VP rheology : ice velocity point is I-point
@@ -266 +282 @@
       tmu(:,1) = 0.e0
       tmu(1,:) = 0.e0
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
       DO jj = 2, jpj               ! ice U.V-point: computed from ice T-point mask
          DO ji = 2, jpim1   ! NO vector opt.
@@ -275 +292 @@
       ! EVP rheology : ice velocity point are U- & V-points ; ice vorticity
       ! point is F-point
+!$OMP PARALLEL WORKSHARE
       tmu(:,:) = umask(:,:,1)
       tmv(:,:) = vmask(:,:,1)
       tmf(:,:) = 0.e0                        ! used of fmask except its special value along the coast (rn_shlat)
       WHERE( fmask(:,:,1) == 1.e0 )   tmf(:,:) = 1.e0
+!$OMP END PARALLEL WORKSHARE
 #endif
       !
       ! unmasked and masked area of T-grid cell
+!$OMP PARALLEL WORKSHARE
       area(:,:) = e1t(:,:) * e2t(:,:)
+!$OMP END PARALLEL WORKSHARE
       !
 #if defined key_lim2_vp