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

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

@@ -70 +70 @@
          IF( lk_mpp    )   CALL mpp_sum( ierr )
          IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'lim_hdf_2 : unable to allocate standard arrays' )
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
          DO jj = 2, jpjm1  
             DO ji = fs_2 , fs_jpim1   ! vector opt.
@@ -83 +84 @@
       zeps  =  2._wp * epsi04
       !
+!$OMP PARALLEL WORKSHARE
       ztab0(:, : ) = ptab(:,:)      ! Arrays initialization
+!$OMP END PARALLEL WORKSHARE
       zdiv0(:, 1 ) = 0._wp
       zdiv0(:,jpj) = 0._wp
-      zflu (jpi,:) = 0._wp   
+      zflu (jpi,:) = 0._wp
       zflv (jpi,:) = 0._wp
       zdiv0(1,  :) = 0._wp
@@ -98 +101 @@
          iter = iter + 1                                       ! incrementation of the sub-time step number
          !
+!$OMP PARALLEL
+!$OMP DO schedule(static) private(jj, ji)
          DO jj = 1, jpjm1                                      ! diffusive fluxes in U- and V- direction
             DO ji = 1 , fs_jpim1   ! vector opt.
@@ -105 +110 @@
          END DO
          !
+!$OMP DO schedule(static) private(jj, ji)
          DO jj= 2, jpjm1                                       ! diffusive trend : divergence of the fluxes
             DO ji = fs_2 , fs_jpim1   ! vector opt. 
@@ -111 +117 @@
             END DO
          END DO
+!$OMP END DO NOWAIT
+!$OMP END PARALLEL
          !
-         IF( iter == 1 )   zdiv0(:,:) = zdiv(:,:)              ! save the 1st evaluation of the diffusive trend in zdiv0
+         IF( iter == 1 ) THEN
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+             DO jj= 2, jpjm1                                       ! diffusive trend : divergence of the fluxes
+                DO ji = fs_2 , fs_jpim1   ! vector opt. 
+                   zdiv0(ji,jj) = zdiv(ji,jj)              ! save the 1st evaluation of the diffusive trend in zdiv0
+                END DO
+             END DO
+         END IF
          !
+!$OMP PARALLEL DO schedule(static) private(jj,ji,zrlxint)
          DO jj = 2, jpjm1                                      ! iterative evaluation
             DO ji = fs_2 , fs_jpim1   ! vector opt.
@@ -127 +143 @@
          zconv = 0._wp                                         ! convergence test
 
+!$OMP PARALLEL DO schedule(static) private(jj,ji) REDUCTION(MAX:zconv)
          DO jj = 2, jpjm1
             DO ji = 2, jpim1
@@ -134 +151 @@
          IF( lk_mpp )   CALL mpp_max( zconv )                  ! max over the global domain
 
+!$OMP PARALLEL WORKSHARE
          ptab(:,:) = zrlx(:,:)
+!$OMP END PARALLEL WORKSHARE 
          !
       END DO                                             ! end of sub-time step loop
 
       IF(ln_ctl)   THEN
+!$OMP PARALLEL WORKSHARE
          zrlx(:,:) = ptab(:,:) - ztab0(:,:)
+!$OMP END PARALLEL WORKSHARE
          WRITE(charout,FMT="(' lim_hdf  : zconv =',D23.16, ' iter =',I4,2X)") zconv, iter
          CALL prt_ctl( tab2d_1=zrlx, clinfo1=charout )