Changeset 9176 for branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

Timestamp:

2018-01-04T13:30:03+01:00 (6 years ago)

Author:

andmirek

Message:

#2001: OMP directives

File:

• branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) (10 diffs)

branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

@@ -222 +222 @@
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   zx1, zy1, zfact2, zx2, zy2   ! local scalars
-      REAL(wp), POINTER, DIMENSION(:,:) :: zwx, zwy, zwz
+      REAL(wp), DIMENSION(jpi, jpj) :: zwx, zwy, zwz
       !!----------------------------------------------------------------------
       !
       IF( nn_timing == 1 )  CALL timing_start('vor_ene')
       !
-      CALL wrk_alloc( jpi, jpj, zwx, zwy, zwz ) 
+!     CALL wrk_alloc( jpi, jpj, zwx, zwy, zwz ) 
       !
       IF( kt == nit000 ) THEN
@@ -237 +237 @@
       zfact2 = 0.5 * 0.5      ! Local constant initialization
 
-!CDIR PARALLEL DO PRIVATE( zwx, zwy, zwz )
+!$OMP PARALLEL DO PRIVATE( zwx, zwy, zwz, zy1, zy2, zx1, zx2 )
       !                                                ! ===============
       DO jk = 1, jpkm1                                 ! Horizontal slab
@@ -292 +292 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      CALL wrk_dealloc( jpi, jpj, zwx, zwy, zwz ) 
+!     CALL wrk_dealloc( jpi, jpj, zwx, zwy, zwz ) 
       !
       IF( nn_timing == 1 )  CALL timing_stop('vor_ene')
@@ -350 +350 @@
       zfact2 = 0.5 * 0.5
 
-!CDIR PARALLEL DO PRIVATE( zwx, zwy, zwz, zww )
+!!!!$OMP PARALLEL DO PRIVATE( zwx, zwy, zwz, zww, zy1, zy2, zx1, zx2, zua, zva, zcua, zcva)
       !                                                ! ===============
       DO jk = 1, jpkm1                                 ! Horizontal slab
@@ -466 +466 @@
       zfact1 = 0.5 * 0.25      ! Local constant initialization
 
-!CDIR PARALLEL DO PRIVATE( zwx, zwy, zwz )
+!!!!$OMP PARALLEL DO PRIVATE( zwx, zwy, zwz, zuav, zvau )
       !                                                ! ===============
       DO jk = 1, jpkm1                                 ! Horizontal slab
@@ -599 +599 @@
 
          IF( ln_dynvor_een_old ) THEN ! original formulation
+!$OMP PARALLEL DO PRIVATE(ze3)
             DO jk = 1, jpk
                DO jj = 1, jpjm1
@@ -609 +610 @@
             END DO
          ELSE ! new formulation from NEMO 3.6
+!$OMP PARALLEL DO PRIVATE(ze3, zmsk)
             DO jk = 1, jpk
                DO jj = 1, jpjm1
@@ -628 +630 @@
 
       
-!CDIR PARALLEL DO PRIVATE( zwx, zwy, zwz, ztnw, ztne, ztsw, ztse )
+!!!!!$OMP PARALLEL DO PRIVATE( zwx, zwy, zwz, ztnw, ztne, ztsw, ztse, zua, zva )
       !                                                ! ===============
       DO jk = 1, jpkm1                                 ! Horizontal slab
@@ -637 +639 @@
          SELECT CASE( kvor )      ! vorticity considered
          CASE ( 1 )                                                ! planetary vorticity (Coriolis)
-            zwz(:,:) = ff(:,:)      * ze3f(:,:,jk)
+               zwz(:,:) = ff(:,:)      * ze3f(:,:,jk)
          CASE ( 2 )                                                ! relative  vorticity
-            zwz(:,:) = rotn(:,:,jk) * ze3f(:,:,jk)
+               zwz(:,:) = rotn(:,:,jk) * ze3f(:,:,jk)
          CASE ( 3 )                                                ! metric term
             DO jj = 1, jpjm1
@@ -650 +652 @@
             CALL lbc_lnk( zwz, 'F', 1. )
         CASE ( 4 )                                                ! total (relative + planetary vorticity)
-            zwz(:,:) = ( rotn(:,:,jk) + ff(:,:) ) * ze3f(:,:,jk)
+              zwz(:,:) = ( rotn(:,:,jk) + ff(:,:) ) * ze3f(:,:,jk)
          CASE ( 5 )                                                ! total (coriolis + metric)
             DO jj = 1, jpjm1