Index: LMDZ5/trunk/libf/dyn3d/addfi.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/addfi.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/addfi.F	(revision 2597)
@@ -46,9 +46,8 @@
 c    ------------------
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom.h"
-#include "serre.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
+      include "serre.h"
 c
 c    Arguments :
Index: LMDZ5/trunk/libf/dyn3d/advect.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/advect.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/advect.F	(revision 2597)
@@ -4,4 +4,6 @@
       SUBROUTINE advect(ucov,vcov,teta,w,massebx,masseby,du,dv,dteta)
 
+      USE comconst_mod, ONLY: daysec
+      
       IMPLICIT NONE
 c=======================================================================
@@ -24,11 +26,10 @@
 c   -------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "logic.h"
-#include "ener.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "logic.h"
+      include "ener.h"
 
 c   Arguments:
Index: LMDZ5/trunk/libf/dyn3d/advtrac.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d/advtrac.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/advtrac.F90	(revision 2597)
@@ -11,5 +11,5 @@
   USE infotrac, ONLY: nqtot, iadv,nqperes,ok_iso_verif
   USE control_mod, ONLY: iapp_tracvl, day_step
-
+  USE comconst_mod, ONLY: dtvr
 
   IMPLICIT NONE
@@ -17,5 +17,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comconst.h"
   include "comvert.h"
   include "comdissip.h"
Index: LMDZ5/trunk/libf/dyn3d/bilan_dyn.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/bilan_dyn.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/bilan_dyn.F	(revision 2597)
@@ -13,14 +13,14 @@
       USE IOIPSL
 #endif
+      USE comconst_mod, ONLY: pi, cpp
 
       IMPLICIT NONE
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom2.h"
-#include "temps.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom2.h"
+      include "temps.h"
+      include "iniprint.h"
 
 c====================================================================
Index: LMDZ5/trunk/libf/dyn3d/caladvtrac.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/caladvtrac.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/caladvtrac.F	(revision 2597)
@@ -10,4 +10,5 @@
       USE infotrac, ONLY : nqtot
       USE control_mod, ONLY : iapp_tracvl,planet_type
+      USE comconst_mod, ONLY: dtvr
  
       IMPLICIT NONE
@@ -23,7 +24,6 @@
 
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
+      include "dimensions.h"
+      include "paramet.h"
 
 c   Arguments:
Index: LMDZ5/trunk/libf/dyn3d/caldyn.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/caldyn.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/caldyn.F	(revision 2597)
@@ -24,9 +24,8 @@
 !   ----------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
 
 !   Arguments:
Index: LMDZ5/trunk/libf/dyn3d/conf_gcm.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d/conf_gcm.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/conf_gcm.F90	(revision 2597)
@@ -13,4 +13,7 @@
   USE infotrac, ONLY : type_trac
   use assert_m, only: assert
+  USE comconst_mod, ONLY: dissip_deltaz, dissip_factz, dissip_zref, &
+                          iflag_top_bound, mode_top_bound, tau_top_bound, &
+                          ngroup
 
   IMPLICIT NONE
@@ -35,5 +38,4 @@
   include "comdissnew.h"
   include "temps.h"
-  include "comconst.h"
   include "iniprint.h"
 
Index: LMDZ5/trunk/libf/dyn3d/dissip.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/dissip.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/dissip.F	(revision 2597)
@@ -4,4 +4,6 @@
       SUBROUTINE dissip( vcov,ucov,teta,p, dv,du,dh )
 c
+      USE comconst_mod, ONLY: dtdiss
+      
       IMPLICIT NONE
 
@@ -25,10 +27,9 @@
 c   -------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom.h"
-#include "comdissnew.h"
-#include "comdissipn.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
+      include "comdissnew.h"
+      include "comdissipn.h"
 
 c   Arguments:
Index: LMDZ5/trunk/libf/dyn3d/dynetat0.f90
===================================================================
--- LMDZ5/trunk/libf/dyn3d/dynetat0.f90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/dynetat0.f90	(revision 2597)
@@ -11,9 +11,9 @@
   USE control_mod, ONLY: planet_type
   USE assert_eq_m, ONLY: assert_eq
+  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, omeg, rad
   IMPLICIT NONE
   include "dimensions.h"
   include "paramet.h"
   include "temps.h"
-  include "comconst.h"
   include "comvert.h"
   include "comgeom2.h"
Index: LMDZ5/trunk/libf/dyn3d/dynredem.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d/dynredem.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/dynredem.F90	(revision 2597)
@@ -11,8 +11,8 @@
                     NF90_CLOSE,  NF90_PUT_ATT, NF90_UNLIMITED, NF90_CLOBBER
   USE dynredem_mod, ONLY: cre_var, put_var1, put_var2, err, modname, fil
+  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
   IMPLICIT NONE
   include "dimensions.h"
   include "paramet.h"
-  include "comconst.h"
   include "comvert.h"
   include "comgeom2.h"
Index: LMDZ5/trunk/libf/dyn3d/fluxstokenc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/fluxstokenc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/fluxstokenc.F	(revision 2597)
@@ -16,12 +16,11 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "tracstoke.h"
-#include "temps.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "tracstoke.h"
+      include "temps.h"
+      include "iniprint.h"
 
       REAL time_step,t_wrt, t_ops
Index: LMDZ5/trunk/libf/dyn3d/friction.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/friction.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/friction.F	(revision 2597)
@@ -12,5 +12,5 @@
       USE ioipsl_getincom
 #endif
-      
+      USE comconst_mod, ONLY: pi
       IMPLICIT NONE
 
@@ -27,10 +27,9 @@
 !=======================================================================
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comgeom2.h"
-#include "comconst.h"
-#include "iniprint.h"
-#include "academic.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom2.h"
+      include "iniprint.h"
+      include "academic.h"
 
 ! arguments:
Index: LMDZ5/trunk/libf/dyn3d/gcm.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d/gcm.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/gcm.F90	(revision 2597)
@@ -23,5 +23,5 @@
   USE control_mod
   USE mod_const_mpi, ONLY: COMM_LMDZ
-
+  USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -68,5 +68,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comconst.h"
   include "comdissnew.h"
   include "comvert.h"
@@ -74,5 +73,4 @@
   include "logic.h"
   include "temps.h"
-!!!!!!!!!!!include "control.h"
   include "ener.h"
   include "description.h"
@@ -89,9 +87,9 @@
   REAL, ALLOCATABLE, DIMENSION(:,:,:):: q! champs advectes
   REAL ps(ip1jmp1)                       ! pression  au sol
-  REAL p (ip1jmp1,llmp1  )               ! pression aux interfac.des couches
+!  REAL p (ip1jmp1,llmp1  )               ! pression aux interfac.des couches
   REAL masse(ip1jmp1,llm)                ! masse d'air
   REAL phis(ip1jmp1)                     ! geopotentiel au sol
-  REAL phi(ip1jmp1,llm)                  ! geopotentiel
-  REAL w(ip1jmp1,llm)                    ! vitesse verticale
+!  REAL phi(ip1jmp1,llm)                  ! geopotentiel
+!  REAL w(ip1jmp1,llm)                    ! vitesse verticale
 
   ! variables dynamiques intermediaire pour le transport
@@ -103,10 +101,7 @@
 
   LOGICAL lafin
-  INTEGER ij,iq,l,i,j
 
 
   real time_step, t_wrt, t_ops
-
-  LOGICAL first
 
   !      LOGICAL call_iniphys
@@ -118,8 +113,8 @@
   !     tansformation d'energie cinetique en energie thermique
   !     cree par la dissipation
-  REAL dhecdt(ip1jmp1,llm)
+!  REAL dhecdt(ip1jmp1,llm)
   !      REAL vcont(ip1jm,llm),ucont(ip1jmp1,llm)
   !      REAL      d_h_vcol, d_qt, d_qw, d_ql, d_ec
-  CHARACTER (len=15) :: ztit
+!  CHARACTER (len=15) :: ztit
   !-jld 
 
Index: LMDZ5/trunk/libf/dyn3d/groupe.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/groupe.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/groupe.F	(revision 2597)
@@ -3,4 +3,7 @@
 !
       subroutine groupe(pext,pbaru,pbarv,pbarum,pbarvm,wm)
+      
+      use comconst_mod, only: ngroup
+      
       implicit none
 
@@ -16,9 +19,8 @@
 c   pas besoin de w en entree.
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom2.h"
-#include "comvert.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom2.h"
+      include "comvert.h"
 
 !     integer ngroup
Index: LMDZ5/trunk/libf/dyn3d/groupeun.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/groupeun.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/groupeun.F	(revision 2597)
@@ -3,10 +3,12 @@
 !
       SUBROUTINE groupeun(jjmax,llmax,q)
+      
+      USE comconst_mod, ONLY: ngroup
+      
       IMPLICIT NONE
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom2.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom2.h"
 
       INTEGER jjmax,llmax
@@ -135,10 +137,12 @@
       
       SUBROUTINE INIT_GROUPEUN(airen_tab, aires_tab)
+      
+      USE comconst_mod, ONLY: ngroup
+      
       IMPLICIT NONE
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom2.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom2.h"
 
 !     INTEGER ngroup
Index: LMDZ5/trunk/libf/dyn3d/guide_mod.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d/guide_mod.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/guide_mod.F90	(revision 2597)
@@ -314,5 +314,6 @@
   SUBROUTINE guide_main(itau,ucov,vcov,teta,q,masse,ps)
 
-    USE control_mod
+    USE control_mod, ONLY: day_step, iperiod
+    USE comconst_mod, ONLY: dtvr, daysec
  
     IMPLICIT NONE
@@ -320,5 +321,4 @@
     INCLUDE "dimensions.h"
     INCLUDE "paramet.h"
-    INCLUDE "comconst.h"
     INCLUDE "comvert.h"
 
@@ -542,4 +542,6 @@
   SUBROUTINE guide_zonave(typ,hsize,vsize,field)
 
+    USE comconst_mod, ONLY: pi
+    
     IMPLICIT NONE
 
@@ -547,5 +549,4 @@
     INCLUDE "paramet.h"
     INCLUDE "comgeom.h"
-    INCLUDE "comconst.h"
     
     ! input/output variables
@@ -607,4 +608,5 @@
   use exner_hyb_m, only: exner_hyb
   use exner_milieu_m, only: exner_milieu
+  use comconst_mod, only: kappa, cpp
   IMPLICIT NONE
 
@@ -613,5 +615,4 @@
   include "comvert.h"
   include "comgeom2.h"
-  include "comconst.h"
 
   REAL, DIMENSION (iip1,jjp1),     INTENT(IN) :: psi ! Psol gcm
@@ -777,15 +778,15 @@
             do j=1,jjp1
                 IF (guide_teta) THEN
-		    do i=1,iim
-			ij=(j-1)*iip1+i
-			tgui1(ij,l)=zu1(i,j,l)
-			tgui2(ij,l)=zu2(i,j,l)
-		    enddo
+                    do i=1,iim
+                        ij=(j-1)*iip1+i
+                        tgui1(ij,l)=zu1(i,j,l)
+                        tgui2(ij,l)=zu2(i,j,l)
+                    enddo
                 ELSE
-		    do i=1,iim
-			ij=(j-1)*iip1+i
-			tgui1(ij,l)=zu1(i,j,l)*cpp/pk(i,j,l)
-			tgui2(ij,l)=zu2(i,j,l)*cpp/pk(i,j,l)
-		    enddo
+                    do i=1,iim
+                        ij=(j-1)*iip1+i
+                        tgui1(ij,l)=zu1(i,j,l)*cpp/pk(i,j,l)
+                        tgui2(ij,l)=zu2(i,j,l)*cpp/pk(i,j,l)
+                    enddo
                 ENDIF
                 tgui1(j*iip1,l)=tgui1((j-1)*iip1+1,l)    
@@ -855,9 +856,10 @@
 ! Calcul des constantes de rappel alpha (=1/tau)
 
+    use comconst_mod, only: pi
+    
     implicit none
 
     include "dimensions.h"
     include "paramet.h"
-    include "comconst.h"
     include "comgeom2.h"
     include "serre.h"
@@ -1516,4 +1518,6 @@
   SUBROUTINE guide_out(varname,hsize,vsize,field)
 
+    USE comconst_mod, ONLY: pi
+    
     IMPLICIT NONE
 
@@ -1522,5 +1526,4 @@
     INCLUDE "netcdf.inc"
     INCLUDE "comgeom2.h"
-    INCLUDE "comconst.h"
     INCLUDE "comvert.h"
     
Index: LMDZ5/trunk/libf/dyn3d/iniacademic.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d/iniacademic.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/iniacademic.F90	(revision 2597)
@@ -16,4 +16,5 @@
   use exner_hyb_m, only: exner_hyb
   use exner_milieu_m, only: exner_milieu
+  USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -29,5 +30,4 @@
   include "paramet.h"
   include "comvert.h"
-  include "comconst.h"
   include "comgeom.h"
   include "academic.h"
Index: LMDZ5/trunk/libf/dyn3d/integrd.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/integrd.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/integrd.F	(revision 2597)
@@ -8,4 +8,5 @@
 
       use control_mod, only : planet_type
+      use comconst_mod, only: pi
 
       IMPLICIT NONE
@@ -27,13 +28,12 @@
 c   -------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom.h"
-#include "comvert.h"
-#include "logic.h"
-#include "temps.h"
-#include "serre.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
+      include "comvert.h"
+      include "logic.h"
+      include "temps.h"
+      include "serre.h"
+      include "iniprint.h"
 
 c   Arguments:
Index: LMDZ5/trunk/libf/dyn3d/leapfrog.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/leapfrog.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/leapfrog.F	(revision 2597)
@@ -20,4 +20,5 @@
       use exner_hyb_m, only: exner_hyb
       use exner_milieu_m, only: exner_milieu
+      USE comconst_mod, ONLY: cpp, dtphys, dtvr, pi, ihf
 
       IMPLICIT NONE
@@ -54,18 +55,16 @@
 c   -------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comdissnew.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "logic.h"
-#include "temps.h"
-#include "ener.h"
-#include "description.h"
-#include "serre.h"
-!#include "com_io_dyn.h"
-#include "iniprint.h"
-#include "academic.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comdissnew.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "logic.h"
+      include "temps.h"
+      include "ener.h"
+      include "description.h"
+      include "serre.h"
+      include "iniprint.h"
+      include "academic.h"
 
       REAL,INTENT(IN) :: time_0 ! not used
Index: LMDZ5/trunk/libf/dyn3d/sw_case_williamson91_6.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/sw_case_williamson91_6.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/sw_case_williamson91_6.F	(revision 2597)
@@ -26,4 +26,6 @@
 c
 c=======================================================================
+      USE comconst_mod, ONLY: cpp, omeg, rad
+      
       IMPLICIT NONE
 c-----------------------------------------------------------------------
@@ -31,10 +33,9 @@
 c   ---------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
-#include "comconst.h"
-#include "comgeom.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "iniprint.h"
 
 c   Arguments:
Index: LMDZ5/trunk/libf/dyn3d/top_bound.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/top_bound.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/top_bound.F	(revision 2597)
@@ -3,11 +3,14 @@
 !
       SUBROUTINE top_bound(vcov,ucov,teta,masse,dt)
+      
+      USE comconst_mod, ONLY: iflag_top_bound, mode_top_bound,
+     &                        tau_top_bound
+      
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom2.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom2.h"
 
 
@@ -39,5 +42,5 @@
 ! NB: top_bound sponge is only called from leapfrog if ok_strato=.true.
 
-! sponge parameters: (loaded/set in conf_gcm.F ; stored in comconst.h)
+! sponge parameters: (loaded/set in conf_gcm.F ; stored in comconst_mod)
 !    iflag_top_bound=0 for no sponge
 !    iflag_top_bound=1 for sponge over 4 topmost layers
Index: LMDZ5/trunk/libf/dyn3d/vlsplt.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/vlsplt.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/vlsplt.F	(revision 2597)
@@ -21,9 +21,8 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
 
 c
@@ -159,5 +158,4 @@
       include "logic.h"
       include "comvert.h"
-      include "comconst.h"
       include "iniprint.h"
 c
@@ -528,12 +526,12 @@
 c
 c   --------------------------------------------------------------------
+      USE comconst_mod, ONLY: pi
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
-#include "comgeom.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
+      include "comgeom.h"
 c
 c
@@ -893,9 +891,8 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
 c
 c
Index: LMDZ5/trunk/libf/dyn3d/vlspltqs.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d/vlspltqs.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d/vlspltqs.F	(revision 2597)
@@ -23,11 +23,13 @@
 c     pk exner au milieu des couches necessaire pour calculer Qsat
 c   --------------------------------------------------------------------
+      
+      USE comconst_mod, ONLY: cpp
+      
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
 
 c
@@ -192,9 +194,8 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
 c
 c
@@ -559,12 +560,14 @@
 c
 c   --------------------------------------------------------------------
+      
+      USE comconst_mod, ONLY: pi
+      
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
-#include "comgeom.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
+      include "comgeom.h"
 c
 c
Index: LMDZ5/trunk/libf/dyn3d_common/adaptdt.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/adaptdt.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/adaptdt.F	(revision 2597)
@@ -5,5 +5,6 @@
      c                   masse)
 
-      USE control_mod
+!      USE control_mod
+      USE comconst_mod, ONLY: dtvr
       IMPLICIT NONE
 
@@ -11,5 +12,4 @@
 c#include "paramr2.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comdissip.h"
 #include "comvert.h"
Index: LMDZ5/trunk/libf/dyn3d_common/advn.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/advn.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/advn.F	(revision 2597)
@@ -21,5 +21,4 @@
 #include "logic.h"
 #include "comvert.h"
-#include "comconst.h"
 #include "comgeom.h"
 #include "iniprint.h"
@@ -488,5 +487,4 @@
 #include "logic.h"
 #include "comvert.h"
-#include "comconst.h"
 #include "iniprint.h"
 c
Index: LMDZ5/trunk/libf/dyn3d_common/advx.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/advx.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/advx.F	(revision 2597)
@@ -25,5 +25,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 
Index: LMDZ5/trunk/libf/dyn3d_common/advxp.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/advxp.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/advxp.F	(revision 2597)
@@ -15,5 +15,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 
Index: LMDZ5/trunk/libf/dyn3d_common/advy.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/advy.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/advy.F	(revision 2597)
@@ -28,5 +28,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom2.h"
Index: LMDZ5/trunk/libf/dyn3d_common/advyp.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/advyp.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/advyp.F	(revision 2597)
@@ -30,5 +30,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3d_common/advz.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/advz.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/advz.F	(revision 2597)
@@ -23,5 +23,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 
Index: LMDZ5/trunk/libf/dyn3d_common/advzp.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/advzp.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/advzp.F	(revision 2597)
@@ -33,5 +33,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3d_common/caldyn0.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/caldyn0.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/caldyn0.F90	(revision 2597)
@@ -10,5 +10,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comconst.h"
   include "comvert.h"
   include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3d_common/comconst.h
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/comconst.h	(revision 2596)
+++ 	(revision )
@@ -1,43 +1,0 @@
-!
-! $Id$
-!
-!-----------------------------------------------------------------------
-! INCLUDE comconst.h
-
-      COMMON/comconsti/im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl,          &
-     &                 iflag_top_bound,mode_top_bound,ngroup
-      COMMON/comconstr/dtvr,daysec,                                     &
-     & pi,dtphys,dtdiss,rad,r,cpp,kappa,cotot,unsim,g,omeg              &
-     &                   ,dissip_factz,dissip_deltaz,dissip_zref        &
-     &                   ,tau_top_bound,                                &
-     & daylen,year_day,molmass, ihf
-
-
-      INTEGER im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl
-      REAL dtvr ! dynamical time step (in s)
-      REAL daysec !length (in s) of a standard day
-      REAL pi    ! something like 3.14159....
-      REAL dtphys ! (s) time step for the physics
-      REAL dtdiss ! (s) time step for the dissipation
-      REAL rad ! (m) radius of the planet
-      REAL r ! Reduced Gas constant r=R/mu
-             ! with R=8.31.. J.K-1.mol-1, mu: mol mass of atmosphere (kg/mol)
-      REAL cpp   ! Specific heat Cp (J.kg-1.K-1)
-      REAL kappa ! kappa=R/Cp 
-      REAL cotot
-      REAL unsim ! = 1./iim
-      REAL g ! (m/s2) gravity
-      REAL omeg ! (rad/s) rotation rate of the planet
-      REAL dissip_factz,dissip_deltaz,dissip_zref
-! top_bound sponge:
-      INTEGER iflag_top_bound ! sponge type
-      INTEGER ngroup
-      INTEGER mode_top_bound  ! sponge mode
-      REAL tau_top_bound ! inverse of sponge characteristic time scale (Hz)
-      REAL daylen ! length of solar day, in 'standard' day length
-      REAL year_day ! Number of standard days in a year
-      REAL molmass ! (g/mol) molar mass of the atmosphere
-
-      REAL ihf ! (W/m2) Intrinsic heat flux (for giant planets)
-
-!-----------------------------------------------------------------------
Index: LMDZ5/trunk/libf/dyn3d_common/comconst_mod.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/comconst_mod.F90	(revision 2597)
+++ LMDZ5/trunk/libf/dyn3d_common/comconst_mod.F90	(revision 2597)
@@ -0,0 +1,37 @@
+!
+! $Id$
+!
+
+MODULE comconst_mod
+
+IMPLICIT NONE  
+
+      INTEGER im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl
+      REAL dtvr ! dynamical time step (in s)
+      REAL daysec !length (in s) of a standard day
+      REAL pi    ! something like 3.14159....
+      REAL dtphys ! (s) time step for the physics
+      REAL dtdiss ! (s) time step for the dissipation
+      REAL rad ! (m) radius of the planet
+      REAL r ! Reduced Gas constant r=R/mu
+             ! with R=8.31.. J.K-1.mol-1, mu: mol mass of atmosphere (kg/mol)
+      REAL cpp   ! Specific heat Cp (J.kg-1.K-1)
+      REAL kappa ! kappa=R/Cp 
+      REAL cotot
+      REAL unsim ! = 1./iim
+      REAL g ! (m/s2) gravity
+      REAL omeg ! (rad/s) rotation rate of the planet
+      REAL dissip_factz,dissip_deltaz,dissip_zref
+! top_bound sponge:
+      INTEGER iflag_top_bound ! sponge type
+      INTEGER ngroup ! parameter to group points (along longitude) near poles
+      INTEGER mode_top_bound  ! sponge mode
+      REAL tau_top_bound ! inverse of sponge characteristic time scale (Hz)
+      REAL daylen ! length of solar day, in 'standard' day length
+      REAL year_day ! Number of standard days in a year
+      REAL molmass ! (g/mol) molar mass of the atmosphere
+
+      REAL ihf ! (W/m2) Intrinsic heat flux (for giant planets)
+
+
+END MODULE comconst_mod
Index: LMDZ5/trunk/libf/dyn3d_common/conf_planete.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/conf_planete.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/conf_planete.F90	(revision 2597)
@@ -10,4 +10,6 @@
 USE ioipsl_getincom
 #endif
+USE comconst_mod, ONLY: pi, g, molmass, kappa, cpp, omeg, rad, &
+                        year_day, daylen, daysec, ihf
 IMPLICIT NONE
 !
@@ -16,5 +18,4 @@
 !   --------------
 #include "dimensions.h"
-#include "comconst.h"
 #include "comvert.h"
 !
Index: LMDZ5/trunk/libf/dyn3d_common/coordij.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/coordij.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/coordij.F	(revision 2597)
@@ -11,4 +11,6 @@
 c=======================================================================
 
+      USE comconst_mod, ONLY: pi
+      
       IMPLICIT NONE
       REAL lon,lat
@@ -18,5 +20,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comgeom.h"
 #include "serre.h"
Index: LMDZ5/trunk/libf/dyn3d_common/disvert.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/disvert.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/disvert.F90	(revision 2597)
@@ -16,5 +16,4 @@
   include "paramet.h"
   include "comvert.h"
-  include "comconst.h"
   include "iniprint.h"
   include "logic.h"
Index: LMDZ5/trunk/libf/dyn3d_common/disvert_noterre.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/disvert_noterre.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/disvert_noterre.F	(revision 2597)
@@ -12,4 +12,5 @@
       use ioipsl_getincom
 #endif
+      USE comconst_mod, ONLY: kappa
 
       IMPLICIT NONE
@@ -18,5 +19,4 @@
 #include "paramet.h"
 #include "comvert.h"
-#include "comconst.h"
 #include "logic.h"
 #include "iniprint.h"
Index: LMDZ5/trunk/libf/dyn3d_common/exner_hyb_m.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/exner_hyb_m.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/exner_hyb_m.F90	(revision 2597)
@@ -33,7 +33,9 @@
     !
     !
+    USE comconst_mod, ONLY: jmp1, cpp, kappa, r
+    IMPLICIT NONE
+    
     include "dimensions.h"
     include "paramet.h"
-    include "comconst.h"
     include "comgeom.h"
     include "comvert.h"
Index: LMDZ5/trunk/libf/dyn3d_common/exner_milieu_m.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/exner_milieu_m.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/exner_milieu_m.F90	(revision 2597)
@@ -30,7 +30,9 @@
     !
     !
+    USE comconst_mod, ONLY: jmp1, cpp, kappa, r
+    IMPLICIT NONE
+    
     include "dimensions.h"
     include "paramet.h"
-    include "comconst.h"
     include "comgeom.h"
     include "comvert.h"
Index: LMDZ5/trunk/libf/dyn3d_common/fxy.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/fxy.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/fxy.F	(revision 2597)
@@ -6,4 +6,5 @@
      , rlonu,xprimu,rlonv,xprimv,rlonm025,xprimm025,rlonp025,xprimp025)
 
+      USE comconst_mod, ONLY: pi
       IMPLICIT NONE
 
@@ -17,5 +18,4 @@
 #include "paramet.h"
 #include "serre.h"
-#include "comconst.h"
 
        INTEGER i,j
Index: LMDZ5/trunk/libf/dyn3d_common/fxysinus.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/fxysinus.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/fxysinus.F	(revision 2597)
@@ -7,4 +7,5 @@
 
 
+      USE comconst_mod, ONLY: pi
       IMPLICIT NONE
 c
@@ -17,5 +18,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 
        INTEGER i,j
Index: LMDZ5/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90	(revision 2597)
@@ -9,9 +9,9 @@
 SUBROUTINE grilles_gcm_netcdf_sub(masque,phis)
 
+  USE comconst_mod, ONLY: cpp, kappa, g, omeg, daysec, rad, pi
   IMPLICIT NONE
 
   INCLUDE "dimensions.h"
   INCLUDE "paramet.h"
-  INCLUDE "comconst.h"
   INCLUDE "comgeom.h"
   INCLUDE "comvert.h"
Index: LMDZ5/trunk/libf/dyn3d_common/iniconst.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/iniconst.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/iniconst.F90	(revision 2597)
@@ -11,5 +11,7 @@
   use ioipsl_getincom
 #endif
-
+  USE comconst_mod, ONLY: im, imp1, jm, jmp1, lllm, lllmm1, lllmp1, &
+                          unsim, pi, r, kappa, cpp, dtvr, dtphys
+  
   IMPLICIT NONE
   !
@@ -21,5 +23,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comconst.h"
   include "temps.h"
   include "comvert.h"
Index: LMDZ5/trunk/libf/dyn3d_common/inidissip.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/inidissip.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/inidissip.F90	(revision 2597)
@@ -12,4 +12,6 @@
 
   USE control_mod, only : dissip_period,iperiod
+  USE comconst_mod, ONLY: dissip_deltaz, dissip_factz, dissip_zref, &
+                          dtdiss, dtvr, rad
 
   IMPLICIT NONE
@@ -17,5 +19,4 @@
   include "paramet.h"
   include "comdissipn.h"
-  include "comconst.h"
   include "comvert.h"
   include "logic.h"
Index: LMDZ5/trunk/libf/dyn3d_common/inigeom.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/inigeom.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/inigeom.F	(revision 2597)
@@ -18,13 +18,13 @@
       use fxhyp_m, only: fxhyp
       use fyhyp_m, only: fyhyp
+      USE comconst_mod, ONLY: pi, g, omeg, rad
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom2.h"
-#include "serre.h"
-#include "logic.h"
-#include "comdissnew.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom2.h"
+      include "serre.h"
+      include "logic.h"
+      include "comdissnew.h"
 
 c-----------------------------------------------------------------------
Index: LMDZ5/trunk/libf/dyn3d_common/initdynav.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/initdynav.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/initdynav.F90	(revision 2597)
@@ -9,4 +9,5 @@
   use com_io_dyn_mod, only : histaveid,histvaveid,histuaveid, &
        dynhistave_file,dynhistvave_file,dynhistuave_file
+  USE comconst_mod, ONLY: pi
   implicit none
 
@@ -34,5 +35,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comconst.h"
   include "comvert.h"
   include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F	(revision 2597)
@@ -9,4 +9,5 @@
        USE IOIPSL
 #endif
+      USE comconst_mod, ONLY: pi
       implicit none
 
@@ -38,15 +39,14 @@
 C
 C   Declarations
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "temps.h"
-#include "ener.h"
-#include "logic.h"
-#include "description.h"
-#include "serre.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "temps.h"
+      include "ener.h"
+      include "logic.h"
+      include "description.h"
+      include "serre.h"
+      include "iniprint.h"
 
 C   Arguments
@@ -114,5 +114,5 @@
      .             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,
Index: LMDZ5/trunk/libf/dyn3d_common/inithist.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/inithist.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/inithist.F	(revision 2597)
@@ -10,5 +10,5 @@
        use com_io_dyn_mod, only : histid,histvid,histuid,               &
      &                        dynhist_file,dynhistv_file,dynhistu_file
-
+       USE comconst_mod, ONLY: pi
       implicit none
 
@@ -38,15 +38,14 @@
 C
 C   Declarations
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "temps.h"
-#include "ener.h"
-#include "logic.h"
-#include "description.h"
-#include "serre.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "temps.h"
+      include "ener.h"
+      include "logic.h"
+      include "description.h"
+      include "serre.h"
+      include "iniprint.h"
 
 C   Arguments
Index: LMDZ5/trunk/libf/dyn3d_common/inter_barxy_m.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/inter_barxy_m.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/inter_barxy_m.F90	(revision 2597)
@@ -374,9 +374,7 @@
 
     use assert_eq_m, only: assert_eq
+    use comconst_mod, only: pi
 
     IMPLICIT NONE
-
-    include "comconst.h"
-    ! (for "pi")
 
     REAL, intent(in):: xi(:)
@@ -431,8 +429,7 @@
     ! order.
 
+    use comconst_mod, only: pi
+
     IMPLICIT NONE
-
-    include "comconst.h"
-    ! (for "pi")
 
     REAL, intent(in):: xi(:) ! angle, in rad or degrees
Index: LMDZ5/trunk/libf/dyn3d_common/interpost.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/interpost.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/interpost.F	(revision 2597)
@@ -7,9 +7,8 @@
 
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom2.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom2.h"
 
 c Arguments   
Index: LMDZ5/trunk/libf/dyn3d_common/interpre.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/interpre.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/interpre.F	(revision 2597)
@@ -6,19 +6,17 @@
      s            unatppm,vnatppm,psppm)
 
-      USE control_mod
+      USE comconst_mod, ONLY: g
 
        implicit none
 
-#include "dimensions.h"
-c#include "paramr2.h"
-#include "paramet.h"
-#include "comconst.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 "comvert.h"
+      include "comgeom2.h"
+      include "logic.h"
+      include "temps.h"
+      include "ener.h"
+      include "description.h"
 
 c---------------------------------------------------
@@ -77,5 +75,5 @@
           do j=1,jjm
               do i=1,iip1
-                  vnat(i,j,l)=-pbarv(i,j,l)/masseby(i,j,l)*cv(i,j)             
+                  vnat(i,j,l)=-pbarv(i,j,l)/masseby(i,j,l)*cv(i,j)
               enddo
           enddo
@@ -119,5 +117,5 @@
                  vnatppm(i,j,l)=vnat(i,j,llm-l+1)
                  fluxwppm(i,j,l)=fluxw(i,j,llm-l+1)
-                 qppm(i,j,l)=q(i,j,llm-l+1)                              
+                 qppm(i,j,l)=q(i,j,llm-l+1)
              enddo
           enddo                                
Index: LMDZ5/trunk/libf/dyn3d_common/limx.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/limx.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/limx.F	(revision 2597)
@@ -15,10 +15,9 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
-#include "comgeom.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
+      include "comgeom.h"
 c
 c
Index: LMDZ5/trunk/libf/dyn3d_common/limy.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/limy.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/limy.F	(revision 2597)
@@ -14,12 +14,12 @@
 c
 c   --------------------------------------------------------------------
+      USE comconst_mod, ONLY: pi
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
-#include "comgeom.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
+      include "comgeom.h"
 c
 c
Index: LMDZ5/trunk/libf/dyn3d_common/limz.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/limz.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/limz.F	(revision 2597)
@@ -15,10 +15,9 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
-#include "comgeom.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
+      include "comgeom.h"
 c
 c
Index: LMDZ5/trunk/libf/dyn3d_common/massbarxy.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/massbarxy.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/massbarxy.F90	(revision 2597)
@@ -9,5 +9,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comconst.h"
   include "comgeom.h"
 !===============================================================================
Index: LMDZ5/trunk/libf/dyn3d_common/massdair.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/massdair.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/massdair.F	(revision 2597)
@@ -18,8 +18,7 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
 c
 c  .....   arguments  ....
Index: LMDZ5/trunk/libf/dyn3d_common/pentes_ini.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/pentes_ini.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/pentes_ini.F	(revision 2597)
@@ -3,4 +3,7 @@
 !
       SUBROUTINE pentes_ini (q,w,masse,pbaru,pbarv,mode)
+      
+      USE comconst_mod, ONLY: pi, dtvr
+      
       IMPLICIT NONE
 
@@ -22,9 +25,8 @@
 
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom2.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom2.h"
 
 c   Arguments:
Index: LMDZ5/trunk/libf/dyn3d_common/prather.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/prather.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/prather.F	(revision 2597)
@@ -3,4 +3,7 @@
 !
       SUBROUTINE prather (q,w,masse,pbaru,pbarv,nt,dt)
+      
+      USE comconst_mod, ONLY: pi
+      
       IMPLICIT NONE
 
@@ -19,9 +22,8 @@
 
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom2.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom2.h"
 
 c   Arguments:
Index: LMDZ5/trunk/libf/dyn3d_common/sortvarc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/sortvarc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/sortvarc.F	(revision 2597)
@@ -7,4 +7,5 @@
 
       USE control_mod, ONLY: resetvarc 
+      USE comconst_mod, ONLY: dtvr, daysec, g, rad, omeg
       IMPLICIT NONE
 
@@ -27,5 +28,4 @@
       INCLUDE "dimensions.h"
       INCLUDE "paramet.h"
-      INCLUDE "comconst.h"
       INCLUDE "comvert.h"
       INCLUDE "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3d_common/traceurpole.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/traceurpole.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/traceurpole.F	(revision 2597)
@@ -4,19 +4,15 @@
           subroutine traceurpole(q,masse)
 
-      USE control_mod
-
           implicit none
       
-#include "dimensions.h"
-c#include "paramr2.h"
-#include "paramet.h"
-#include "comconst.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 "comvert.h"
+      include "comgeom2.h"
+      include "logic.h"
+      include "temps.h"
+      include "ener.h"
+      include "description.h"
 
 
Index: LMDZ5/trunk/libf/dyn3d_common/ugeostr.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/ugeostr.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/ugeostr.F90	(revision 2597)
@@ -11,9 +11,10 @@
   ! levels are pressure levels.
 
+  use comconst_mod, only: omeg, rad
+  
   implicit none
 
   include "dimensions.h"
   include "paramet.h"
-  include "comconst.h"
   include "comgeom2.h"
 
Index: LMDZ5/trunk/libf/dyn3d_common/writedynav.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/writedynav.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/writedynav.F90	(revision 2597)
@@ -8,4 +8,5 @@
   USE infotrac, ONLY : nqtot, ttext
   use com_io_dyn_mod, only : histaveid, histvaveid, histuaveid
+  USE comconst_mod, ONLY: cpp
 
   implicit none
@@ -31,5 +32,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comconst.h"
   include "comvert.h"
   include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3d_common/writehist.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/writehist.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3d_common/writehist.F	(revision 2597)
@@ -33,15 +33,14 @@
 C
 C   Declarations
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "temps.h"
-#include "ener.h"
-#include "logic.h"
-#include "description.h"
-#include "serre.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "temps.h"
+      include "ener.h"
+      include "logic.h"
+      include "description.h"
+      include "serre.h"
+      include "iniprint.h"
 
 C
Index: LMDZ5/trunk/libf/dyn3dmem/addfi_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/addfi_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/addfi_loc.F	(revision 2597)
@@ -46,9 +46,8 @@
 c    ------------------
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom.h"
-#include "serre.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
+      include "serre.h"
 c
 c    Arguments :
Index: LMDZ5/trunk/libf/dyn3dmem/advect_new_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/advect_new_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/advect_new_loc.F	(revision 2597)
@@ -7,4 +7,5 @@
       USE write_field_loc
       USE advect_new_mod
+      USE comconst_mod, ONLY: daysec
       IMPLICIT NONE
 c=======================================================================
@@ -27,11 +28,10 @@
 c   -------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "logic.h"
-#include "ener.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "logic.h"
+      include "ener.h"
 
 c   Arguments:
@@ -122,5 +122,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/dyn3dmem/advtrac_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/advtrac_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/advtrac_loc.F	(revision 2597)
@@ -27,16 +27,16 @@
       USE control_mod, ONLY: iapp_tracvl, day_step, planet_type
       USE advtrac_mod, ONLY: finmasse
+      USE comconst_mod, ONLY: dtvr
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comdissip.h"
-#include "comgeom2.h"
-#include "logic.h"
-#include "temps.h"
-#include "ener.h"
-#include "description.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comdissip.h"
+      include "comgeom2.h"
+      include "logic.h"
+      include "temps.h"
+      include "ener.h"
+      include "description.h"
 
 c-------------------------------------------------------------------
Index: LMDZ5/trunk/libf/dyn3dmem/bilan_dyn_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/bilan_dyn_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/bilan_dyn_loc.F	(revision 2597)
@@ -17,13 +17,13 @@
       use misc_mod
       USE write_field_loc
+      USE comconst_mod, ONLY: cpp, pi
       IMPLICIT NONE
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom2.h"
-#include "temps.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom2.h"
+      include "temps.h"
+      include "iniprint.h"
 
 c====================================================================
Index: LMDZ5/trunk/libf/dyn3dmem/caladvtrac_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/caladvtrac_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/caladvtrac_loc.F	(revision 2597)
@@ -29,7 +29,6 @@
 
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
+      include "dimensions.h"
+      include "paramet.h"
 
 c   Arguments:
@@ -210,5 +209,5 @@
 	call resume_timer(timer_caldyn)
 c$OMP END MASTER
-c$OMP BARRIER	
+c$OMP BARRIER
           iadvtr=0
        ENDIF ! if iadvtr.EQ.iapp_tracvl
Index: LMDZ5/trunk/libf/dyn3dmem/caldyn_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/caldyn_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/caldyn_loc.F	(revision 2597)
@@ -31,9 +31,8 @@
 !   ----------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
 
 !   Arguments:
Index: LMDZ5/trunk/libf/dyn3dmem/call_calfis_mod.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/call_calfis_mod.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/call_calfis_mod.F90	(revision 2597)
@@ -82,6 +82,6 @@
   USE write_field_loc
   USE write_field
+  USE comconst_mod, ONLY: dtphys
   IMPLICIT NONE
-    INCLUDE "comconst.h"
     INCLUDE "comvert.h"
     INCLUDE "logic.h"
Index: LMDZ5/trunk/libf/dyn3dmem/conf_gcm.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/conf_gcm.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/conf_gcm.F90	(revision 2597)
@@ -17,4 +17,7 @@
   USE infotrac, ONLY : type_trac
   use assert_m, only: assert
+  USE comconst_mod, ONLY: dissip_deltaz, dissip_factz, dissip_zref, &
+                          iflag_top_bound, mode_top_bound, tau_top_bound, &
+                          ngroup
 
   IMPLICIT NONE
@@ -39,5 +42,4 @@
   include "comdissnew.h"
   include "temps.h"
-  include "comconst.h"
   include "iniprint.h"
 
Index: LMDZ5/trunk/libf/dyn3dmem/dissip_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/dissip_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/dissip_loc.F	(revision 2597)
@@ -7,4 +7,5 @@
       USE write_field_loc
       USE dissip_mod, ONLY: dissip_allocate
+      USE comconst_mod, ONLY: dtdiss
       IMPLICIT NONE
 
@@ -28,10 +29,9 @@
 c   -------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom.h"
-#include "comdissnew.h"
-#include "comdissipn.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
+      include "comdissnew.h"
+      include "comdissipn.h"
 
 c   Arguments:
Index: LMDZ5/trunk/libf/dyn3dmem/dynetat0_loc.f90
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/dynetat0_loc.f90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/dynetat0_loc.f90	(revision 2597)
@@ -12,9 +12,10 @@
   USE control_mod, ONLY: planet_type
   USE assert_eq_m, ONLY: assert_eq
+  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, &
+                          omeg, rad
   IMPLICIT NONE
   include "dimensions.h"
   include "paramet.h"
   include "temps.h"
-  include "comconst.h"
   include "comvert.h"
   include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3dmem/dynredem_loc.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/dynredem_loc.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/dynredem_loc.F90	(revision 2597)
@@ -13,8 +13,8 @@
                     NF90_CLOSE,  NF90_PUT_ATT, NF90_UNLIMITED, NF90_CLOBBER
   USE dynredem_mod, ONLY: cre_var, put_var, err, modname, fil
+  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
   IMPLICIT NONE
   include "dimensions.h"
   include "paramet.h"
-  include "comconst.h"
   include "comvert.h"
   include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3dmem/exner_hyb_loc_m.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/exner_hyb_loc_m.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/exner_hyb_loc_m.F90	(revision 2597)
@@ -35,8 +35,9 @@
     USE mod_filtreg_p
     USE write_field_loc
+    USE comconst_mod, ONLY: cpp, kappa, r, jmp1
+    IMPLICIT NONE
     !
     include "dimensions.h"
     include "paramet.h"
-    include "comconst.h"
     include "comgeom.h"
     include "comvert.h"
Index: LMDZ5/trunk/libf/dyn3dmem/exner_milieu_loc_m.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/exner_milieu_loc_m.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/exner_milieu_loc_m.F90	(revision 2597)
@@ -31,8 +31,9 @@
     USE parallel_lmdz
     USE mod_filtreg_p
+    USE comconst_mod, ONLY: cpp, kappa, r, jmp1
+    IMPLICIT NONE
     !
     include "dimensions.h"
     include "paramet.h"
-    include "comconst.h"
     include "comgeom.h"
     include "comvert.h"
Index: LMDZ5/trunk/libf/dyn3dmem/friction_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/friction_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/friction_loc.F	(revision 2597)
@@ -12,4 +12,5 @@
       USE ioipsl_getincom
 #endif
+      USE comconst_mod, ONLY: pi
       IMPLICIT NONE
 
@@ -26,10 +27,9 @@
 !=======================================================================
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comgeom2.h"
-#include "comconst.h"
-#include "iniprint.h"
-#include "academic.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom2.h"
+      include "iniprint.h"
+      include "academic.h"
 
 ! arguments:
Index: LMDZ5/trunk/libf/dyn3dmem/gcm.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/gcm.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/gcm.F90	(revision 2597)
@@ -21,4 +21,5 @@
   USE iniphysiq_mod, ONLY: iniphysiq
 #endif
+  USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
   IMPLICIT NONE
 
@@ -54,5 +55,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comconst.h"
   include "comdissnew.h"
   include "comvert.h"
Index: LMDZ5/trunk/libf/dyn3dmem/groupe_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/groupe_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/groupe_loc.F	(revision 2597)
@@ -3,4 +3,5 @@
       USE Write_field_loc
       USE groupe_mod
+      USE comconst_mod, ONLY: ngroup
       implicit none
 
@@ -16,9 +17,8 @@
 c   pas besoin de w en entree.
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom2.h"
-#include "comvert.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom2.h"
+      include "comvert.h"
 
 !     integer ngroup
Index: LMDZ5/trunk/libf/dyn3dmem/groupeun_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/groupeun_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/groupeun_loc.F	(revision 2597)
@@ -2,10 +2,10 @@
       USE parallel_lmdz
       USE Write_Field_p
+      USE comconst_mod, ONLY: ngroup
       IMPLICIT NONE
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom2.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom2.h"
 
       INTEGER jjmax,llmax,sb,se,jjb,jje
@@ -136,10 +136,10 @@
 
       USE parallel_lmdz
+      USE comconst_mod, ONLY: ngroup
       IMPLICIT NONE
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom2.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom2.h"
 
 !     INTEGER ngroup
Index: LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90	(revision 2597)
@@ -346,4 +346,5 @@
     USE control_mod
     USE write_field_loc
+    USE comconst_mod, ONLY: cpp, daysec, dtvr, kappa
     
     IMPLICIT NONE
@@ -351,5 +352,4 @@
     INCLUDE "dimensions.h"
     INCLUDE "paramet.h"
-    INCLUDE "comconst.h"
     INCLUDE "comvert.h"
 
@@ -748,4 +748,6 @@
   SUBROUTINE guide_zonave_u(typ,vsize,field)
 
+    USE comconst_mod, ONLY: pi
+    
     IMPLICIT NONE
 
@@ -753,5 +755,4 @@
     INCLUDE "paramet.h"
     INCLUDE "comgeom.h"
-    INCLUDE "comconst.h"
     
     ! input/output variables
@@ -819,4 +820,6 @@
   SUBROUTINE guide_zonave_v(typ,hsize,vsize,field)
 
+    USE comconst_mod, ONLY: pi
+    
     IMPLICIT NONE
 
@@ -824,5 +827,4 @@
     INCLUDE "paramet.h"
     INCLUDE "comgeom.h"
-    INCLUDE "comconst.h"
     
     ! input/output variables
@@ -890,4 +892,5 @@
   USE mod_hallo
   USE Bands
+  USE comconst_mod, ONLY: cpp, kappa
   IMPLICIT NONE
 
@@ -896,5 +899,4 @@
   include "comvert.h"
   include "comgeom2.h"
-  include "comconst.h"
 
   REAL, DIMENSION (iip1,jjb_u:jje_u),     INTENT(IN) :: psi ! Psol gcm
@@ -1012,6 +1014,6 @@
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
         DO l=1,llm
-	    DO j=jjbu,jjeu
-		DO i =1, iip1
+            DO j=jjbu,jjeu
+                DO i =1, iip1
                     pls(i,j,l)=(ap(l)+ap(l+1))/2.+psi(i,j)*(bp(l)+bp(l+1))/2.
                 ENDDO
@@ -1030,7 +1032,7 @@
    DO l = 1, llm
        DO j=jjbu,jjeu
-   	DO i =1, iip1
-   	    pls(i,j,l) = preff * ( pk(i,j,l)/cpp) ** unskap
-   	ENDDO
+           DO i =1, iip1
+               pls(i,j,l) = preff * ( pk(i,j,l)/cpp) ** unskap
+           ENDDO
        ENDDO
    ENDDO
@@ -1302,9 +1304,9 @@
         ! Calcul des nouvelles valeurs des niveaux de pression du guidage
         IF (guide_plevs.EQ.1) THEN
-	 CALL Register_Hallo_u(psnat1,1,1,2,2,1,Req)
-	 CALL Register_Hallo_u(psnat2,1,1,2,2,1,Req)
-	 CALL SendRequest(Req)
-!$OMP BARRIER
-	 CALL WaitRequest(Req)
+         CALL Register_Hallo_u(psnat1,1,1,2,2,1,Req)
+         CALL Register_Hallo_u(psnat2,1,1,2,2,1,Req)
+         CALL SendRequest(Req)
+!$OMP BARRIER
+         CALL WaitRequest(Req)
 !$OMP BARRIER
 !$OMP DO
@@ -1320,9 +1322,9 @@
             ENDDO
         ELSE IF (guide_plevs.EQ.2) THEN
-	 CALL Register_Hallo_u(pnat1,llm,1,2,2,1,Req)
-	 CALL Register_Hallo_u(pnat2,llm,1,2,2,1,Req)
-	 CALL SendRequest(Req)
-!$OMP BARRIER
-	 CALL WaitRequest(Req)
+         CALL Register_Hallo_u(pnat1,llm,1,2,2,1,Req)
+         CALL Register_Hallo_u(pnat2,llm,1,2,2,1,Req)
+         CALL SendRequest(Req)
+!$OMP BARRIER
+         CALL WaitRequest(Req)
 !$OMP BARRIER
 !$OMP DO
@@ -1370,9 +1372,10 @@
 ! Calcul des constantes de rappel alpha (=1/tau)
 
+    use comconst_mod, only: pi
+    
     implicit none
 
     include "dimensions.h"
     include "paramet.h"
-    include "comconst.h"
     include "comgeom2.h"
     include "serre.h"
@@ -2127,4 +2130,5 @@
     USE parallel_lmdz
     USE mod_hallo, ONLY : gather_field_u, gather_field_v
+    USE comconst_mod, ONLY: pi
     IMPLICIT NONE
 
@@ -2133,5 +2137,4 @@
     INCLUDE "netcdf.inc"
     INCLUDE "comgeom2.h"
-    INCLUDE "comconst.h"
     INCLUDE "comvert.h"
     
Index: LMDZ5/trunk/libf/dyn3dmem/iniacademic_loc.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/iniacademic_loc.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/iniacademic_loc.F90	(revision 2597)
@@ -18,4 +18,5 @@
 #endif
   USE Write_Field
+  USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -31,5 +32,4 @@
   include "paramet.h"
   include "comvert.h"
-  include "comconst.h"
   include "comgeom.h"
   include "academic.h"
Index: LMDZ5/trunk/libf/dyn3dmem/initdynav_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/initdynav_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/initdynav_loc.F	(revision 2597)
@@ -14,4 +14,5 @@
        use com_io_dyn_mod, only : histaveid,histvaveid,histuaveid,       &
      &        dynhistave_file,dynhistvave_file,dynhistuave_file
+       USE comconst_mod, ONLY: pi
        implicit none
 
@@ -41,15 +42,14 @@
 C
 C   Declarations
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "temps.h"
-#include "ener.h"
-#include "logic.h"
-#include "description.h"
-#include "serre.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "temps.h"
+      include "ener.h"
+      include "logic.h"
+      include "description.h"
+      include "serre.h"
+      include "iniprint.h"
 
 C   Arguments
Index: LMDZ5/trunk/libf/dyn3dmem/initfluxsto_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/initfluxsto_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/initfluxsto_p.F	(revision 2597)
@@ -13,4 +13,5 @@
        use Write_field
        use misc_mod
+       USE comconst_mod, ONLY: pi
        
       implicit none
@@ -43,15 +44,14 @@
 C
 C   Declarations
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "temps.h"
-#include "ener.h"
-#include "logic.h"
-#include "description.h"
-#include "serre.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "temps.h"
+      include "ener.h"
+      include "logic.h"
+      include "description.h"
+      include "serre.h"
+      include "iniprint.h"
 
 C   Arguments
@@ -166,5 +166,5 @@
      .             filevid,dynv_domain_id)
 	
-      rl(1,1) = 1.	
+      rl(1,1) = 1.
       
       if (mpi_rank==0) then
Index: LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F	(revision 2597)
@@ -14,4 +14,5 @@
        use com_io_dyn_mod, only : histid,histvid,histuid,               &
      &                        dynhist_file,dynhistv_file,dynhistu_file
+       USE comconst_mod, ONLY: pi
        implicit none
 
@@ -40,15 +41,14 @@
 C
 C   Declarations
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "temps.h"
-#include "ener.h"
-#include "logic.h"
-#include "description.h"
-#include "serre.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "temps.h"
+      include "ener.h"
+      include "logic.h"
+      include "description.h"
+      include "serre.h"
+      include "iniprint.h"
 
 C   Arguments
Index: LMDZ5/trunk/libf/dyn3dmem/integrd_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/integrd_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/integrd_loc.F	(revision 2597)
@@ -12,4 +12,5 @@
       USE integrd_mod
       USE infotrac, ONLY: ok_iso_verif ! ajout CRisi
+      USE comconst_mod, ONLY: pi
       IMPLICIT NONE
 
@@ -30,14 +31,12 @@
 c   -------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom.h"
-#include "comvert.h"
-#include "logic.h"
-#include "temps.h"
-#include "serre.h"
-#include "iniprint.h"
-!      include 'mpif.h'
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
+      include "comvert.h"
+      include "logic.h"
+      include "temps.h"
+      include "serre.h"
+      include "iniprint.h"
 
 c   Arguments:
@@ -335,5 +334,5 @@
       ije=ij_end
 
-	 if (planet_type.eq."earth") then
+         if (planet_type.eq."earth") then
 ! Earth-specific treatment of first 2 tracers (water)
 c$OMP BARRIER
@@ -452,6 +451,6 @@
           DO l = 1, llm
             massem1(ijb:ije,l)=massescr(ijb:ije,l)
-	  ENDDO
-c$OMP END DO NOWAIT	  
+          ENDDO
+c$OMP END DO NOWAIT          
       END IF
 c$OMP BARRIER
Index: LMDZ5/trunk/libf/dyn3dmem/leapfrog_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/leapfrog_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/leapfrog_loc.F	(revision 2597)
@@ -32,4 +32,5 @@
        use exner_hyb_loc_m, only: exner_hyb_loc
        use exner_milieu_loc_m, only: exner_milieu_loc
+       USE comconst_mod, ONLY: cpp, dtvr, ihf
       IMPLICIT NONE
 
@@ -65,19 +66,16 @@
 c   -------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comdissnew.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "logic.h"
-#include "temps.h"
-#include "ener.h"
-#include "description.h"
-#include "serre.h"
-!#include "com_io_dyn.h"
-#include "iniprint.h"
-#include "academic.h"
-!      include "mpif.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comdissnew.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "logic.h"
+      include "temps.h"
+      include "ener.h"
+      include "description.h"
+      include "serre.h"
+      include "iniprint.h"
+      include "academic.h"
       
       REAL,INTENT(IN) :: time_0 ! not used
Index: LMDZ5/trunk/libf/dyn3dmem/massbarxy_loc.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/massbarxy_loc.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/massbarxy_loc.F90	(revision 2597)
@@ -10,5 +10,4 @@
   include "dimensions.h"
   include "paramet.h"
-  include "comconst.h"
   include "comgeom.h"
 !===============================================================================
Index: LMDZ5/trunk/libf/dyn3dmem/massdair_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/massdair_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/massdair_loc.F	(revision 2597)
@@ -16,8 +16,7 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comgeom.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
 c
 c  .....   arguments  ....
Index: LMDZ5/trunk/libf/dyn3dmem/sw_case_williamson91_6_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/sw_case_williamson91_6_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/sw_case_williamson91_6_loc.F	(revision 2597)
@@ -27,4 +27,5 @@
 c=======================================================================
       USE parallel_lmdz
+      USE comconst_mod, ONLY: cpp, omeg, rad
 
       IMPLICIT NONE
@@ -33,10 +34,9 @@
 c   ---------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
-#include "comconst.h"
-#include "comgeom.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "iniprint.h"
 
 c   Arguments:
Index: LMDZ5/trunk/libf/dyn3dmem/top_bound_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/top_bound_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/top_bound_loc.F	(revision 2597)
@@ -4,11 +4,12 @@
       SUBROUTINE top_bound_loc(vcov,ucov,teta,masse,dt)
       USE parallel_lmdz
+      USE comconst_mod, ONLY: iflag_top_bound, mode_top_bound,
+     &                        tau_top_bound
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom2.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom2.h"
 
 
@@ -40,5 +41,5 @@
 ! NB: top_bound sponge is only called from leapfrog if ok_strato=.true.
 
-! sponge parameters: (loaded/set in conf_gcm.F ; stored in comconst.h)
+! sponge parameters: (loaded/set in conf_gcm.F ; stored in comconst_mod)
 !    iflag_top_bound=0 for no sponge
 !    iflag_top_bound=1 for sponge over 4 topmost layers
@@ -74,5 +75,5 @@
       REAL tzon(jjb_u:jje_u,llm)
       
-      integer i	
+      integer i
       REAL,SAVE :: rdamp(llm)
       real,save :: lambda(llm) ! inverse or quenching time scale (Hz)
Index: LMDZ5/trunk/libf/dyn3dmem/vlsplt_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/vlsplt_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/vlsplt_loc.F	(revision 2597)
@@ -17,9 +17,8 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
 c
 c
@@ -417,12 +416,12 @@
       USE parallel_lmdz
       USE infotrac, ONLY : nqtot,nqfils,nqdesc,iqfils ! CRisi
+      USE comconst_mod, ONLY: pi
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
-#include "comgeom.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
+      include "comgeom.h"
 c
 c
@@ -875,9 +874,8 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
 c
 c
Index: LMDZ5/trunk/libf/dyn3dmem/vlspltgen_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/vlspltgen_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/vlspltgen_loc.F	(revision 2597)
@@ -31,12 +31,12 @@
      &    ok_iso_verif
       USE vlspltgen_mod
+      USE comconst_mod, ONLY: cpp
       IMPLICIT NONE
 
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
 
 c
@@ -100,11 +100,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
@@ -208,19 +208,19 @@
 #endif
         if(iadv(iq) == 0) then
-	
-	  cycle 
-	
-	else if (iadv(iq)==10) then
+        
+          cycle 
+        
+        else if (iadv(iq)==10) then
 
 #ifdef _ADV_HALO        
 ! CRisi: on ajoute les nombres de fils et tableaux des fils
 ! On suppose qu'on ne peut advecter les fils que par le schéma 10.  
-	  call vlx_loc(zq,pente_max,zm,mu,
-     &	             ij_begin,ij_begin+2*iip1-1,iq)
+          call vlx_loc(zq,pente_max,zm,mu,
+     &                     ij_begin,ij_begin+2*iip1-1,iq)
           call vlx_loc(zq,pente_max,zm,mu,
      &               ij_end-2*iip1+1,ij_end,iq)
 #else
-	  call vlx_loc(zq,pente_max,zm,mu,
-     &	             ij_begin,ij_end,iq)
+          call vlx_loc(zq,pente_max,zm,mu,
+     &                     ij_begin,ij_end,iq)
 #endif
 
@@ -240,5 +240,5 @@
           call VTe(VTHallo)
 c$OMP END MASTER
-	else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
 
 #ifdef _ADV_HALO           
@@ -268,6 +268,6 @@
 c$OMP END MASTER 
         else
-	
-	  stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -301,8 +301,8 @@
 
         if(iadv(iq) == 0) then
-	
-	  cycle 
-	
-	else if (iadv(iq)==10) then
+        
+          cycle 
+        
+        else if (iadv(iq)==10) then
 
 #ifdef _ADV_HALLO
@@ -310,5 +310,5 @@
      &                 ij_begin+2*iip1,ij_end-2*iip1,iq)
 #endif        
-	else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
 #ifdef _ADV_HALLO
           call vlxqs_loc(zq,pente_max,zm,mu,
@@ -316,6 +316,6 @@
 #endif    
         else
-	
-	  stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -358,12 +358,12 @@
 
         if(iadv(iq) == 0) then
-	
-	  cycle 
-	
-	else if (iadv(iq)==10) then
+        
+          cycle 
+        
+        else if (iadv(iq)==10) then
         
           call vly_loc(zq,pente_max,zm,mv,iq)
   
-	else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
       
           call vlyqs_loc(zq,pente_max,zm,mv,
@@ -371,6 +371,6 @@
  
         else
-	
-	  stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -389,8 +389,8 @@
 #endif
         if(iadv(iq) == 0) then 
-	  
-	  cycle 
-	
-	else if (iadv(iq)==10 .or. iadv(iq)==14 ) then
+          
+          cycle 
+        
+        else if (iadv(iq)==10 .or. iadv(iq)==14 ) then
 
 c$OMP BARRIER        
@@ -420,9 +420,9 @@
 c$OMP MASTER
           call VTe(VTHallo)
-c$OMP END MASTER	
+c$OMP END MASTER        
 c$OMP BARRIER
         else
-	
-	  stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -439,5 +439,5 @@
 c$OMP MASTER
       call VTe(VTHallo)
-c$OMP END MASTER	
+c$OMP END MASTER        
 
 
@@ -451,8 +451,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        
 
@@ -464,6 +464,6 @@
 c$OMP BARRIER        
         else
-	
-	  stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -501,12 +501,12 @@
 #endif
         if(iadv(iq) == 0) then
-	
-	  cycle 
-	
-	else if (iadv(iq)==10) then
+        
+          cycle 
+        
+        else if (iadv(iq)==10) then
         
           call vly_loc(zq,pente_max,zm,mv,iq)
   
-	else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
       
           call vlyqs_loc(zq,pente_max,zm,mv,
@@ -514,6 +514,6 @@
  
         else
-	
-	  stop 'vlspltgen_p : schema non parallelise'
+        
+          stop 'vlspltgen_p : schema non parallelise'
       
         endif
@@ -532,13 +532,13 @@
 #endif
         if(iadv(iq) == 0) then 
-	  
-	  cycle 
-	
-	else if (iadv(iq)==10) then
+          
+          cycle 
+        
+        else if (iadv(iq)==10) then
         
           call vlx_loc(zq,pente_max,zm,mu,
      &               ij_begin,ij_end,iq)
   
-	else if (iadv(iq)==14) then
+        else if (iadv(iq)==14) then
       
           call vlxqs_loc(zq,pente_max,zm,mu,
@@ -546,5 +546,5 @@
  
         else
-	
+        
           stop 'vlspltgen_p : schema non parallelise'
       
@@ -574,6 +574,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/dyn3dmem/vlspltqs_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/vlspltqs_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/vlspltqs_loc.F	(revision 2597)
@@ -12,9 +12,8 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
 c
 c
@@ -420,12 +419,12 @@
       USE parallel_lmdz
       USE infotrac, ONLY : nqtot,nqfils,nqdesc,iqfils ! CRisi  
+      USE comconst_mod, ONLY: pi
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
-#include "comvert.h"
-#include "comconst.h"
-#include "comgeom.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "logic.h"
+      include "comvert.h"
+      include "comgeom.h"
 c
 c
Index: LMDZ5/trunk/libf/dyn3dmem/writedynav_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/writedynav_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/writedynav_loc.F	(revision 2597)
@@ -13,4 +13,5 @@
       USE infotrac, ONLY : nqtot, ttext
       use com_io_dyn_mod, only : histaveid,histvaveid,histuaveid
+      USE comconst_mod, ONLY: cpp
       implicit none
 
@@ -41,15 +42,14 @@
 C
 C   Declarations
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "temps.h"
-#include "ener.h"
-#include "logic.h"
-#include "description.h"
-#include "serre.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "temps.h"
+      include "ener.h"
+      include "logic.h"
+      include "description.h"
+      include "serre.h"
+      include "iniprint.h"
 
 C
Index: LMDZ5/trunk/libf/dyn3dmem/writehist_loc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dmem/writehist_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dmem/writehist_loc.F	(revision 2597)
@@ -13,4 +13,5 @@
       USE infotrac, ONLY : nqtot, ttext
       use com_io_dyn_mod, only : histid,histvid,histuid
+      USE comconst_mod, ONLY: cpp
       implicit none
 
@@ -41,15 +42,14 @@
 C
 C   Declarations
-#include "dimensions.h"
-#include "paramet.h"
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom.h"
-#include "temps.h"
-#include "ener.h"
-#include "logic.h"
-#include "description.h"
-#include "serre.h"
-#include "iniprint.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comvert.h"
+      include "comgeom.h"
+      include "temps.h"
+      include "ener.h"
+      include "logic.h"
+      include "description.h"
+      include "serre.h"
+      include "iniprint.h"
 
 C
Index: LMDZ5/trunk/libf/dyn3dpar/addfi_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/addfi_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/addfi_p.F	(revision 2597)
@@ -48,5 +48,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comgeom.h"
 #include "serre.h"
Index: LMDZ5/trunk/libf/dyn3dpar/advect_new_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/advect_new_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/advect_new_p.F	(revision 2597)
@@ -6,4 +6,5 @@
       USE parallel_lmdz
       USE write_field_p
+      USE comconst_mod, ONLY: daysec
       IMPLICIT NONE
 c=======================================================================
@@ -28,5 +29,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3dpar/advect_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/advect_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/advect_p.F	(revision 2597)
@@ -5,4 +5,5 @@
       USE parallel_lmdz
       USE write_field_p
+      USE comconst_mod, ONLY: daysec
       IMPLICIT NONE
 c=======================================================================
@@ -27,5 +28,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3dpar/advtrac_p.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/advtrac_p.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/advtrac_p.F90	(revision 2597)
@@ -19,9 +19,9 @@
   USE infotrac, ONLY: nqtot, iadv
   USE control_mod, ONLY: iapp_tracvl, day_step, planet_type
+  USE comconst_mod, ONLY: dtvr
   IMPLICIT NONE
   !
   include "dimensions.h"
   include "paramet.h"
-  include "comconst.h"
   include "comvert.h"
   include "comdissip.h"
Index: LMDZ5/trunk/libf/dyn3dpar/bilan_dyn_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/bilan_dyn_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/bilan_dyn_p.F	(revision 2597)
@@ -17,9 +17,9 @@
       use misc_mod
       use write_field_p
+      USE comconst_mod, ONLY: cpp, pi
       IMPLICIT NONE
 
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom2.h"
Index: LMDZ5/trunk/libf/dyn3dpar/caladvtrac_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/caladvtrac_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/caladvtrac_p.F	(revision 2597)
@@ -10,4 +10,5 @@
       USE infotrac, ONLY : nqtot
       USE control_mod, ONLY : iapp_tracvl,planet_type
+      USE comconst_mod, ONLY: dtvr
 c
       IMPLICIT NONE
@@ -25,5 +26,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 
 c   Arguments:
Index: LMDZ5/trunk/libf/dyn3dpar/caldyn_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/caldyn_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/caldyn_p.F	(revision 2597)
@@ -31,5 +31,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3dpar/conf_gcm.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/conf_gcm.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/conf_gcm.F90	(revision 2597)
@@ -16,4 +16,7 @@
   USE infotrac, ONLY : type_trac
   use assert_m, only: assert
+  USE comconst_mod, ONLY: dissip_deltaz, dissip_factz, dissip_zref, &
+                          iflag_top_bound, mode_top_bound, tau_top_bound, &
+                          ngroup
 
   IMPLICIT NONE
@@ -38,5 +41,4 @@
   include "comdissnew.h"
   include "temps.h"
-  include "comconst.h"
   include "iniprint.h"
 
Index: LMDZ5/trunk/libf/dyn3dpar/dissip_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/dissip_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/dissip_p.F	(revision 2597)
@@ -6,4 +6,5 @@
       USE parallel_lmdz
       USE write_field_p
+      USE comconst_mod, ONLY: dtdiss
       IMPLICIT NONE
 
@@ -29,5 +30,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comgeom.h"
 #include "comdissnew.h"
Index: LMDZ5/trunk/libf/dyn3dpar/dynetat0.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/dynetat0.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/dynetat0.F	(revision 2597)
@@ -9,4 +9,6 @@
 
       use control_mod, only : planet_type
+      USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa,
+     &                        lllm, omeg, rad
 
       IMPLICIT NONE
@@ -30,5 +32,4 @@
 #include "paramet.h"
 #include "temps.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom2.h"
Index: LMDZ5/trunk/libf/dyn3dpar/dynredem.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/dynredem.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/dynredem.F	(revision 2597)
@@ -9,4 +9,5 @@
       USE infotrac
       use netcdf95, only: NF95_PUT_VAR
+      USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
  
       IMPLICIT NONE
@@ -18,5 +19,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom2.h"
Index: LMDZ5/trunk/libf/dyn3dpar/dynredem_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/dynredem_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/dynredem_p.F	(revision 2597)
@@ -10,4 +10,5 @@
       USE infotrac
       use netcdf95, only: NF95_PUT_VAR
+      USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
  
       IMPLICIT NONE
@@ -19,5 +20,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom2.h"
Index: LMDZ5/trunk/libf/dyn3dpar/exner_hyb_p_m.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/exner_hyb_p_m.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/exner_hyb_p_m.F90	(revision 2597)
@@ -33,8 +33,8 @@
     !
     USE parallel_lmdz
+    USE comconst_mod, ONLY: cpp, kappa, r, jmp1
     !
     include "dimensions.h"
     include "paramet.h"
-    include "comconst.h"
     include "comgeom.h"
     include "comvert.h"
Index: LMDZ5/trunk/libf/dyn3dpar/exner_milieu_p_m.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/exner_milieu_p_m.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/exner_milieu_p_m.F90	(revision 2597)
@@ -30,8 +30,8 @@
     !
     USE parallel_lmdz
+    USE comconst_mod, ONLY: cpp, kappa, r, jmp1
     !
     include "dimensions.h"
     include "paramet.h"
-    include "comconst.h"
     include "comgeom.h"
     include "comvert.h"
Index: LMDZ5/trunk/libf/dyn3dpar/fluxstokenc_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/fluxstokenc_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/fluxstokenc_p.F	(revision 2597)
@@ -21,5 +21,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3dpar/friction_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/friction_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/friction_p.F	(revision 2597)
@@ -12,4 +12,5 @@
       USE ioipsl_getincom
 #endif
+      USE comconst_mod, ONLY: pi
       IMPLICIT NONE
 
@@ -29,5 +30,4 @@
 #include "paramet.h"
 #include "comgeom2.h"
-#include "comconst.h"
 #include "iniprint.h"
 #include "academic.h"
Index: LMDZ5/trunk/libf/dyn3dpar/gcm.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/gcm.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/gcm.F	(revision 2597)
@@ -32,4 +32,6 @@
       USE iniphysiq_mod, ONLY: iniphysiq
 #endif
+      USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
+
       IMPLICIT NONE
 
@@ -65,5 +67,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comdissnew.h"
 #include "comvert.h"
Index: LMDZ5/trunk/libf/dyn3dpar/groupe_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/groupe_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/groupe_p.F	(revision 2597)
@@ -1,4 +1,5 @@
       subroutine groupe_p(pext,pbaru,pbarv,pbarum,pbarvm,wm)
       USE parallel_lmdz
+      USE comconst_mod, ONLY: ngroup
       implicit none
 
@@ -16,5 +17,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comgeom2.h"
 #include "comvert.h"
Index: LMDZ5/trunk/libf/dyn3dpar/groupeun_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/groupeun_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/groupeun_p.F	(revision 2597)
@@ -2,9 +2,9 @@
       USE parallel_lmdz
       USE Write_Field_p
+      USE comconst_mod, ONLY: ngroup
       IMPLICIT NONE
 
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comgeom2.h"
 
@@ -136,9 +136,9 @@
 
       USE parallel_lmdz
+      USE comconst_mod, ONLY: ngroup
       IMPLICIT NONE
 
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comgeom2.h"
 
Index: LMDZ5/trunk/libf/dyn3dpar/guide_p_mod.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/guide_p_mod.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/guide_p_mod.F90	(revision 2597)
@@ -341,4 +341,5 @@
     USE parallel_lmdz
     USE control_mod
+    USE comconst_mod, ONLY: daysec, dtvr, cpp, kappa
     
     IMPLICIT NONE
@@ -346,5 +347,4 @@
     INCLUDE "dimensions.h"
     INCLUDE "paramet.h"
-    INCLUDE "comconst.h"
     INCLUDE "comvert.h"
 
@@ -619,4 +619,6 @@
   SUBROUTINE guide_zonave(typ,hsize,vsize,field)
 
+    USE comconst_mod, ONLY: pi
+    
     IMPLICIT NONE
 
@@ -624,5 +626,4 @@
     INCLUDE "paramet.h"
     INCLUDE "comgeom.h"
-    INCLUDE "comconst.h"
     
     ! input/output variables
@@ -707,4 +708,5 @@
   USE mod_hallo
   USE Bands
+  USE comconst_mod, ONLY: cpp, kappa
   IMPLICIT NONE
 
@@ -713,5 +715,4 @@
   include "comvert.h"
   include "comgeom2.h"
-  include "comconst.h"
 
   REAL, DIMENSION (iip1,jjp1),     INTENT(IN) :: psi ! Psol gcm
@@ -1099,9 +1100,10 @@
 ! Calcul des constantes de rappel alpha (=1/tau)
 
+    use comconst_mod, only: pi
+    
     implicit none
 
     include "dimensions.h"
     include "paramet.h"
-    include "comconst.h"
     include "comgeom2.h"
     include "serre.h"
@@ -1813,4 +1815,5 @@
   SUBROUTINE guide_out(varname,hsize,vsize,field,factt)
     USE parallel_lmdz
+    USE comconst_mod, ONLY: pi
     IMPLICIT NONE
 
@@ -1819,5 +1822,4 @@
     INCLUDE "netcdf.inc"
     INCLUDE "comgeom2.h"
-    INCLUDE "comconst.h"
     INCLUDE "comvert.h"
     
Index: LMDZ5/trunk/libf/dyn3dpar/iniacademic.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/iniacademic.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/iniacademic.F90	(revision 2597)
@@ -16,4 +16,5 @@
   use exner_hyb_m, only: exner_hyb
   use exner_milieu_m, only: exner_milieu
+  USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -29,5 +30,4 @@
   include "paramet.h"
   include "comvert.h"
-  include "comconst.h"
   include "comgeom.h"
   include "academic.h"
Index: LMDZ5/trunk/libf/dyn3dpar/initdynav_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/initdynav_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/initdynav_p.F	(revision 2597)
@@ -12,4 +12,5 @@
        use misc_mod
        USE infotrac
+       USE comconst_mod, ONLY: pi
 
       implicit none
@@ -43,5 +44,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3dpar/initfluxsto_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/initfluxsto_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/initfluxsto_p.F	(revision 2597)
@@ -13,4 +13,5 @@
        use Write_field
        use misc_mod
+       USE comconst_mod, ONLY: pi
        
       implicit none
@@ -45,5 +46,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3dpar/inithist_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/inithist_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/inithist_p.F	(revision 2597)
@@ -13,4 +13,5 @@
        use misc_mod
        USE infotrac
+       USE comconst_mod, ONLY: pi
 
       implicit none
@@ -45,5 +46,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3dpar/integrd_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/integrd_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/integrd_p.F	(revision 2597)
@@ -7,4 +7,5 @@
       USE parallel_lmdz
       USE control_mod, only : planet_type
+      USE comconst_mod, ONLY: pi
       IMPLICIT NONE
 
@@ -27,5 +28,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comgeom.h"
 #include "comvert.h"
Index: LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F	(revision 2597)
@@ -28,4 +28,5 @@
      &                       periodav, ok_dyn_ave, output_grads_dyn,
      &                       iapp_tracvl
+       USE comconst_mod, ONLY: cpp, dtvr, ihf, dtphys, pi, jmp1
       IMPLICIT NONE
 
@@ -63,5 +64,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comdissnew.h"
 #include "comvert.h"
Index: LMDZ5/trunk/libf/dyn3dpar/massbar_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/massbar_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/massbar_p.F	(revision 2597)
@@ -18,5 +18,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comgeom.h"
 c
Index: LMDZ5/trunk/libf/dyn3dpar/massbarxy_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/massbarxy_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/massbarxy_p.F	(revision 2597)
@@ -17,5 +17,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comgeom.h"
 c
Index: LMDZ5/trunk/libf/dyn3dpar/massdair_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/massdair_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/massdair_p.F	(revision 2597)
@@ -18,5 +18,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comgeom.h"
 c
Index: LMDZ5/trunk/libf/dyn3dpar/sw_case_williamson91_6.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/sw_case_williamson91_6.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/sw_case_williamson91_6.F	(revision 2597)
@@ -26,4 +26,5 @@
 c
 c=======================================================================
+      USE comconst_mod, ONLY: cpp, omeg, rad
       IMPLICIT NONE
 c-----------------------------------------------------------------------
@@ -34,5 +35,4 @@
 #include "paramet.h"
 #include "comvert.h"
-#include "comconst.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 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/top_bound_p.F	(revision 2597)
@@ -4,9 +4,10 @@
       SUBROUTINE top_bound_p(vcov,ucov,teta,masse,dt)
       USE parallel_lmdz
+      USE comconst_mod, ONLY: iflag_top_bound, mode_top_bound,
+     &                        tau_top_bound
       IMPLICIT NONE
 c
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom2.h"
@@ -40,5 +41,5 @@
 ! NB: top_bound sponge is only called from leapfrog if ok_strato=.true.
 
-! sponge parameters: (loaded/set in conf_gcm.F ; stored in comconst.h)
+! sponge parameters: (loaded/set in conf_gcm.F ; stored in comconst_mod)
 !    iflag_top_bound=0 for no sponge
 !    iflag_top_bound=1 for sponge over 4 topmost layers
Index: LMDZ5/trunk/libf/dyn3dpar/vlsplt_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/vlsplt_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/vlsplt_p.F	(revision 2597)
@@ -27,5 +27,4 @@
 #include "logic.h"
 #include "comvert.h"
-#include "comconst.h"
 
 c
@@ -210,5 +209,4 @@
 #include "logic.h"
 #include "comvert.h"
-#include "comconst.h"
 c
 c
@@ -539,4 +537,5 @@
 c   --------------------------------------------------------------------
       USE parallel_lmdz
+      USE comconst_mod, ONLY: pi
       IMPLICIT NONE
 c
@@ -545,5 +544,4 @@
 #include "logic.h"
 #include "comvert.h"
-#include "comconst.h"
 #include "comgeom.h"
 c
@@ -934,5 +932,4 @@
 #include "logic.h"
 #include "comvert.h"
-#include "comconst.h"
 c
 c
Index: LMDZ5/trunk/libf/dyn3dpar/vlspltgen_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/vlspltgen_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/vlspltgen_p.F	(revision 2597)
@@ -27,4 +27,5 @@
       USE VAMPIR
       USE infotrac, ONLY : nqtot
+      USE comconst_mod, ONLY: cpp
       IMPLICIT NONE
 
@@ -34,5 +35,4 @@
 #include "logic.h"
 #include "comvert.h"
-#include "comconst.h"
 
 c
Index: LMDZ5/trunk/libf/dyn3dpar/vlspltqs_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/vlspltqs_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/vlspltqs_p.F	(revision 2597)
@@ -25,4 +25,5 @@
       USE mod_hallo
       USE VAMPIR
+      USE comconst_mod, ONLY: cpp
       IMPLICIT NONE
 
@@ -32,5 +33,4 @@
 #include "logic.h"
 #include "comvert.h"
-#include "comconst.h"
 
 c
@@ -238,5 +238,4 @@
 #include "logic.h"
 #include "comvert.h"
-#include "comconst.h"
 c
 c
@@ -584,4 +583,5 @@
 c   --------------------------------------------------------------------
       USE parallel_lmdz
+      USE comconst_mod, ONLY: pi
       IMPLICIT NONE
 c
@@ -590,5 +590,4 @@
 #include "logic.h"
 #include "comvert.h"
-#include "comconst.h"
 #include "comgeom.h"
 c
Index: LMDZ5/trunk/libf/dyn3dpar/writedynav_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/writedynav_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/writedynav_p.F	(revision 2597)
@@ -12,4 +12,5 @@
       USE misc_mod
       USE infotrac
+      USE comconst_mod, ONLY: cpp
       implicit none
 
@@ -42,5 +43,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom.h"
Index: LMDZ5/trunk/libf/dyn3dpar/writehist_p.F
===================================================================
--- LMDZ5/trunk/libf/dyn3dpar/writehist_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dyn3dpar/writehist_p.F	(revision 2597)
@@ -43,5 +43,4 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom.h"
Index: LMDZ5/trunk/libf/dynphy_lonlat/calfis.F
===================================================================
--- LMDZ5/trunk/libf/dynphy_lonlat/calfis.F	(revision 2596)
+++ LMDZ5/trunk/libf/dynphy_lonlat/calfis.F	(revision 2597)
@@ -34,5 +34,6 @@
       USE callphysiq_mod, ONLY: call_physiq
 #endif 
-
+      USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, kappa, pi
+      
       IMPLICIT NONE
 c=======================================================================
@@ -96,5 +97,4 @@
       PARAMETER( ngridmx = 2+(jjm-1)*iim - 1/jjm   )
 
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom2.h"
Index: LMDZ5/trunk/libf/dynphy_lonlat/calfis_loc.F
===================================================================
--- LMDZ5/trunk/libf/dynphy_lonlat/calfis_loc.F	(revision 2596)
+++ LMDZ5/trunk/libf/dynphy_lonlat/calfis_loc.F	(revision 2597)
@@ -50,4 +50,5 @@
       USE callphysiq_mod, ONLY: call_physiq
 #endif 
+      USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, kappa, pi
 
 #ifdef CPP_PARA
@@ -107,15 +108,14 @@
 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 "comconst.h"
-#include "comvert.h"
-#include "comgeom2.h"
-#include "iniprint.h"
+      include "comvert.h"
+      include "comgeom2.h"
+      include "iniprint.h"
 #ifdef CPP_MPI
       include 'mpif.h'
Index: LMDZ5/trunk/libf/dynphy_lonlat/calfis_p.F
===================================================================
--- LMDZ5/trunk/libf/dynphy_lonlat/calfis_p.F	(revision 2596)
+++ LMDZ5/trunk/libf/dynphy_lonlat/calfis_p.F	(revision 2597)
@@ -47,4 +47,5 @@
       USE callphysiq_mod, ONLY: call_physiq
 #endif 
+      USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, kappa, pi
 
       IMPLICIT NONE
@@ -110,5 +111,4 @@
       PARAMETER( ngridmx = 2+(jjm-1)*iim - 1/jjm   )
 
-#include "comconst.h"
 #include "comvert.h"
 #include "comgeom2.h"
@@ -159,5 +159,6 @@
       REAL,ALLOCATABLE,SAVE :: zphi(:,:),zphis(:)
 c
-      REAL zrot(iip1,jjb_v:jje_v,llm) ! AdlC May 2014
+!      REAL zrot(iip1,jjb_v:jje_v,llm) ! AdlC May 2014
+      REAL :: zrot(iip1,jjm,llm)
       REAL,ALLOCATABLE,SAVE :: zufi(:,:), zvfi(:,:), zrfi(:,:)
       REAL,ALLOCATABLE,SAVE :: ztfi(:,:),zqfi(:,:,:)
Index: LMDZ5/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90
===================================================================
--- LMDZ5/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90	(revision 2597)
@@ -34,4 +34,6 @@
   USE mod_interface_dyn_phys, ONLY: init_interface_dyn_phys
 #endif
+  USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, kappa, omeg, r, rad, &
+                          pi, jmp1
 
   IMPLICIT NONE
@@ -42,5 +44,4 @@
   include "paramet.h"
   include "comgeom2.h"
-  include "comconst.h"
   include "comvert.h"
   include "iniprint.h"
Index: LMDZ5/trunk/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90
===================================================================
--- LMDZ5/trunk/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90	(revision 2597)
@@ -36,4 +36,5 @@
   USE ioipsl,         ONLY: flininfo, flinopen, flinget, flinclo, histclo
   USE assert_eq_m,    ONLY: assert_eq
+  USE comconst_mod, ONLY: pi, cpp, kappa
   IMPLICIT NONE
 
@@ -46,5 +47,4 @@
   include "comgeom2.h"
   include "comvert.h"
-  include "comconst.h"
   include "temps.h"
   include "comdissnew.h"
Index: LMDZ5/trunk/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90
===================================================================
--- LMDZ5/trunk/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90	(revision 2597)
@@ -44,4 +44,5 @@
     zmax0,fevap, rnebcon,falb_dir, wake_fip,    agesno,  detr_therm, pbl_tke,  &
     phys_state_var_init
+  USE comconst_mod, ONLY: pi, dtvr
 
   PRIVATE
@@ -52,5 +53,4 @@
   include "paramet.h"
   include "comgeom2.h"
-  include "comconst.h"
   include "dimsoil.h"
   include "temps.h"
Index: LMDZ5/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90
===================================================================
--- LMDZ5/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90	(revision 2597)
@@ -51,5 +51,4 @@
   include "dimensions.h"
   include "comvert.h"
-  include "comconst.h"
   include "iniprint.h"
   include "temps.h"
Index: LMDZ5/trunk/libf/dynphy_lonlat/phylmd/init_ssrf_m.F90
===================================================================
--- LMDZ5/trunk/libf/dynphy_lonlat/phylmd/init_ssrf_m.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dynphy_lonlat/phylmd/init_ssrf_m.F90	(revision 2597)
@@ -9,4 +9,5 @@
   USE grid_atob_m,        ONLY: grille_m
   USE ioipsl,             ONLY: flininfo, flinopen, flinget, flinclo
+  USE comconst_mod, ONLY: im, pi
 
   CHARACTER(LEN=256), PARAMETER :: icefname="landiceref.nc", icevar="landice"
@@ -17,5 +18,4 @@
   include "paramet.h"
   include "comgeom2.h"
-  include "comconst.h"
 
 CONTAINS
Index: LMDZ5/trunk/libf/dynphy_lonlat/phylmd/limit_netcdf.F90
===================================================================
--- LMDZ5/trunk/libf/dynphy_lonlat/phylmd/limit_netcdf.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dynphy_lonlat/phylmd/limit_netcdf.F90	(revision 2597)
@@ -70,4 +70,5 @@
   USE inter_barxy_m,      ONLY: inter_barxy
   USE netcdf95,           ONLY: nf95_def_var, nf95_put_att, nf95_put_var
+  USE comconst_mod, ONLY: pi
   IMPLICIT NONE
 !-------------------------------------------------------------------------------
@@ -83,5 +84,4 @@
   include "logic.h"
   include "comgeom2.h"
-  include "comconst.h"
 
 !--- INPUT NETCDF FILES NAMES --------------------------------------------------
Index: LMDZ5/trunk/libf/dynphy_lonlat/phylmd/test_disvert_m.F90
===================================================================
--- LMDZ5/trunk/libf/dynphy_lonlat/phylmd/test_disvert_m.F90	(revision 2596)
+++ LMDZ5/trunk/libf/dynphy_lonlat/phylmd/test_disvert_m.F90	(revision 2597)
@@ -15,10 +15,8 @@
     use exner_hyb_m, only: exner_hyb
     use vertical_layers_mod, only: ap,bp,preff
+    use comconst_mod, only: kappa, cpp
 
     ! For llm:
     include "dimensions.h"
-
-    ! For kappa, cpp:
-    include "comconst.h"
 
     ! Local:
Index: LMDZ5/trunk/libf/phylmd/dyn1d/1DUTILS.h
===================================================================
--- LMDZ5/trunk/libf/phylmd/dyn1d/1DUTILS.h	(revision 2596)
+++ LMDZ5/trunk/libf/phylmd/dyn1d/1DUTILS.h	(revision 2597)
@@ -435,4 +435,5 @@
       USE infotrac
       use control_mod
+      USE comconst_mod, ONLY: im, jm, lllm
 
       IMPLICIT NONE
@@ -443,5 +444,4 @@
 !   -------------
       include "dimensions.h"
-      include "comconst.h"
       include "temps.h"
 !!#include "control.h"
@@ -579,4 +579,5 @@
       USE infotrac
       use control_mod
+      USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
 
       IMPLICIT NONE
@@ -587,5 +588,4 @@
 !   -------------
       include "dimensions.h"
-      include "comconst.h"
       include "temps.h"
 !!#include "control.h"
Index: LMDZ5/trunk/libf/phylmd/dyn1d/comconst.h
===================================================================
--- LMDZ5/trunk/libf/phylmd/dyn1d/comconst.h	(revision 2596)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../../dyn3d_common/comconst.h
Index: LMDZ5/trunk/libf/phylmd/dyn1d/comconst_mod.F90
===================================================================
--- LMDZ5/trunk/libf/phylmd/dyn1d/comconst_mod.F90	(revision 2597)
+++ LMDZ5/trunk/libf/phylmd/dyn1d/comconst_mod.F90	(revision 2597)
@@ -0,0 +1,1 @@
+link ../../dyn3d_common/comconst_mod.F90
