Index: /LMDZ5/trunk/libf/dyn3d/advect.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/advect.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/advect.F	(revision 2600)
@@ -28,5 +28,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
       include "logic.h"
Index: /LMDZ5/trunk/libf/dyn3d/advtrac.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/advtrac.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/advtrac.F90	(revision 2600)
@@ -17,5 +17,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
   include "comdissip.h"
   include "comgeom2.h"
Index: /LMDZ5/trunk/libf/dyn3d/bilan_dyn.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/bilan_dyn.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/bilan_dyn.F	(revision 2600)
@@ -14,4 +14,5 @@
 #endif
       USE comconst_mod, ONLY: pi, cpp
+      USE comvert_mod, ONLY: presnivs
 
       IMPLICIT NONE
@@ -19,5 +20,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom2.h"
       include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3d/caldyn.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/caldyn.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/caldyn.F	(revision 2600)
@@ -6,4 +6,7 @@
      $  phi,conser,du,dv,dteta,dp,w,pbaru,pbarv,time )
 
+      
+      USE comvert_mod, ONLY: ap, bp
+      
       IMPLICIT NONE
 
@@ -26,5 +29,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
 
Index: /LMDZ5/trunk/libf/dyn3d/dudv2.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/dudv2.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/dudv2.F	(revision 2600)
@@ -26,7 +26,6 @@
 c=======================================================================
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
+      include "dimensions.h"
+      include "paramet.h"
 
       REAL teta( ip1jmp1,llm ),pkf( ip1jmp1,llm ) ,bern( ip1jmp1,llm ),
Index: /LMDZ5/trunk/libf/dyn3d/dynetat0.f90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/dynetat0.f90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/dynetat0.f90	(revision 2600)
@@ -11,11 +11,12 @@
   USE control_mod, ONLY: planet_type
   USE assert_eq_m, ONLY: assert_eq
+  USE comvert_mod, ONLY: pa,preff
   USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, omeg, rad
   USE serre_mod, ONLY: clon, clat, grossismx, grossismy
+
   IMPLICIT NONE
   include "dimensions.h"
   include "paramet.h"
   include "temps.h"
-  include "comvert.h"
   include "comgeom2.h"
   include "ener.h"
Index: /LMDZ5/trunk/libf/dyn3d/dynredem.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/dynredem.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/dynredem.F90	(revision 2600)
@@ -11,11 +11,12 @@
                     NF90_CLOSE,  NF90_PUT_ATT, NF90_UNLIMITED, NF90_CLOBBER
   USE dynredem_mod, ONLY: cre_var, put_var1, put_var2, err, modname, fil
+  USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt,pa,preff, &
+                              nivsig,nivsigs
   USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
   USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
-      			taux,tauy
+                              taux,tauy
   IMPLICIT NONE
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
   include "comgeom2.h"
   include "temps.h"
@@ -173,5 +174,4 @@
   include "paramet.h"
   include "description.h"
-  include "comvert.h"
   include "comgeom.h"
   include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3d/fluxstokenc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/fluxstokenc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/fluxstokenc.F	(revision 2600)
@@ -18,5 +18,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
       include "tracstoke.h"
@@ -35,5 +34,5 @@
 
       REAL pbarvst(iip1,jjp1,llm),zistdyn
-	real dtcum
+        real dtcum
 
       INTEGER iadvtr,ndex(1) 
@@ -59,13 +58,13 @@
       if(first) then
 
-	CALL initfluxsto( 'fluxstoke',
+        CALL initfluxsto( 'fluxstoke',
      .  time_step,istdyn* time_step,istdyn* time_step,
      .  fluxid,fluxvid,fluxdid) 
-	
-	ndex(1) = 0
+        
+        ndex(1) = 0
         call histwrite(fluxid, 'phis', 1, phis, iip1*jjp1, ndex)
         call histwrite(fluxid, 'aire', 1, aire, iip1*jjp1, ndex)
-	
-	ndex(1) = 0
+        
+        ndex(1) = 0
         nscal = 1
         tst(1) = time_step
@@ -75,6 +74,6 @@
         istp(1)= istphy
         call histwrite(fluxdid, 'istphy', 1, istp, nscal, ndex)
-	
-	first = .false.
+        
+        first = .false.
 
       endif
@@ -140,24 +139,24 @@
 
          iadvtr=0
-	write(lunout,*)'ITAU auquel on stoke les fluxmasses',itau
-	
-	call histwrite(fluxid, 'masse', itau, massem,
+        write(lunout,*)'ITAU auquel on stoke les fluxmasses',itau
+        
+        call histwrite(fluxid, 'masse', itau, massem,
      .               iip1*jjp1*llm, ndex)
-	
-	call histwrite(fluxid, 'pbaru', itau, pbarug,
+        
+        call histwrite(fluxid, 'pbaru', itau, pbarug,
      .               iip1*jjp1*llm, ndex)
-	
-	call histwrite(fluxvid, 'pbarv', itau, pbarvg,
+        
+        call histwrite(fluxvid, 'pbarv', itau, pbarvg,
      .               iip1*jjm*llm, ndex)
-	
+        
         call histwrite(fluxid, 'w' ,itau, wg, 
      .             iip1*jjp1*llm, ndex) 
-	
-	call histwrite(fluxid, 'teta' ,itau, tetac, 
+        
+        call histwrite(fluxid, 'teta' ,itau, tetac, 
      .             iip1*jjp1*llm, ndex) 
-	
-	call histwrite(fluxid, 'phi' ,itau, phic, 
+        
+        call histwrite(fluxid, 'phi' ,itau, phic, 
      .             iip1*jjp1*llm, ndex) 
-	
+        
 C
 
Index: /LMDZ5/trunk/libf/dyn3d/gcm.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/gcm.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/gcm.F90	(revision 2600)
@@ -69,5 +69,4 @@
   include "paramet.h"
   include "comdissnew.h"
-  include "comvert.h"
   include "comgeom.h"
   include "logic.h"
Index: /LMDZ5/trunk/libf/dyn3d/groupe.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/groupe.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/groupe.F	(revision 2600)
@@ -22,5 +22,4 @@
       include "paramet.h"
       include "comgeom2.h"
-      include "comvert.h"
 
 !     integer ngroup
Index: /LMDZ5/trunk/libf/dyn3d/guide_mod.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/guide_mod.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/guide_mod.F90	(revision 2600)
@@ -314,4 +314,5 @@
     USE control_mod, ONLY: day_step, iperiod
     USE comconst_mod, ONLY: dtvr, daysec
+    USE comvert_mod, ONLY: ap, bp, preff, presnivs
  
     IMPLICIT NONE
@@ -319,5 +320,4 @@
     INCLUDE "dimensions.h"
     INCLUDE "paramet.h"
-    INCLUDE "comvert.h"
 
     ! Variables entree
@@ -607,9 +607,9 @@
   use exner_milieu_m, only: exner_milieu
   use comconst_mod, only: kappa, cpp
+  use comvert_mod, only: preff, pressure_exner, bp, ap
   IMPLICIT NONE
 
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
   include "comgeom2.h"
 
@@ -1517,4 +1517,5 @@
 
     USE comconst_mod, ONLY: pi
+    USE comvert_mod, ONLY: presnivs
     
     IMPLICIT NONE
@@ -1524,5 +1525,4 @@
     INCLUDE "netcdf.inc"
     INCLUDE "comgeom2.h"
-    INCLUDE "comvert.h"
     
     ! Variables entree
Index: /LMDZ5/trunk/libf/dyn3d/iniacademic.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/iniacademic.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/iniacademic.F90	(revision 2600)
@@ -17,4 +17,5 @@
   use exner_milieu_m, only: exner_milieu
   USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
+  USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -29,5 +30,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
   include "comgeom.h"
   include "academic.h"
Index: /LMDZ5/trunk/libf/dyn3d/integrd.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/integrd.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/integrd.F	(revision 2600)
@@ -9,4 +9,5 @@
       use control_mod, only : planet_type
       use comconst_mod, only: pi
+      use comvert_mod, only: ap, bp
 
       IMPLICIT NONE
@@ -31,5 +32,4 @@
       include "paramet.h"
       include "comgeom.h"
-      include "comvert.h"
       include "logic.h"
       include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3d/leapfrog.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/leapfrog.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/leapfrog.F	(revision 2600)
@@ -20,4 +20,5 @@
       use exner_hyb_m, only: exner_hyb
       use exner_milieu_m, only: exner_milieu
+      USE comvert_mod, ONLY: ap,bp,pressure_exner,presnivs
       USE comconst_mod, ONLY: cpp, dtphys, dtvr, pi, ihf
 
@@ -58,5 +59,4 @@
       include "paramet.h"
       include "comdissnew.h"
-      include "comvert.h"
       include "comgeom.h"
       include "logic.h"
@@ -712,5 +712,5 @@
             IF( MOD(itau,iecri).EQ.0) THEN
              ! Ehouarn: output only during LF or Backward Matsuno
-	     if (leapf.or.(.not.leapf.and.(.not.forward))) then
+             if (leapf.or.(.not.leapf.and.(.not.forward))) then
               CALL geopot(ip1jmp1,teta,pk,pks,phis,phi)
               unat=0.
@@ -722,5 +722,5 @@
               if (ok_dyn_ins) then
 !               write(lunout,*) "leapfrog: call writehist, itau=",itau
-	       CALL writehist(itau,vcov,ucov,teta,phi,q,masse,ps,phis)
+               CALL writehist(itau,vcov,ucov,teta,phi,q,masse,ps,phis)
 !               call WriteField('ucov',reshape(ucov,(/iip1,jmp1,llm/)))
 !               call WriteField('vcov',reshape(vcov,(/iip1,jjm,llm/)))
@@ -852,5 +852,5 @@
 !                write(lunout,*) "leapfrog: call writehist (b)",
 !     &                        itau,iecri
-		CALL writehist(itau,vcov,ucov,teta,phi,q,masse,ps,phis)
+                CALL writehist(itau,vcov,ucov,teta,phi,q,masse,ps,phis)
               endif ! of if (ok_dyn_ins)
 #endif
Index: /LMDZ5/trunk/libf/dyn3d/qminimum.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/qminimum.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/qminimum.F	(revision 2600)
@@ -10,7 +10,6 @@
 c             pour l'eau vapeur et l'eau liquide
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
+      include "dimensions.h"
+      include "paramet.h"
 c
       INTEGER nqtot
Index: /LMDZ5/trunk/libf/dyn3d/sw_case_williamson91_6.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/sw_case_williamson91_6.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/sw_case_williamson91_6.F	(revision 2600)
@@ -27,4 +27,5 @@
 c=======================================================================
       USE comconst_mod, ONLY: cpp, omeg, rad
+      USE comvert_mod, ONLY: ap, bp, preff
       
       IMPLICIT NONE
@@ -35,5 +36,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
       include "iniprint.h"
Index: /LMDZ5/trunk/libf/dyn3d/top_bound.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/top_bound.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/top_bound.F	(revision 2600)
@@ -6,4 +6,5 @@
       USE comconst_mod, ONLY: iflag_top_bound, mode_top_bound,
      &                        tau_top_bound
+      USE comvert_mod, ONLY: presnivs, preff, scaleheight
       
       IMPLICIT NONE
@@ -11,5 +12,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom2.h"
 
Index: /LMDZ5/trunk/libf/dyn3d/vlsplt.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/vlsplt.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/vlsplt.F	(revision 2600)
@@ -24,5 +24,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
 
 c
@@ -157,5 +156,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
       include "iniprint.h"
 c
@@ -532,5 +530,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
       include "comgeom.h"
 c
@@ -894,5 +891,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
 c
 c
Index: /LMDZ5/trunk/libf/dyn3d/vlspltqs.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d/vlspltqs.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d/vlspltqs.F	(revision 2600)
@@ -31,5 +31,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
 
 c
@@ -197,5 +196,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
 c
 c
@@ -568,5 +566,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
       include "comgeom.h"
 c
Index: /LMDZ5/trunk/libf/dyn3d_common/adaptdt.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/adaptdt.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/adaptdt.F	(revision 2600)
@@ -9,14 +9,12 @@
       IMPLICIT NONE
 
-#include "dimensions.h"
-c#include "paramr2.h"
-#include "paramet.h"
-#include "comdissip.h"
-#include "comvert.h"
-#include "comgeom2.h"
-#include "logic.h"
-#include "temps.h"
-#include "ener.h"
-#include "description.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comdissip.h"
+      include "comgeom2.h"
+      include "logic.h"
+      include "temps.h"
+      include "ener.h"
+      include "description.h"
 
 c----------------------------------------------------------
Index: /LMDZ5/trunk/libf/dyn3d_common/advn.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/advn.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/advn.F	(revision 2600)
@@ -17,10 +17,9 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comgeom.h"
+      include "iniprint.h"
 
 c
@@ -483,9 +482,8 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "iniprint.h"
 c
 c
Index: /LMDZ5/trunk/libf/dyn3d_common/advx.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/advx.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/advx.F	(revision 2600)
@@ -18,12 +18,11 @@
 C  sm,s0,sx,sy,sz                                                C
 C  sont les arguments de sortie pour le s-pg                     C
-C								 C
+C                                                                C
 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
 C
 C  parametres principaux du modele
 C
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
+      include "dimensions.h"
+      include "paramet.h"
 
 C  Arguments :
Index: /LMDZ5/trunk/libf/dyn3d_common/advxp.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/advxp.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/advxp.F	(revision 2600)
@@ -13,7 +13,6 @@
 C  parametres principaux du modele
 C
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
+      include "dimensions.h"
+      include "paramet.h"
 
        INTEGER ntra
@@ -102,5 +101,5 @@
 c         IF (S0(i,j,l,ntra) .lt. 0. ) THEN
 c         PRINT*,'S0(',i,j,l,')=',S0(i,j,l,ntra)
-c	     print*, 'SSX(',i,j,l,')=',SSX(i,j,l,ntra)
+c             print*, 'SSX(',i,j,l,')=',SSX(i,j,l,ntra)
 c         print*, 'SY(',i,j,l,')=',SY(i,j,l,ntra)
 c         print*, 'SZ(',i,j,l,')=',SZ(i,j,l,ntra)
@@ -119,5 +118,5 @@
       DO j = 1, jjp1
       DO i = 1, iim
-	 sqi = sqi + S0(i,j,l,ntra)
+         sqi = sqi + S0(i,j,l,ntra)
       END DO
       END DO
@@ -611,11 +610,11 @@
 c      DO 9999 j = 1, jjp1
 c      DO 9999 i = 1, iip1
-c	   IF (S0(i,j,l,ntra).lt.0..and.LIMIT) THEN
+c           IF (S0(i,j,l,ntra).lt.0..and.LIMIT) THEN
 c           PRINT*, '-------------------'
-c	        PRINT*, 'En fin de ADVXP'
+c                PRINT*, 'En fin de ADVXP'
 c           PRINT*,'S0(',i,j,l,')=',S0(i,j,l,ntra)
-c	        print*, 'SSX(',i,j,l,')=',SSX(i,j,l,ntra)
+c                print*, 'SSX(',i,j,l,')=',SSX(i,j,l,ntra)
 c           print*, 'SY(',i,j,l,')=',SY(i,j,l,ntra)
-c       	print*, 'SZ(',i,j,l,')=',SZ(i,j,l,ntra)
+c               print*, 'SZ(',i,j,l,')=',SZ(i,j,l,ntra)
 c            WRITE (*,*) 'On arrete !! - pbl en fin de ADVXP'
 c            STOP
@@ -628,7 +627,7 @@
          SM(iip1,j,l) = SM(1,j,l)
          S0(iip1,j,l,ntra) = S0(1,j,l,ntra)
-     	 SSX(iip1,j,l,ntra) = SSX(1,j,l,ntra)
-    	 SY(iip1,j,l,ntra) = SY(1,j,l,ntra)
-    	 SZ(iip1,j,l,ntra) = SZ(1,j,l,ntra)
+              SSX(iip1,j,l,ntra) = SSX(1,j,l,ntra)
+             SY(iip1,j,l,ntra) = SY(1,j,l,ntra)
+             SZ(iip1,j,l,ntra) = SZ(1,j,l,ntra)
       END DO
       END DO
Index: /LMDZ5/trunk/libf/dyn3d_common/advy.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/advy.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/advy.F	(revision 2600)
@@ -9,12 +9,12 @@
 C  first-order moments (SOM) advection of tracer in Y direction  C
 C                                                                C
-C  Source : Pascal Simon ( Meteo, CNRM )			 C
-C  Adaptation : A.A. (LGGE) 					 C
+C  Source : Pascal Simon ( Meteo, CNRM )                         C
+C  Adaptation : A.A. (LGGE)                                      C
 C  Derniere Modif : 15/12/94 LAST
-C								 C
-C  sont les arguments d'entree pour le s-pg			 C
-C								 C
-C  argument de sortie du s-pg					 C
-C								 C
+C                                                                C
+C  sont les arguments d'entree pour le s-pg                      C
+C                                                                C
+C  argument de sortie du s-pg                                    C
+C                                                                C
 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
@@ -26,8 +26,7 @@
 C
 C
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
-#include "comgeom2.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom2.h"
  
 C  Arguments :
Index: /LMDZ5/trunk/libf/dyn3d_common/advyp.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/advyp.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/advyp.F	(revision 2600)
@@ -11,12 +11,12 @@
 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
 C                                                                C
-C  Source : Pascal Simon ( Meteo, CNRM )			 C
-C  Adaptation : A.A. (LGGE) 					 C
+C  Source : Pascal Simon ( Meteo, CNRM )                         C
+C  Adaptation : A.A. (LGGE)                                      C
 C  Derniere Modif : 19/10/95 LAST
-C								 C
-C  sont les arguments d'entree pour le s-pg			 C
-C								 C
-C  argument de sortie du s-pg					 C
-C								 C
+C                                                                C
+C  sont les arguments d'entree pour le s-pg                      C
+C                                                                C
+C  argument de sortie du s-pg                                    C
+C                                                                C
 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
@@ -28,8 +28,7 @@
 C
 C
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
-#include "comgeom.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
  
 C  Arguments :
Index: /LMDZ5/trunk/libf/dyn3d_common/advz.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/advz.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/advz.F	(revision 2600)
@@ -16,12 +16,11 @@
 C                                                                C
 C  dq est l'argument de sortie pour le s-pg                      C
-C								 C
+C                                                                C
 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
 C
 C  parametres principaux du modele
 C
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
+      include "dimensions.h"
+      include "paramet.h"
 
 C    #include "traceur.h"
Index: /LMDZ5/trunk/libf/dyn3d_common/advzp.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/advzp.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/advzp.F	(revision 2600)
@@ -31,8 +31,7 @@
 C  parametres principaux du modele
 C
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
-#include "comgeom.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
 C
 C  Arguments :
@@ -355,11 +354,11 @@
       DO j = 1,jjp1
           SM(iip1,j,l) = SM(1,j,l)
-	  S0(iip1,j,l,ntra) = S0(1,j,l,ntra)
+          S0(iip1,j,l,ntra) = S0(1,j,l,ntra)
           SSX(iip1,j,l,ntra) = SSX(1,j,l,ntra)
-	  SY(iip1,j,l,ntra) = SY(1,j,l,ntra)
+          SY(iip1,j,l,ntra) = SY(1,j,l,ntra)
           SZ(iip1,j,l,ntra) = SZ(1,j,l,ntra)
       ENDDO
       ENDDO
-c										C-------------------------------------------------------------
+c                                                                                C-------------------------------------------------------------
 C *** Test : diag de la qqtite totale de tarceur
 C            dans l'atmosphere avant l'advection en z
Index: /LMDZ5/trunk/libf/dyn3d_common/caldyn0.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/caldyn0.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/caldyn0.F90	(revision 2600)
@@ -7,8 +7,8 @@
 !-------------------------------------------------------------------------------
   USE control_mod, ONLY: resetvarc 
+  USE comvert_mod, ONLY: ap, bp
   IMPLICIT NONE
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
   include "comgeom.h"
 !===============================================================================
Index: DZ5/trunk/libf/dyn3d_common/comvert.h
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/comvert.h	(revision 2599)
+++ 	(revision )
@@ -1,38 +1,0 @@
-!
-! $Id$
-!
-!-----------------------------------------------------------------------
-!   INCLUDE 'comvert.h'
-
-      COMMON/comvertr/ap(llm+1),bp(llm+1),presnivs(llm),dpres(llm),     &
-     &               pa,preff,nivsigs(llm),nivsig(llm+1),               &
-     &               aps(llm),bps(llm),scaleheight,pseudoalt(llm)
-
-      common/comverti/disvert_type, pressure_exner
-
-      real ap     ! hybrid pressure contribution at interlayers
-      real bp     ! hybrid sigma contribution at interlayer
-      real presnivs ! (reference) pressure at mid-layers
-      real dpres
-      real pa     ! reference pressure (Pa) at which hybrid coordinates
-                  ! become purely pressure
-      real preff  ! reference surface pressure (Pa)
-      real nivsigs
-      real nivsig
-      real aps    ! hybrid pressure contribution at mid-layers
-      real bps    ! hybrid sigma contribution at mid-layers
-      real scaleheight ! atmospheric (reference) scale height (km)
-      real pseudoalt ! pseudo-altitude of model levels (km), based on presnivs(),
-                     ! preff and scaleheight
-
-      integer disvert_type ! type of vertical discretization:
-                           ! 1: Earth (default for planet_type==earth),
-                           !     automatic generation
-                           ! 2: Planets (default for planet_type!=earth),
-                           !     using 'z2sig.def' (or 'esasig.def) file
-
-      logical pressure_exner
-!     compute pressure inside layers using Exner function, else use mean
-!     of pressure values at interfaces
-
- !-----------------------------------------------------------------------
Index: /LMDZ5/trunk/libf/dyn3d_common/comvert_mod.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/comvert_mod.F90	(revision 2600)
+++ /LMDZ5/trunk/libf/dyn3d_common/comvert_mod.F90	(revision 2600)
@@ -0,0 +1,37 @@
+!
+! $Id$
+!
+MODULE comvert_mod
+
+IMPLICIT NONE  
+
+INCLUDE "dimensions.h"
+
+REAL ap(llm+1) ! hybrid pressure contribution at interlayers
+REAL bp (llm+1) ! hybrid sigma contribution at interlayer
+REAL presnivs(llm) ! (reference) pressure at mid-layers
+REAL dpres(llm)
+REAL sig(llm+1)
+REAL ds(llm)
+REAL pa ! reference pressure (Pa) at which hybrid coordinates
+        ! become purely pressure (more or less)
+REAL preff  ! reference surface pressure (Pa)
+REAL nivsigs(llm)
+REAL nivsig(llm+1)
+REAL aps(llm) ! hybrid pressure contribution at mid-layers
+REAL bps(llm) ! hybrid sigma contribution at mid-layers
+REAL scaleheight ! atmospheric (reference) scale height (km)
+REAL pseudoalt(llm) ! pseudo-altitude of model levels (km), based on presnivs(),
+                     ! preff and scaleheight
+
+INTEGER disvert_type ! type of vertical discretization:
+                     ! 1: Earth (default for planet_type==earth),
+                     !     automatic generation
+                     ! 2: Planets (default for planet_type!=earth),
+                     !     using 'z2sig.def' (or 'esasig.def) file
+
+LOGICAL pressure_exner
+!     compute pressure inside layers using Exner function, else use mean
+!     of pressure values at interfaces
+
+END MODULE comvert_mod
Index: /LMDZ5/trunk/libf/dyn3d_common/conf_planete.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/conf_planete.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/conf_planete.F90	(revision 2600)
@@ -12,4 +12,5 @@
 USE comconst_mod, ONLY: pi, g, molmass, kappa, cpp, omeg, rad, &
                         year_day, daylen, daysec, ihf
+USE comvert_mod, ONLY: preff, pa
 IMPLICIT NONE
 !
@@ -17,6 +18,5 @@
 !   Declarations :
 !   --------------
-#include "dimensions.h"
-#include "comvert.h"
+
 !
 !   local:
Index: /LMDZ5/trunk/libf/dyn3d_common/disvert.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/disvert.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/disvert.F90	(revision 2600)
@@ -10,4 +10,6 @@
   use new_unit_m, only: new_unit
   use assert_m, only: assert
+  USE comvert_mod, ONLY: ap, bp, nivsigs, nivsig, dpres, presnivs, &
+                         pa, preff, scaleheight
 
   IMPLICIT NONE
@@ -15,5 +17,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
   include "iniprint.h"
   include "logic.h"
@@ -23,5 +24,5 @@
 !          Triggered by the levels number llm.
 !-------------------------------------------------------------------------------
-! Read    in "comvert.h":
+! Read    in "comvert_mod":
 
 ! pa !--- vertical coordinate is close to a PRESSURE COORDINATE FOR P
@@ -29,5 +30,5 @@
 
 ! preff                      !--- REFERENCE PRESSURE                 (101325 Pa)
-! Written in "comvert.h":
+! Written in "comvert_mod":
 ! ap(llm+1), bp(llm+1)       !--- Ap, Bp HYBRID COEFFICIENTS AT INTERFACES
 ! aps(llm),  bps(llm)        !--- Ap, Bp HYBRID COEFFICIENTS AT MID-LAYERS
Index: /LMDZ5/trunk/libf/dyn3d_common/disvert_noterre.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/disvert_noterre.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/disvert_noterre.F	(revision 2600)
@@ -12,13 +12,14 @@
       use ioipsl_getincom
 #endif
+      USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt,
+     &                       nivsig,nivsigs,pa,preff,scaleheight
       USE comconst_mod, ONLY: kappa
 
       IMPLICIT NONE
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
-#include "logic.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "iniprint.h"
 c
 c=======================================================================
Index: /LMDZ5/trunk/libf/dyn3d_common/exner_hyb_m.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/exner_hyb_m.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/exner_hyb_m.F90	(revision 2600)
@@ -34,4 +34,6 @@
     !
     USE comconst_mod, ONLY: jmp1, cpp, kappa, r
+    USE comvert_mod, ONLY: preff
+    
     IMPLICIT NONE
     
@@ -39,5 +41,4 @@
     include "paramet.h"
     include "comgeom.h"
-    include "comvert.h"
 
     INTEGER  ngrid
Index: /LMDZ5/trunk/libf/dyn3d_common/exner_milieu_m.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/exner_milieu_m.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/exner_milieu_m.F90	(revision 2600)
@@ -31,4 +31,6 @@
     !
     USE comconst_mod, ONLY: jmp1, cpp, kappa, r
+    USE comvert_mod, ONLY: preff
+    
     IMPLICIT NONE
     
@@ -36,5 +38,4 @@
     include "paramet.h"
     include "comgeom.h"
-    include "comvert.h"
 
     INTEGER  ngrid
Index: /LMDZ5/trunk/libf/dyn3d_common/geopot.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/geopot.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/geopot.F	(revision 2600)
@@ -27,7 +27,6 @@
 c   -------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
+      include "dimensions.h"
+      include "paramet.h"
 
 c   Arguments:
Index: /LMDZ5/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90	(revision 2600)
@@ -10,4 +10,6 @@
 
   USE comconst_mod, ONLY: cpp, kappa, g, omeg, daysec, rad, pi
+  USE comvert_mod, ONLY: presnivs, preff, pa
+  
   IMPLICIT NONE
 
@@ -15,5 +17,4 @@
   INCLUDE "paramet.h"
   INCLUDE "comgeom.h"
-  INCLUDE "comvert.h"
   INCLUDE "netcdf.inc"
 
Index: /LMDZ5/trunk/libf/dyn3d_common/iniconst.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/iniconst.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/iniconst.F90	(revision 2600)
@@ -13,4 +13,5 @@
   USE comconst_mod, ONLY: im, imp1, jm, jmp1, lllm, lllmm1, lllmp1, &
                           unsim, pi, r, kappa, cpp, dtvr, dtphys
+  USE comvert_mod, ONLY: disvert_type, pressure_exner
   
   IMPLICIT NONE
@@ -24,5 +25,4 @@
   include "paramet.h"
   include "temps.h"
-  include "comvert.h"
   include "iniprint.h"
 
Index: /LMDZ5/trunk/libf/dyn3d_common/inidissip.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/inidissip.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/inidissip.F90	(revision 2600)
@@ -14,4 +14,5 @@
   USE comconst_mod, ONLY: dissip_deltaz, dissip_factz, dissip_zref, &
                           dtdiss, dtvr, rad
+  USE comvert_mod, ONLY: preff, presnivs
 
   IMPLICIT NONE
@@ -19,5 +20,4 @@
   include "paramet.h"
   include "comdissipn.h"
-  include "comvert.h"
   include "logic.h"
   include "iniprint.h"
Index: /LMDZ5/trunk/libf/dyn3d_common/initdynav.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/initdynav.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/initdynav.F90	(revision 2600)
@@ -10,4 +10,5 @@
        dynhistave_file,dynhistvave_file,dynhistuave_file
   USE comconst_mod, ONLY: pi
+  USE comvert_mod, ONLY: presnivs
   implicit none
 
@@ -35,5 +36,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
   include "comgeom.h"
   include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F	(revision 2600)
@@ -10,4 +10,5 @@
 #endif
       USE comconst_mod, ONLY: pi
+      USE comvert_mod, ONLY: nivsigs
       implicit none
 
@@ -41,5 +42,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
       include "temps.h"
@@ -85,6 +85,6 @@
       CALL ymds2ju(zan, 1, idayref, 0.0, zjulian)
       tau0 = itau_dyn
-	
-	do jj = 1, jjp1
+        
+        do jj = 1, jjp1
         do ii = 1, iip1
           rlong(ii,jj) = rlonu(ii) * 180. / pi
@@ -112,6 +112,6 @@
      .             1, iip1, 1, jjm,
      .             tau0, zjulian, tstep, vhoriid, filevid)
-	
-	rl(1,1) = 1.
+        
+        rl(1,1) = 1.
       call histbeg('defstoke.nc', 1, rl, 1, rl,
      .             1, 1, 1, 1,
@@ -130,5 +130,5 @@
       call histhori(fileid, iip1, rlong, jjp1, rlat, 'scalar',
      .              'Grille points scalaires', thoriid)
-	
+        
 C
 C  Appel a histvert pour la grille verticale
@@ -149,6 +149,6 @@
 C
 C  Appels a histdef pour la definition des variables a sauvegarder
-	
-	CALL histdef(fileid, "phis", "Surface geop. height", "-",
+        
+        CALL histdef(fileid, "phis", "Surface geop. height", "-",
      .                iip1,jjp1,thoriid, 1,1,1, -99, 32,
      .                "once", t_ops, t_wrt)
@@ -157,6 +157,6 @@
      .                iip1,jjp1,thoriid, 1,1,1, -99, 32,
      .                "once", t_ops, t_wrt)
-	
-	CALL histdef(filedid, "dtvr", "tps dyn", "s",
+        
+        CALL histdef(filedid, "dtvr", "tps dyn", "s",
      .                1,1,dhoriid, 1,1,1, -99, 32,
      .                "once", t_ops, t_wrt)
@@ -222,5 +222,5 @@
         call histsync(filedid)
       endif
-	
+        
 #else
 ! tell the user this routine should be run with ioipsl
Index: /LMDZ5/trunk/libf/dyn3d_common/inithist.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/inithist.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/inithist.F	(revision 2600)
@@ -11,4 +11,5 @@
      &                        dynhist_file,dynhistv_file,dynhistu_file
        USE comconst_mod, ONLY: pi
+       USE comvert_mod, ONLY: presnivs
       implicit none
 
@@ -40,5 +41,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
       include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3d_common/interpost.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/interpost.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/interpost.F	(revision 2600)
@@ -9,5 +9,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom2.h"
 
Index: /LMDZ5/trunk/libf/dyn3d_common/interpre.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/interpre.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/interpre.F	(revision 2600)
@@ -7,4 +7,5 @@
 
       USE comconst_mod, ONLY: g
+      USE comvert_mod, ONLY: ap, bp
 
        implicit none
@@ -13,5 +14,4 @@
       include "paramet.h"
       include "comdissip.h"
-      include "comvert.h"
       include "comgeom2.h"
       include "logic.h"
Index: /LMDZ5/trunk/libf/dyn3d_common/limx.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/limx.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/limx.F	(revision 2600)
@@ -18,5 +18,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
       include "comgeom.h"
 c
Index: /LMDZ5/trunk/libf/dyn3d_common/limy.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/limy.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/limy.F	(revision 2600)
@@ -20,5 +20,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
       include "comgeom.h"
 c
Index: /LMDZ5/trunk/libf/dyn3d_common/limz.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/limz.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/limz.F	(revision 2600)
@@ -18,5 +18,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
       include "comgeom.h"
 c
Index: /LMDZ5/trunk/libf/dyn3d_common/pentes_ini.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/pentes_ini.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/pentes_ini.F	(revision 2600)
@@ -27,5 +27,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom2.h"
 
@@ -439,6 +438,6 @@
 
         DO l = 1,llm
-    	 DO j = 1,jjp1
-    	  DO i = 1,iip1
+             DO j = 1,jjp1
+              DO i = 1,iip1
                 IF (q(i,j,l,0).lt.0.)  THEN
 c                    PRINT*,'------------ BIP-----------' 
@@ -447,5 +446,5 @@
 c                    PRINT*,'QY(',i,j,l,')=',q(i,j,l,2)
 c                    PRINT*,'QZ(',i,j,l,')=',q(i,j,l,3)
-c       		     PRINT*,' PBL EN SORTIE DE PENTES'
+c                            PRINT*,' PBL EN SORTIE DE PENTES'
                      q(i,j,l,0)=0.
 c                    STOP
Index: /LMDZ5/trunk/libf/dyn3d_common/prather.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/prather.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/prather.F	(revision 2600)
@@ -24,5 +24,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom2.h"
 
Index: /LMDZ5/trunk/libf/dyn3d_common/sortvarc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/sortvarc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/sortvarc.F	(revision 2600)
@@ -28,5 +28,4 @@
       INCLUDE "dimensions.h"
       INCLUDE "paramet.h"
-      INCLUDE "comvert.h"
       INCLUDE "comgeom.h"
       INCLUDE "ener.h"
Index: /LMDZ5/trunk/libf/dyn3d_common/traceurpole.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/traceurpole.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/traceurpole.F	(revision 2600)
@@ -9,5 +9,4 @@
       include "paramet.h"
       include "comdissip.h"
-      include "comvert.h"
       include "comgeom2.h"
       include "logic.h"
Index: /LMDZ5/trunk/libf/dyn3d_common/vitvert.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/vitvert.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/vitvert.F90	(revision 2600)
@@ -5,8 +5,8 @@
 !-------------------------------------------------------------------------------
 ! Purpose: Compute vertical speed at sigma levels.
+  USE comvert_mod, ONLY: bp
   IMPLICIT NONE
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ5/trunk/libf/dyn3d_common/writedynav.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/writedynav.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/writedynav.F90	(revision 2600)
@@ -32,5 +32,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
   include "comgeom.h"
   include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3d_common/writehist.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3d_common/writehist.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3d_common/writehist.F	(revision 2600)
@@ -35,5 +35,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
       include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3dmem/advect_new_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/advect_new_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/advect_new_loc.F	(revision 2600)
@@ -30,5 +30,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
       include "logic.h"
Index: /LMDZ5/trunk/libf/dyn3dmem/advtrac_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/advtrac_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/advtrac_loc.F	(revision 2600)
@@ -32,5 +32,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comdissip.h"
       include "comgeom2.h"
@@ -172,5 +171,5 @@
 #endif
          
-	  GOTO 1234     
+          GOTO 1234     
 c-----------------------------------------------------------
 c     Appel des sous programmes d'advection
@@ -184,5 +183,5 @@
         if(iadv(iq).eq.10) THEN
      
-!LF	    call vlsplt_p(q(1,1,iq),2.,massem,wg,pbarug,pbarvg,dtvr)
+!LF            call vlsplt_p(q(1,1,iq),2.,massem,wg,pbarug,pbarvg,dtvr)
 
 c   ----------------------------------------------------------------
Index: /LMDZ5/trunk/libf/dyn3dmem/bilan_dyn_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/bilan_dyn_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/bilan_dyn_loc.F	(revision 2600)
@@ -18,9 +18,10 @@
       USE write_field_loc
       USE comconst_mod, ONLY: cpp, pi
+      USE comvert_mod, ONLY: presnivs
+      
       IMPLICIT NONE
 
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom2.h"
       include "temps.h"
@@ -598,5 +599,5 @@
         do l=1,llm
           Q_cum(:,jjb:jje,l,iQ)=Q_cum(:,jjb:jje,l,iQ) 
-     .	                        /masse_cum(:,jjb:jje,l)
+     .                                /masse_cum(:,jjb:jje,l)
         enddo
 !$OMP ENDDO NOWAIT 
Index: /LMDZ5/trunk/libf/dyn3dmem/caldyn_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/caldyn_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/caldyn_loc.F	(revision 2600)
@@ -12,4 +12,5 @@
       USE caldyn_mod, ONLY: vcont, ucont, ang, p, massebx, masseby,
      &                      vorpot, ecin, bern, massebxy, convm
+      USE comvert_mod, ONLY: ap, bp
       
       IMPLICIT NONE
@@ -33,5 +34,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
 
Index: /LMDZ5/trunk/libf/dyn3dmem/call_calfis_mod.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/call_calfis_mod.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/call_calfis_mod.F90	(revision 2600)
@@ -83,6 +83,7 @@
   USE write_field
   USE comconst_mod, ONLY: dtphys
+  USE comvert_mod, ONLY: ap, bp, pressure_exner
+  
   IMPLICIT NONE
-    INCLUDE "comvert.h"
     INCLUDE "logic.h"
     INCLUDE "temps.h"
Index: /LMDZ5/trunk/libf/dyn3dmem/dudv2_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/dudv2_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/dudv2_loc.F	(revision 2600)
@@ -23,7 +23,6 @@
 c=======================================================================
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
+      include "dimensions.h"
+      include "paramet.h"
 
       REAL teta( ijb_u:ije_u,llm ),pkf( ijb_u:ije_u,llm )
Index: /LMDZ5/trunk/libf/dyn3dmem/dynetat0_loc.f90
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/dynetat0_loc.f90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/dynetat0_loc.f90	(revision 2600)
@@ -12,4 +12,5 @@
   USE control_mod, ONLY: planet_type
   USE assert_eq_m, ONLY: assert_eq
+  USE comvert_mod, ONLY: pa,preff
   USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, &
                           omeg, rad
@@ -20,5 +21,4 @@
   include "paramet.h"
   include "temps.h"
-  include "comvert.h"
   include "comgeom.h"
   include "ener.h"
Index: /LMDZ5/trunk/libf/dyn3dmem/dynredem_loc.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/dynredem_loc.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/dynredem_loc.F90	(revision 2600)
@@ -13,4 +13,6 @@
                     NF90_CLOSE,  NF90_PUT_ATT, NF90_UNLIMITED, NF90_CLOBBER
   USE dynredem_mod, ONLY: cre_var, put_var, err, modname, fil
+  USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt,pa,preff, &
+                         nivsig,nivsigs
   USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
   USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
@@ -20,5 +22,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
   include "comgeom.h"
   include "temps.h"
@@ -182,5 +183,4 @@
   include "paramet.h"
   include "description.h"
-  include "comvert.h"
   include "comgeom.h"
   include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3dmem/exner_hyb_loc_m.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/exner_hyb_loc_m.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/exner_hyb_loc_m.F90	(revision 2600)
@@ -36,4 +36,6 @@
     USE write_field_loc
     USE comconst_mod, ONLY: cpp, kappa, r, jmp1
+    USE comvert_mod, ONLY: preff
+    
     IMPLICIT NONE
     !
@@ -41,5 +43,4 @@
     include "paramet.h"
     include "comgeom.h"
-    include "comvert.h"
 
     INTEGER  ngrid
Index: /LMDZ5/trunk/libf/dyn3dmem/exner_milieu_loc_m.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/exner_milieu_loc_m.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/exner_milieu_loc_m.F90	(revision 2600)
@@ -32,4 +32,6 @@
     USE mod_filtreg_p
     USE comconst_mod, ONLY: cpp, kappa, r, jmp1
+    USE comvert_mod, ONLY: preff
+    
     IMPLICIT NONE
     !
@@ -37,5 +39,4 @@
     include "paramet.h"
     include "comgeom.h"
-    include "comvert.h"
 
     INTEGER  ngrid
Index: /LMDZ5/trunk/libf/dyn3dmem/gcm.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/gcm.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/gcm.F90	(revision 2600)
@@ -56,5 +56,4 @@
   include "paramet.h"
   include "comdissnew.h"
-  include "comvert.h"
   include "comgeom.h"
   include "logic.h"
Index: /LMDZ5/trunk/libf/dyn3dmem/geopot_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/geopot_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/geopot_loc.F	(revision 2600)
@@ -26,7 +26,6 @@
 c   -------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
+      include "dimensions.h"
+      include "paramet.h"
 
 c   Arguments:
Index: /LMDZ5/trunk/libf/dyn3dmem/groupe_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/groupe_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/groupe_loc.F	(revision 2600)
@@ -20,5 +20,4 @@
       include "paramet.h"
       include "comgeom2.h"
-      include "comvert.h"
 
 !     integer ngroup
Index: /LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90	(revision 2600)
@@ -345,4 +345,5 @@
     USE write_field_loc
     USE comconst_mod, ONLY: cpp, daysec, dtvr, kappa
+    USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
     
     IMPLICIT NONE
@@ -350,5 +351,4 @@
     INCLUDE "dimensions.h"
     INCLUDE "paramet.h"
-    INCLUDE "comvert.h"
 
     ! Variables entree
@@ -891,9 +891,9 @@
   USE Bands
   USE comconst_mod, ONLY: cpp, kappa
+  USE comvert_mod, ONLY: preff, pressure_exner, bp, ap, disvert_type
   IMPLICIT NONE
 
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
   include "comgeom2.h"
 
@@ -2129,4 +2129,5 @@
     USE mod_hallo, ONLY : gather_field_u, gather_field_v
     USE comconst_mod, ONLY: pi
+    USE comvert_mod, ONLY: presnivs
     IMPLICIT NONE
 
@@ -2135,5 +2136,4 @@
     INCLUDE "netcdf.inc"
     INCLUDE "comgeom2.h"
-    INCLUDE "comvert.h"
     
     ! Variables entree
Index: /LMDZ5/trunk/libf/dyn3dmem/iniacademic_loc.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/iniacademic_loc.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/iniacademic_loc.F90	(revision 2600)
@@ -19,4 +19,5 @@
   USE Write_Field
   USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
+  USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -31,5 +32,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
   include "comgeom.h"
   include "academic.h"
Index: /LMDZ5/trunk/libf/dyn3dmem/initdynav_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/initdynav_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/initdynav_loc.F	(revision 2600)
@@ -15,4 +15,6 @@
      &        dynhistave_file,dynhistvave_file,dynhistuave_file
        USE comconst_mod, ONLY: pi
+       USE comvert_mod, ONLY: presnivs
+       
        implicit none
 
@@ -44,5 +46,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
       include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3dmem/initfluxsto_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/initfluxsto_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/initfluxsto_p.F	(revision 2600)
@@ -14,4 +14,5 @@
        use misc_mod
        USE comconst_mod, ONLY: pi
+       USE comvert_mod, ONLY: nivsigs
        
       implicit none
@@ -46,5 +47,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
       include "temps.h"
@@ -105,6 +105,6 @@
       CALL ymds2ju(zan, 1, idayref, 0.0, zjulian)
       tau0 = itau_dyn
-	
-	do jj = 1, jjp1
+        
+        do jj = 1, jjp1
         do ii = 1, iip1
           rlong(ii,jj) = rlonu(ii) * 180. / pi
@@ -164,5 +164,5 @@
      .             1, iip1, 1, jjn,tau0, zjulian, tstep, vhoriid,
      .             filevid,dynv_domain_id)
-	
+        
       rl(1,1) = 1.
       
@@ -190,5 +190,5 @@
       call histhori(fileid, iip1, rlong(:,jjb:jje),jjn,rlat(:,jjb:jje),
      .             'scalar','Grille points scalaires', thoriid)
-	
+        
 C
 C  Appel a histvert pour la grille verticale
@@ -210,6 +210,6 @@
 C
 C  Appels a histdef pour la definition des variables a sauvegarder
-	
-	CALL histdef(fileid, "phis", "Surface geop. height", "-",
+        
+        CALL histdef(fileid, "phis", "Surface geop. height", "-",
      .                iip1,jjn,thoriid, 1,1,1, -99, 32,
      .                "once", t_ops, t_wrt)
@@ -218,8 +218,8 @@
      .                iip1,jjn,thoriid, 1,1,1, -99, 32,
      .                "once", t_ops, t_wrt)
-	
+        
         if (mpi_rank==0) then
-	
-	CALL histdef(filedid, "dtvr", "tps dyn", "s",
+        
+        CALL histdef(filedid, "dtvr", "tps dyn", "s",
      .                1,1,dhoriid, 1,1,1, -99, 32,
      .                "once", t_ops, t_wrt)
@@ -288,5 +288,5 @@
         if (mpi_rank==0) call histsync(filedid)
       endif
-	
+        
 #else
       write(lunout,*)'initfluxsto_p: Needs IOIPSL to function'
Index: /LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F	(revision 2600)
@@ -15,4 +15,6 @@
      &                        dynhist_file,dynhistv_file,dynhistu_file
        USE comconst_mod, ONLY: pi
+       USE comvert_mod, ONLY: presnivs
+       
        implicit none
 
@@ -43,5 +45,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
       include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3dmem/integrd_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/integrd_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/integrd_loc.F	(revision 2600)
@@ -13,4 +13,6 @@
       USE infotrac, ONLY: ok_iso_verif ! ajout CRisi
       USE comconst_mod, ONLY: pi
+      USE comvert_mod, ONLY: ap, bp
+      
       IMPLICIT NONE
 
@@ -34,5 +36,4 @@
       include "paramet.h"
       include "comgeom.h"
-      include "comvert.h"
       include "logic.h"
       include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3dmem/leapfrog_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/leapfrog_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/leapfrog_loc.F	(revision 2600)
@@ -33,4 +33,6 @@
        use exner_milieu_loc_m, only: exner_milieu_loc
        USE comconst_mod, ONLY: cpp, dtvr, ihf
+       USE comvert_mod, ONLY: ap, bp, pressure_exner
+       
       IMPLICIT NONE
 
@@ -69,5 +71,4 @@
       include "paramet.h"
       include "comdissnew.h"
-      include "comvert.h"
       include "comgeom.h"
       include "logic.h"
@@ -1632,5 +1633,5 @@
             IF( MOD(itau,iecri).EQ.0) THEN
              ! Ehouarn: output only during LF or Backward Matsuno
-	     if (leapf.or.(.not.leapf.and.(.not.forward))) then
+             if (leapf.or.(.not.leapf.and.(.not.forward))) then
 
 c$OMP BARRIER
@@ -1642,5 +1643,5 @@
 #ifdef CPP_IOIPSL
              if (ok_dyn_ins) then
-	         CALL writehist_loc(itau,vcov,ucov,teta,pk,phi,q,
+                 CALL writehist_loc(itau,vcov,ucov,teta,pk,phi,q,
      &                              masse,ps,phis)
              endif
Index: /LMDZ5/trunk/libf/dyn3dmem/qminimum_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/qminimum_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/qminimum_loc.F	(revision 2600)
@@ -7,7 +7,6 @@
 c             pour l'eau vapeur et l'eau liquide
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
+      include "dimensions.h"
+      include "paramet.h"
 c
       INTEGER nqtot ! CRisi: on remplace nq par nqtot
Index: /LMDZ5/trunk/libf/dyn3dmem/sw_case_williamson91_6_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/sw_case_williamson91_6_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/sw_case_williamson91_6_loc.F	(revision 2600)
@@ -28,4 +28,5 @@
       USE parallel_lmdz
       USE comconst_mod, ONLY: cpp, omeg, rad
+      USE comvert_mod, ONLY: ap, bp, preff
 
       IMPLICIT NONE
@@ -36,5 +37,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
       include "iniprint.h"
Index: /LMDZ5/trunk/libf/dyn3dmem/top_bound_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/top_bound_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/top_bound_loc.F	(revision 2600)
@@ -6,9 +6,10 @@
       USE comconst_mod, ONLY: iflag_top_bound, mode_top_bound,
      &                        tau_top_bound
+      USE comvert_mod, ONLY: presnivs, preff, scaleheight
+
       IMPLICIT NONE
 c
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom2.h"
 
Index: /LMDZ5/trunk/libf/dyn3dmem/vitvert_loc.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/vitvert_loc.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/vitvert_loc.F90	(revision 2600)
@@ -6,8 +6,9 @@
 ! Purpose: Compute vertical speed at sigma levels.
   USE parallel_lmdz
+  USE comvert_mod, ONLY: bp
+  
   IMPLICIT NONE
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ5/trunk/libf/dyn3dmem/vlsplt_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/vlsplt_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/vlsplt_loc.F	(revision 2600)
@@ -20,5 +20,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
 c
 c
@@ -422,5 +421,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
       include "comgeom.h"
 c
@@ -877,5 +875,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
 c
 c
Index: /LMDZ5/trunk/libf/dyn3dmem/vlspltgen_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/vlspltgen_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/vlspltgen_loc.F	(revision 2600)
@@ -38,5 +38,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
 
 c
Index: /LMDZ5/trunk/libf/dyn3dmem/vlspltqs_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/vlspltqs_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/vlspltqs_loc.F	(revision 2600)
@@ -15,5 +15,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
 c
 c
@@ -173,9 +172,9 @@
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
         DO l=1,llm 
-	  iadvplus(ip1jm+1:ip1jmp1,l)=0
+          iadvplus(ip1jm+1:ip1jmp1,l)=0
         ENDDO
 c$OMP END DO NOWAIT
       endif
-      	
+              
 c   calcul des flux a gauche et a droite
 
@@ -413,5 +412,5 @@
 c    ********************************************************************
 c     q,masse_adv_v,w sont des arguments d'entree  pour le s-pg ....
-c     qsat 	       est   un argument de sortie pour le s-pg ....
+c     qsat                est   un argument de sortie pour le s-pg ....
 c
 c
@@ -425,5 +424,4 @@
       include "paramet.h"
       include "logic.h"
-      include "comvert.h"
       include "comgeom.h"
 c
@@ -581,5 +579,5 @@
          dyq(ij,l)=fn*dyq(ij,l)
         ENDDO
-	  
+          
       ENDIF
       
@@ -602,5 +600,5 @@
         ENDDO
         
-c   calcul des pentes limites aux poles	
+c   calcul des pentes limites aux poles        
         fs=1.
         DO ij=1,iim
@@ -613,5 +611,5 @@
          dyq(ip1jm+ij,l)=fs*dyq(ip1jm+ij,l)
         ENDDO
-	
+        
       ENDIF
 
@@ -778,10 +776,10 @@
               masse(ij,l,iq)=newmasse
            ENDDO
-	 
-	 ENDIF
          
-	 IF (pole_sud) THEN
-	 
-	   convps  = -SSUM(iim,qbyv(ip1jm-iim,l,iq),iq,1)/apols
+         ENDIF
+         
+         IF (pole_sud) THEN
+         
+           convps  = -SSUM(iim,qbyv(ip1jm-iim,l,iq),iq,1)/apols
            convmps = -SSUM(iim,masse_adv_v(ip1jm-iim,l),1)/apols
            DO ij = ip1jm+1,ip1jmp1
@@ -791,6 +789,6 @@
               masse(ij,l,iq)=newmasse
            ENDDO
-	 
-	 ENDIF
+         
+         ENDIF
 c.-. fin ancienne version
 
Index: /LMDZ5/trunk/libf/dyn3dmem/writedynav_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/writedynav_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/writedynav_loc.F	(revision 2600)
@@ -44,5 +44,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
       include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3dmem/writehist_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dmem/writehist_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dmem/writehist_loc.F	(revision 2600)
@@ -44,5 +44,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "comvert.h"
       include "comgeom.h"
       include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3dpar/advect_new_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/advect_new_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/advect_new_p.F	(revision 2600)
@@ -29,5 +29,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom.h"
 #include "logic.h"
Index: /LMDZ5/trunk/libf/dyn3dpar/advect_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/advect_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/advect_p.F	(revision 2600)
@@ -28,5 +28,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom.h"
 #include "logic.h"
@@ -86,5 +85,5 @@
                   
            uav(ij,l)=0.25*(ucov(ij,l)+ucov(ij-iip1,l))
-     .	             +0.25*(ucov(ij+iip1,l)+ucov(ij,l))
+     .                     +0.25*(ucov(ij+iip1,l)+ucov(ij,l))
          ENDDO
          
Index: /LMDZ5/trunk/libf/dyn3dpar/advtrac_p.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/advtrac_p.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/advtrac_p.F90	(revision 2600)
@@ -24,5 +24,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
   include "comdissip.h"
   include "comgeom2.h"
Index: /LMDZ5/trunk/libf/dyn3dpar/bilan_dyn_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/bilan_dyn_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/bilan_dyn_p.F	(revision 2600)
@@ -18,9 +18,10 @@
       use write_field_p
       USE comconst_mod, ONLY: cpp, pi
+      USE comvert_mod, ONLY: presnivs
+      
       IMPLICIT NONE
 
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom2.h"
 #include "temps.h"
@@ -202,7 +203,7 @@
 
 !        if (i_sortie.eq.1) then
-!	 file='dynzon'
+!         file='dynzon'
 !         if (mpi_rank==0) then
-!	 call inigrads(ifile,1
+!         call inigrads(ifile,1
 !     s  ,0.,180./pi,0.,0.,jjm,rlatv,-90.,90.,180./pi
 !     s  ,llm,presnivs,1.
@@ -568,5 +569,5 @@
         do l=1,llm
           Q_cum(:,jjb:jje,l,iQ)=Q_cum(:,jjb:jje,l,iQ) 
-     .	                        /masse_cum(:,jjb:jje,l)
+     .                                /masse_cum(:,jjb:jje,l)
         enddo
 !$OMP ENDDO NOWAIT 
Index: /LMDZ5/trunk/libf/dyn3dpar/caldyn_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/caldyn_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/caldyn_p.F	(revision 2600)
@@ -10,4 +10,5 @@
       USE parallel_lmdz
       USE Write_Field_p
+      USE comvert_mod, ONLY: ap, bp
       
       IMPLICIT NONE
@@ -31,5 +32,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom.h"
 
Index: /LMDZ5/trunk/libf/dyn3dpar/convmas1_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/convmas1_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/convmas1_p.F	(revision 2600)
@@ -32,5 +32,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "logic.h"
 
Index: /LMDZ5/trunk/libf/dyn3dpar/convmas2_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/convmas2_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/convmas2_p.F	(revision 2600)
@@ -32,5 +32,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "logic.h"
 
Index: /LMDZ5/trunk/libf/dyn3dpar/convmas_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/convmas_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/convmas_p.F	(revision 2600)
@@ -32,5 +32,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "logic.h"
 
Index: /LMDZ5/trunk/libf/dyn3dpar/dudv2_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/dudv2_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/dudv2_p.F	(revision 2600)
@@ -25,5 +25,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 
       REAL teta( ip1jmp1,llm ),pkf( ip1jmp1,llm ) ,bern( ip1jmp1,llm ),
Index: /LMDZ5/trunk/libf/dyn3dpar/dynetat0.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/dynetat0.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/dynetat0.F	(revision 2600)
@@ -9,6 +9,8 @@
 
       use control_mod, only : planet_type
+      USE comvert_mod, ONLY: pa,preff
       USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa,
      &                        lllm, omeg, rad
+
       USE serre_mod, ONLY: clon,clat,grossismx,grossismy
 
@@ -33,5 +35,4 @@
 #include "paramet.h"
 #include "temps.h"
-#include "comvert.h"
 #include "comgeom2.h"
 #include "ener.h"
Index: /LMDZ5/trunk/libf/dyn3dpar/dynredem.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/dynredem.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/dynredem.F	(revision 2600)
@@ -9,4 +9,6 @@
       USE infotrac
       use netcdf95, only: NF95_PUT_VAR
+      USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt,pa,preff,
+     &                        nivsig,nivsigs
       USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
       USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy,
@@ -21,5 +23,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom2.h"
 #include "temps.h"
@@ -481,5 +482,4 @@
 #include "description.h"
 #include "netcdf.inc"
-#include "comvert.h"
 #include "comgeom.h"
 #include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3dpar/dynredem_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/dynredem_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/dynredem_p.F	(revision 2600)
@@ -10,4 +10,6 @@
       USE infotrac
       use netcdf95, only: NF95_PUT_VAR
+      USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt,pa,preff,
+     &                        nivsig,nivsigs
       USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
       USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy,
@@ -22,5 +24,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom2.h"
 #include "temps.h"
@@ -482,5 +483,4 @@
 #include "description.h"
 #include "netcdf.inc"
-#include "comvert.h"
 #include "comgeom.h"
 #include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3dpar/exner_hyb_p_m.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/exner_hyb_p_m.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/exner_hyb_p_m.F90	(revision 2600)
@@ -34,9 +34,9 @@
     USE parallel_lmdz
     USE comconst_mod, ONLY: cpp, kappa, r, jmp1
+    USE comvert_mod, ONLY: preff
     !
     include "dimensions.h"
     include "paramet.h"
     include "comgeom.h"
-    include "comvert.h"
 
     INTEGER  ngrid
Index: /LMDZ5/trunk/libf/dyn3dpar/exner_milieu_p_m.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/exner_milieu_p_m.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/exner_milieu_p_m.F90	(revision 2600)
@@ -31,9 +31,9 @@
     USE parallel_lmdz
     USE comconst_mod, ONLY: cpp, kappa, r, jmp1
+    USE comvert_mod, ONLY: preff
     !
     include "dimensions.h"
     include "paramet.h"
     include "comgeom.h"
-    include "comvert.h"
 
     INTEGER  ngrid
Index: /LMDZ5/trunk/libf/dyn3dpar/fluxstokenc_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/fluxstokenc_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/fluxstokenc_p.F	(revision 2600)
@@ -21,5 +21,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom.h"
 #include "tracstoke.h"
Index: /LMDZ5/trunk/libf/dyn3dpar/gcm.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/gcm.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/gcm.F	(revision 2600)
@@ -68,5 +68,4 @@
 #include "paramet.h"
 #include "comdissnew.h"
-#include "comvert.h"
 #include "comgeom.h"
 #include "logic.h"
Index: /LMDZ5/trunk/libf/dyn3dpar/geopot_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/geopot_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/geopot_p.F	(revision 2600)
@@ -28,5 +28,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 
 c   Arguments:
Index: /LMDZ5/trunk/libf/dyn3dpar/groupe_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/groupe_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/groupe_p.F	(revision 2600)
@@ -18,5 +18,4 @@
 #include "paramet.h"
 #include "comgeom2.h"
-#include "comvert.h"
 
 !     integer ngroup
Index: /LMDZ5/trunk/libf/dyn3dpar/guide_p_mod.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/guide_p_mod.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/guide_p_mod.F90	(revision 2600)
@@ -340,4 +340,5 @@
     USE control_mod
     USE comconst_mod, ONLY: daysec, dtvr, cpp, kappa
+    USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
     
     IMPLICIT NONE
@@ -345,5 +346,4 @@
     INCLUDE "dimensions.h"
     INCLUDE "paramet.h"
-    INCLUDE "comvert.h"
 
     ! Variables entree
@@ -707,9 +707,9 @@
   USE Bands
   USE comconst_mod, ONLY: cpp, kappa
+  USE comvert_mod, ONLY: preff, pressure_exner, bp, ap
   IMPLICIT NONE
 
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
   include "comgeom2.h"
 
@@ -1814,4 +1814,5 @@
     USE parallel_lmdz
     USE comconst_mod, ONLY: pi
+    USE comvert_mod, ONLY: presnivs
     IMPLICIT NONE
 
@@ -1820,5 +1821,4 @@
     INCLUDE "netcdf.inc"
     INCLUDE "comgeom2.h"
-    INCLUDE "comvert.h"
     
     ! Variables entree
Index: /LMDZ5/trunk/libf/dyn3dpar/iniacademic.F90
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/iniacademic.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/iniacademic.F90	(revision 2600)
@@ -17,4 +17,5 @@
   use exner_milieu_m, only: exner_milieu
   USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
+  USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -29,5 +30,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comvert.h"
   include "comgeom.h"
   include "academic.h"
Index: /LMDZ5/trunk/libf/dyn3dpar/initdynav_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/initdynav_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/initdynav_p.F	(revision 2600)
@@ -13,4 +13,5 @@
        USE infotrac
        USE comconst_mod, ONLY: pi
+       USE comvert_mod, ONLY: nivsigs
 
       implicit none
@@ -44,5 +45,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom.h"
 #include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3dpar/initfluxsto_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/initfluxsto_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/initfluxsto_p.F	(revision 2600)
@@ -14,4 +14,5 @@
        use misc_mod
        USE comconst_mod, ONLY: pi
+       USE comvert_mod, ONLY: nivsigs
        
       implicit none
@@ -46,5 +47,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom.h"
 #include "temps.h"
@@ -105,6 +105,6 @@
       CALL ymds2ju(zan, 1, idayref, 0.0, zjulian)
       tau0 = itau_dyn
-	
-	do jj = 1, jjp1
+        
+        do jj = 1, jjp1
         do ii = 1, iip1
           rlong(ii,jj) = rlonu(ii) * 180. / pi
@@ -164,6 +164,6 @@
      .             1, iip1, 1, jjn,tau0, zjulian, tstep, vhoriid,
      .             filevid,dynv_domain_id)
-	
-      rl(1,1) = 1.	
+        
+      rl(1,1) = 1.        
       
       if (mpi_rank==0) then
@@ -190,5 +190,5 @@
       call histhori(fileid, iip1, rlong(:,jjb:jje),jjn,rlat(:,jjb:jje),
      .             'scalar','Grille points scalaires', thoriid)
-	
+        
 C
 C  Appel a histvert pour la grille verticale
@@ -210,6 +210,6 @@
 C
 C  Appels a histdef pour la definition des variables a sauvegarder
-	
-	CALL histdef(fileid, "phis", "Surface geop. height", "-",
+        
+        CALL histdef(fileid, "phis", "Surface geop. height", "-",
      .                iip1,jjn,thoriid, 1,1,1, -99, 32,
      .                "once", t_ops, t_wrt)
@@ -218,8 +218,8 @@
      .                iip1,jjn,thoriid, 1,1,1, -99, 32,
      .                "once", t_ops, t_wrt)
-	
+        
         if (mpi_rank==0) then
-	
-	CALL histdef(filedid, "dtvr", "tps dyn", "s",
+        
+        CALL histdef(filedid, "dtvr", "tps dyn", "s",
      .                1,1,dhoriid, 1,1,1, -99, 32,
      .                "once", t_ops, t_wrt)
@@ -288,5 +288,5 @@
         if (mpi_rank==0) call histsync(filedid)
       endif
-	
+        
 #else
       write(lunout,*)'initfluxsto_p: Needs IOIPSL to function'
Index: /LMDZ5/trunk/libf/dyn3dpar/inithist_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/inithist_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/inithist_p.F	(revision 2600)
@@ -14,4 +14,5 @@
        USE infotrac
        USE comconst_mod, ONLY: pi
+       USE comvert_mod, ONLY: nivsigs
 
       implicit none
@@ -46,5 +47,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom.h"
 #include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3dpar/integrd_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/integrd_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/integrd_p.F	(revision 2600)
@@ -8,4 +8,5 @@
       USE control_mod, only : planet_type
       USE comconst_mod, ONLY: pi
+      USE comvert_mod, ONLY: ap, bp
       IMPLICIT NONE
 
@@ -29,5 +30,4 @@
 #include "paramet.h"
 #include "comgeom.h"
-#include "comvert.h"
 #include "logic.h"
 #include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F	(revision 2600)
@@ -28,4 +28,5 @@
      &                       periodav, ok_dyn_ave, output_grads_dyn,
      &                       iapp_tracvl
+       USE comvert_mod, ONLY: ap,bp,pressure_exner,presnivs
        USE comconst_mod, ONLY: cpp, dtvr, ihf, dtphys, pi, jmp1
       IMPLICIT NONE
@@ -65,5 +66,4 @@
 #include "paramet.h"
 #include "comdissnew.h"
-#include "comvert.h"
 #include "comgeom.h"
 #include "logic.h"
@@ -1454,15 +1454,15 @@
                 call Gather_Field(teta,ip1jmp1,llm,0)
                 call Gather_Field(pk,ip1jmp1,llm,0)
-		call Gather_Field(phi,ip1jmp1,llm,0)
+                call Gather_Field(phi,ip1jmp1,llm,0)
                 do iq=1,nqtot
                   call Gather_Field(q(1,1,iq),ip1jmp1,llm,0)
                 enddo
-		call Gather_Field(masse,ip1jmp1,llm,0)
+                call Gather_Field(masse,ip1jmp1,llm,0)
                 call Gather_Field(ps,ip1jmp1,1,0)
-		call Gather_Field(phis,ip1jmp1,1,0)
+                call Gather_Field(phis,ip1jmp1,1,0)
                 if (mpi_rank==0) then
                  CALL writedynav(itau,vcov,
      &                 ucov,teta,pk,phi,q,masse,ps,phis)
-		endif
+                endif
 #endif
 !$OMP END MASTER
@@ -1476,5 +1476,5 @@
             IF( MOD(itau,iecri).EQ.0) THEN
              ! Ehouarn: output only during LF or Backward Matsuno
-	     if (leapf.or.(.not.leapf.and.(.not.forward))) then
+             if (leapf.or.(.not.leapf.and.(.not.forward))) then
 c$OMP BARRIER
 c$OMP MASTER
@@ -1514,14 +1514,14 @@
                 call Gather_Field(ucov,ip1jmp1,llm,0)
                 call Gather_Field(teta,ip1jmp1,llm,0)
-		call Gather_Field(phi,ip1jmp1,llm,0)
+                call Gather_Field(phi,ip1jmp1,llm,0)
                 do iq=1,nqtot
                   call Gather_Field(q(1,1,iq),ip1jmp1,llm,0)
                 enddo
-		call Gather_Field(masse,ip1jmp1,llm,0)
+                call Gather_Field(masse,ip1jmp1,llm,0)
                 call Gather_Field(ps,ip1jmp1,1,0)
-		call Gather_Field(phis,ip1jmp1,1,0)
+                call Gather_Field(phis,ip1jmp1,1,0)
                 if (mpi_rank==0) then
-	         CALL writehist(itau,vcov,ucov,teta,phi,q,masse,ps,phis)
-		endif
+                 CALL writehist(itau,vcov,ucov,teta,phi,q,masse,ps,phis)
+                endif
 !              CALL writehist_p(histid,histvid, itau,vcov, 
 !     &                         ucov,teta,phi,q,masse,ps,phis)
@@ -1649,15 +1649,15 @@
                 call Gather_Field(teta,ip1jmp1,llm,0)
                 call Gather_Field(pk,ip1jmp1,llm,0)
-		call Gather_Field(phi,ip1jmp1,llm,0)
+                call Gather_Field(phi,ip1jmp1,llm,0)
                 do iq=1,nqtot
                   call Gather_Field(q(1,1,iq),ip1jmp1,llm,0)
                 enddo
-		call Gather_Field(masse,ip1jmp1,llm,0)
+                call Gather_Field(masse,ip1jmp1,llm,0)
                 call Gather_Field(ps,ip1jmp1,1,0)
-		call Gather_Field(phis,ip1jmp1,1,0)
+                call Gather_Field(phis,ip1jmp1,1,0)
                 if (mpi_rank==0) then
                  CALL writedynav(itau,vcov,
      &                 ucov,teta,pk,phi,q,masse,ps,phis)
-		endif
+                endif
 #endif
 !$OMP END MASTER
@@ -1705,14 +1705,14 @@
                 call Gather_Field(ucov,ip1jmp1,llm,0)
                 call Gather_Field(teta,ip1jmp1,llm,0)
-		call Gather_Field(phi,ip1jmp1,llm,0)
+                call Gather_Field(phi,ip1jmp1,llm,0)
                 do iq=1,nqtot
                   call Gather_Field(q(1,1,iq),ip1jmp1,llm,0)
                 enddo
-		call Gather_Field(masse,ip1jmp1,llm,0)
+                call Gather_Field(masse,ip1jmp1,llm,0)
                 call Gather_Field(ps,ip1jmp1,1,0)
-		call Gather_Field(phis,ip1jmp1,1,0)
+                call Gather_Field(phis,ip1jmp1,1,0)
                 if (mpi_rank==0) then
                  CALL writehist(itau,vcov,ucov,teta,phi,q,masse,ps,phis)
-		endif
+                endif
 !                CALL writehist_p(histid, histvid, itau,vcov , 
 !     &                           ucov,teta,phi,q,masse,ps,phis)
Index: /LMDZ5/trunk/libf/dyn3dpar/qminimum_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/qminimum_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/qminimum_p.F	(revision 2600)
@@ -8,5 +8,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 c
       INTEGER nq
Index: /LMDZ5/trunk/libf/dyn3dpar/sw_case_williamson91_6.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/sw_case_williamson91_6.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/sw_case_williamson91_6.F	(revision 2600)
@@ -27,4 +27,6 @@
 c=======================================================================
       USE comconst_mod, ONLY: cpp, omeg, rad
+      USE comvert_mod, ONLY: ap, bp, preff
+      
       IMPLICIT NONE
 c-----------------------------------------------------------------------
@@ -34,5 +36,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom.h"
 #include "iniprint.h"
Index: /LMDZ5/trunk/libf/dyn3dpar/top_bound_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/top_bound_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/top_bound_p.F	(revision 2600)
@@ -6,9 +6,10 @@
       USE comconst_mod, ONLY: iflag_top_bound, mode_top_bound,
      &                        tau_top_bound
+      USE comvert_mod, ONLY: presnivs, preff, scaleheight
+      
       IMPLICIT NONE
 c
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom2.h"
 
@@ -70,5 +71,5 @@
       REAL uzon(jjp1,llm),vzon(jjm,llm),tzon(jjp1,llm)
       
-      integer i	
+      integer i
       REAL,SAVE :: rdamp(llm) ! quenching coefficient
       real,save :: lambda(llm) ! inverse or quenching time scale (Hz)
Index: /LMDZ5/trunk/libf/dyn3dpar/vitvert_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/vitvert_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/vitvert_p.F	(revision 2600)
@@ -2,4 +2,6 @@
 c
       USE parallel_lmdz
+      USE comvert_mod, ONLY: bp
+      
       IMPLICIT NONE
 
@@ -28,5 +30,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 
       REAL w(ip1jmp1,llm),convm(ip1jmp1,llm)
Index: /LMDZ5/trunk/libf/dyn3dpar/vlsplt_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/vlsplt_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/vlsplt_p.F	(revision 2600)
@@ -26,5 +26,4 @@
 #include "paramet.h"
 #include "logic.h"
-#include "comvert.h"
 
 c
@@ -208,5 +207,4 @@
 #include "paramet.h"
 #include "logic.h"
-#include "comvert.h"
 c
 c
@@ -543,5 +541,4 @@
 #include "paramet.h"
 #include "logic.h"
-#include "comvert.h"
 #include "comgeom.h"
 c
@@ -931,5 +928,4 @@
 #include "paramet.h"
 #include "logic.h"
-#include "comvert.h"
 c
 c
Index: /LMDZ5/trunk/libf/dyn3dpar/vlspltgen_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/vlspltgen_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/vlspltgen_p.F	(revision 2600)
@@ -34,5 +34,4 @@
 #include "paramet.h"
 #include "logic.h"
-#include "comvert.h"
 
 c
@@ -105,11 +104,11 @@
 
         
-	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,17 +190,17 @@
 
         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,5 +214,5 @@
           call VTe(VTHallo)
 c$OMP END MASTER
-	else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
 
 #ifdef _ADV_HALO           
@@ -239,6 +238,6 @@
 c$OMP END MASTER 
         else
-	
-	  stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -261,8 +260,8 @@
 
         if(iadv(iq) == 0) then
-	
-	  cycle 
-	
-	else if (iadv(iq)==10) then
+        
+          cycle 
+        
+        else if (iadv(iq)==10) then
 
 #ifdef _ADV_HALLO
@@ -270,5 +269,5 @@
      &               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,6 +275,6 @@
 #endif    
         else
-	
-	  stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -301,18 +300,18 @@
 
         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,8 +323,8 @@
 
         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,9 +349,9 @@
 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,5 +368,5 @@
 c$OMP MASTER
       call VTe(VTHallo)
-c$OMP END MASTER	
+c$OMP END MASTER        
 
 c$OMP BARRIER
@@ -375,8 +374,8 @@
 
         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,6 +387,6 @@
 c$OMP BARRIER        
         else
-	
-	  stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -414,18 +413,18 @@
 
         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,13 +435,13 @@
 
         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,5 +449,5 @@
  
         else
-	
+        
           stop 'vlspltgen_p : schema non parallelise'
       
@@ -469,6 +468,6 @@
            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
Index: /LMDZ5/trunk/libf/dyn3dpar/vlspltqs_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/vlspltqs_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/vlspltqs_p.F	(revision 2600)
@@ -32,5 +32,4 @@
 #include "paramet.h"
 #include "logic.h"
-#include "comvert.h"
 
 c
@@ -237,5 +236,4 @@
 #include "paramet.h"
 #include "logic.h"
-#include "comvert.h"
 c
 c
@@ -589,5 +587,4 @@
 #include "paramet.h"
 #include "logic.h"
-#include "comvert.h"
 #include "comgeom.h"
 c
Index: /LMDZ5/trunk/libf/dyn3dpar/writedynav_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/writedynav_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/writedynav_p.F	(revision 2600)
@@ -43,5 +43,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom.h"
 #include "temps.h"
Index: /LMDZ5/trunk/libf/dyn3dpar/writehist_p.F
===================================================================
--- /LMDZ5/trunk/libf/dyn3dpar/writehist_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dyn3dpar/writehist_p.F	(revision 2600)
@@ -43,5 +43,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom.h"
 #include "temps.h"
Index: /LMDZ5/trunk/libf/dynphy_lonlat/calfis.F
===================================================================
--- /LMDZ5/trunk/libf/dynphy_lonlat/calfis.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dynphy_lonlat/calfis.F	(revision 2600)
@@ -35,4 +35,5 @@
 #endif 
       USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, kappa, pi
+      USE comvert_mod, ONLY: preff, presnivs
       
       IMPLICIT NONE
@@ -90,14 +91,13 @@
 c    ------------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "temps.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "temps.h"
 
       INTEGER ngridmx
       PARAMETER( ngridmx = 2+(jjm-1)*iim - 1/jjm   )
 
-#include "comvert.h"
-#include "comgeom2.h"
-#include "iniprint.h"
+      include "comgeom2.h"
+      include "iniprint.h"
 
 c    Arguments :
Index: /LMDZ5/trunk/libf/dynphy_lonlat/calfis_loc.F
===================================================================
--- /LMDZ5/trunk/libf/dynphy_lonlat/calfis_loc.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dynphy_lonlat/calfis_loc.F	(revision 2600)
@@ -50,4 +50,5 @@
       USE callphysiq_mod, ONLY: call_physiq
 #endif 
+      USE comvert_mod, ONLY: preff, presnivs
       USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, kappa, pi
 
@@ -115,5 +116,4 @@
       PARAMETER( ngridmx = 2+(jjm-1)*iim - 1/jjm   )
 
-      include "comvert.h"
       include "comgeom2.h"
       include "iniprint.h"
@@ -277,5 +277,5 @@
       ALLOCATE(flxwfi(klon,llm))
 c$OMP END MASTER
-c$OMP BARRIER	  
+c$OMP BARRIER          
       ELSE
           debut = .FALSE.
@@ -365,5 +365,5 @@
            enddo
          ENDDO
-c$OMP END DO NOWAIT	 
+c$OMP END DO NOWAIT         
       ENDDO
 
@@ -382,5 +382,5 @@
            enddo
          ENDDO
-c$OMP END DO NOWAIT	 
+c$OMP END DO NOWAIT         
 
 c      CALL gr_dyn_fi_p(llm,iip1,jjp1,klon,pphi,zphi)
@@ -403,7 +403,7 @@
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
       DO l=1,llm
-	 DO ig=1,klon
-	   zphi(ig,l)=zphi(ig,l)-zphis(ig)
-	 ENDDO
+         DO ig=1,klon
+           zphi(ig,l)=zphi(ig,l)-zphis(ig)
+         ENDDO
       ENDDO
 c$OMP END DO NOWAIT
@@ -532,10 +532,10 @@
            DO i=2,iim
              z1(i)   =(rlonu(i)-rlonu(i-1))*pvcov(i,jjm,l)/cv(i,jjm)
-	   ENDDO
+           ENDDO
   
            DO i=1,iim
               zcos(i)    = COS(rlonv(i))*z1(i)
               zsin(i)    = SIN(rlonv(i))*z1(i)
-	   ENDDO
+           ENDDO
   
            zufi(klon,l)  = SSUM(iim,zcos,1)/pi
@@ -590,8 +590,8 @@
         allocate(zdpsrf_omp(klon))
         allocate(flxwfi_omp(klon,llm))
-	first_omp=.false.
+        first_omp=.false.
       endif
        
-	   
+           
       klon=klon_omp
       offset=klon_omp_begin-1
@@ -600,88 +600,88 @@
         do i=1,klon
           zplev_omp(i,l)=zplev(offset+i,l)
-	enddo 
-      enddo
-	  
+        enddo 
+      enddo
+          
        do l=1,llm
         do i=1,klon  
-	  zplay_omp(i,l)=zplay(offset+i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zphi_omp(i,l)=zphi(offset+i,l)
-	enddo 
-      enddo
-	
+          zplay_omp(i,l)=zplay(offset+i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zphi_omp(i,l)=zphi(offset+i,l)
+        enddo 
+      enddo
+        
       do i=1,klon
-	zphis_omp(i)=zphis(offset+i)
+        zphis_omp(i)=zphis(offset+i)
       enddo 
      
-	
+        
       do l=1,llm
         presnivs_omp(l)=presnivs(l)
       enddo 
-	
-      do l=1,llm
-        do i=1,klon
-	  zufi_omp(i,l)=zufi(offset+i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zvfi_omp(i,l)=zvfi(offset+i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zrfi_omp(i,l)=zrfi(offset+i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  ztfi_omp(i,l)=ztfi(offset+i,l)
-	enddo 
-      enddo
-	
+        
+      do l=1,llm
+        do i=1,klon
+          zufi_omp(i,l)=zufi(offset+i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zvfi_omp(i,l)=zvfi(offset+i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zrfi_omp(i,l)=zrfi(offset+i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          ztfi_omp(i,l)=ztfi(offset+i,l)
+        enddo 
+      enddo
+        
       do iq=1,nqtot
         do l=1,llm
           do i=1,klon
             zqfi_omp(i,l,iq)=zqfi(offset+i,l,iq)
-	  enddo
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zdufi_omp(i,l)=zdufi(offset+i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zdvfi_omp(i,l)=zdvfi(offset+i,l)
-	enddo 
-      enddo
-	
+          enddo
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zdufi_omp(i,l)=zdufi(offset+i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zdvfi_omp(i,l)=zdvfi(offset+i,l)
+        enddo 
+      enddo
+        
       do l=1,llm
         do i=1,klon
           zdtfi_omp(i,l)=zdtfi(offset+i,l)
-	enddo 
-      enddo
-	
+        enddo 
+      enddo
+        
       do iq=1,nqtot
         do l=1,llm
           do i=1,klon
-	    zdqfi_omp(i,l,iq)=zdqfi(offset+i,l,iq)
-	  enddo 
+            zdqfi_omp(i,l,iq)=zdqfi(offset+i,l,iq)
+          enddo 
         enddo
       enddo
-      	
+              
       do i=1,klon
-	zdpsrf_omp(i)=zdpsrf(offset+i)
+        zdpsrf_omp(i)=zdpsrf(offset+i)
       enddo 
 
@@ -689,5 +689,5 @@
         do i=1,klon
           flxwfi_omp(i,l)=flxwfi(offset+i,l)
-	enddo 
+        enddo 
       enddo
       
@@ -749,83 +749,83 @@
         do i=1,klon
           zplev(offset+i,l)=zplev_omp(i,l)
-	enddo 
-      enddo
-	  
+        enddo 
+      enddo
+          
        do l=1,llm
         do i=1,klon  
-	  zplay(offset+i,l)=zplay_omp(i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zphi(offset+i,l)=zphi_omp(i,l)
-	enddo 
-      enddo
-	
+          zplay(offset+i,l)=zplay_omp(i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zphi(offset+i,l)=zphi_omp(i,l)
+        enddo 
+      enddo
+        
 
       do i=1,klon
-	zphis(offset+i)=zphis_omp(i)
+        zphis(offset+i)=zphis_omp(i)
       enddo 
      
-	
+        
       do l=1,llm
         presnivs(l)=presnivs_omp(l)
       enddo 
-	
-      do l=1,llm
-        do i=1,klon
-	  zufi(offset+i,l)=zufi_omp(i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zvfi(offset+i,l)=zvfi_omp(i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  ztfi(offset+i,l)=ztfi_omp(i,l)
-	enddo 
-      enddo
-	
+        
+      do l=1,llm
+        do i=1,klon
+          zufi(offset+i,l)=zufi_omp(i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zvfi(offset+i,l)=zvfi_omp(i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          ztfi(offset+i,l)=ztfi_omp(i,l)
+        enddo 
+      enddo
+        
       do iq=1,nqtot
         do l=1,llm
           do i=1,klon
             zqfi(offset+i,l,iq)=zqfi_omp(i,l,iq)
-	  enddo
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zdufi(offset+i,l)=zdufi_omp(i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zdvfi(offset+i,l)=zdvfi_omp(i,l)
-	enddo 
-      enddo
-	
+          enddo
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zdufi(offset+i,l)=zdufi_omp(i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zdvfi(offset+i,l)=zdvfi_omp(i,l)
+        enddo 
+      enddo
+        
       do l=1,llm
         do i=1,klon
           zdtfi(offset+i,l)=zdtfi_omp(i,l)
-	enddo 
-      enddo
-	
+        enddo 
+      enddo
+        
       do iq=1,nqtot
         do l=1,llm
           do i=1,klon
-	    zdqfi(offset+i,l,iq)=zdqfi_omp(i,l,iq)
-	  enddo 
+            zdqfi(offset+i,l,iq)=zdqfi_omp(i,l,iq)
+          enddo 
         enddo
       enddo
-      	
+              
       do i=1,klon
-	zdpsrf(offset+i)=zdpsrf_omp(i)
+        zdpsrf(offset+i)=zdpsrf_omp(i)
       enddo 
       
@@ -929,5 +929,5 @@
        
        if (.not. is_south_pole_dyn) then
-	 pdpsfi(:,jj_end:jj_end+1)=0
+         pdpsfi(:,jj_end:jj_end+1)=0
        endif
 c$OMP END MASTER
@@ -1045,5 +1045,5 @@
         pdqfi(:,jj_begin:jj_end,l,:)=0.
       ENDDO
-c$OMP END DO NOWAIT	 
+c$OMP END DO NOWAIT         
 
 C
@@ -1056,5 +1056,5 @@
 !CDIR ON_ADB(index_j) 
 !cdir NODEP           
-	     DO ig0=kstart,kend
+             DO ig0=kstart,kend
               i=index_i(ig0)
               j=index_j(ig0)
@@ -1062,19 +1062,19 @@
               if (i==1) pdqfi(iip1,j,l,iiq) = zdqfi(ig0,l,iq)
             ENDDO
-	    
-	    IF (is_north_pole_dyn) then
-	      DO i=1,iip1
+            
+            IF (is_north_pole_dyn) then
+              DO i=1,iip1
                 pdqfi(i,1,l,iiq)    = zdqfi(1,l,iq)
-	      ENDDO
-	    ENDIF
-	    
-	    IF (is_south_pole_dyn) then
-	      DO i=1,iip1
+              ENDDO
+            ENDIF
+            
+            IF (is_south_pole_dyn) then
+              DO i=1,iip1
                 pdqfi(i,jjp1,l,iiq) = zdqfi(klon,l,iq)
-	      ENDDO
-	    ENDIF
-	    
+              ENDDO
+            ENDIF
+            
          ENDDO
-c$OMP END DO NOWAIT	 
+c$OMP END DO NOWAIT         
       ENDDO
       
@@ -1136,6 +1136,6 @@
            pdvfi(i,j,l)=0.5*(zdvfi2(ig0,l)+zdvfi2(ig0+iim,l))*cv(i,j)
            if (i==1) pdvfi(iip1,j,l) = 0.5*(zdvfi2(ig0,l)+
-     $	                                    zdvfi2(ig0+iim,l))
-     $				          *cv(i,j)
+     $                                            zdvfi2(ig0+iim,l))
+     $                                          *cv(i,j)
         enddo
          
Index: /LMDZ5/trunk/libf/dynphy_lonlat/calfis_p.F
===================================================================
--- /LMDZ5/trunk/libf/dynphy_lonlat/calfis_p.F	(revision 2599)
+++ /LMDZ5/trunk/libf/dynphy_lonlat/calfis_p.F	(revision 2600)
@@ -47,4 +47,5 @@
       USE callphysiq_mod, ONLY: call_physiq
 #endif 
+      USE comvert_mod, ONLY: preff, presnivs
       USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, kappa, pi
 
@@ -111,5 +112,4 @@
       PARAMETER( ngridmx = 2+(jjm-1)*iim - 1/jjm   )
 
-#include "comvert.h"
 #include "comgeom2.h"
 #include "iniprint.h"
@@ -277,5 +277,5 @@
       ALLOCATE(flxwfi(klon,llm))
 c$OMP END MASTER
-c$OMP BARRIER	  
+c$OMP BARRIER          
       ELSE
           debut = .FALSE.
@@ -365,5 +365,5 @@
            enddo
          ENDDO
-c$OMP END DO NOWAIT	 
+c$OMP END DO NOWAIT         
       ENDDO
 
@@ -380,7 +380,7 @@
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
       DO l=1,llm
-	 DO ig=1,klon
-	   zphi(ig,l)=zphi(ig,l)-zphis(ig)
-	 ENDDO
+         DO ig=1,klon
+           zphi(ig,l)=zphi(ig,l)-zphis(ig)
+         ENDDO
       ENDDO
 c$OMP END DO NOWAIT
@@ -510,10 +510,10 @@
            DO i=2,iim
              z1(i)   =(rlonu(i)-rlonu(i-1))*pvcov(i,jjm,l)/cv(i,jjm)
-	   ENDDO
+           ENDDO
   
            DO i=1,iim
               zcos(i)    = COS(rlonv(i))*z1(i)
               zsin(i)    = SIN(rlonv(i))*z1(i)
-	   ENDDO
+           ENDDO
   
            zufi(klon,l)  = SSUM(iim,zcos,1)/pi
@@ -556,8 +556,8 @@
         allocate(zdpsrf_omp(klon))
         allocate(flxwfi_omp(klon,llm))
-	first_omp=.false.
+        first_omp=.false.
       endif
        
-	   
+           
       klon=klon_omp
       offset=klon_omp_begin-1
@@ -566,89 +566,89 @@
         do i=1,klon
           zplev_omp(i,l)=zplev(offset+i,l)
-	enddo 
-      enddo
-	  
+        enddo 
+      enddo
+          
        do l=1,llm
         do i=1,klon  
-	  zplay_omp(i,l)=zplay(offset+i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zphi_omp(i,l)=zphi(offset+i,l)
-	enddo 
-      enddo
-	
+          zplay_omp(i,l)=zplay(offset+i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zphi_omp(i,l)=zphi(offset+i,l)
+        enddo 
+      enddo
+        
       do i=1,klon
-	zphis_omp(i)=zphis(offset+i)
+        zphis_omp(i)=zphis(offset+i)
       enddo 
      
-	
+        
       do l=1,llm
         presnivs_omp(l)=presnivs(l)
       enddo 
-	
-      do l=1,llm
-        do i=1,klon
-	  zufi_omp(i,l)=zufi(offset+i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zvfi_omp(i,l)=zvfi(offset+i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zrfi_omp(i,l)=zrfi(offset+i,l)
-	enddo 
-      enddo
-	
-	
-      do l=1,llm
-        do i=1,klon
-	  ztfi_omp(i,l)=ztfi(offset+i,l)
-	enddo 
-      enddo
-	
+        
+      do l=1,llm
+        do i=1,klon
+          zufi_omp(i,l)=zufi(offset+i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zvfi_omp(i,l)=zvfi(offset+i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zrfi_omp(i,l)=zrfi(offset+i,l)
+        enddo 
+      enddo
+        
+        
+      do l=1,llm
+        do i=1,klon
+          ztfi_omp(i,l)=ztfi(offset+i,l)
+        enddo 
+      enddo
+        
       do iq=1,nqtot
         do l=1,llm
           do i=1,klon
             zqfi_omp(i,l,iq)=zqfi(offset+i,l,iq)
-	  enddo
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zdufi_omp(i,l)=zdufi(offset+i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zdvfi_omp(i,l)=zdvfi(offset+i,l)
-	enddo 
-      enddo
-	
+          enddo
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zdufi_omp(i,l)=zdufi(offset+i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zdvfi_omp(i,l)=zdvfi(offset+i,l)
+        enddo 
+      enddo
+        
       do l=1,llm
         do i=1,klon
           zdtfi_omp(i,l)=zdtfi(offset+i,l)
-	enddo 
-      enddo
-	
+        enddo 
+      enddo
+        
       do iq=1,nqtot
         do l=1,llm
           do i=1,klon
-	    zdqfi_omp(i,l,iq)=zdqfi(offset+i,l,iq)
-	  enddo 
+            zdqfi_omp(i,l,iq)=zdqfi(offset+i,l,iq)
+          enddo 
         enddo
       enddo
-      	
+              
       do i=1,klon
-	zdpsrf_omp(i)=zdpsrf(offset+i)
+        zdpsrf_omp(i)=zdpsrf(offset+i)
       enddo 
 
@@ -656,5 +656,5 @@
         do i=1,klon
           flxwfi_omp(i,l)=flxwfi(offset+i,l)
-	enddo 
+        enddo 
       enddo
       
@@ -713,83 +713,83 @@
         do i=1,klon
           zplev(offset+i,l)=zplev_omp(i,l)
-	enddo 
-      enddo
-	  
+        enddo 
+      enddo
+          
        do l=1,llm
         do i=1,klon  
-	  zplay(offset+i,l)=zplay_omp(i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zphi(offset+i,l)=zphi_omp(i,l)
-	enddo 
-      enddo
-	
+          zplay(offset+i,l)=zplay_omp(i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zphi(offset+i,l)=zphi_omp(i,l)
+        enddo 
+      enddo
+        
 
       do i=1,klon
-	zphis(offset+i)=zphis_omp(i)
+        zphis(offset+i)=zphis_omp(i)
       enddo 
      
-	
+        
       do l=1,llm
         presnivs(l)=presnivs_omp(l)
       enddo 
-	
-      do l=1,llm
-        do i=1,klon
-	  zufi(offset+i,l)=zufi_omp(i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zvfi(offset+i,l)=zvfi_omp(i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  ztfi(offset+i,l)=ztfi_omp(i,l)
-	enddo 
-      enddo
-	
+        
+      do l=1,llm
+        do i=1,klon
+          zufi(offset+i,l)=zufi_omp(i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zvfi(offset+i,l)=zvfi_omp(i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          ztfi(offset+i,l)=ztfi_omp(i,l)
+        enddo 
+      enddo
+        
       do iq=1,nqtot
         do l=1,llm
           do i=1,klon
             zqfi(offset+i,l,iq)=zqfi_omp(i,l,iq)
-	  enddo
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zdufi(offset+i,l)=zdufi_omp(i,l)
-	enddo 
-      enddo
-	
-      do l=1,llm
-        do i=1,klon
-	  zdvfi(offset+i,l)=zdvfi_omp(i,l)
-	enddo 
-      enddo
-	
+          enddo
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zdufi(offset+i,l)=zdufi_omp(i,l)
+        enddo 
+      enddo
+        
+      do l=1,llm
+        do i=1,klon
+          zdvfi(offset+i,l)=zdvfi_omp(i,l)
+        enddo 
+      enddo
+        
       do l=1,llm
         do i=1,klon
           zdtfi(offset+i,l)=zdtfi_omp(i,l)
-	enddo 
-      enddo
-	
+        enddo 
+      enddo
+        
       do iq=1,nqtot
         do l=1,llm
           do i=1,klon
-	    zdqfi(offset+i,l,iq)=zdqfi_omp(i,l,iq)
-	  enddo 
+            zdqfi(offset+i,l,iq)=zdqfi_omp(i,l,iq)
+          enddo 
         enddo
       enddo
-      	
+              
       do i=1,klon
-	zdpsrf(offset+i)=zdpsrf_omp(i)
+        zdpsrf(offset+i)=zdpsrf_omp(i)
       enddo 
       
@@ -892,5 +892,5 @@
        pdpsfi(:,jj_begin)=0    
        if (.not. is_south_pole_dyn) then
-	 pdpsfi(:,jj_end)=0
+         pdpsfi(:,jj_end)=0
        endif
 c$OMP END MASTER
@@ -976,5 +976,5 @@
         pdqfi(:,:,l,:)=0.
       ENDDO
-c$OMP END DO NOWAIT	 
+c$OMP END DO NOWAIT         
 
 C
@@ -987,5 +987,5 @@
 !CDIR ON_ADB(index_j) 
 !cdir NODEP           
-	     DO ig0=kstart,kend
+             DO ig0=kstart,kend
               i=index_i(ig0)
               j=index_j(ig0)
@@ -993,19 +993,19 @@
               if (i==1) pdqfi(iip1,j,l,iiq) = zdqfi(ig0,l,iq)
             ENDDO
-	    
-	    IF (is_north_pole_dyn) then
-	      DO i=1,iip1
+            
+            IF (is_north_pole_dyn) then
+              DO i=1,iip1
                 pdqfi(i,1,l,iiq)    = zdqfi(1,l,iq)
-	      ENDDO
-	    ENDIF
-	    
-	    IF (is_south_pole_dyn) then
-	      DO i=1,iip1
+              ENDDO
+            ENDIF
+            
+            IF (is_south_pole_dyn) then
+              DO i=1,iip1
                 pdqfi(i,jjp1,l,iiq) = zdqfi(klon,l,iq)
-	      ENDDO
-	    ENDIF
-	    
+              ENDDO
+            ENDIF
+            
          ENDDO
-c$OMP END DO NOWAIT	 
+c$OMP END DO NOWAIT         
       ENDDO
       
@@ -1067,6 +1067,6 @@
            pdvfi(i,j,l)=0.5*(zdvfi2(ig0,l)+zdvfi2(ig0+iim,l))*cv(i,j)
            if (i==1) pdvfi(iip1,j,l) = 0.5*(zdvfi2(ig0,l)+
-     $	                                    zdvfi2(ig0+iim,l))
-     $				          *cv(i,j)
+     $                                            zdvfi2(ig0+iim,l))
+     $                                          *cv(i,j)
         enddo
          
Index: /LMDZ5/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90
===================================================================
--- /LMDZ5/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90	(revision 2600)
@@ -36,4 +36,5 @@
   USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, kappa, omeg, r, rad, &
                           pi, jmp1
+  USE comvert_mod, ONLY: pa, preff, pressure_exner
 
   IMPLICIT NONE
@@ -44,5 +45,4 @@
   include "paramet.h"
   include "comgeom2.h"
-  include "comvert.h"
   include "iniprint.h"
   include "temps.h"
Index: /LMDZ5/trunk/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90
===================================================================
--- /LMDZ5/trunk/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90	(revision 2600)
@@ -37,4 +37,5 @@
   USE assert_eq_m,    ONLY: assert_eq
   USE comconst_mod, ONLY: pi, cpp, kappa
+  USE comvert_mod, ONLY: ap, bp, preff, pressure_exner
   IMPLICIT NONE
 
@@ -46,5 +47,4 @@
   include "paramet.h"
   include "comgeom2.h"
-  include "comvert.h"
   include "temps.h"
   include "comdissnew.h"
Index: /LMDZ5/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90
===================================================================
--- /LMDZ5/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90	(revision 2600)
@@ -12,4 +12,5 @@
                      prad,pg,pr,pcpp,iflag_phys)
   USE dimphy, ONLY: init_dimphy
+  USE comvert_mod, ONLY: preff, ap, bp, presnivs, scaleheight, pseudoalt
   USE inigeomphy_mod, ONLY: inigeomphy
   USE mod_grid_phy_lmdz, ONLY: klon_glo ! number of atmospheric columns (on full grid)
@@ -50,5 +51,4 @@
 
   include "dimensions.h"
-  include "comvert.h"
   include "iniprint.h"
   include "temps.h"
Index: /LMDZ5/trunk/libf/dynphy_lonlat/phymar/iniphysiq_mod.F90
===================================================================
--- /LMDZ5/trunk/libf/dynphy_lonlat/phymar/iniphysiq_mod.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/dynphy_lonlat/phymar/iniphysiq_mod.F90	(revision 2600)
@@ -12,4 +12,5 @@
                      prad,pg,pr,pcpp,iflag_phys)
   USE dimphy, ONLY: init_dimphy
+  USE comvert_mod, ONLY: preff, ap, bp, presnivs, scaleheight, pseudoalt
   USE inigeomphy_mod, ONLY: inigeomphy
   USE vertical_layers_mod, ONLY : init_vertical_layers
@@ -29,6 +30,4 @@
  
  
-  include "dimensions.h"
-  include "comvert.h"
   include "iniprint.h"
 
Index: DZ5/trunk/libf/phylmd/dyn1d/comvert.h
===================================================================
--- /LMDZ5/trunk/libf/phylmd/dyn1d/comvert.h	(revision 2599)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../../dyn3d_common/comvert.h
Index: /LMDZ5/trunk/libf/phylmd/dyn1d/comvert_mod.F90
===================================================================
--- /LMDZ5/trunk/libf/phylmd/dyn1d/comvert_mod.F90	(revision 2600)
+++ /LMDZ5/trunk/libf/phylmd/dyn1d/comvert_mod.F90	(revision 2600)
@@ -0,0 +1,1 @@
+link ../../dyn3d_common/comvert_mod.F90
Index: /LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90
===================================================================
--- /LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90	(revision 2599)
+++ /LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90	(revision 2600)
@@ -950,9 +950,9 @@
 !---------------------------------------------------------------------
        call physiq(ngrid,llm, &
-	            firstcall,lastcall,timestep, &
-	            plev,play,phi,phis,presnivs, &
-	            u,v, rot, temp,q,omega2, &
-	            du_phys,dv_phys,dt_phys,dq,dpsrf)
-	        firstcall=.false.
+                    firstcall,lastcall,timestep, &
+                    plev,play,phi,phis,presnivs, &
+                    u,v, rot, temp,q,omega2, &
+                    du_phys,dv_phys,dt_phys,dq,dpsrf)
+                firstcall=.false.
 
 !---------------------------------------------------------------------
