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

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

@@ -504 +504 @@
       CASE( np_teos10, np_eos80 )                !==  polynomial TEOS-10 / EOS-80 ==!
          !
+!$OMP PARALLEL DO schedule(static) private(jj, ji, zh, zt, zs, zn3, zn2, zn1, zn0, zn)
          DO jj = 1, jpjm1
             DO ji = 1, fs_jpim1   ! vector opt.
@@ -543 +544 @@
       CASE( np_seos )                !==  simplified EOS  ==!
          !
+!$OMP PARALLEL DO schedule(static) private(jj, ji, zh, zt, zs, zn)
          DO jj = 1, jpjm1
             DO ji = 1, fs_jpim1   ! vector opt.
@@ -705 +707 @@
       IF( nn_timing == 1 ) CALL timing_start('rab_2d')
       !
+!$OMP PARALLEL WORKSHARE
       pab(:,:,:) = 0._wp
+!$OMP END PARALLEL WORKSHARE
       !
       SELECT CASE ( neos )
@@ -711 +715 @@
       CASE( np_teos10, np_eos80 )                !==  polynomial TEOS-10 / EOS-80 ==!
          !
+!$OMP PARALLEL DO schedule(static) private(jj, ji, zh, zt, zs, zn3, zn2, zn1, zn0, zn)
          DO jj = 1, jpjm1
             DO ji = 1, fs_jpim1   ! vector opt.
@@ -769 +774 @@
       CASE( np_seos )                  !==  simplified EOS  ==!
          !
+!$OMP PARALLEL DO schedule(static) private(jj, ji, zh, zt, zs, zn)
          DO jj = 1, jpjm1
             DO ji = 1, fs_jpim1   ! vector opt.
@@ -977 +983 @@
       z1_T0   = 1._wp/40._wp
       !
+!$OMP PARALLEL DO schedule(static) private(jj, ji, zt, zs, ztm, zn,zd)
       DO jj = 1, jpj
          DO ji = 1, jpi
@@ -1032 +1039 @@
          !
          z1_S0 = 1._wp / 35.16504_wp
+!$OMP PARALLEL
+!$OMP DO schedule(static) private(jj, ji, zs)
          DO jj = 1, jpj
             DO ji = 1, jpi
@@ -1039 +1048 @@
             END DO
          END DO
+!$OMP WORKSHARE
          ptf(:,:) = ptf(:,:) * psal(:,:)
-         !
-         IF( PRESENT( pdep ) )   ptf(:,:) = ptf(:,:) - 7.53e-4 * pdep(:,:)
+!$OMP END WORKSHARE NOWAIT
+!$OMP END PARALLEL
+         !
+         IF( PRESENT( pdep ) ) THEN
+!$OMP DO schedule(static) private(jj, ji)
+           DO jj = 1, jpj
+              DO ji = 1, jpi
+                 ptf(ji,jj) = ptf(ji,jj) - 7.53e-4 * pdep(ji,jj)
+              END DO
+           END DO
+         END IF
          !
       CASE ( np_eos80 )                !==  PT,SP (UNESCO formulation)  ==!
          !
-         ptf(:,:) = ( - 0.0575_wp + 1.710523e-3_wp * SQRT( psal(:,:) )   &
-            &                     - 2.154996e-4_wp *       psal(:,:)   ) * psal(:,:)
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+            ptf(ji,jj) = ( - 0.0575_wp + 1.710523e-3_wp * SQRT( psal(ji,jj) )   &
+               &                     - 2.154996e-4_wp *       psal(ji,jj)   ) * psal(ji,jj)
+            END DO
+         END DO
             !
-         IF( PRESENT( pdep ) )   ptf(:,:) = ptf(:,:) - 7.53e-4 * pdep(:,:)
+         IF( PRESENT( pdep ) ) THEN
+!$OMP PARALLEL WORKSHARE
+            ptf(:,:) = ptf(:,:) - 7.53e-4 * pdep(:,:)
+!$OMP END PARALLEL WORKSHARE
+         END IF
          !
       CASE DEFAULT