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

Timestamp:

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

Author:

Laurent Fairhead

Message:

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

File:

• LMDZ4/trunk/libf/dyn3dpar/nxgraro2_p.F (modified) (6 diffs)

LMDZ4/trunk/libf/dyn3dpar/nxgraro2_p.F

@@ -1 @@
-       SUBROUTINE nxgraro2_p (klevel,xcov, ycov, lr, grx, gry )
+       SUBROUTINE nxgraro2_p (klevel,xcov, ycov, lr, grx_out, gry_out )
 c
 c      P.Le Van .
@@ -25 +25 @@
       INTEGER klevel
       REAL xcov( ip1jmp1,klevel ), ycov( ip1jm,klevel )
-      REAL  grx( ip1jmp1,klevel ),  gry( ip1jm,klevel )
+      REAL,SAVE ::  grx( ip1jmp1,llm ),  gry( ip1jm,llm )
+      REAL  grx_out( ip1jmp1,klevel ),  gry_out( ip1jm,klevel )
 c
 c    ......   variables locales     ........
 c
-      REAL rot(ip1jm,llm) , signe, nugradrs
+      REAL,SAVE :: rot(ip1jm,llm)
+      REAL  signe, nugradrs
       INTEGER l,ij,iter,lr
 c    ........................................................
 c
-      EXTERNAL    filtreg
-      EXTERNAL  SCOPY, rotatf, nxgrad, laplacien_rotgam
       INTEGER :: ijb,ije,jjb,jje
       
@@ -47 +47 @@
       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
+
+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
 
       ijb=ij_begin
       ije=ij_end
       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
+ 
 c
       CALL     rotatf_p     ( klevel, grx, gry, rot )
 c      call write_field3d_p('rot1',reshape(rot,(/iip1,jjm,llm/)))
-      
+
+c$OMP BARRIER
+c$OMP MASTER      
       call suspend_timer(timer_dissip)
       call exchange_Hallo(rot,ip1jm,llm,1,1)
       call resume_timer(timer_dissip)
+c$OMP END MASTER
+c$OMP BARRIER
       
       CALL laplacien_rot_p ( klevel, rot, rot,grx,gry      )
@@ -71 +90 @@
 c
       DO  iter = 1, lr -2
+c$OMP BARRIER
+c$OMP MASTER
         call suspend_timer(timer_dissip)
         call exchange_Hallo(rot,ip1jm,llm,1,1)
         call resume_timer(timer_dissip)
+c$OMP END MASTER
+c$OMP BARRIER
         CALL laplacien_rotgam_p ( klevel, rot, rot )
       ENDDO
@@ -86 +109 @@
        
       CALL filtreg_p( rot, jjb,jje,jjm, klevel, 2,1, .FALSE.,1)
+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 )
 
@@ -94 +121 @@
       ijb=ij_begin
       ije=ij_end
-    
+      
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)    
       DO    l = 1, klevel
         
          if(pole_sud) ije=ij_end-iip1
          DO  ij = ijb, ije
-          gry( ij,l ) = gry( ij,l ) * nugradrs
+          gry_out( ij,l ) = gry( ij,l ) * nugradrs
          ENDDO
         
          if(pole_sud) ije=ij_end
          DO  ij = ijb, ije
-          grx( ij,l ) = grx( ij,l ) * nugradrs
+          grx_out( ij,l ) = grx( ij,l ) * nugradrs
          ENDDO
      
       ENDDO
+c$OMP END DO NOWAIT
 c
       RETURN