Changeset 8279 for branches/2017/wrk_OMP_test_for_Silvia/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90

Timestamp:

2017-07-04T17:46:48+02:00 (7 years ago)

Author:

mocavero

Message:

Implementation of OMP coarse-grained parallelization on ZDF new package

File:

• branches/2017/wrk_OMP_test_for_Silvia/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90 (modified) (8 diffs)

branches/2017/wrk_OMP_test_for_Silvia/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90

@@ -32 +32 @@
    USE lbclnk         ! lateral boundary conditions
    USE lib_mpp        ! distribued memory computing
+#if defined key_omp
+   USE dom_omp        ! omp threads decomposition of MPI subdomain
+#endif
 
    IMPLICIT NONE
@@ -47 +50 @@
 
    LOGICAL ::   l_zdfsh2   ! shear production term flag (=F for CST, =T otherwise (i.e. TKE, GLS, RIC))
+   INTEGER :: ARG_2D
 
    !! * Substitutions
@@ -216 +220 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       !
-      INTEGER ::   ji, jj, jk   ! dummy loop indice
+      INTEGER :: jk   ! dummy loop indice
 !!OMP      REAL(wp), DIMENSION(WRK_3D) ::   zsh2   ! shear production
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   zsh2   ! shear production
       !! ---------------------------------------------------------------------
       !      
-!!OMP ===>>>>   Open-MP   to be defined elsewhere   
-      !
-      INTEGER ::   ARG_2D
-      !
+      !
+      IF (kt==nn_it000) THEN
+#ifdef key_omp
+         CALL tile_dec_2D
+#else
 #if defined key_vectopt_loop
-      k_Istr = 1   ;   k_Iend = jpi
+         tnldi = 1   ;   tnlei = jpi
 #else
-      k_Istr = 2   ;   k_Iend = jpim1
+         tnldi = 2   ;   tnlei = jpim1
 #endif
-      k_Jstr = 2   ;   k_Jend = jpjm1
-      !
-!!OMP <<<<===   end
-      
+         tnldj = 2   ;   tnlej = jpjm1
+#endif
+      END IF
+      !
+      CALL zdf_bfr( kt )                        !* bottom friction (if quadratic)
+      !
+!$OMP PARALLEL PRIVATE(zsh2)
       ALLOCATE( zsh2(WRK_3D) )
-      
-      
-      !
-      CALL zdf_bfr( kt )                        !* bottom friction (if quadratic)
-      !
-
       !                          !==  Kz from chosen turbulent closure  ==!   (avm_k, avt_k)
-      
       IF( l_zdfsh2 )   &                        !* shear production at w-points (energy conserving form)
          CALL zdf_sh2( ARG_2D, ub, vb, un, vn, avm_k,   &   ! <<== in  fields
@@ -248 +249 @@
 
       !
+!$OMP BARRIER
       SELECT CASE ( nzdf_phy )                  !* Vertical eddy viscosity and diffusivity coefficients at w-points
       CASE( np_RIC )   ;   CALL zdf_ric( ARG_2D, kt, gdept_n, zsh2, avm_k, avt_k )         ! Richardson number dependent Kz
@@ -257 +259 @@
 !!gm         avm_k(WRK_3D) = rn_avm0 * wmask(WRK_3D)
       END SELECT
+      !
+      DEALLOCATE( zsh2 )
       !  
       !                          !==  ocean Kz  ==!   (avt, avs, avm)
@@ -271 +275 @@
       !
       IF( ln_zdfevd )   CALL zdf_evd( ARG_2D, kt, avm, avt )      !* convection: enhanced vertical eddy diffusivity
-      !
+
       !                                         !* double diffusive mixing
       IF( ln_zdfddm ) THEN                            ! update avt and compute avs
@@ -282 +286 @@
       IF( ln_zdfswm )   CALL zdf_swm( ARG_2D, kt, avm, avt, avs )   ! surface  wave (Qiao et al. 2004) 
       IF( ln_zdfiwm )   CALL zdf_iwm( ARG_2D, kt, avm, avt, avs )   ! internal wave (de Lavergne et al 2017)
-
+!$OMP END PARALLEL
+      !
 
       !                                         !* Lateral boundary conditions (sign unchanged)
@@ -301 +306 @@
       ENDIF
       !
-      DEALLOCATE( zsh2 )
-      !
    END SUBROUTINE zdf_phy