Changeset 854 for LMDZ4/trunk/libf/dyn3dpar/vlspltgen_p.F

Timestamp:

Oct 23, 2007, 2:03:16 PM (17 years ago)

Author:

lsce

Message:

AC + JG + YM + ACo : - Corrected bugs found on 16 and 24 CPUs on ccrt scalar machine platine

• Added use of lmdz communicator in inca model

File:

• LMDZ4/trunk/libf/dyn3dpar/vlspltgen_p.F (modified) (5 diffs)

LMDZ4/trunk/libf/dyn3dpar/vlspltgen_p.F

@@ -184 +184 @@
         
           call vlx_p(zq(1,1,iq),pente_max,zm(1,1,iq),mu,
-     &               ij_begin,ij_begin+2*iip1-1)
-          call vlx_p(zq(1,1,iq),pente_max,zm(1,1,iq),mu,
-     &               ij_end-2*iip1+1,ij_end)
+     &               ij_begin,ij_end)
 
 c$OMP MASTER
@@ -197 +195 @@
       
           call vlxqs_p(zq(1,1,iq),pente_max,zm(1,1,iq),mu,qsat,
-     &                 ij_begin,ij_begin+2*iip1-1)
-          call vlxqs_p(zq(1,1,iq),pente_max,zm(1,1,iq),mu,qsat,
-     &                 ij_end-2*iip1+1,ij_end)
+     &                 ij_begin,ij_end)
 c$OMP MASTER
           call VTb(VTHallo)
@@ -219 +215 @@
       call VTb(VTHallo)
       call SendRequest(MyRequest1)
-      call VTe(VTHallo)
-c$OMP END MASTER       
-c$OMP BARRIER
-      do iq=1,nqmx
-
-        if(iadv(iq) == 0) then
-        
-          cycle 
-        
-        else if (iadv(iq)==10) then
-
-          call vlx_p(zq(1,1,iq),pente_max,zm(1,1,iq),mu,
-     &               ij_begin+2*iip1,ij_end-2*iip1)
-        
-        else if (iadv(iq)==14) then
-
-          call vlxqs_p(zq(1,1,iq),pente_max,zm(1,1,iq),mu,qsat,
-     &                 ij_begin+2*iip1,ij_end-2*iip1)
-    
-        else
-        
-          stop 'vlspltgen_p : schema non parallelise'
-      
-        endif
-      
-      enddo
-c$OMP BARRIER      
-c$OMP MASTER
-      call VTb(VTHallo)
       call WaitRecvRequest(MyRequest1)
       call WaitSendRequest(MyRequest1)
@@ -286 +253 @@
 c$OMP BARRIER        
           call vlz_p(zq(1,1,iq),pente_max,zm(1,1,iq),mw,
-     &               ij_begin,ij_begin+2*iip1-1)
-          call vlz_p(zq(1,1,iq),pente_max,zm(1,1,iq),mw,
-     &               ij_end-2*iip1+1,ij_end)
+     &               ij_begin,ij_end)
 c$OMP BARRIER
 
@@ -309 +274 @@
       call VTb(VTHallo)
       call SendRequest(MyRequest2)
-      call VTe(VTHallo)
-c$OMP END MASTER        
-c$OMP BARRIER
-      do iq=1,nqmx
-
-        if(iadv(iq) == 0) then
-          
-          cycle 
-        
-        else if (iadv(iq)==10 .or. iadv(iq)==14 ) then
-c$OMP BARRIER        
-          call vlz_p(zq(1,1,iq),pente_max,zm(1,1,iq),mw,
-     &               ij_begin+2*iip1,ij_end-2*iip1)
-c$OMP BARRIER        
-        else
-        
-          stop 'vlspltgen_p : schema non parallelise'
-      
-        endif
-      
-      enddo
-
-c$OMP BARRIER
-c$OMP MASTER
-      call VTb(VTHallo)
       call WaitRecvRequest(MyRequest2)
       call WaitSendRequest(MyRequest2)