Changeset 2600 for LMDZ5/trunk/libf/dyn3dpar/vlspltgen_p.F

Timestamp:

Jul 23, 2016, 7:45:38 AM (8 years ago)

Author:

Ehouarn Millour

Message:

Cleanup in the dynamics: turn comvert.h into module comvert_mod.F90
EM

File:

• LMDZ5/trunk/libf/dyn3dpar/vlspltgen_p.F (modified) (18 diffs)

LMDZ5/trunk/libf/dyn3dpar/vlspltgen_p.F

@@ -34 +34 @@
 #include "paramet.h"
 #include "logic.h"
-#include "comvert.h"
 
 c
@@ -105 +104 @@
 
         
-        ijb=ij_begin-iip1
-        ije=ij_end+iip1
-        if (pole_nord) ijb=ij_begin
-        if (pole_sud) ije=ij_end
-        
+        ijb=ij_begin-iip1
+        ije=ij_end+iip1
+        if (pole_nord) ijb=ij_begin
+        if (pole_sud) ije=ij_end
+        
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK) 
-        DO l = 1, llm
+        DO l = 1, llm
          DO ij = ijb, ije
           tempe(ij) = teta(ij,l) * pk(ij,l) /cpp
@@ -191 +190 @@
 
         if(iadv(iq) == 0) then
-        
-          cycle 
-        
-        else if (iadv(iq)==10) then
+        
+          cycle 
+        
+        else if (iadv(iq)==10) then
 
 #ifdef _ADV_HALO        
-          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_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)
 #else
-          call vlx_p(zq(1,1,iq),pente_max,zm(1,1,iq),mu,
-     &               ij_begin,ij_end)
+          call vlx_p(zq(1,1,iq),pente_max,zm(1,1,iq),mu,
+     &                     ij_begin,ij_end)
 #endif
 
@@ -215 +214 @@
           call VTe(VTHallo)
 c$OMP END MASTER
-        else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
 
 #ifdef _ADV_HALO           
@@ -239 +238 @@
 c$OMP END MASTER 
         else
-        
-          stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -261 +260 @@
 
         if(iadv(iq) == 0) then
-        
-          cycle 
-        
-        else if (iadv(iq)==10) then
+        
+          cycle 
+        
+        else if (iadv(iq)==10) then
 
 #ifdef _ADV_HALLO
@@ -270 +269 @@
      &               ij_begin+2*iip1,ij_end-2*iip1)
 #endif        
-        else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
 #ifdef _ADV_HALLO
           call vlxqs_p(zq(1,1,iq),pente_max,zm(1,1,iq),mu,qsat,
@@ -276 +275 @@
 #endif    
         else
-        
-          stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -301 +300 @@
 
         if(iadv(iq) == 0) then
-        
-          cycle 
-        
-        else if (iadv(iq)==10) then
+        
+          cycle 
+        
+        else if (iadv(iq)==10) then
         
           call vly_p(zq(1,1,iq),pente_max,zm(1,1,iq),mv)
   
-        else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
       
           call vlyqs_p(zq(1,1,iq),pente_max,zm(1,1,iq),mv,qsat)
  
         else
-        
-          stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -324 +323 @@
 
         if(iadv(iq) == 0) then 
-          
-          cycle 
-        
-        else if (iadv(iq)==10 .or. iadv(iq)==14 ) then
+          
+          cycle 
+        
+        else if (iadv(iq)==10 .or. iadv(iq)==14 ) then
 
 c$OMP BARRIER        
@@ -350 +349 @@
 c$OMP MASTER
           call VTe(VTHallo)
-c$OMP END MASTER        
-c$OMP BARRIER
-        else
-        
-          stop 'vlspltgen_p : schema non parallelise'
+c$OMP END MASTER        
+c$OMP BARRIER
+        else
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -369 +368 @@
 c$OMP MASTER
       call VTe(VTHallo)
-c$OMP END MASTER        
+c$OMP END MASTER        
 
 c$OMP BARRIER
@@ -375 +374 @@
 
         if(iadv(iq) == 0) then
-          
-          cycle 
-        
-        else if (iadv(iq)==10 .or. iadv(iq)==14 ) then
+          
+          cycle 
+        
+        else if (iadv(iq)==10 .or. iadv(iq)==14 ) then
 c$OMP BARRIER        
 
@@ -388 +387 @@
 c$OMP BARRIER        
         else
-        
-          stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -414 +413 @@
 
         if(iadv(iq) == 0) then
-        
-          cycle 
-        
-        else if (iadv(iq)==10) then
+        
+          cycle 
+        
+        else if (iadv(iq)==10) then
         
           call vly_p(zq(1,1,iq),pente_max,zm(1,1,iq),mv)
   
-        else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
       
           call vlyqs_p(zq(1,1,iq),pente_max,zm(1,1,iq),mv,qsat)
  
         else
-        
-          stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -436 +435 @@
 
         if(iadv(iq) == 0) then 
-          
-          cycle 
-        
-        else if (iadv(iq)==10) then
+          
+          cycle 
+        
+        else if (iadv(iq)==10) then
         
           call vlx_p(zq(1,1,iq),pente_max,zm(1,1,iq),mu,
      &               ij_begin,ij_end)
   
-        else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
       
           call vlxqs_p(zq(1,1,iq),pente_max,zm(1,1,iq),mu,qsat,
@@ -450 +449 @@
  
         else
-        
+        
           stop 'vlspltgen_p : schema non parallelise'
       
@@ -469 +468 @@
            DO ij=ijb,ije
 c             print *,'zq-->',ij,l,iq,zq(ij,l,iq)
-c            print *,'q-->',ij,l,iq,q(ij,l,iq)
-             q(ij,l,iq)=zq(ij,l,iq)
+c             print *,'q-->',ij,l,iq,q(ij,l,iq)
+             q(ij,l,iq)=zq(ij,l,iq)
            ENDDO
         ENDDO