Changeset 764 for LMDZ4/trunk/libf/dyn3dpar/divgrad2_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/divgrad2_p.F (modified) (8 diffs)

LMDZ4/trunk/libf/dyn3dpar/divgrad2_p.F

@@ -1 @@
-      SUBROUTINE divgrad2_p ( klevel, h, deltapres, lh, divgra )
+      SUBROUTINE divgrad2_p ( klevel, h, deltapres, lh, divgra_out )
 c
 c     P. Le Van
@@ -23 +23 @@
       INTEGER klevel
       REAL h( ip1jmp1,klevel ), deltapres( ip1jmp1,klevel )
-      REAL divgra( ip1jmp1,klevel)
+      REAL divgra_out( ip1jmp1,klevel)
+      REAL,SAVE :: divgra( ip1jmp1,llm)
+
 c
 c    .......    variables  locales    ..........
@@ -31 +33 @@
 c    ...................................................................
 
-      EXTERNAL  filtreg
-      EXTERNAL  SCOPY,  laplacien_gam
       INTEGER ijb,ije
 c
@@ -41 +41 @@
       ijb=ij_begin
       ije=ij_end
-      divgra(ijb:ije,1:klevel)=h(ijb:ije,1:klevel)
-
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+      DO l = 1, klevel
+        divgra(ijb:ije,l)=h(ijb:ije,l)
+      ENDDO
+c$OMP END DO NOWAIT
 c
+c$OMP BARRIER
+c$OMP MASTER
       call suspend_timer(timer_dissip)
       call exchange_Hallo(divgra,ip1jmp1,llm,1,1)
       call resume_timer(timer_dissip)
+c$OMP END MASTER
+c$OMP BARRIER
       CALL laplacien_p( klevel, divgra, divgra )
-     
+
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)     
       DO l = 1, klevel
        DO ij = ijb, ije
@@ -54 +62 @@
        ENDDO
       ENDDO
+c$OMP END DO NOWAIT
+
 c
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)     
       DO l = 1, klevel
         DO ij = ijb, ije
@@ -60 +71 @@
         ENDDO
       ENDDO
+c$OMP END DO NOWAIT
    
 c    ........    Iteration de l'operateur  laplacien_gam    ........
 c
       DO  iter = 1, lh - 2
+c$OMP BARRIER
+c$OMP MASTER
        call suspend_timer(timer_dissip)
        call exchange_Hallo(divgra,ip1jmp1,llm,1,1)
        call resume_timer(timer_dissip)
+c$OMP END MASTER
+c$OMP BARRIER
        CALL laplacien_gam_p ( klevel,cuvscvgam2,cvuscugam2,unsair_gam2,
      *                     unsapolnga2, unsapolsga2,  divgra, divgra )
@@ -72 +88 @@
 c
 c    ...............................................................
- 
+
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)     
       DO l = 1, klevel
         DO ij = ijb, ije
@@ -78 +95 @@
         ENDDO
       ENDDO
+c$OMP END DO NOWAIT
 c
+c$OMP BARRIER
+c$OMP MASTER
       call suspend_timer(timer_dissip)
       call exchange_Hallo(divgra,ip1jmp1,llm,1,1)
       call resume_timer(timer_dissip)
+c$OMP END MASTER
+c$OMP BARRIER
+
       CALL laplacien_p ( klevel, divgra, divgra )
 c
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
       DO l  = 1,klevel
       DO ij = ijb,ije
-      divgra(ij,l) =  nudivgrs * divgra(ij,l) / deltapres(ij,l)
+      divgra_out(ij,l) =  nudivgrs * divgra(ij,l) / deltapres(ij,l)
       ENDDO
       ENDDO
+c$OMP END DO NOWAIT
 
       RETURN