Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/addfi.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/addfi.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/addfi.F90	(revision 5134)
@@ -46,7 +46,7 @@
   !    ------------------
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !
   !    Arguments :
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/advect.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/advect.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/advect.F90	(revision 5134)
@@ -28,7 +28,7 @@
   !   -------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/advtrac.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/advtrac.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/advtrac.f90	(revision 5134)
@@ -18,11 +18,11 @@
   USE lmdz_iniprint, ONLY: lunout, prt_level
   USE lmdz_ssum_scopy, ONLY: scopy
+  USE lmdz_comdissip, ONLY: coefdis, tetavel, tetatemp, gamdissip, niterdis
 
   IMPLICIT NONE
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissip.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   !---------------------------------------------------------------------------
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/bilan_dyn.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/bilan_dyn.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/bilan_dyn.F90	(revision 5134)
@@ -18,7 +18,7 @@
   IMPLICIT NONE
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   !====================================================================
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/caladvtrac.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/caladvtrac.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/caladvtrac.F90	(revision 5134)
@@ -24,6 +24,6 @@
   !=======================================================================
 
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/caldyn.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/caldyn.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/caldyn.F90	(revision 5134)
@@ -25,7 +25,7 @@
   !   ----------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/check_isotopes.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/check_isotopes.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/check_isotopes.F90	(revision 5134)
@@ -5,5 +5,5 @@
 
    IMPLICIT NONE
-   include "dimensions.h"
+   INCLUDE "dimensions.h"
    REAL,             INTENT(INOUT) :: q(ip1jmp1,llm,nqtot)
    INTEGER,          INTENT(IN)    :: ip1jmp1
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/conf_gcm.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/conf_gcm.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/conf_gcm.f90	(revision 5134)
@@ -17,5 +17,6 @@
   USE temps_mod, ONLY: calend, year_len
   USE lmdz_iniprint, ONLY: lunout, prt_level
-
+  USE lmdz_comdissnew, ONLY: lstardis, nitergdiv, nitergrot, niterh, tetagdiv, &
+          tetagrot, tetatemp, coefdis, vert_prof_dissip
 
   IMPLICIT NONE
@@ -34,7 +35,6 @@
   !   Declarations :
   !   --------------
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissnew.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   !   local:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/covnat.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/covnat.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/covnat.F90	(revision 5134)
@@ -18,7 +18,7 @@
   !=======================================================================
 
- include "dimensions.h"
- include "paramet.h"
- include "comgeom.h"
+ INCLUDE "dimensions.h"
+ INCLUDE "paramet.h"
+ INCLUDE "comgeom.h"
 
   INTEGER :: klevel
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/dissip.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/dissip.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/dissip.F90	(revision 5134)
@@ -2,6 +2,8 @@
 
 SUBROUTINE dissip(vcov, ucov, teta, p, dv, du, dh)
-  !
   USE comconst_mod, ONLY: dtdiss
+  USE lmdz_comdissipn, ONLY: tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
+  USE lmdz_comdissnew, ONLY: lstardis, nitergdiv, nitergrot, niterh, tetagdiv, &
+          tetagrot, tetatemp, coefdis, vert_prof_dissip
 
   IMPLICIT NONE
@@ -26,9 +28,7 @@
   !   -------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
-  include "comdissnew.h"
-  include "comdissipn.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/dteta1.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/dteta1.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/dteta1.F90	(revision 5134)
@@ -20,6 +20,6 @@
   !=======================================================================
 
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   REAL :: teta(ip1jmp1, llm), pbaru(ip1jmp1, llm), pbarv(ip1jm, llm)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/dudv1.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/dudv1.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/dudv1.F90	(revision 5134)
@@ -18,6 +18,6 @@
   !-----------------------------------------------------------------------
 
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   REAL :: vorpot(ip1jm, llm), pbaru(ip1jmp1, llm), &
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/dudv2.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/dudv2.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/dudv2.F90	(revision 5134)
@@ -25,6 +25,6 @@
   !=======================================================================
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   REAL :: teta(ip1jmp1, llm), pkf(ip1jmp1, llm), bern(ip1jmp1, llm), &
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/dynetat0.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/dynetat0.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/dynetat0.F90	(revision 5134)
@@ -25,7 +25,7 @@
 
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/dynredem.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/dynredem.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/dynredem.F90	(revision 5134)
@@ -22,7 +22,7 @@
 
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
   !===============================================================================
   ! Arguments:
@@ -169,7 +169,7 @@
 
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !===============================================================================
   ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/dynredem_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/dynredem_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/dynredem_mod.F90	(revision 5134)
@@ -7,6 +7,6 @@
   PUBLIC :: dynredem_write_u, dynredem_write_v, dynredem_read_u, err
   PUBLIC :: cre_var, put_var1, put_var2, fil, modname, msg
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
   CHARACTER(LEN = 256), SAVE :: fil, modname
   INTEGER, SAVE :: nvarid
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/fluxstokenc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/fluxstokenc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/fluxstokenc.F90	(revision 5134)
@@ -16,8 +16,8 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
-  include "tracstoke.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
+  INCLUDE "tracstoke.h"
 
   REAL :: time_step, t_wrt, t_ops
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/friction.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/friction.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/friction.F90	(revision 5134)
@@ -8,5 +8,5 @@
   USE comconst_mod, ONLY: pi
   USE lmdz_iniprint, ONLY: lunout, prt_level
-
+  USE lmdz_academic, ONLY: tetarappel, knewt_t, kfrict, knewt_g, clat4
 
   IMPLICIT NONE
@@ -24,8 +24,7 @@
   !=======================================================================
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
-  include "academic.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   ! arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/gcm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/gcm.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/gcm.F90	(revision 5134)
@@ -28,5 +28,6 @@
   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   USE lmdz_iniprint, ONLY: lunout, prt_level
-
+  USE lmdz_comdissnew, ONLY: lstardis, nitergdiv, nitergrot, niterh, tetagdiv, &
+          tetagrot, tetatemp, coefdis, vert_prof_dissip
 
   IMPLICIT NONE
@@ -62,9 +63,8 @@
   !   -------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissnew.h"
-  include "comgeom.h"
-  include "tracstoke.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
+  INCLUDE "tracstoke.h"
 
   REAL zdtvr
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/groupe.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/groupe.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/groupe.F90	(revision 5134)
@@ -20,7 +20,7 @@
   !   pas besoin de w en entree.
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   ! integer ngroup
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/groupeun.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/groupeun.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/groupeun.F90	(revision 5134)
@@ -7,7 +7,7 @@
   IMPLICIT NONE
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   INTEGER :: jjmax, llmax
@@ -137,7 +137,7 @@
   IMPLICIT NONE
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   ! INTEGER ngroup
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/guide_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/guide_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/guide_mod.F90	(revision 5134)
@@ -678,7 +678,7 @@
     IMPLICIT NONE
 
-    include "dimensions.h"
-    include "paramet.h"
-    include "comgeom2.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
+    INCLUDE "comgeom2.h"
 
     REAL, DIMENSION (iip1, jjp1), INTENT(IN) :: psi ! Psol gcm
@@ -928,7 +928,7 @@
     IMPLICIT NONE
 
-    include "dimensions.h"
-    include "paramet.h"
-    include "comgeom2.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
+    INCLUDE "comgeom2.h"
 
     ! input arguments :
@@ -1094,6 +1094,6 @@
     IMPLICIT NONE
 
-    include "dimensions.h"
-    include "paramet.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
 
     INTEGER, INTENT(IN) :: timestep
@@ -1390,6 +1390,6 @@
     IMPLICIT NONE
 
-    include "dimensions.h"
-    include "paramet.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
 
     INTEGER, INTENT(IN) :: timestep
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/iniacademic.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/iniacademic.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/iniacademic.F90	(revision 5134)
@@ -19,5 +19,5 @@
   USE lmdz_ran1, ONLY: ran1
   USE lmdz_iniprint, ONLY: lunout, prt_level
-
+  USE lmdz_academic, ONLY: tetarappel, knewt_t, kfrict, knewt_g, clat4
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -30,8 +30,7 @@
   !   ---------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
-  include "academic.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/integrd.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/integrd.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/integrd.F90	(revision 5134)
@@ -33,7 +33,7 @@
   !   -------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/leapfrog.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/leapfrog.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/leapfrog.F90	(revision 5134)
@@ -28,5 +28,7 @@
   USE lmdz_iniprint, ONLY: lunout, prt_level
   USE lmdz_ssum_scopy, ONLY: scopy, ssum
-
+  USE lmdz_academic, ONLY: tetarappel, knewt_t, kfrict, knewt_g, clat4
+  USE lmdz_comdissnew, ONLY: lstardis, nitergdiv, nitergrot, niterh, tetagdiv, &
+          tetagrot, tetatemp, coefdis, vert_prof_dissip
 
   IMPLICIT NONE
@@ -63,9 +65,7 @@
   !   -------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissnew.h"
-  include "comgeom.h"
-  include "academic.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   REAL, INTENT(IN) :: time_0 ! not used
@@ -686,5 +686,5 @@
         ! For some Grads outputs of fields
         IF (output_grads_dyn) THEN
-          include "write_grads_dyn.h"
+          INCLUDE "write_grads_dyn.h"
         endif
       endif ! of if (leapf.OR.(.NOT.leapf.AND.(.NOT.forward)))
@@ -806,5 +806,5 @@
         ! For some Grads outputs
         IF (output_grads_dyn) THEN
-          include "write_grads_dyn.h"
+          INCLUDE "write_grads_dyn.h"
         endif
 
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/paramet.h
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/paramet.h	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/paramet.h	(revision 5134)
@@ -3,5 +3,5 @@
 
 
-!  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
+!  ATTENTION!!!!: ce fichier INCLUDE est compatible format fixe/format libre
 !                 veillez  n'utiliser que des ! pour les commentaires
 !                 et  bien positionner les & des lignes de continuation
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/qminimum.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/qminimum.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/qminimum.F90	(revision 5134)
@@ -8,11 +8,11 @@
   USE lmdz_ssum_scopy, ONLY: ssum
 
-  IMPLICIT none
+  IMPLICIT NONE
   !
   !  -- Objet : Traiter les valeurs trop petites (meme negatives)
   !         pour l'eau vapeur et l'eau liquide
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
   !
   INTEGER :: nqtot
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/replay3d.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/replay3d.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/replay3d.F90	(revision 5134)
@@ -21,5 +21,6 @@
         grossismx, grossismy, dzoomx, dzoomy,taux,tauy
   USE mod_const_mpi, ONLY: comm_lmdz
-
+  USE lmdz_comdissnew, ONLY: lstardis, nitergdiv, nitergrot, niterh, tetagdiv, &
+          tetagrot, tetatemp, coefdis, vert_prof_dissip
 
   IMPLICIT NONE
@@ -55,8 +56,7 @@
   !   -------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissnew.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   REAL zdtvr
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/sw_case_williamson91_6.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/sw_case_williamson91_6.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/sw_case_williamson91_6.F90	(revision 5134)
@@ -34,7 +34,7 @@
   !   ---------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/tetaleveli1j.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/tetaleveli1j.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/tetaleveli1j.F90	(revision 5134)
@@ -6,7 +6,7 @@
 
   ! FH 2008/05/09 On elimine toutes les clefs physiques dans la dynamique
-  IMPLICIT none
+  IMPLICIT NONE
 
-  include "dimensions.h"
+  INCLUDE "dimensions.h"
 
   !================================================================
@@ -43,5 +43,5 @@
   ! REAL ptop, pbot, aist(klon), aisb(klon)
   !
-  include "paramet.h"
+  INCLUDE "paramet.h"
   !
   INTEGER :: lt(ip1jm), lb(ip1jm)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/tetaleveli1j1.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/tetaleveli1j1.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/tetaleveli1j1.F90	(revision 5134)
@@ -6,7 +6,7 @@
 
   ! FH 2008/05/09 On elimine toutes les clefs physiques dans la dynamique
-  IMPLICIT none
+  IMPLICIT NONE
 
-  include "dimensions.h"
+  INCLUDE "dimensions.h"
 
   !================================================================
@@ -43,5 +43,5 @@
   ! REAL ptop, pbot, aist(klon), aisb(klon)
   !
-  include "paramet.h"
+  INCLUDE "paramet.h"
   !
   INTEGER :: lt(ip1jmp1), lb(ip1jmp1)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/top_bound.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/top_bound.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/top_bound.F90	(revision 5134)
@@ -7,10 +7,11 @@
   USE comvert_mod, ONLY: presnivs, preff, scaleheight
   USE lmdz_iniprint, ONLY: lunout, prt_level
+  USE lmdz_comdissipn, ONLY: tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
 
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
 
@@ -52,6 +53,4 @@
   !    tau_top_bound : inverse of charactericstic relaxation time scale at
   !                   the topmost layer (Hz)
-
-  include "comdissipn.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/vlsplt.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/vlsplt.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/vlsplt.F90	(revision 5134)
@@ -22,6 +22,6 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   !
@@ -120,6 +120,6 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
   !
   !
@@ -437,7 +437,7 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !
   !
@@ -756,6 +756,6 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
   !
   !
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/vlspltqs.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/vlspltqs.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/vlspltqs.F90	(revision 5134)
@@ -29,6 +29,6 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   !
@@ -188,6 +188,6 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
   !
   !
@@ -525,7 +525,7 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !
   !
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/wrgrads.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/wrgrads.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/wrgrads.f90	(revision 5134)
@@ -14,5 +14,5 @@
   !    titlevar   Titre
 
-  include "gradsdef.h"
+  INCLUDE "gradsdef.h"
 
   !   arguments
Index: DZ6/branches/Amaury_dev/libf/dyn3d_common/academic.h
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/academic.h	(revision 5133)
+++ 	(revision )
@@ -1,9 +1,0 @@
-
-! $Id$
-
-      common/academic/tetarappel,knewt_t,kfrict,knewt_g,clat4
-      REAL :: tetarappel(ip1jmp1,llm)
-      REAL :: knewt_t(llm)
-      REAL :: kfrict(llm)
-      REAL :: knewt_g
-      REAL :: clat4(ip1jmp1)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/adaptdt.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/adaptdt.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/adaptdt.f90	(revision 5134)
@@ -7,10 +7,11 @@
   USE comconst_mod, ONLY: dtvr
   USE lmdz_description, ONLY: descript
+  USE lmdz_comdissip, ONLY: coefdis, tetavel, tetatemp, gamdissip, niterdis
+
   IMPLICIT NONE
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissip.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   !----------------------------------------------------------
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advn.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advn.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advn.f90	(revision 5134)
@@ -19,7 +19,7 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !
@@ -469,6 +469,6 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
   !
   !
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advx.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advx.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advx.f90	(revision 5134)
@@ -23,6 +23,6 @@
   !  parametres principaux du modele
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   !  Arguments :
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advxp.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advxp.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advxp.f90	(revision 5134)
@@ -13,6 +13,6 @@
   !  parametres principaux du modele
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
    INTEGER :: ntra
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advy.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advy.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advy.f90	(revision 5134)
@@ -26,7 +26,7 @@
   !
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   !  Arguments :
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advyp.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advyp.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advyp.f90	(revision 5134)
@@ -28,7 +28,7 @@
   !
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !  Arguments :
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advz.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advz.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advz.f90	(revision 5134)
@@ -21,6 +21,6 @@
   !  parametres principaux du modele
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   ! INCLUDE "traceur.h"
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advzp.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advzp.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advzp.f90	(revision 5134)
@@ -31,7 +31,7 @@
   !  parametres principaux du modele
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !
   !  Arguments :
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/bernoui.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/bernoui.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/bernoui.f90	(revision 5134)
@@ -26,6 +26,6 @@
   !   -------------
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
   !
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/caldyn0.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/caldyn0.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/caldyn0.F90	(revision 5134)
@@ -9,7 +9,7 @@
   USE comvert_mod, ONLY: ap, bp
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: DZ6/branches/Amaury_dev/libf/dyn3d_common/clesph0.h
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/clesph0.h	(revision 5133)
+++ 	(revision )
@@ -1,11 +1,0 @@
-
-! $Header$
-
-c..include clesph0.h
-c
-       COMMON/clesph0/cycle_diurne, soil_model,new_oliq, ok_orodr ,
-     ,                ok_orolf ,ok_limitvrai, nbapp_rad, iflag_con
-c
-       LOGICAL cycle_diurne,soil_model,ok_orodr,ok_orolf,new_oliq
-       LOGICAL ok_limitvrai
-       INTEGER nbapp_rad, iflag_con
Index: DZ6/branches/Amaury_dev/libf/dyn3d_common/comdissip.h
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/comdissip.h	(revision 5133)
+++ 	(revision )
@@ -1,15 +1,0 @@
-
-! $Header$
-
-!-----------------------------------------------------------------------
-! INCLUDE comdissip.h
-
-      COMMON/comdissip/                                                 &
-          coefdis,tetavel,tetatemp,gamdissip,niterdis
-
-
-      INTEGER niterdis
-
-      REAL tetavel,tetatemp,coefdis,gamdissip
-
-!-----------------------------------------------------------------------
Index: DZ6/branches/Amaury_dev/libf/dyn3d_common/comdissipn.h
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/comdissipn.h	(revision 5133)
+++ 	(revision )
@@ -1,19 +1,0 @@
-
-! $Header$
-
-!  Attention : ce fichier include est compatible format fixe/format libre
-!                 veillez à n'utiliser que des ! pour les commentaires
-!                 et à bien positionner les & des lignes de continuation 
-!                 (les placer en colonne 6 et en colonne 73)
-!-----------------------------------------------------------------------
-! INCLUDE comdissipn.h
-
-      REAL  tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
-
-      COMMON/comdissipn/ tetaudiv(llm),tetaurot(llm),tetah(llm)   ,     &
-                              cdivu,      crot,         cdivh
-
-!    Les parametres de ce common proviennent des calculs effectues dans 
-!             Inidissip  .
-
-!-----------------------------------------------------------------------
Index: DZ6/branches/Amaury_dev/libf/dyn3d_common/comdissnew.h
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/comdissnew.h	(revision 5133)
+++ 	(revision )
@@ -1,29 +1,0 @@
-
-! $Id$
-
-
-!  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
-!                 veillez à n'utiliser que des ! pour les commentaires
-!                 et à bien positionner les & des lignes de continuation
-!                 (les placer en colonne 6 et en colonne 73)
-
-!-----------------------------------------------------------------------
-! INCLUDE 'comdissnew.h'
-
-      COMMON/comdissnew/ lstardis,nitergdiv,nitergrot,niterh,tetagdiv,  &
-                         tetagrot,tetatemp,coefdis, vert_prof_dissip
-
-      LOGICAL lstardis
-      INTEGER nitergdiv, nitergrot, niterh
-
-      INTEGER vert_prof_dissip ! vertical profile of horizontal dissipation
-!     Allowed values:
-!     0: rational fraction, function of pressure
-!     1: tanh of altitude
-
-      REAL     tetagdiv, tetagrot,  tetatemp, coefdis
-
-! ... Les parametres de ce common comdissnew sont  lues par defrun_new 
-!              sur le fichier  run.def    ....
-
-!-----------------------------------------------------------------------
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/convmas.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/convmas.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/convmas.F90	(revision 5134)
@@ -7,7 +7,7 @@
   USE lmdz_filtreg, ONLY: filtreg
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/coordij.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/coordij.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/coordij.f90	(revision 5134)
@@ -18,7 +18,7 @@
   INTEGER :: i,j
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   REAL :: zlon,zlat
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/covcont.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/covcont.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/covcont.F90	(revision 5134)
@@ -7,7 +7,7 @@
 !-------------------------------------------------------------------------------
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert.F90	(revision 5134)
@@ -14,6 +14,6 @@
   IMPLICIT NONE
 
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
 !-------------------------------------------------------------------------------
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert_noterre.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert_noterre.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert_noterre.f90	(revision 5134)
@@ -15,6 +15,6 @@
   IMPLICIT NONE
 
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
   !
   !=======================================================================
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/divgrad.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/divgrad.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/divgrad.f90	(revision 5134)
@@ -4,4 +4,6 @@
   USE lmdz_filtreg, ONLY: filtreg
   USE lmdz_ssum_scopy, ONLY: scopy
+  USE lmdz_comdissipn, ONLY: tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
+
   IMPLICIT NONE
   !
@@ -21,8 +23,7 @@
   !   -------------
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
-  include "comdissipn.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !
   INTEGER :: klevel
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/divgrad2.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/divgrad2.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/divgrad2.f90	(revision 5134)
@@ -13,4 +13,5 @@
   !
   USE lmdz_ssum_scopy, ONLY: scopy
+  USE lmdz_comdissipn, ONLY: tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
 
   IMPLICIT NONE
@@ -19,5 +20,4 @@
   INCLUDE "paramet.h"
   INCLUDE "comgeom2.h"
-  INCLUDE "comdissipn.h"
 
   !    .......    variables en arguments   .......
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ener_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ener_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ener_mod.F90	(revision 5134)
@@ -6,6 +6,6 @@
 IMPLICIT NONE  
 
-include "dimensions.h"
-include "paramet.h"
+INCLUDE "dimensions.h"
+INCLUDE "paramet.h"
 
       REAL ang0,etot0,ptot0,ztot0,stot0,			&
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/enercin.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/enercin.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/enercin.F90	(revision 5134)
@@ -6,7 +6,7 @@
 ! Purpose: Compute kinetic energy at sigma levels.
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_hyb_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_hyb_m.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_hyb_m.F90	(revision 5134)
@@ -39,7 +39,7 @@
     IMPLICIT NONE
     
-    include "dimensions.h"
-    include "paramet.h"
-    include "comgeom.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
+    INCLUDE "comgeom.h"
 
     INTEGER  ngrid
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_milieu_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_milieu_m.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_milieu_m.F90	(revision 5134)
@@ -37,7 +37,7 @@
     IMPLICIT NONE
     
-    include "dimensions.h"
-    include "paramet.h"
-    include "comgeom.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
+    INCLUDE "comgeom.h"
 
     INTEGER  ngrid
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/extrapol.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/extrapol.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/extrapol.f90	(revision 5134)
@@ -6,5 +6,5 @@
 SUBROUTINE extrapol(pfild, kxlon, kylat, pmask, &
         norsud, ldper, knbor, pwork)
-  IMPLICIT none
+  IMPLICIT NONE
   !
   ! OASIS routine (Adaptation: Laurent Li, le 14 mars 1997)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/flumass.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/flumass.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/flumass.F90	(revision 5134)
@@ -6,7 +6,7 @@
 ! Purpose: Compute mass flux at s levels.
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/fxhyp_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/fxhyp_m.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/fxhyp_m.F90	(revision 5134)
@@ -24,5 +24,5 @@
     USE serre_mod, ONLY: clon, grossismx, dzoomx, taux
 
-    include "dimensions.h"
+    INCLUDE "dimensions.h"
     ! for iim
 
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/fxy.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/fxy.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/fxy.f90	(revision 5134)
@@ -15,6 +15,6 @@
   !
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   INTEGER :: i, j
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/fyhyp_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/fyhyp_m.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/fyhyp_m.F90	(revision 5134)
@@ -20,5 +20,5 @@
     USE serre_mod, ONLY: clat, grossismy, dzoomy, tauy
 
-    include "dimensions.h"
+    INCLUDE "dimensions.h"
     ! for jjm
 
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/geopot.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/geopot.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/geopot.f90	(revision 5134)
@@ -27,6 +27,6 @@
   !   -------------
 
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gr_ecrit_fi.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gr_ecrit_fi.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gr_ecrit_fi.f90	(revision 5134)
@@ -4,5 +4,5 @@
   SUBROUTINE gr_ecrit_fi(nfield,nlon,iim,jjmp1,ecrit,fi)
 
-    IMPLICIT none
+    IMPLICIT NONE
 
   ! Transformer une variable de la grille d'ecriture a la grille physique
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gradiv.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gradiv.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gradiv.f90	(revision 5134)
@@ -18,10 +18,10 @@
   USE lmdz_filtreg, ONLY: filtreg
   USE lmdz_ssum_scopy, ONLY: scopy
+  USE lmdz_comdissipn, ONLY: tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
 
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissipn.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   INTEGER :: klevel
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gradiv2.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gradiv2.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gradiv2.f90	(revision 5134)
@@ -17,4 +17,5 @@
   USE lmdz_filtreg, ONLY: filtreg
   USE lmdz_ssum_scopy, ONLY: scopy
+  USE lmdz_comdissipn, ONLY: tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
 
   IMPLICIT NONE
@@ -23,5 +24,4 @@
   INCLUDE "paramet.h"
   INCLUDE "comgeom.h"
-  INCLUDE "comdissipn.h"
   !
   ! ........    variables en arguments      ........
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/iniconst.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/iniconst.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/iniconst.F90	(revision 5134)
@@ -18,6 +18,6 @@
   !   -------------
 
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   CHARACTER(LEN = *), parameter :: modname = "iniconst"
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inidissip.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inidissip.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inidissip.F90	(revision 5134)
@@ -18,10 +18,9 @@
   USE lmdz_ran1, ONLY: ran1
   USE lmdz_iniprint, ONLY: lunout, prt_level
-
+  USE lmdz_comdissipn, ONLY: tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
 
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissipn.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   LOGICAL, INTENT(IN) :: lstardis
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inigeom.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inigeom.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inigeom.f90	(revision 5134)
@@ -23,10 +23,12 @@
         alphax,alphay,taux,tauy,transx,transy,pxo,pyo
   USE lmdz_ssum_scopy, ONLY: ssum
+  USE lmdz_comdissnew, ONLY: lstardis, nitergdiv, nitergrot, niterh, tetagdiv, &
+          tetagrot, tetatemp, coefdis, vert_prof_dissip
+
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
-  include "comdissnew.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   !-----------------------------------------------------------------------
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/initdynav.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/initdynav.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/initdynav.F90	(revision 5134)
@@ -36,7 +36,7 @@
   !   L. Fairhead, LMD, 03/99
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/initfluxsto.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/initfluxsto.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/initfluxsto.f90	(revision 5134)
@@ -41,7 +41,7 @@
   !
   !   Declarations
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inithist.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inithist.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inithist.F90	(revision 5134)
@@ -40,7 +40,7 @@
   !
   !   Declarations
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inter_barxy_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inter_barxy_m.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inter_barxy_m.F90	(revision 5134)
@@ -17,11 +17,11 @@
     USE lmdz_assert, ONLY: assert
 
-    include "dimensions.h"
+    INCLUDE "dimensions.h"
     ! (for "iim", "jjm")
 
-    include "paramet.h"
+    INCLUDE "paramet.h"
     ! (for other included files)
 
-    include "comgeom2.h"
+    INCLUDE "comgeom2.h"
     ! (for "aire", "apoln", "apols")
 
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/interpost.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/interpost.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/interpost.f90	(revision 5134)
@@ -7,7 +7,7 @@
 
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   ! Arguments
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/interpre.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/interpre.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/interpre.f90	(revision 5134)
@@ -8,11 +8,11 @@
   USE comvert_mod, ONLY: ap, bp
   USE lmdz_description, ONLY: descript
+  USE lmdz_comdissip, ONLY: coefdis, tetavel, tetatemp, gamdissip, niterdis
 
   IMPLICIT NONE
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissip.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   !---------------------------------------------------
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/invert_zoom_x_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/invert_zoom_x_m.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/invert_zoom_x_m.F90	(revision 5134)
@@ -13,5 +13,5 @@
     USE serre_mod, ONLY: clon
 
-    include "dimensions.h"
+    INCLUDE "dimensions.h"
     ! for iim
 
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limx.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limx.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limx.f90	(revision 5134)
@@ -15,7 +15,7 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !
   !
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limy.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limy.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limy.f90	(revision 5134)
@@ -20,7 +20,7 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !
   !
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limz.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limz.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limz.f90	(revision 5134)
@@ -15,7 +15,7 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !
   !
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_academic.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_academic.f90	(revision 5134)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_academic.f90	(revision 5134)
@@ -0,0 +1,17 @@
+! Replaces academic.h
+! $Id$
+
+MODULE lmdz_academic
+  IMPLICIT NONE; PRIVATE
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+
+  PUBLIC tetarappel, knewt_t, kfrict, knewt_g, clat4
+
+  REAL :: tetarappel(ip1jmp1, llm)
+  REAL :: knewt_t(llm)
+  REAL :: kfrict(llm)
+  REAL :: knewt_g
+  REAL :: clat4(ip1jmp1)
+
+END MODULE lmdz_academic
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_comdissip.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_comdissip.f90	(revision 5134)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_comdissip.f90	(revision 5134)
@@ -0,0 +1,8 @@
+! Replaces comdissip.h
+MODULE lmdz_comdissip
+  IMPLICIT NONE; PRIVATE
+  PUBLIC coefdis, tetavel, tetatemp, gamdissip, niterdis
+
+  INTEGER niterdis
+  REAL tetavel, tetatemp, coefdis, gamdissip
+END MODULE lmdz_comdissip
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_comdissipn.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_comdissipn.f90	(revision 5134)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_comdissipn.f90	(revision 5134)
@@ -0,0 +1,9 @@
+! Replaces comdissipn.h
+MODULE lmdz_comdissipn
+  IMPLICIT NONE; PRIVATE
+  PUBLIC tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
+
+  INCLUDE "dimensions.h"
+
+  REAL tetaudiv(llm), tetaurot(llm), tetah(llm), cdivu, crot, cdivh
+END MODULE lmdz_comdissipn
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_comdissnew.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_comdissnew.f90	(revision 5134)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_comdissnew.f90	(revision 5134)
@@ -0,0 +1,19 @@
+! Replaces comdissnew.h
+
+MODULE lmdz_comdissnew
+  IMPLICIT NONE; PRIVATE
+  PUBLIC lstardis, nitergdiv, nitergrot, niterh, tetagdiv, &
+          tetagrot, tetatemp, coefdis, vert_prof_dissip
+
+  LOGICAL lstardis
+  INTEGER nitergdiv, nitergrot, niterh
+
+  INTEGER vert_prof_dissip ! vertical profile of horizontal dissipation
+  !     Allowed values:
+  !     0: rational fraction, function of pressure
+  !     1: tanh of altitude
+
+  REAL     tetagdiv, tetagrot, tetatemp, coefdis
+  ! ... Les parametres de ce common comdissnew sont  lues par defrun_new
+  !              sur le fichier  run.def    ....
+END MODULE lmdz_comdissnew
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/massbar.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/massbar.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/massbar.F90	(revision 5134)
@@ -7,7 +7,7 @@
 ! See iniconst for more details.
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/massbarxy.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/massbarxy.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/massbarxy.F90	(revision 5134)
@@ -7,7 +7,7 @@
 ! See iniconst for more details.
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/massdair.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/massdair.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/massdair.f90	(revision 5134)
@@ -18,7 +18,7 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !
   !  .....   arguments  ....
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/nxgraro2.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/nxgraro2.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/nxgraro2.f90	(revision 5134)
@@ -16,4 +16,5 @@
   USE lmdz_filtreg, ONLY: filtreg
   USE lmdz_ssum_scopy, ONLY: scopy
+  USE lmdz_comdissipn, ONLY: tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
 
   IMPLICIT NONE
@@ -21,5 +22,4 @@
   INCLUDE "dimensions.h"
   INCLUDE "paramet.h"
-  INCLUDE "comdissipn.h"
   !
   !    ......  variables en arguments  .......
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/nxgrarot.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/nxgrarot.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/nxgrarot.f90	(revision 5134)
@@ -17,11 +17,11 @@
   USE lmdz_filtreg, ONLY: filtreg
   USE lmdz_ssum_scopy, ONLY: scopy
+  USE lmdz_comdissipn, ONLY: tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
 
   IMPLICIT NONE
   !
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissipn.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
   !
   INTEGER :: klevel
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/pentes_ini.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/pentes_ini.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/pentes_ini.f90	(revision 5134)
@@ -26,7 +26,7 @@
 
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/prather.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/prather.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/prather.f90	(revision 5134)
@@ -23,7 +23,7 @@
 
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/pression.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/pression.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/pression.F90	(revision 5134)
@@ -9,6 +9,6 @@
 !-------------------------------------------------------------------------------
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/principal_cshift_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/principal_cshift_m.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/principal_cshift_m.F90	(revision 5134)
@@ -14,5 +14,5 @@
     USE serre_mod, ONLY: clon
 
-    include "dimensions.h"
+    INCLUDE "dimensions.h"
     ! for iim
 
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/tourpot.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/tourpot.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/tourpot.F90	(revision 5134)
@@ -7,7 +7,7 @@
   USE lmdz_filtreg, ONLY: filtreg
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/traceurpole.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/traceurpole.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/traceurpole.f90	(revision 5134)
@@ -3,10 +3,11 @@
 SUBROUTINE traceurpole(q, masse)
   USE lmdz_description, ONLY: descript
+  USE lmdz_comdissip, ONLY: coefdis, tetavel, tetatemp, gamdissip, niterdis
+
   IMPLICIT NONE
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissip.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
 
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ugeostr.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ugeostr.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ugeostr.F90	(revision 5134)
@@ -15,7 +15,7 @@
   IMPLICIT NONE
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   REAL ucov(iip1,jjp1,llm),phi(iip1,jjp1,llm)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/vitvert.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/vitvert.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/vitvert.F90	(revision 5134)
@@ -7,6 +7,6 @@
   USE comvert_mod, ONLY: bp
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/writedynav.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/writedynav.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/writedynav.F90	(revision 5134)
@@ -31,7 +31,7 @@
 
   !   Declarations
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/writehist.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/writehist.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/writehist.f90	(revision 5134)
@@ -34,7 +34,7 @@
   !
   !   Declarations
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/addfi_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/addfi_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/addfi_loc.f90	(revision 5134)
@@ -47,7 +47,7 @@
   !    ------------------
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !
   !    Arguments :
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/advect_new_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/advect_new_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/advect_new_loc.f90	(revision 5134)
@@ -30,7 +30,7 @@
   !   -------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/advtrac_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/advtrac_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/advtrac_loc.f90	(revision 5134)
@@ -21,12 +21,11 @@
   USE lmdz_description, ONLY: descript
   USE lmdz_libmath, ONLY: minmax
-
+  USE lmdz_comdissip, ONLY: coefdis, tetavel, tetatemp, gamdissip, niterdis
 
   IMPLICIT NONE
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissip.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   !---------------------------------------------------------------------------
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/bands.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/bands.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/bands.F90	(revision 5134)
@@ -44,5 +44,5 @@
     IMPLICIT NONE
 
-    include "dimensions.h"
+    INCLUDE "dimensions.h"
       INTEGER :: i,j
       CHARACTER (LEN=4) :: siim,sjjm,sllm,sproc
@@ -438,5 +438,5 @@
     USE parallel_lmdz
     IMPLICIT NONE
-    include "dimensions.h"
+    INCLUDE "dimensions.h"
 
       INTEGER :: i,j
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/bernoui_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/bernoui_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/bernoui_loc.f90	(revision 5134)
@@ -24,6 +24,6 @@
   !   -------------
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
   !
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/bilan_dyn_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/bilan_dyn_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/bilan_dyn_loc.f90	(revision 5134)
@@ -23,7 +23,7 @@
   IMPLICIT NONE
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   !====================================================================
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/caladvtrac_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/caladvtrac_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/caladvtrac_loc.f90	(revision 5134)
@@ -28,6 +28,6 @@
   !=======================================================================
 
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/caldyn_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/caldyn_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/caldyn_loc.f90	(revision 5134)
@@ -29,7 +29,7 @@
   !   ----------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/check_isotopes_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/check_isotopes_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/check_isotopes_loc.F90	(revision 5134)
@@ -7,5 +7,5 @@
 
    IMPLICIT NONE
-   include "dimensions.h"
+   INCLUDE "dimensions.h"
    REAL,             INTENT(INOUT) :: q(ijb_u:ije_u,llm,nqtot)
    INTEGER,          INTENT(IN)    :: ijb, ije   !--- Can be local and different from ijb_u,ije_u, for example in qminimum
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/conf_gcm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/conf_gcm.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/conf_gcm.F90	(revision 5134)
@@ -22,5 +22,6 @@
   USE temps_mod, ONLY: calend, year_len, offline_time
   USE lmdz_iniprint, ONLY: lunout, prt_level
-
+  USE lmdz_comdissnew, ONLY: lstardis, nitergdiv, nitergrot, niterh, tetagdiv, &
+          tetagrot, tetatemp, coefdis, vert_prof_dissip
 
   IMPLICIT NONE
@@ -39,7 +40,6 @@
   !   Declarations :
   !   --------------
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissnew.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   !   local:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/convmas1_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/convmas1_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/convmas1_loc.F90	(revision 5134)
@@ -9,7 +9,7 @@
   USE lmdz_filtreg_p
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/convmas2_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/convmas2_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/convmas2_loc.F90	(revision 5134)
@@ -8,7 +8,7 @@
   USE parallel_lmdz
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/convmas_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/convmas_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/convmas_loc.F90	(revision 5134)
@@ -8,7 +8,7 @@
   USE lmdz_filtreg_p
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dissip_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dissip_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dissip_loc.f90	(revision 5134)
@@ -8,4 +8,8 @@
   USE comconst_mod, ONLY: dtdiss
   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO
+  USE lmdz_comdissipn, ONLY: tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
+  USE lmdz_comdissnew, ONLY: lstardis, nitergdiv, nitergrot, niterh, tetagdiv, &
+          tetagrot, tetatemp, coefdis, vert_prof_dissip
+
   IMPLICIT NONE
 
@@ -29,9 +33,7 @@
   !   -------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
-  include "comdissnew.h"
-  include "comdissipn.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/divgrad2_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/divgrad2_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/divgrad2_loc.f90	(revision 5134)
@@ -14,4 +14,6 @@
   USE mod_hallo
   USE divgrad2_mod
+  USE lmdz_comdissipn, ONLY: tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
+
   IMPLICIT NONE
   !
@@ -19,5 +21,4 @@
   INCLUDE "paramet.h"
   INCLUDE "comgeom2.h"
-  INCLUDE "comdissipn.h"
 
   !    .......    variables en arguments   .......
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dteta1_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dteta1_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dteta1_loc.f90	(revision 5134)
@@ -21,6 +21,6 @@
 
 
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   REAL :: teta( ijb_u:ije_u,llm )
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dudv2_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dudv2_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dudv2_loc.f90	(revision 5134)
@@ -23,6 +23,6 @@
   !=======================================================================
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   REAL :: teta( ijb_u:ije_u,llm ),pkf( ijb_u:ije_u,llm )
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynetat0_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynetat0_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynetat0_loc.F90	(revision 5134)
@@ -26,7 +26,7 @@
 
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynredem_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynredem_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynredem_loc.F90	(revision 5134)
@@ -25,7 +25,7 @@
 
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !===============================================================================
   ! Arguments:
@@ -178,7 +178,7 @@
 
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !===============================================================================
   ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/enercin_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/enercin_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/enercin_loc.F90	(revision 5134)
@@ -7,7 +7,7 @@
   USE parallel_lmdz
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/exner_hyb_loc_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/exner_hyb_loc_m.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/exner_hyb_loc_m.F90	(revision 5134)
@@ -41,7 +41,7 @@
     IMPLICIT NONE
 
-    include "dimensions.h"
-    include "paramet.h"
-    include "comgeom.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
+    INCLUDE "comgeom.h"
 
     INTEGER  ngrid
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/exner_milieu_loc_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/exner_milieu_loc_m.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/exner_milieu_loc_m.F90	(revision 5134)
@@ -37,7 +37,7 @@
     IMPLICIT NONE
 
-    include "dimensions.h"
-    include "paramet.h"
-    include "comgeom.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
+    INCLUDE "comgeom.h"
 
     INTEGER  ngrid
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/flumass_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/flumass_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/flumass_loc.F90	(revision 5134)
@@ -7,7 +7,7 @@
   USE parallel_lmdz
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/fluxstokenc_p.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/fluxstokenc_p.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/fluxstokenc_p.f90	(revision 5134)
@@ -24,7 +24,7 @@
   !=======================================================================
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "tracstoke.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "tracstoke.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/friction_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/friction_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/friction_loc.f90	(revision 5134)
@@ -8,5 +8,5 @@
   USE comconst_mod, ONLY: pi
   USE lmdz_iniprint, ONLY: lunout, prt_level
-
+  USE lmdz_academic, ONLY: tetarappel, knewt_t, kfrict, knewt_g, clat4
 
   IMPLICIT NONE
@@ -24,8 +24,7 @@
   !=======================================================================
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
-  include "academic.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   ! arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/gcm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/gcm.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/gcm.F90	(revision 5134)
@@ -27,5 +27,6 @@
   USE lmdz_description, ONLY: descript
   USE lmdz_iniprint, ONLY: lunout, prt_level
-
+  USE lmdz_comdissnew, ONLY: lstardis, nitergdiv, nitergrot, niterh, tetagdiv, &
+          tetagrot, tetatemp, coefdis, vert_prof_dissip
 
   IMPLICIT NONE
@@ -60,9 +61,8 @@
   !   Declarations:
   !   -------------
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissnew.h"
-  include "comgeom.h"
-  include "tracstoke.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
+  INCLUDE "tracstoke.h"
 
   REAL zdtvr
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/geopot_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/geopot_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/geopot_loc.f90	(revision 5134)
@@ -26,6 +26,6 @@
   !   -------------
 
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/gradiv2_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/gradiv2_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/gradiv2_loc.f90	(revision 5134)
@@ -19,4 +19,6 @@
   USE lmdz_filtreg_p
   USE gradiv2_mod
+  USE lmdz_comdissipn, ONLY: tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
+
   IMPLICIT NONE
   !
@@ -24,5 +26,4 @@
   INCLUDE "paramet.h"
   INCLUDE "comgeom.h"
-  INCLUDE "comdissipn.h"
   !
   ! ........    variables en arguments      ........
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/groupe_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/groupe_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/groupe_loc.f90	(revision 5134)
@@ -18,7 +18,7 @@
   !   pas besoin de w en entree.
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   ! integer ngroup
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/groupeun_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/groupeun_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/groupeun_loc.f90	(revision 5134)
@@ -5,7 +5,7 @@
   IMPLICIT NONE
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   INTEGER :: jjmax,llmax,sb,se,jjb,jje
@@ -139,7 +139,7 @@
   IMPLICIT NONE
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   ! INTEGER ngroup
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/guide_loc_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/guide_loc_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/guide_loc_mod.F90	(revision 5134)
@@ -916,7 +916,7 @@
     IMPLICIT NONE
 
-    include "dimensions.h"
-    include "paramet.h"
-    include "comgeom2.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
+    INCLUDE "comgeom2.h"
 
     REAL, DIMENSION (iip1, jjb_u:jje_u), INTENT(IN) :: psi ! Psol gcm
@@ -1400,7 +1400,7 @@
     IMPLICIT NONE
 
-    include "dimensions.h"
-    include "paramet.h"
-    include "comgeom2.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
+    INCLUDE "comgeom2.h"
 
     ! input arguments :
@@ -1566,6 +1566,6 @@
     IMPLICIT NONE
 
-    include "dimensions.h"
-    include "paramet.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
 
     INTEGER, INTENT(IN) :: timestep
@@ -1881,6 +1881,6 @@
     IMPLICIT NONE
 
-    include "dimensions.h"
-    include "paramet.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
 
     INTEGER, INTENT(IN) :: timestep
@@ -2380,6 +2380,6 @@
     USE mod_hallo
     IMPLICIT NONE
-    include 'dimensions.h'
-    include 'paramet.h'
+    INCLUDE 'dimensions.h'
+    INCLUDE 'paramet.h'
 
     CHARACTER (len = *) :: varname
@@ -2408,7 +2408,7 @@
   SUBROUTINE dumpall
     IMPLICIT NONE
-    include "dimensions.h"
-    include "paramet.h"
-    include "comgeom.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
+    INCLUDE "comgeom.h"
     CALL barrier
     CALL dump2du(alpha_u(ijb_u:ije_u), '  alpha_u couche 1')
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/iniacademic_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/iniacademic_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/iniacademic_loc.F90	(revision 5134)
@@ -20,5 +20,5 @@
   USE lmdz_ran1, ONLY: ran1
   USE lmdz_iniprint, ONLY: lunout, prt_level
-
+  USE lmdz_academic, ONLY: tetarappel, knewt_t, kfrict, knewt_g, clat4
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -31,8 +31,7 @@
   !   ---------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
-  include "academic.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/initdynav_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/initdynav_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/initdynav_loc.f90	(revision 5134)
@@ -44,7 +44,7 @@
   !
   !   Declarations
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/initfluxsto_p.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/initfluxsto_p.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/initfluxsto_p.f90	(revision 5134)
@@ -41,7 +41,7 @@
   !
   !   Declarations
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/inithist_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/inithist_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/inithist_loc.F90	(revision 5134)
@@ -42,7 +42,7 @@
   !
   !   Declarations
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/integrd_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/integrd_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/integrd_loc.f90	(revision 5134)
@@ -38,7 +38,7 @@
   !   -------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/leapfrog_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/leapfrog_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/leapfrog_loc.F90	(revision 5134)
@@ -42,5 +42,7 @@
   USE lmdz_description, ONLY: descript
   USE lmdz_iniprint, ONLY: lunout, prt_level
-
+  USE lmdz_academic, ONLY: tetarappel, knewt_t, kfrict, knewt_g, clat4
+  USE lmdz_comdissnew, ONLY: lstardis, nitergdiv, nitergrot, niterh, tetagdiv, &
+          tetagrot, tetatemp, coefdis, vert_prof_dissip
 
   IMPLICIT NONE
@@ -77,9 +79,7 @@
   !   -------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comdissnew.h"
-  include "comgeom.h"
-  include "academic.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   REAL, INTENT(IN) :: time_0 ! not used
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/massbar_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/massbar_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/massbar_loc.F90	(revision 5134)
@@ -8,7 +8,7 @@
   USE parallel_lmdz
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/massbarxy_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/massbarxy_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/massbarxy_loc.F90	(revision 5134)
@@ -8,7 +8,7 @@
   USE parallel_lmdz
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/massdair_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/massdair_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/massdair_loc.f90	(revision 5134)
@@ -16,7 +16,7 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !
   !  .....   arguments  ....
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/mod_xios_dyn3dmem.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/mod_xios_dyn3dmem.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/mod_xios_dyn3dmem.F90	(revision 5134)
@@ -133,6 +133,6 @@
      USE parallel_lmdz
      IMPLICIT NONE
-     include 'dimensions.h'
-     include 'paramet.h'
+     INCLUDE 'dimensions.h'
+     INCLUDE 'paramet.h'
      CHARACTER(LEN=*)   :: name
      REAL, DIMENSION(ij_begin:ij_end) :: Field
@@ -154,6 +154,6 @@
      USE parallel_lmdz
      IMPLICIT NONE
-     include 'dimensions.h'
-     include 'paramet.h'
+     INCLUDE 'dimensions.h'
+     INCLUDE 'paramet.h'
      CHARACTER(LEN=*)   :: name
      REAL, DIMENSION(ij_begin:ij_end,llm) :: Field
@@ -187,6 +187,6 @@
      USE parallel_lmdz
      IMPLICIT NONE
-     include 'dimensions.h'
-     include 'paramet.h'
+     INCLUDE 'dimensions.h'
+     INCLUDE 'paramet.h'
      CHARACTER(LEN=*)   :: name
      REAL, DIMENSION(ij_begin:ij_end) :: Field
@@ -217,6 +217,6 @@
      USE parallel_lmdz
      IMPLICIT NONE
-     include 'dimensions.h'
-     include 'paramet.h'
+     INCLUDE 'dimensions.h'
+     INCLUDE 'paramet.h'
      CHARACTER(LEN=*)   :: name
      REAL, DIMENSION(ij_begin:ij_end,llm) :: Field
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/nxgraro2_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/nxgraro2_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/nxgraro2_loc.f90	(revision 5134)
@@ -18,9 +18,10 @@
   USE lmdz_filtreg_p
   USE nxgraro2_mod
+  USE lmdz_comdissipn, ONLY: tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
+
   IMPLICIT NONE
   !
   INCLUDE "dimensions.h"
   INCLUDE "paramet.h"
-  INCLUDE "comdissipn.h"
   !
   !    ......  variables en arguments  .......
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/parallel_lmdz.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/parallel_lmdz.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/parallel_lmdz.F90	(revision 5134)
@@ -392,6 +392,6 @@
 #endif
 
-    include "dimensions.h"
-    include "paramet.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
 
     INTEGER :: ierr
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/paramet.h
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/paramet.h	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/paramet.h	(revision 5134)
@@ -3,5 +3,5 @@
 
 
-!  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
+!  ATTENTION!!!!: ce fichier INCLUDE est compatible format fixe/format libre
 !                 veillez  n'utiliser que des ! pour les commentaires
 !                 et  bien positionner les & des lignes de continuation
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/qminimum_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/qminimum_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/qminimum_loc.f90	(revision 5134)
@@ -10,11 +10,11 @@
 
 
-  IMPLICIT none
+  IMPLICIT NONE
   !
   !  -- Objet : Traiter les valeurs trop petites (meme negatives)
   !         pour l'eau vapeur et l'eau liquide
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
   !
   INTEGER :: nqtot ! CRisi: on remplace nq par nqtot
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/sw_case_williamson91_6_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/sw_case_williamson91_6_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/sw_case_williamson91_6_loc.f90	(revision 5134)
@@ -35,7 +35,7 @@
   !   ---------------
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/top_bound_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/top_bound_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/top_bound_loc.f90	(revision 5134)
@@ -7,10 +7,11 @@
   USE comvert_mod, ONLY: presnivs, preff, scaleheight
   USE lmdz_iniprint, ONLY: lunout, prt_level
+  USE lmdz_comdissipn, ONLY: tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
 
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
 
@@ -52,6 +53,4 @@
   !    tau_top_bound : inverse of charactericstic relaxation time scale at
   !                   the topmost layer (Hz)
-
-  INCLUDE "comdissipn.h"
 
   !   Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/tourpot_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/tourpot_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/tourpot_loc.F90	(revision 5134)
@@ -8,7 +8,7 @@
   USE lmdz_filtreg_p
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vitvert_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vitvert_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vitvert_loc.F90	(revision 5134)
@@ -9,6 +9,6 @@
   
   IMPLICIT NONE
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 !===============================================================================
 ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vlsplt_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vlsplt_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vlsplt_loc.f90	(revision 5134)
@@ -18,6 +18,6 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
   !
   !
@@ -386,7 +386,7 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !
   !
@@ -817,6 +817,6 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
   !
   !
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vlspltgen_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vlspltgen_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vlspltgen_loc.F90	(revision 5134)
@@ -36,6 +36,6 @@
 
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   !
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vlspltqs_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vlspltqs_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vlspltqs_loc.f90	(revision 5134)
@@ -15,6 +15,6 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
   !
   !
@@ -394,7 +394,7 @@
   IMPLICIT NONE
   !
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
   !
   !
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/write_field_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/write_field_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/write_field_loc.F90	(revision 5134)
@@ -38,6 +38,6 @@
     USE mod_hallo
     IMPLICIT NONE
-    include 'dimensions.h'
-    include 'paramet.h'
+    INCLUDE 'dimensions.h'
+    INCLUDE 'paramet.h'
       
     CHARACTER(LEN=*)   :: name
@@ -103,6 +103,6 @@
     USE mod_hallo
     IMPLICIT NONE
-    include 'dimensions.h'
-    include 'paramet.h'
+    INCLUDE 'dimensions.h'
+    INCLUDE 'paramet.h'
       
     CHARACTER(LEN=*)   :: name
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/writedyn_xios.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/writedyn_xios.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/writedyn_xios.F90	(revision 5134)
@@ -35,7 +35,7 @@
 
   !   Declarations
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !   Arguments
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/writedynav_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/writedynav_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/writedynav_loc.f90	(revision 5134)
@@ -43,7 +43,7 @@
   !
   !   Declarations
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/writehist_loc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/writehist_loc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/writehist_loc.f90	(revision 5134)
@@ -40,7 +40,7 @@
   !
   !   Declarations
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom.h"
 
   !
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/calfis.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/calfis.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/calfis.f90	(revision 5134)
@@ -92,11 +92,11 @@
   !    ------------------
 
-  include "dimensions.h"
-  include "paramet.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
 
   INTEGER :: ngridmx
   PARAMETER(ngridmx = 2 + (jjm - 1) * iim - 1 / jjm)
 
-  include "comgeom2.h"
+  INCLUDE "comgeom2.h"
 
   !    Arguments :
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/lmdz_calfis_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/lmdz_calfis_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/lmdz_calfis_loc.F90	(revision 5134)
@@ -109,11 +109,11 @@
     !    ------------------
 
-    include "dimensions.h"
-    include "paramet.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
 
     INTEGER :: ngridmx
     PARAMETER(ngridmx = 2 + (jjm - 1) * iim - 1 / jjm)
 
-    include "comgeom2.h"
+    INCLUDE "comgeom2.h"
     !    Arguments :
     !    -----------
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/mod_interface_dyn_phys.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/mod_interface_dyn_phys.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/mod_interface_dyn_phys.F90	(revision 5134)
@@ -14,5 +14,5 @@
     USE lmdz_phys_mpi_data
     IMPLICIT NONE
-    include 'dimensions.h'    
+    INCLUDE 'dimensions.h'
     
     INTEGER :: i,j,k
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/ce0l.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/ce0l.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/ce0l.F90	(revision 5134)
@@ -52,7 +52,7 @@
   !-------------------------------------------------------------------------------
   ! Local variables:
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
   REAL :: masque(iip1, jjp1)             !--- CONTINENTAL MASK
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90	(revision 5134)
@@ -41,4 +41,6 @@
   USE lmdz_strings, ONLY: strLower
   USE lmdz_iniprint, ONLY: lunout, prt_level
+  USE lmdz_comdissnew, ONLY: lstardis, nitergdiv, nitergrot, niterh, tetagdiv, &
+          tetagrot, tetatemp, coefdis, vert_prof_dissip
 
   IMPLICIT NONE
@@ -47,8 +49,7 @@
   PUBLIC :: etat0dyn_netcdf
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
-  include "comdissnew.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
   REAL, SAVE :: deg2rad
   INTEGER, SAVE :: iml_dyn, jml_dyn, llm_dyn, ttm_dyn, fid_dyn
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90	(revision 5134)
@@ -56,9 +56,9 @@
   PUBLIC :: etat0phys_netcdf
 
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
-  include "dimsoil.h"
-  include "clesphys.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
+  INCLUDE "dimsoil.h"
+  INCLUDE "clesphys.h"
   REAL, SAVE :: deg2rad
   REAL, SAVE, ALLOCATABLE :: tsol(:)
@@ -94,4 +94,6 @@
     USE phys_state_var_mod, ONLY: beta_aridity, delta_tsurf, awake_dens, cv_gen, &
             ratqs_inter_, rneb_ancien
+    USE lmdz_alpale
+
     IMPLICIT NONE
     !-------------------------------------------------------------------------------
@@ -128,5 +130,4 @@
 
     INCLUDE "compbl.h"
-    INCLUDE "alpale.h"
 
     deg2rad = pi / 180.0
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90	(revision 5134)
@@ -49,8 +49,8 @@
     ! =======================================================================
 
-    include "dimensions.h"
-    include "paramet.h"
-    include "tracstoke.h"
-    include "comgeom.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
+    INCLUDE "tracstoke.h"
+    INCLUDE "comgeom.h"
 
     REAL, INTENT (IN) :: prad ! radius of the planet (m)
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/init_ssrf_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/init_ssrf_m.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/init_ssrf_m.F90	(revision 5134)
@@ -17,7 +17,7 @@
   PRIVATE
   PUBLIC :: start_init_subsurf
-  include "dimensions.h"
-  include "paramet.h"
-  include "comgeom2.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "paramet.h"
+  INCLUDE "comgeom2.h"
 
 CONTAINS
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/limit_netcdf.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/limit_netcdf.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/limit_netcdf.f90	(revision 5134)
@@ -85,6 +85,6 @@
     !-------------------------------------------------------------------------------
     ! Arguments:
-    include "dimensions.h"
-    include "paramet.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
     REAL, DIMENSION(iip1, jjp1), INTENT(INOUT) :: masque ! land mask
     REAL, DIMENSION(iip1, jjp1), INTENT(INOUT) :: phis   ! ground geopotential
@@ -92,5 +92,5 @@
     !-------------------------------------------------------------------------------
     ! Local variables:
-    include "comgeom2.h"
+    INCLUDE "comgeom2.h"
 
     !--- INPUT NETCDF FILES AND VARIABLES NAMES ------------------------------------
@@ -334,7 +334,7 @@
 
       IMPLICIT NONE
-      include "dimensions.h"
-      include "paramet.h"
-      include "comgeom2.h"
+      INCLUDE "dimensions.h"
+      INCLUDE "paramet.h"
+      INCLUDE "comgeom2.h"
       !-----------------------------------------------------------------------------
       ! Arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/test_disvert_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/test_disvert_m.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/test_disvert_m.F90	(revision 5134)
@@ -19,5 +19,5 @@
 
     ! For llm:
-    include "dimensions.h"
+    INCLUDE "dimensions.h"
 
     ! Local:
Index: /LMDZ6/branches/Amaury_dev/libf/filtrez/lmdz_fft_fftw.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/filtrez/lmdz_fft_fftw.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/filtrez/lmdz_fft_fftw.F90	(revision 5134)
@@ -17,5 +17,5 @@
   SUBROUTINE Init_fft(iim,nvectmax)
   IMPLICIT NONE
-#include <fftw3.f>
+#INCLUDE <fftw3.f>
     INTEGER :: iim
     INTEGER :: nvectmax
@@ -85,5 +85,5 @@
   SUBROUTINE fft_forward(vect,TF_vect,nb_vect)
     IMPLICIT NONE
-#include <fftw3.f>
+#INCLUDE <fftw3.f>
     INTEGER,INTENT(IN)     :: nb_vect
     REAL,INTENT(IN)        :: vect(vsize+inc,nb_vect)
@@ -98,5 +98,5 @@
   SUBROUTINE fft_backward(TF_vect,vect,nb_vect)
     IMPLICIT NONE
-#include <fftw3.f>
+#INCLUDE <fftw3.f>
     INTEGER,INTENT(IN)     :: nb_vect
     REAL,INTENT(OUT)       :: vect(vsize+inc,nb_vect)
Index: /LMDZ6/branches/Amaury_dev/libf/filtrez/lmdz_filtre_fft.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/filtrez/lmdz_filtre_fft.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/filtrez/lmdz_filtre_fft.F90	(revision 5134)
@@ -17,5 +17,5 @@
     USE lmdz_fft
     IMPLICIT NONE
-    include 'dimensions.h'
+    INCLUDE 'dimensions.h'
     REAL,   INTENT(IN) :: coeffu(iim,jjm)
     INTEGER,INTENT(IN) :: modfrstu(jjm)
@@ -123,5 +123,5 @@
 #endif
     IMPLICIT NONE
-    include 'dimensions.h'
+    INCLUDE 'dimensions.h'
     INTEGER,INTENT(IN) :: nlat
     INTEGER,INTENT(IN) :: jj_begin
Index: /LMDZ6/branches/Amaury_dev/libf/filtrez/lmdz_filtre_fft_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/filtrez/lmdz_filtre_fft_loc.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/filtrez/lmdz_filtre_fft_loc.F90	(revision 5134)
@@ -14,5 +14,5 @@
     USE lmdz_fft
     IMPLICIT NONE
-    include 'dimensions.h'
+    INCLUDE 'dimensions.h'
     REAL, INTENT(IN) :: coeffu(iim, jjm)
     INTEGER, INTENT(IN) :: modfrstu(jjm)
@@ -111,5 +111,5 @@
 #endif
     IMPLICIT NONE
-    include 'dimensions.h'
+    INCLUDE 'dimensions.h'
     INTEGER, INTENT(IN) :: jjb
     INTEGER, INTENT(IN) :: jje
Index: /LMDZ6/branches/Amaury_dev/libf/filtrez/lmdz_filtreg.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/filtrez/lmdz_filtreg.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/filtrez/lmdz_filtreg.F90	(revision 5134)
@@ -333,7 +333,7 @@
     IMPLICIT NONE
     !
-    include "dimensions.h"
-    include "paramet.h"
-    include "comgeom.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
+    INCLUDE "comgeom.h"
     !
     REAL :: vec(iim, iim), vec1(iim, iim)
@@ -593,7 +593,7 @@
     !     Correction  le 28/10/97    P. Le Van .
     !  -------------------------------------------------------------------
-    include "dimensions.h"
-    include "paramet.h"
-    include "comgeom.h"
+    INCLUDE "dimensions.h"
+    INCLUDE "paramet.h"
+    INCLUDE "comgeom.h"
 
     REAL  dlonu(iim), dlatu(jjm)
Index: /LMDZ6/branches/Amaury_dev/libf/misc/lmdz_vampir.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/lmdz_vampir.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/lmdz_vampir.F90	(revision 5134)
@@ -19,5 +19,5 @@
 
 #ifdef USE_VT
-    include 'VT.inc'
+    INCLUDE 'VT.inc'
     INTEGER :: ierr
     
@@ -32,5 +32,5 @@
 
 #ifdef USE_MPE
-    include 'mpe_logf.h' 
+    INCLUDE 'mpe_logf.h'
     INTEGER :: ierr,i
     
@@ -53,5 +53,5 @@
     INTEGER :: number
 #ifdef USE_VT    
-    include 'VT.inc'
+    INCLUDE 'VT.inc'
     INTEGER :: ierr
     
@@ -59,5 +59,5 @@
 #endif 
 #ifdef USE_MPE
-    include 'mpe_logf.h' 
+    INCLUDE 'mpe_logf.h'
     INTEGER :: ierr,i
     ierr = MPE_Log_event( MPE_begin(number), 0, '' )
@@ -70,5 +70,5 @@
     INTEGER :: Number
 #ifdef USE_VT    
-    include 'VT.inc'
+    INCLUDE 'VT.inc'
     INTEGER :: ierr
    
@@ -77,5 +77,5 @@
 
 #ifdef USE_MPE
-    include 'mpe_logf.h' 
+    INCLUDE 'mpe_logf.h'
     INTEGER :: ierr,i
     ierr = MPE_Log_event( MPE_end(number), 0, '' )
Index: /LMDZ6/branches/Amaury_dev/libf/misc/lmdz_xer.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/lmdz_xer.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/lmdz_xer.f90	(revision 5134)
@@ -1045,5 +1045,5 @@
     !   891214  Prologue converted to Version 4.0 format.  (BAB)
     !   900206  Routine changed from user-callable to subsidiary.  (WRB)
-    !   900510  Changed calling sequence to include LIBRARY and SUBROUTINE
+    !   900510  Changed calling sequence to INCLUDE LIBRARY and SUBROUTINE
     !       names, changed routine name from XERCTL to XERCNT.  (RWC)
     !   920501  Reformatted the REFERENCES section.  (WRB)
Index: /LMDZ6/branches/Amaury_dev/libf/phydev/physiq_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phydev/physiq_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phydev/physiq_mod.F90	(revision 5134)
@@ -27,5 +27,5 @@
       USE iophy, ONLY: histwrite_phy
 
-      IMPLICIT none
+      IMPLICIT NONE
 
 ! Routine argument:
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/aeropt_spl.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/aeropt_spl.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/aeropt_spl.f90	(revision 5134)
@@ -10,5 +10,5 @@
   USE dimphy
   USE infotrac
-  IMPLICIT none
+  IMPLICIT NONE
   !
   INCLUDE "chem.h"
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/cltrac_spl.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/cltrac_spl.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/cltrac_spl.f90	(revision 5134)
@@ -3,5 +3,5 @@
 
   USE dimphy
-  IMPLICIT none
+  IMPLICIT NONE
   !======================================================================
   ! Auteur(s): O. Boucher (LOA/LMD) date: 19961127
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfc.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfc.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfc.f90	(revision 5134)
@@ -5,5 +5,5 @@
   USE dimphy
   USE netcdf, ONLY: nf90_close, nf90_noerr, nf90_inq_varid, nf90_open, nf90_nowrite, nf90_get_var
-  IMPLICIT none
+  IMPLICIT NONE
 
   ! Lire les conditions aux limites du modele pour la chimie.
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfc_new.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfc_new.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfc_new.f90	(revision 5134)
@@ -7,5 +7,5 @@
   USE dimphy
   USE netcdf, ONLY: nf90_get_var, nf90_close, nf90_noerr, nf90_inq_varid, nf90_open, nf90_nowrite
-  IMPLICIT none
+  IMPLICIT NONE
 
   ! Lire les conditions aux limites du modele pour la chimie.
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfs.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfs.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfs.f90	(revision 5134)
@@ -6,5 +6,5 @@
   USE netcdf, ONLY: nf90_close, nf90_noerr, nf90_inq_varid, nf90_open, &
           nf90_nowrite, nf90_get_var
-  IMPLICIT none
+  IMPLICIT NONE
 
   ! Lire les conditions aux limites du modele pour la chimie.
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfs_new.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfs_new.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfs_new.f90	(revision 5134)
@@ -10,5 +10,5 @@
   USE dimphy
   USE netcdf, ONLY: nf90_get_var, nf90_inq_varid, nf90_close, nf90_noerr, nf90_open, nf90_nowrite
-  IMPLICIT none
+  IMPLICIT NONE
 
   ! Lire les conditions aux limites du modele pour la chimie.
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/lsc_scav_orig.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/lsc_scav_orig.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/lsc_scav_orig.F90	(revision 5134)
@@ -21,7 +21,7 @@
 !=====================================================================
 
-  include "dimensions.h"
-  include "chem.h"
-  include "YOECUMF.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "chem.h"
+  INCLUDE "YOECUMF.h"
 
   REAL,INTENT(IN)                        :: pdtime ! time step (s)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/lsc_scav_spl.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/lsc_scav_spl.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/lsc_scav_spl.F90	(revision 5134)
@@ -23,7 +23,7 @@
 ! SPLA version taken from trunk revision 2041
 
-  include "dimensions.h"
-  include "chem.h"
-  include "YOECUMF.h"
+  INCLUDE "dimensions.h"
+  INCLUDE "chem.h"
+  INCLUDE "YOECUMF.h"
 
   REAL,INTENT(IN)                        :: pdtime ! time step (s)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phys_output_write_spl_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phys_output_write_spl_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phys_output_write_spl_mod.F90	(revision 5134)
@@ -75,5 +75,5 @@
   !JE20150620>>
 
-  ! Author: Abderrahmane IDELKADI (original include file)
+  ! Author: Abderrahmane IDELKADI (original INCLUDE file)
   ! Author: Laurent FAIRHEAD (transformation to module/subroutine)
   ! Author: Ulysse GERARD (effective implementation)
@@ -396,4 +396,5 @@
     USE lmdz_yomcst
     USE lmdz_iniprint, ONLY: lunout, prt_level
+    USE lmdz_alpale
 
     IMPLICIT NONE
@@ -401,5 +402,4 @@
     !   INCLUDE "temps.h"
     INCLUDE "clesphys.h"
-    INCLUDE "alpale.h"
     INCLUDE "compbl.h"
     INCLUDE "dimensions.h"
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phytracr_spl_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phytracr_spl_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phytracr_spl_mod.F90	(revision 5134)
@@ -798,6 +798,7 @@
 
     USE lmdz_yomcst
-
-    IMPLICIT none
+    USE lmdz_alpale
+
+    IMPLICIT NONE
 
     !======================================================================
@@ -817,5 +818,4 @@
     INCLUDE "YOETHF.h"
     INCLUDE "paramet.h"
-    INCLUDE "alpale.h"
 
     !======================================================================
@@ -1161,5 +1161,5 @@
     ! JE for updating in  cltrac
     REAL, DIMENSION(klon, klev) :: delp     ! epaisseur de couche (Pa)
-    !! JE for include gas to particle conversion in output
+    !! JE for INCLUDE gas to particle conversion in output
     !      REAL his_g2pgas(klon)      ! gastoparticle in gas units (check!)
     !      REAL his_g2paer(klon)      ! gastoparticle in aerosol units (check!)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/tiedqneg.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/tiedqneg.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/tiedqneg.f90	(revision 5134)
@@ -2,5 +2,5 @@
 
   USE dimphy
-  IMPLICIT none
+  IMPLICIT NONE
   !======================================================================
   ! Auteur(s): CG (LGGE/CNRS) date: 19950201
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/add_phys_tend_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/add_phys_tend_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/add_phys_tend_mod.F90	(revision 5134)
@@ -108,5 +108,5 @@
 USE phys_output_var_mod, ONLY: d_qw_col, d_ql_col, d_qs_col, d_qbs_col, d_qt_col, d_ek_col, d_h_dair_col &
              , d_h_qw_col, d_h_ql_col, d_h_qs_col, d_h_qbs_col, d_h_col
-IMPLICIT none
+IMPLICIT NONE
 INCLUDE "YOMCST.h"
 INCLUDE "clesphys.h"
@@ -507,5 +507,5 @@
 USE phys_output_var_mod, ONLY: d_qw_col, d_ql_col, d_qs_col, d_qbs_col, d_qt_col, d_ek_col, d_h_dair_col &
              , d_h_qw_col, d_h_ql_col, d_h_qs_col, d_h_qbs_col, d_h_col
-IMPLICIT none
+IMPLICIT NONE
   include "YOMCST.h"
   include "clesphys.h"
@@ -656,5 +656,5 @@
                     zh_qw_col, zh_ql_col, zh_qs_col, zh_qbs_col, zh_col)
 
-IMPLICIT none
+IMPLICIT NONE
 INCLUDE "YOMCST.h"
 
@@ -736,5 +736,5 @@
     , rain_lsc, snow_lsc
 USE climb_hq_mod, ONLY: d_h_col_vdf, f_h_bnd
-IMPLICIT none
+IMPLICIT NONE
 INCLUDE "YOMCST.h"
 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/add_wake_tend.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/add_wake_tend.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/add_wake_tend.F90	(revision 5134)
@@ -13,5 +13,5 @@
 
 USE lmdz_print_control, ONLY: prt_level
-IMPLICIT none
+IMPLICIT NONE
 
 ! Arguments :
Index: DZ6/branches/Amaury_dev/libf/phylmd/alpale.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/alpale.F90	(revision 5133)
+++ 	(revision )
@@ -1,198 +1,0 @@
-SUBROUTINE alpale( debut, itap, dtime, paprs, omega, t_seri,   &
-                    alp_offset, it_wape_prescr,  wape_prescr, fip_prescr, &
-                    ale_bl_prescr, alp_bl_prescr, &
-                    wake_pe, wake_fip,  &
-                    Ale_bl, Ale_bl_trig, Alp_bl, &
-                    Ale, Alp, Ale_wake, Alp_wake )
-
-! **************************************************************
-! *
-! ALPALE                                                       *
-! *
-! *
-! written by   : Jean-Yves Grandpeix, 12/05/2016              *
-! modified by :                                               *
-! **************************************************************
-
-  USE dimphy
-  USE lmdz_ioipsl_getin_p, ONLY: getin_p
-  USE lmdz_print_control, ONLY: mydebug=>debug , lunout, prt_level
-  USE phys_local_var_mod, ONLY: zw2       ! Variables internes non sauvegardees de la physique
-  USE lmdz_abort_physic, ONLY: abort_physic
-
-  IMPLICIT NONE
-
-!================================================================
-! Auteur(s)   : Jean-Yves Grandpeix, 12/05/2016
-! Objet : Sums up all contributions to Ale and Alp
-!================================================================
-
-! Input arguments
-!----------------
-  LOGICAL, INTENT(IN)                                        :: debut
-  INTEGER, INTENT(IN)                                        :: itap
-  REAL, INTENT(IN)                                           :: dtime
-  INTEGER, INTENT(IN)                                        :: it_wape_prescr
-  REAL, INTENT(IN)                                           :: wape_prescr, fip_prescr
-  REAL, INTENT(IN)                                           :: Ale_bl_prescr, Alp_bl_prescr
-  REAL, INTENT(IN)                                           :: alp_offset
-  REAL, DIMENSION(klon,klev+1), INTENT(IN)                   :: paprs
-  REAL, DIMENSION(klon,klev), INTENT(IN)                     :: t_seri
-  REAL, DIMENSION(klon,klev), INTENT(IN)                     :: omega
-  REAL, DIMENSION(klon), INTENT(IN)                          :: wake_pe, wake_fip
-  REAL, DIMENSION(klon), INTENT(IN)                          :: Ale_bl, Ale_bl_trig, Alp_bl
-
-
-! Output arguments
-!----------------
-  REAL, DIMENSION(klon), INTENT(OUT)                         :: Ale, Alp
-  REAL, DIMENSION(klon), INTENT(OUT)                         :: Ale_wake, Alp_wake
-
-  include "alpale.h"
-  include "YOMCST.h"
-  include "YOETHF.h"
-
-! Local variables
-!----------------
-  INTEGER                                                    :: i, k
-  REAL, DIMENSION(klon)                                      :: www
-  REAL, SAVE                                                 :: ale_max=1000.
-  REAL, SAVE                                                 :: alp_max=2.
-  CHARACTER*20 modname
-  CHARACTER*80 abort_message
-
-
-    !$OMP THREADPRIVATE(ale_max,alp_max)
-
-       ! Calcul de l'energie disponible ALE (J/kg) et de la puissance
-       ! disponible ALP (W/m2) pour le soulevement des particules dans
-       ! le modele convectif
-
-       do i = 1,klon
-          ALE(i) = 0.
-          ALP(i) = 0.
-       enddo
-
-       !calcul de ale_wake et alp_wake
-       IF (iflag_wake>=1) THEN
-          IF (itap <= it_wape_prescr) THEN
-             do i = 1,klon
-                ale_wake(i) = wape_prescr
-                alp_wake(i) = fip_prescr
-             enddo
-          else
-             do i = 1,klon
-                !jyg  ALE=WAPE au lieu de ALE = 1/2 Cstar**2
-                !cc           ale_wake(i) = 0.5*wake_cstar(i)**2
-                ale_wake(i) = wake_pe(i)
-                alp_wake(i) = wake_fip(i)
-             enddo
-          endif
-       else
-          do i = 1,klon
-             ale_wake(i) = 0.
-             alp_wake(i) = 0.
-          enddo
-       endif
-       !combinaison avec ale et alp de couche limite: constantes si pas
-       !de couplage, valeurs calculees dans le thermique sinon
-       IF (iflag_coupl==0) THEN
-          IF (debut.AND.prt_level>9) &
-               WRITE(lunout,*)'ALE et ALP imposes'
-          do i = 1,klon
-             !on ne couple que ale
-             !           ALE(i) = max(ale_wake(i),Ale_bl(i))
-             ALE(i) = max(ale_wake(i),ale_bl_prescr)
-             !on ne couple que alp
-             !           ALP(i) = alp_wake(i) + Alp_bl(i)
-             ALP(i) = alp_wake(i) + alp_bl_prescr
-          enddo
-       else
-          IF(prt_level>9)WRITE(lunout,*)'ALE et ALP couples au thermique'
-          !         do i = 1,klon
-          !             ALE(i) = max(ale_wake(i),Ale_bl(i))
-          ! avant        ALP(i) = alp_wake(i) + Alp_bl(i)
-          !             ALP(i) = alp_wake(i) + Alp_bl(i) + alp_offset ! modif sb
-          !         WRITE(20,*)'ALE',ALE(i),Ale_bl(i),ale_wake(i)
-          !         WRITE(21,*)'ALP',ALP(i),Alp_bl(i),alp_wake(i)
-          !         enddo
-
-          ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-          ! Modif FH 2010/04/27. Sans doute temporaire.
-          ! Deux options pour le alp_offset : constant si >?? 0 ou
-          ! proportionnel ??a w si <0
-          ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-          ! Estimation d'une vitesse verticale effective pour ALP
-          IF (1==0) THEN
-             www(1:klon)=0.
-             do k=2,klev-1
-                do i=1,klon
-                   www(i)=max(www(i),-omega(i,k)*RD*t_seri(i,k) &
-                        /(RG*paprs(i,k)) *zw2(i,k)*zw2(i,k))
-                   ! if (paprs(i,k)>pbase(i)) THEN
-                   ! calcul approche de la vitesse verticale en m/s
-                   !  www(i)=max(www(i),-omega(i,k)*RD*temp(i,k)/(RG*paprs(i,k))
-                   !             endif
-                   !   Le 0.1 est en gros H / ps = 1e4 / 1e5
-                enddo
-             enddo
-             do i=1,klon
-                IF (www(i)>0. .AND. ale_bl(i)>0. ) www(i)=www(i)/ale_bl(i)
-             enddo
-          ENDIF
-
-
-          do i = 1,klon
-             ALE(i) = max(ale_wake(i),Ale_bl(i))
-             !cc nrlmd le 10/04/2012----------Stochastic triggering------------
-             IF (iflag_trig_bl>=1) THEN
-                ALE(i) = max(ale_wake(i),Ale_bl_trig(i))
-             endif
-             !cc fin nrlmd le 10/04/2012
-             IF (alp_offset>=0.) THEN
-                ALP(i) = alp_wake(i) + Alp_bl(i) + alp_offset ! modif sb
-             else
-                abort_message ='Ne pas passer la car www non calcule'
-                CALL abort_physic (modname,abort_message,1)
-
-                ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-                !                                _                  _
-                ! Ajout d'une composante 3 * A * w w'2 a w'3 avec
-                ! w=www : w max sous pbase ou A est la fraction
-                ! couverte par les ascendances w' on utilise le fait
-                ! que A * w'3 = ALP et donc A * w'2 ~ ALP / sqrt(ALE)
-                ! (on ajoute 0.1 pour les singularites)
-                ALP(i)=alp_wake(i)*(1.+3.*www(i)/( sqrt(ale_wake(i))+0.1) ) &
-                     +alp_bl(i)  *(1.+3.*www(i)/( sqrt(ale_bl(i))  +0.1) )
-                !    ALP(i)=alp_wake(i)+Alp_bl(i)+alp_offset*min(omega(i,6),0.)
-                !             if (alp(i)<0.) THEN
-                !                PRINT*,'ALP ',alp(i),alp_wake(i) &
-                !                     ,Alp_bl(i),alp_offset*min(omega(i,6),0.)
-                !             endif
-             endif
-          enddo
-          ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-       endif
-       do i=1,klon
-          IF (alp(i)>alp_max) THEN
-             IF(prt_level>9)WRITE(lunout,*)                             &
-                  'WARNING SUPER ALP (seuil=',alp_max, &
-                  '): i, alp, alp_wake,ale',i,alp(i),alp_wake(i),ale(i)
-             alp(i)=alp_max
-          endif
-          IF (ale(i)>ale_max) THEN
-             IF(prt_level>9)WRITE(lunout,*)                             &
-                  'WARNING SUPER ALE (seuil=',ale_max, &
-                  '): i, alp, alp_wake,ale',i,ale(i),ale_wake(i),alp(i)
-             ale(i)=ale_max
-          endif
-       enddo
-
-       !fin calcul ale et alp
-       !=======================================================================
-
-
-  RETURN
-  END
-
Index: DZ6/branches/Amaury_dev/libf/phylmd/alpale.h
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/alpale.h	(revision 5133)
+++ 	(revision )
@@ -1,18 +1,0 @@
-!=====================================================================
-! Specifique de Ale/Alp :
-!=====================================================================
-! Mettre ca dans un alealp_th.sh en attendant mieux ...
-
-! dans alealp_th, thermcell_alp, physiq_mod, conf_phys
-      INTEGER            :: iflag_trig_bl,iflag_clos_bl,iflag_strig
-      INTEGER            :: tau_trig_shallow,tau_trig_deep
-      real               :: s_trig, h_trig
-! thermcell_alp et convection ...
-      INTEGER            :: iflag_coupl,iflag_clos,iflag_wake
-! thermcell_alp
-      real               :: alp_bl_k
-
-      common/calpale1/iflag_trig_bl,iflag_clos_bl,tau_trig_shallow,tau_trig_deep,iflag_strig
-      common/calpale2/alp_bl_k,s_trig,h_trig,iflag_coupl,iflag_clos,iflag_wake
-
-!$OMP THREADPRIVATE(/calpale1/,/calpale2/)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/alpale_th.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/alpale_th.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/alpale_th.F90	(revision 5134)
@@ -21,4 +21,5 @@
   USE lmdz_print_control, ONLY: mydebug=>debug , lunout, prt_level
   USE lmdz_abort_physic, ONLY: abort_physic
+  USE lmdz_alpale
 
   IMPLICIT NONE
@@ -47,6 +48,4 @@
 
   REAL, DIMENSION(klon), INTENT(OUT)                         :: birth_rate
-
-  include "alpale.h"
 
 ! Local variables
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/calbeta.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/calbeta.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/calbeta.F90	(revision 5134)
@@ -8,5 +8,5 @@
   USE indice_sol_mod
 
-  IMPLICIT none
+  IMPLICIT NONE
 
   INCLUDE "flux_arp.h"
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cfmip_point_locations.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cfmip_point_locations.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cfmip_point_locations.F90	(revision 5134)
@@ -5,5 +5,5 @@
 
  SUBROUTINE read_CFMIP_point_locations(npCFMIP, tab, lonCFMIP, latCFMIP)
-  IMPLICIT none
+  IMPLICIT NONE
   INTEGER :: npCFMIP
   REAL, DIMENSION(npCFMIP) :: lonCFMIP, latCFMIP
@@ -35,5 +35,5 @@
   USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, klon_glo
 
-  IMPLICIT none 
+  IMPLICIT NONE
   INTEGER :: npCFMIP
   REAL, DIMENSION(npCFMIP) :: lonCFMIP, latCFMIP
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cmp_seri_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cmp_seri_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cmp_seri_mod.F90	(revision 5134)
@@ -26,5 +26,5 @@
          t_seri
 
-    IMPLICIT none
+    IMPLICIT NONE
     ! Local :
     !--------
@@ -62,5 +62,5 @@
          t_seri
     USE lmdz_print_control, ONLY: prt_level
-    IMPLICIT none
+    IMPLICIT NONE
     ! Arguments :
     !------------
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/coefcdrag.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/coefcdrag.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/coefcdrag.F90	(revision 5134)
@@ -10,5 +10,5 @@
       USE lmdz_abort_physic, ONLY: abort_physic
 
-      IMPLICIT none
+      IMPLICIT NONE
 !-------------------------------------------------------------------------
 ! Objet : calcul des cdrags pour le moment (cdram) et les flux de chaleur 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/conf_phys_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/conf_phys_m.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/conf_phys_m.F90	(revision 5134)
@@ -37,4 +37,5 @@
     USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_STRATAER
     USE lmdz_abort_physic, ONLY: abort_physic
+    USE lmdz_alpale
 
     INCLUDE "conema3.h"
@@ -42,5 +43,4 @@
     INCLUDE "YOMCST.h"
     INCLUDE "YOMCST2.h"
-    INCLUDE "alpale.h"
 
     !IM : on inclut/initialise les taux de CH4, N2O, CFC11 et CFC12
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/create_etat0_unstruct_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/create_etat0_unstruct_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/create_etat0_unstruct_mod.F90	(revision 5134)
@@ -92,4 +92,5 @@
   USE lmdz_geometry
   USE lmdz_ioipsl_getin_p, ONLY: getin_p
+  USE lmdz_alpale
 
   IMPLICIT NONE
@@ -114,6 +115,5 @@
 
     INCLUDE "compbl.h"
-    INCLUDE "alpale.h"
-   
+
     INTEGER :: ji,j,i
  
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/lmdz_1dutils.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/lmdz_1dutils.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/lmdz_1dutils.f90	(revision 5134)
@@ -6,5 +6,5 @@
 CONTAINS
   REAL FUNCTION fq_sat(kelvin, millibar)
-    IMPLICIT none
+    IMPLICIT NONE
     !======================================================================
     ! Autheur(s): Z.X. Li (LMD/CNRS)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/lmdz_old_1dconv.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/lmdz_old_1dconv.f90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/lmdz_old_1dconv.f90	(revision 5134)
@@ -632,5 +632,5 @@
   SUBROUTINE rdgrads(itape, icount, nl, z, ht, hq, hw, hu, hv, hthtur, hqtur, &
           &  ts_fcg, ts, imp_fcg, Turb_fcg)
-    IMPLICIT none
+    IMPLICIT NONE
     INTEGER itape, icount, icomp, nl
     REAL z(nl), ht(nl), hq(nl), hw(nl), hu(nl), hv(nl)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/ener_conserv.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/ener_conserv.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/ener_conserv.F90	(revision 5134)
@@ -31,5 +31,5 @@
 USE lmdz_abort_physic, ONLY: abort_physic
 
-IMPLICIT none
+IMPLICIT NONE
 INCLUDE "YOMCST.h"
 INCLUDE "YOETHF.h"
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/gr_fi_ecrit.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/gr_fi_ecrit.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/gr_fi_ecrit.F90	(revision 5134)
@@ -1,4 +1,4 @@
 SUBROUTINE gr_fi_ecrit(nfield,nlon,iim,jjmp1,fi,ecrit)
-  IMPLICIT none
+  IMPLICIT NONE
 
   ! Tranformer une variable de la grille physique a
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/surf_inlandsis_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/surf_inlandsis_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/surf_inlandsis_mod.F90	(revision 5134)
@@ -1042,5 +1042,5 @@
         USE indice_sol_mod
 
-        IMPLICIT none
+        IMPLICIT NONE
         !======================================================================
         ! Auteur(s) HJ PUNGE (LSCE) date: 07/2009
@@ -1278,5 +1278,5 @@
         USE dimphy
 
-        IMPLICIT none
+        IMPLICIT NONE
 
         include "clesphys.h"
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/iophys.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/iophys.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/iophys.F90	(revision 5134)
@@ -187,5 +187,5 @@
 #ifdef und
       SUBROUTINE gr_fi_ecrit(nfield,nlon,iim,jjmp1,fi,ecrit)
-      IMPLICIT none
+      IMPLICIT NONE
 
 !=======================================================================
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_alpale.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_alpale.f90	(revision 5134)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_alpale.f90	(revision 5134)
@@ -0,0 +1,220 @@
+! Contains the alpale subroutine, as well as the old content from alpale.h
+
+MODULE lmdz_alpale
+  IMPLICIT NONE; PRIVATE
+  PUBLIC alpale
+
+  !=====================================================================
+  ! Specifique de Ale/Alp :
+  !=====================================================================
+  PUBLIC iflag_trig_bl, iflag_clos_bl, tau_trig_shallow, tau_trig_deep, iflag_strig, &
+          alp_bl_k, s_trig, h_trig, iflag_coupl, iflag_clos, iflag_wake
+  ! dans alealp_th, thermcell_alp, physiq_mod, conf_phys
+  INTEGER :: iflag_trig_bl, iflag_clos_bl, iflag_strig
+  INTEGER :: tau_trig_shallow, tau_trig_deep
+  REAL :: s_trig, h_trig
+  ! thermcell_alp et convection ...
+  INTEGER :: iflag_coupl, iflag_clos, iflag_wake
+  ! thermcell_alp
+  REAL :: alp_bl_k
+  !$OMP THREADPRIVATE(iflag_trig_bl, iflag_clos_bl, tau_trig_shallow, tau_trig_deep, iflag_strig)
+  !$OMP THREADPRIVATE(alp_bl_k, s_trig, h_trig, iflag_coupl, iflag_clos, iflag_wake)
+
+CONTAINS
+
+  SUBROUTINE alpale(debut, itap, dtime, paprs, omega, t_seri, &
+          alp_offset, it_wape_prescr, wape_prescr, fip_prescr, &
+          ale_bl_prescr, alp_bl_prescr, &
+          wake_pe, wake_fip, &
+          Ale_bl, Ale_bl_trig, Alp_bl, &
+          Ale, Alp, Ale_wake, Alp_wake)
+
+    ! **************************************************************
+    ! *
+    ! ALPALE                                                       *
+    ! *
+    ! *
+    ! written by   : Jean-Yves Grandpeix, 12/05/2016              *
+    ! modified by :                                               *
+    ! **************************************************************
+
+    USE dimphy
+    USE lmdz_ioipsl_getin_p, ONLY: getin_p
+    USE lmdz_print_control, ONLY: mydebug => debug, lunout, prt_level
+    USE phys_local_var_mod, ONLY: zw2       ! Variables internes non sauvegardees de la physique
+    USE lmdz_abort_physic, ONLY: abort_physic
+
+    IMPLICIT NONE
+
+    !================================================================
+    ! Auteur(s)   : Jean-Yves Grandpeix, 12/05/2016
+    ! Objet : Sums up all contributions to Ale and Alp
+    !================================================================
+
+    ! Input arguments
+    !----------------
+    LOGICAL, INTENT(IN) :: debut
+    INTEGER, INTENT(IN) :: itap
+    REAL, INTENT(IN) :: dtime
+    INTEGER, INTENT(IN) :: it_wape_prescr
+    REAL, INTENT(IN) :: wape_prescr, fip_prescr
+    REAL, INTENT(IN) :: Ale_bl_prescr, Alp_bl_prescr
+    REAL, INTENT(IN) :: alp_offset
+    REAL, DIMENSION(klon, klev + 1), INTENT(IN) :: paprs
+    REAL, DIMENSION(klon, klev), INTENT(IN) :: t_seri
+    REAL, DIMENSION(klon, klev), INTENT(IN) :: omega
+    REAL, DIMENSION(klon), INTENT(IN) :: wake_pe, wake_fip
+    REAL, DIMENSION(klon), INTENT(IN) :: Ale_bl, Ale_bl_trig, Alp_bl
+
+
+    ! Output arguments
+    !----------------
+    REAL, DIMENSION(klon), INTENT(OUT) :: Ale, Alp
+    REAL, DIMENSION(klon), INTENT(OUT) :: Ale_wake, Alp_wake
+
+    include "YOMCST.h"
+    include "YOETHF.h"
+
+    ! Local variables
+    !----------------
+    INTEGER :: i, k
+    REAL, DIMENSION(klon) :: www
+    REAL, SAVE :: ale_max = 1000.
+    REAL, SAVE :: alp_max = 2.
+    CHARACTER*20 modname
+    CHARACTER*80 abort_message
+
+
+    !$OMP THREADPRIVATE(ale_max,alp_max)
+
+    ! Calcul de l'energie disponible ALE (J/kg) et de la puissance
+    ! disponible ALP (W/m2) pour le soulevement des particules dans
+    ! le modele convectif
+
+    do i = 1, klon
+      ALE(i) = 0.
+      ALP(i) = 0.
+    enddo
+
+    !calcul de ale_wake et alp_wake
+    IF (iflag_wake>=1) THEN
+      IF (itap <= it_wape_prescr) THEN
+        do i = 1, klon
+          ale_wake(i) = wape_prescr
+          alp_wake(i) = fip_prescr
+        enddo
+      else
+        do i = 1, klon
+          !jyg  ALE=WAPE au lieu de ALE = 1/2 Cstar**2
+          !cc           ale_wake(i) = 0.5*wake_cstar(i)**2
+          ale_wake(i) = wake_pe(i)
+          alp_wake(i) = wake_fip(i)
+        enddo
+      endif
+    else
+      do i = 1, klon
+        ale_wake(i) = 0.
+        alp_wake(i) = 0.
+      enddo
+    endif
+    !combinaison avec ale et alp de couche limite: constantes si pas
+    !de couplage, valeurs calculees dans le thermique sinon
+    IF (iflag_coupl==0) THEN
+      IF (debut.AND.prt_level>9) &
+              WRITE(lunout, *)'ALE et ALP imposes'
+      do i = 1, klon
+        !on ne couple que ale
+        !           ALE(i) = max(ale_wake(i),Ale_bl(i))
+        ALE(i) = max(ale_wake(i), ale_bl_prescr)
+        !on ne couple que alp
+        !           ALP(i) = alp_wake(i) + Alp_bl(i)
+        ALP(i) = alp_wake(i) + alp_bl_prescr
+      enddo
+    else
+      IF(prt_level>9)WRITE(lunout, *)'ALE et ALP couples au thermique'
+      !         do i = 1,klon
+      !             ALE(i) = max(ale_wake(i),Ale_bl(i))
+      ! avant        ALP(i) = alp_wake(i) + Alp_bl(i)
+      !             ALP(i) = alp_wake(i) + Alp_bl(i) + alp_offset ! modif sb
+      !         WRITE(20,*)'ALE',ALE(i),Ale_bl(i),ale_wake(i)
+      !         WRITE(21,*)'ALP',ALP(i),Alp_bl(i),alp_wake(i)
+      !         enddo
+
+      ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      ! Modif FH 2010/04/27. Sans doute temporaire.
+      ! Deux options pour le alp_offset : constant si >?? 0 ou
+      ! proportionnel ??a w si <0
+      ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      ! Estimation d'une vitesse verticale effective pour ALP
+      IF (1==0) THEN
+        www(1:klon) = 0.
+        do k = 2, klev - 1
+          do i = 1, klon
+            www(i) = max(www(i), -omega(i, k) * RD * t_seri(i, k) &
+                    / (RG * paprs(i, k)) * zw2(i, k) * zw2(i, k))
+            ! if (paprs(i,k)>pbase(i)) THEN
+            ! calcul approche de la vitesse verticale en m/s
+            !  www(i)=max(www(i),-omega(i,k)*RD*temp(i,k)/(RG*paprs(i,k))
+            !             endif
+            !   Le 0.1 est en gros H / ps = 1e4 / 1e5
+          enddo
+        enddo
+        do i = 1, klon
+          IF (www(i)>0. .AND. ale_bl(i)>0.) www(i) = www(i) / ale_bl(i)
+        enddo
+      ENDIF
+
+      do i = 1, klon
+        ALE(i) = max(ale_wake(i), Ale_bl(i))
+        !cc nrlmd le 10/04/2012----------Stochastic triggering------------
+        IF (iflag_trig_bl>=1) THEN
+          ALE(i) = max(ale_wake(i), Ale_bl_trig(i))
+        endif
+        !cc fin nrlmd le 10/04/2012
+        IF (alp_offset>=0.) THEN
+          ALP(i) = alp_wake(i) + Alp_bl(i) + alp_offset ! modif sb
+        else
+          abort_message = 'Ne pas passer la car www non calcule'
+          CALL abort_physic (modname, abort_message, 1)
+
+          ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+          !                                _                  _
+          ! Ajout d'une composante 3 * A * w w'2 a w'3 avec
+          ! w=www : w max sous pbase ou A est la fraction
+          ! couverte par les ascendances w' on utilise le fait
+          ! que A * w'3 = ALP et donc A * w'2 ~ ALP / sqrt(ALE)
+          ! (on ajoute 0.1 pour les singularites)
+          ALP(i) = alp_wake(i) * (1. + 3. * www(i) / (sqrt(ale_wake(i)) + 0.1)) &
+                  + alp_bl(i) * (1. + 3. * www(i) / (sqrt(ale_bl(i)) + 0.1))
+          !    ALP(i)=alp_wake(i)+Alp_bl(i)+alp_offset*min(omega(i,6),0.)
+          !             if (alp(i)<0.) THEN
+          !                PRINT*,'ALP ',alp(i),alp_wake(i) &
+          !                     ,Alp_bl(i),alp_offset*min(omega(i,6),0.)
+          !             endif
+        endif
+      enddo
+      ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+    endif
+    do i = 1, klon
+      IF (alp(i)>alp_max) THEN
+        IF(prt_level>9)WRITE(lunout, *)                             &
+                'WARNING SUPER ALP (seuil=', alp_max, &
+                '): i, alp, alp_wake,ale', i, alp(i), alp_wake(i), ale(i)
+        alp(i) = alp_max
+      endif
+      IF (ale(i)>ale_max) THEN
+        IF(prt_level>9)WRITE(lunout, *)                             &
+                'WARNING SUPER ALE (seuil=', ale_max, &
+                '): i, alp, alp_wake,ale', i, ale(i), ale_wake(i), alp(i)
+        ale(i) = ale_max
+      endif
+    enddo
+
+    !fin calcul ale et alp
+    !=======================================================================
+
+    RETURN
+  END
+
+END MODULE lmdz_alpale
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_cloudth.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_cloudth.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_cloudth.F90	(revision 5134)
@@ -2122,5 +2122,5 @@
     USE phys_state_var_mod, ONLY: fm_therm, detr_therm, entr_therm
 
-    IMPLICIT none
+    IMPLICIT NONE
 
     INCLUDE "YOMCST.h"
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_old.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_old.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_old.F90	(revision 5134)
@@ -27,5 +27,5 @@
 
 
-  IMPLICIT none
+  IMPLICIT NONE
   !======================================================================
   ! Auteur(s): Z.X. Li (LMD/CNRS)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_alp.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_alp.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_alp.F90	(revision 5134)
@@ -21,4 +21,6 @@
       USE indice_sol_mod
       USE lmdz_thermcell_main, ONLY: thermcell_tke_transport
+      USE lmdz_alpale
+
       IMPLICIT NONE
 
@@ -40,5 +42,4 @@
       INCLUDE "YOETHF.h"
       INCLUDE "FCTTRE.h"
-      INCLUDE "alpale.h"
 
 !   arguments:
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/o3_chem_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/o3_chem_m.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/o3_chem_m.F90	(revision 5134)
@@ -2,5 +2,5 @@
 module o3_chem_m
 
-  IMPLICIT none
+  IMPLICIT NONE
 
   PRIVATE o3_prod
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/perturb_radlwsw.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/perturb_radlwsw.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/perturb_radlwsw.F90	(revision 5134)
@@ -4,5 +4,5 @@
 
       USE dimphy
-      IMPLICIT none
+      IMPLICIT NONE
       INCLUDE "flux_arp.h"     
 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/phyetat0_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/phyetat0_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/phyetat0_mod.F90	(revision 5134)
@@ -42,6 +42,7 @@
     USE netcdf, ONLY: missing_val_netcdf => nf90_fill_real
     USE config_ocean_skin_m, ONLY: activate_ocean_skin
-
-    IMPLICIT none
+    USE lmdz_alpale
+
+    IMPLICIT NONE
     !======================================================================
     ! Auteur(s) Z.X. Li (LMD/CNRS) date: 19930818
@@ -50,5 +51,4 @@
     include "dimsoil.h"
     include "clesphys.h"
-    include "alpale.h"
     include "compbl.h"
     include "YOMCST.h"
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/phyredem.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/phyredem.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/phyredem.F90	(revision 5134)
@@ -42,10 +42,10 @@
   USE config_ocean_skin_m, ONLY: activate_ocean_skin
   USE lmdz_abort_physic, ONLY: abort_physic
-
-  IMPLICIT none
+  USE lmdz_alpale
+
+  IMPLICIT NONE
 
   include "dimsoil.h"
   include "clesphys.h"
-  include "alpale.h"
   include "compbl.h"
   !======================================================================
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/phys_output_write_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/phys_output_write_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/phys_output_write_mod.F90	(revision 5134)
@@ -467,11 +467,10 @@
     USE tracinca_mod, ONLY: config_inca
     USE config_ocean_skin_m, ONLY: activate_ocean_skin
-
     USE lmdz_vertical_layers, ONLY: presnivs
+    USE lmdz_alpale
 
     IMPLICIT NONE
 
     INCLUDE "clesphys.h"
-    INCLUDE "alpale.h"
     INCLUDE "compbl.h"
     INCLUDE "YOMCST.h"
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/physiq_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/physiq_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/physiq_mod.F90	(revision 5134)
@@ -350,4 +350,5 @@
     USE output_physiqex_mod, ONLY: output_physiqex
     USE lmdz_simu_airs, ONLY: simu_airs
+    USE lmdz_alpale
 
     IMPLICIT NONE
@@ -405,5 +406,4 @@
     include "dimsoil.h"
     include "clesphys.h"
-    include "alpale.h"
     include "dimpft.h"
     !======================================================================
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/physiqex_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/physiqex_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/physiqex_mod.F90	(revision 5134)
@@ -22,5 +22,5 @@
       USE output_physiqex_mod, ONLY: output_physiqex
 
-      IMPLICIT none
+      IMPLICIT NONE
 
 ! Routine argument:
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/qcheck.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/qcheck.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/qcheck.F90	(revision 5134)
@@ -1,4 +1,4 @@
 FUNCTION qcheck(klon,klev,paprs,q,ql,aire)
-  IMPLICIT none
+  IMPLICIT NONE
 
   ! Calculer et imprimer l'eau totale. A utiliser pour verifier
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/reevap.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/reevap.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/reevap.F90	(revision 5134)
@@ -5,5 +5,5 @@
     USE add_phys_tend_mod, ONLY: fl_cor_ebil
     
-    IMPLICIT none
+    IMPLICIT NONE
     !>======================================================================
 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/screenp_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/screenp_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/screenp_mod.F90	(revision 5134)
@@ -19,5 +19,5 @@
                      ustar, testar, qstar, zref, &
                      delu, delte, delq)
-      IMPLICIT none
+      IMPLICIT NONE
 !-------------------------------------------------------------------------
 
@@ -126,5 +126,5 @@
                      zref, &
                      delu, delte, delq)
-      IMPLICIT none
+      IMPLICIT NONE
 !-------------------------------------------------------------------------
 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/water_int.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/water_int.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/water_int.F90	(revision 5134)
@@ -6,5 +6,5 @@
 !=============================================================
 
-IMPLICIT none
+IMPLICIT NONE
 
 ! Arguments
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/add_phys_tend_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/add_phys_tend_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/add_phys_tend_mod.F90	(revision 5134)
@@ -160,5 +160,5 @@
 #endif  
 #endif
-IMPLICIT none
+IMPLICIT NONE
   include "YOMCST.h"
   include "clesphys.h"
@@ -684,5 +684,5 @@
 USE phys_output_var_mod, ONLY: d_qw_col, d_ql_col, d_qs_col, d_qbs_col, d_qt_col, d_ek_col, d_h_dair_col &
               , d_h_qw_col, d_h_ql_col, d_h_qs_col, d_h_qbs_col, d_h_col
-IMPLICIT none
+IMPLICIT NONE
   include "YOMCST.h"
   include "clesphys.h"
@@ -834,5 +834,5 @@
                     zh_qw_col, zh_ql_col, zh_qs_col, zh_qbs_col, zh_col)
 
-IMPLICIT none
+IMPLICIT NONE
   include "YOMCST.h"
 
@@ -915,5 +915,5 @@
       , rain_lsc, snow_lsc
 USE climb_hq_mod, ONLY: d_h_col_vdf, f_h_bnd
-IMPLICIT none
+IMPLICIT NONE
 include "YOMCST.h"
 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/add_wake_tend.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/add_wake_tend.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/add_wake_tend.F90	(revision 5134)
@@ -21,5 +21,5 @@
     USE phys_state_var_mod, ONLY:  wake_deltaxt   
 #endif
-IMPLICIT none
+IMPLICIT NONE
 
 ! Arguments :
Index: DZ6/branches/Amaury_dev/libf/phylmdiso/alpale.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/alpale.F90	(revision 5133)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../phylmd/alpale.F90
Index: DZ6/branches/Amaury_dev/libf/phylmdiso/alpale.h
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/alpale.h	(revision 5133)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../phylmd/alpale.h
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_alpale.f90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_alpale.f90	(revision 5134)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_alpale.f90	(revision 5134)
@@ -0,0 +1,1 @@
+link ../phylmd/lmdz_alpale.f90
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_lscp_old.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_lscp_old.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_lscp_old.F90	(revision 5134)
@@ -68,5 +68,5 @@
 #endif
 
-  IMPLICIT none
+  IMPLICIT NONE
   !======================================================================
   ! Auteur(s): Z.X. Li (LMD/CNRS)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyetat0_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyetat0_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyetat0_mod.F90	(revision 5134)
@@ -51,4 +51,5 @@
   USE netcdf, ONLY: missing_val_netcdf => nf90_fill_real
   USE config_ocean_skin_m, ONLY: activate_ocean_skin
+  USE lmdz_alpale
 #ifdef ISO
   USE infotrac_phy, ONLY: niso
@@ -60,5 +61,5 @@
 #endif
 
-  IMPLICIT none
+  IMPLICIT NONE
   !======================================================================
   ! Auteur(s) Z.X. Li (LMD/CNRS) date: 19930818
@@ -67,5 +68,4 @@
   include "dimsoil.h"
   include "clesphys.h"
-  include "alpale.h"
   include "compbl.h"
   include "YOMCST.h"
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyredem.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyredem.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyredem.F90	(revision 5134)
@@ -52,10 +52,10 @@
   USE config_ocean_skin_m, ONLY: activate_ocean_skin
   USE lmdz_abort_physic, ONLY: abort_physic
-
-  IMPLICIT none
+  USE lmdz_alpale
+
+  IMPLICIT NONE
 
   include "dimsoil.h"
   include "clesphys.h"
-  include "alpale.h"
   include "compbl.h"
   !======================================================================
@@ -509,4 +509,5 @@
 #endif
       !USE phyredem, ONLY: put_field_srf1
+      USE lmdz_alpale
 
         IMPLICIT NONE
@@ -516,5 +517,4 @@
  include "dimsoil.h"
  include "clesphys.h"
- include "alpale.h"
  include "compbl.h"
       ! inputs
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90	(revision 5134)
@@ -418,4 +418,5 @@
        USE output_physiqex_mod, ONLY: output_physiqex
        USE lmdz_simu_airs, ONLY: simu_airs
+       USE lmdz_alpale
 
 
@@ -474,5 +475,4 @@
     include "dimsoil.h"
     include "clesphys.h"
-    include "alpale.h"
     include "dimpft.h"
     !======================================================================
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/reevap.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/reevap.F90	(revision 5133)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/reevap.F90	(revision 5134)
@@ -15,5 +15,5 @@
 #endif
 #endif
-    IMPLICIT none
+    IMPLICIT NONE
     !>======================================================================
 
Index: DZ6/branches/Amaury_dev/libf/phylmdiso/simu_airs.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/simu_airs.F90	(revision 5133)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../phylmd/simu_airs.F90
