Changeset 764 for LMDZ4/trunk/libf/dyn3dpar/gradiv2_p.F

Timestamp:

Jun 4, 2007, 4:13:10 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Merge entre la version V3_conv et le HEAD
YM, JG, LF

File:

• LMDZ4/trunk/libf/dyn3dpar/gradiv2_p.F (modified) (8 diffs)

LMDZ4/trunk/libf/dyn3dpar/gradiv2_p.F

@@ -1 @@
-      SUBROUTINE gradiv2_p(klevel, xcov, ycov, ld, gdx, gdy )
+      SUBROUTINE gradiv2_p(klevel, xcov, ycov, ld, gdx_out, gdy_out )
 c
 c     P. Le Van
@@ -27 +27 @@
       INTEGER klevel
       REAL  xcov( ip1jmp1,klevel ), ycov( ip1jm,klevel )
-      REAL   gdx( ip1jmp1,klevel ),  gdy( ip1jm,klevel )
+      REAL,SAVE ::  gdx( ip1jmp1,llm ),  gdy( ip1jm,llm )
+      REAL   gdx_out( ip1jmp1,klevel ), gdy_out( ip1jm,klevel )
 c
 c     ........       variables locales       .........
 c
-      REAL div(ip1jmp1,llm)
+      REAL,SAVE :: div(ip1jmp1,llm)
       REAL signe, nugrads
       INTEGER l,ij,iter,ld
@@ -38 +39 @@
 c    ........................................................
 c
-      EXTERNAL   SCOPY, divergf, grad, laplacien_gam, filtreg
 c
 c      CALL SCOPY( ip1jmp1 * klevel, xcov, 1, gdx, 1 )
@@ -45 +45 @@
       ijb=ij_begin
       ije=ij_end
-      gdx(ijb:ije,1:klevel)=xcov(ijb:ije,1:klevel)
-
+      
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+      DO   l = 1, klevel
+        gdx(ijb:ije,l)=xcov(ijb:ije,l)
+      ENDDO
+c$OMP END DO NOWAIT      
       
       ijb=ij_begin
       ije=ij_end
       if(pole_sud) ije=ij_end-iip1
-      gdy(ijb:ije,1:klevel)=ycov(ijb:ije,1:klevel)
-      
+
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)      
+      DO   l = 1, klevel
+        gdy(ijb:ije,l)=ycov(ijb:ije,l)
+      ENDDO
+c$OMP END DO NOWAIT
+
+c$OMP BARRIER
+c$OMP MASTER      
       call suspend_timer(timer_dissip)
       call exchange_Hallo(gdy,ip1jm,llm,1,0)
       call resume_timer(timer_dissip)
+c$OMP END MASTER
+c$OMP BARRIER
 c
 c
@@ -67 +80 @@
 
       IF( ld.GT.1 )   THEN
-        
+c$OMP BARRIER
+c$OMP MASTER        
         call suspend_timer(timer_dissip)
         call exchange_Hallo(div,ip1jmp1,llm,1,1)
         call resume_timer(timer_dissip)
-        
+c$OMP END MASTER        
+c$OMP BARRIER
         CALL laplacien_p ( klevel, div,  div     )
 
@@ -78 +93 @@
 
         DO iter = 1, ld -2
+c$OMP BARRIER
+c$OMP MASTER
          call suspend_timer(timer_dissip)
          call exchange_Hallo(div,ip1jmp1,llm,1,1)
          call resume_timer(timer_dissip)
+c$OMP END MASTER
+c$OMP BARRIER
          CALL laplacien_gam ( klevel,cuvscvgam1,cvuscugam1,unsair_gam1,
      *                       unsapolnga1, unsapolsga1,  div, div       )
@@ -92 +111 @@
        CALL filtreg_p( div   ,jjb,jje, jjp1, klevel, 2, 1, .TRUE., 1 )
 c       call exchange_Hallo(div,ip1jmp1,llm,0,1)
-        
+c$OMP BARRIER
+c$OMP MASTER        
         call suspend_timer(timer_dissip)
         call exchange_Hallo(div,ip1jmp1,llm,1,1)
         call resume_timer(timer_dissip)
-
+c$OMP END MASTER
+c$OMP BARRIER
 c       call write_field3d_p('div4',reshape(div,(/iip1,jjp1,llm/)))
        CALL  grad_p  ( klevel,  div,   gdx,  gdy             )
@@ -104 +125 @@
       ije=ij_end
          
-      
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)      
        DO   l = 1, klevel
          
          if (pole_sud) ije=ij_end
          DO  ij = ijb, ije
-          gdx( ij,l ) = gdx( ij,l ) * nugrads
+          gdx_out( ij,l ) = gdx( ij,l ) * nugrads
          ENDDO
          
          if (pole_sud) ije=ij_end-iip1
          DO  ij = ijb, ije
-          gdy( ij,l ) = gdy( ij,l ) * nugrads
+          gdy_out( ij,l ) = gdy( ij,l ) * nugrads
          ENDDO
        
        ENDDO
+c$OMP END DO NOWAIT
 c
        RETURN