Changeset 764 for LMDZ4/trunk/libf/dyn3dpar/nxgrarot_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/nxgrarot_p.F (modified) (4 diffs)

LMDZ4/trunk/libf/dyn3dpar/nxgrarot_p.F

@@ -1 @@
-      SUBROUTINE nxgrarot_p (klevel,xcov, ycov, lr, grx, gry )
+      SUBROUTINE nxgrarot_p (klevel,xcov, ycov, lr, grx_out, gry_out )
 c   ***********************************************************
 c
@@ -26 +26 @@
       INTEGER klevel
       REAL xcov( ip1jmp1,klevel ), ycov( ip1jm,klevel )
-      REAL  grx( ip1jmp1,klevel ),  gry( ip1jm,klevel )
+      REAL  grx_out( ip1jmp1,klevel ),  gry_out( ip1jm,klevel )
+      REAL,SAVE ::  grx( ip1jmp1,llm ),  gry( ip1jm,llm )
+
 c
-      REAL rot(ip1jm,llm)
+      REAL,SAVE :: rot(ip1jm,llm)
 
       INTEGER l,ij,iter,lr
 c
-      EXTERNAL    filtreg
-      EXTERNAL       SCOPY, rotat, nXgrad
       INTEGER ijb,ije,jjb,jje
 c
@@ -42 +42 @@
       ijb=ij_begin
       ije=ij_end
-      grx(ijb:ije,1:klevel)=xcov(ijb:ije,1:klevel)
-      
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)  
+      DO l = 1, klevel
+        grx(ijb:ije,l)=xcov(ijb:ije,l)
+      ENDDO 
+c$OMP END DO NOWAIT      
+
       if(pole_sud) ije=ij_end-iip1
-      gry(ijb:ije,1:klevel)=ycov(ijb:ije,1:klevel)
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)      
+      DO l = 1, klevel
+        gry(ijb:ije,l)=ycov(ijb:ije,l)
+      ENDDO
+c$OMP END DO NOWAIT
       
       DO 10 iter = 1,lr
+c$OMP BARRIER
+c$OMP MASTER
       call suspend_timer(timer_dissip)
       call exchange_Hallo(grx,ip1jmp1,llm,0,1)
       call resume_timer(timer_dissip)
+c$OMP END MASTER
+c$OMP BARRIER
+
       CALL  rotat_p (klevel,grx, gry, rot )
 c      call write_field3d_p('rot',reshape(rot,(/iip1,jjm,llm/)))
@@ -58 +71 @@
       if (pole_sud) jje=jj_end-1
       CALL filtreg_p( rot,jjb,jje, jjm, klevel, 2,1, .false.,2)
-      
+
+c$OMP BARRIER
+c$OMP MASTER
       call suspend_timer(timer_dissip)
       call exchange_Hallo(rot,ip1jm,llm,1,0)
       call resume_timer(timer_dissip)
+c$OMP END MASTER
+c$OMP BARRIER
       
       CALL nxgrad_p (klevel,rot, grx, gry )
 c
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
       DO 5  l = 1, klevel
       if(pole_sud) ije=ij_end-iip1
       DO 2 ij = ijb, ije
-      gry( ij,l ) = - gry( ij,l ) * crot
+      gry_out( ij,l ) = - gry( ij,l ) * crot
    2  CONTINUE
       if(pole_sud) ije=ij_end
       DO 3 ij = ijb, ije
-      grx( ij,l ) = - grx( ij,l ) * crot
+      grx_out( ij,l ) = - grx( ij,l ) * crot
    3  CONTINUE
    5  CONTINUE
-
+c$OMP END DO NOWAIT
 c      call write_field3d_p('grx',reshape(grx,(/iip1,jjp1,llm/)))
 c      call write_field3d_p('gry',reshape(gry,(/iip1,jjm,llm/)))