Changeset 2597 for LMDZ5/trunk/libf/dyn3dmem/vlspltgen_loc.F

Timestamp:

Jul 22, 2016, 8:44:47 AM (8 years ago)

Author:

Ehouarn Millour

Message:

Cleanup in the dynamics: get rid of comconst.h, make it a module comconst_mod.
EM

File:

• LMDZ5/trunk/libf/dyn3dmem/vlspltgen_loc.F (modified) (20 diffs)

LMDZ5/trunk/libf/dyn3dmem/vlspltgen_loc.F

@@ -31 +31 @@
      &    ok_iso_verif
       USE vlspltgen_mod
+      USE comconst_mod, ONLY: cpp
       IMPLICIT NONE
 
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
 
 c
@@ -100 +100 @@
 
         
-        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
@@ -208 +208 @@
 #endif
         if(iadv(iq) == 0) then
-        
-          cycle 
-        
-        else if (iadv(iq)==10) then
+        
+          cycle 
+        
+        else if (iadv(iq)==10) then
 
 #ifdef _ADV_HALO        
 ! CRisi: on ajoute les nombres de fils et tableaux des fils
 ! On suppose qu'on ne peut advecter les fils que par le schéma 10.  
-          call vlx_loc(zq,pente_max,zm,mu,
-     &               ij_begin,ij_begin+2*iip1-1,iq)
+          call vlx_loc(zq,pente_max,zm,mu,
+     &                     ij_begin,ij_begin+2*iip1-1,iq)
           call vlx_loc(zq,pente_max,zm,mu,
      &               ij_end-2*iip1+1,ij_end,iq)
 #else
-          call vlx_loc(zq,pente_max,zm,mu,
-     &               ij_begin,ij_end,iq)
+          call vlx_loc(zq,pente_max,zm,mu,
+     &                     ij_begin,ij_end,iq)
 #endif
 
@@ -240 +240 @@
           call VTe(VTHallo)
 c$OMP END MASTER
-        else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
 
 #ifdef _ADV_HALO           
@@ -268 +268 @@
 c$OMP END MASTER 
         else
-        
-          stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -301 +301 @@
 
         if(iadv(iq) == 0) then
-        
-          cycle 
-        
-        else if (iadv(iq)==10) then
+        
+          cycle 
+        
+        else if (iadv(iq)==10) then
 
 #ifdef _ADV_HALLO
@@ -310 +310 @@
      &                 ij_begin+2*iip1,ij_end-2*iip1,iq)
 #endif        
-        else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
 #ifdef _ADV_HALLO
           call vlxqs_loc(zq,pente_max,zm,mu,
@@ -316 +316 @@
 #endif    
         else
-        
-          stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -358 +358 @@
 
         if(iadv(iq) == 0) then
-        
-          cycle 
-        
-        else if (iadv(iq)==10) then
+        
+          cycle 
+        
+        else if (iadv(iq)==10) then
         
           call vly_loc(zq,pente_max,zm,mv,iq)
   
-        else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
       
           call vlyqs_loc(zq,pente_max,zm,mv,
@@ -371 +371 @@
  
         else
-        
-          stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -389 +389 @@
 #endif
         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        
@@ -420 +420 @@
 c$OMP MASTER
           call VTe(VTHallo)
-c$OMP END MASTER        
+c$OMP END MASTER        
 c$OMP BARRIER
         else
-        
-          stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -439 +439 @@
 c$OMP MASTER
       call VTe(VTHallo)
-c$OMP END MASTER        
+c$OMP END MASTER        
 
 
@@ -451 +451 @@
 
         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        
 
@@ -464 +464 @@
 c$OMP BARRIER        
         else
-        
-          stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -501 +501 @@
 #endif
         if(iadv(iq) == 0) then
-        
-          cycle 
-        
-        else if (iadv(iq)==10) then
+        
+          cycle 
+        
+        else if (iadv(iq)==10) then
         
           call vly_loc(zq,pente_max,zm,mv,iq)
   
-        else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
       
           call vlyqs_loc(zq,pente_max,zm,mv,
@@ -514 +514 @@
  
         else
-        
-          stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -532 +532 @@
 #endif
         if(iadv(iq) == 0) then 
-          
-          cycle 
-        
-        else if (iadv(iq)==10) then
+          
+          cycle 
+        
+        else if (iadv(iq)==10) then
         
           call vlx_loc(zq,pente_max,zm,mu,
      &               ij_begin,ij_end,iq)
   
-        else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
       
           call vlxqs_loc(zq,pente_max,zm,mu,
@@ -546 +546 @@
  
         else
-        
+        
           stop 'vlspltgen_p : schema non parallelise'
       
@@ -574 +574 @@
            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