Index: LMDZ5/trunk/libf/dyn3d_common/adaptdt.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/adaptdt.F	(revision 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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: LMDZ5/trunk/libf/dyn3d_common/comvert.h
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/comvert.h	(revision 2598)
+++ 	(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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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 2598)
+++ 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"