Changeset 709 for LMDZ4/branches/V3_test/libf/dyn3dpar/gradiv_p.F

Timestamp:

Sep 20, 2006, 12:12:39 PM (18 years ago)

Author:

Laurent Fairhead

Message:

Nouvelles versions de la dynamique YM
LF

File:

• LMDZ4/branches/V3_test/libf/dyn3dpar/gradiv_p.F (modified) (4 diffs)

LMDZ4/branches/V3_test/libf/dyn3dpar/gradiv_p.F

@@ -1 @@
-      SUBROUTINE gradiv_p(klevel, xcov, ycov, ld, gdx, gdy )
+      SUBROUTINE gradiv_p(klevel, xcov, ycov, ld, gdx_out, gdy_out )
 c
 c    Auteur :   P. Le Van
@@ -26 +26 @@
 c
       REAL xcov( ip1jmp1,klevel ), ycov( ip1jm,klevel )
-      REAL gdx( ip1jmp1,klevel ),   gdy( ip1jm,klevel )
+      REAL,SAVE :: gdx( ip1jmp1,llm ),   gdy( ip1jm,llm )
 
-      REAL div(ip1jmp1,llm)
+      REAL gdx_out( ip1jmp1,klevel ),   gdy_out( ip1jm,klevel )
+
+      REAL,SAVE ::  div(ip1jmp1,llm)
 
       INTEGER l,ij,iter,ld
 c
-      EXTERNAL   SCOPY, diverg,  grad
-      EXTERNAL   filtreg
       INTEGER ijb,ije,jjb,jje
 c
@@ -42 +42 @@
       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
       DO 10 iter = 1,ld
-      
+
+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
+
       CALL  diverg_p( klevel,  gdx , gdy, div          )
       
@@ -63 +77 @@
       
 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
       
       CALL    grad_p( klevel,  div, gdx, gdy           )
 c
+
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)      
       DO 5  l = 1, klevel
       
       if(pole_sud) ije=ij_end
       DO 3 ij = ijb, ije
-        gdx( ij,l ) = - gdx( ij,l ) * cdivu
+        gdx_out( ij,l ) = - gdx( ij,l ) * cdivu
    3  CONTINUE
    
       if(pole_sud) ije=ij_end-iip1
       DO 4 ij = ijb, ije
-        gdy( ij,l ) = - gdy( ij,l ) * cdivu
+        gdy_out( ij,l ) = - gdy( ij,l ) * cdivu
    4  CONTINUE
 
    5  CONTINUE
+c$OMP END DO NOWAIT
 c
   10  CONTINUE