Index: /LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3d/inidissip.F90
===================================================================
--- /LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3d/inidissip.F90	(revision 1489)
+++ /LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3d/inidissip.F90	(revision 1490)
@@ -11,5 +11,5 @@
   !   -------------
 
-  USE control_mod
+  USE control_mod, only : idissip,iperiod
 
   IMPLICIT NONE
@@ -20,8 +20,11 @@
   include "comvert.h"
   include "logic.h"
-
-  LOGICAL lstardis
-  INTEGER nitergdiv,nitergrot,niterh
-  REAL    tetagdiv,tetagrot,tetatemp
+  include "iniprint.h"
+
+  LOGICAL,INTENT(in) :: lstardis
+  INTEGER,INTENT(in) :: nitergdiv,nitergrot,niterh
+  REAL,INTENT(in) :: tetagdiv,tetagrot,tetatemp
+
+! Local variables:
   REAL fact,zvert(llm),zz
   REAL zh(ip1jmp1),zu(ip1jmp1),zv(ip1jm),deltap(ip1jmp1,llm)
@@ -32,4 +35,5 @@
   REAL tetamin
   REAL pseudoz
+  character (len=80) :: abort_message
 
   REAL ran1
@@ -66,6 +70,7 @@
 
   IF ( zhmin .GE. zhmax  )     THEN
-     PRINT*,'  Inidissip  zh min max  ',zhmin,zhmax
-     STOP'probleme generateur alleatoire dans inidissip'
+     write(lunout,*)'  Inidissip  zh min max  ',zhmin,zhmax
+     abort_message='probleme generateur alleatoire dans inidissip'
+     call abort_gcm('inidissip',abort_message,1)
   ENDIF
 
@@ -95,5 +100,5 @@
   !   calcul des valeurs propres de gradiv (ii =1) et  nxgrarot(ii=2)
   !   -----------------------------------------------------------------
-  print*,'calcul des valeurs propres'
+  write(lunout,*)'inidissip: calcul des valeurs propres'
 
   DO    ii = 1, 2
@@ -168,7 +173,7 @@
   fact    = rad*24./REAL(jjm)
   fact    = fact*fact
-  PRINT*,'coef u ', fact/cdivu, 1./cdivu
-  PRINT*,'coef r ', fact/crot , 1./crot
-  PRINT*,'coef h ', fact/cdivh, 1./cdivh
+  write(lunout,*)'inidissip: coef u ', fact/cdivu, 1./cdivu
+  write(lunout,*)'inidissip: coef r ', fact/crot , 1./crot
+  write(lunout,*)'inidissip: coef h ', fact/cdivh, 1./cdivh
   !     ENDIF
 
@@ -196,5 +201,5 @@
 
 
-  PRINT*,'Constantes de temps de la diffusion horizontale'
+  write(lunout,*)'inidissip: Constantes de temps de la diffusion horizontale'
 
   tetamin =  1.e+6
@@ -210,13 +215,13 @@
   ENDDO
 
-  PRINT *,' INIDI tetamin dtvr ',tetamin,dtvr,iperiod
+  write(lunout,*)'inidissip: tetamin dtvr iperiod ',tetamin,dtvr,iperiod
   idissip = INT( tetamin/( 2.*dtvr*iperiod) ) * iperiod
-  PRINT *,' INIDI tetamin idissip ',tetamin,idissip
+  write(lunout,*)'inidissip: tetamin idissip ',tetamin,idissip
   idissip = MAX(iperiod,idissip)
   dtdiss  = idissip * dtvr
-  PRINT *,' INIDI idissip dtdiss ',idissip,dtdiss
+  write(lunout,*)'inidissip: idissip dtdiss ',idissip,dtdiss
 
   DO l = 1,llm
-     PRINT*,zvert(l),dtdiss*tetaudiv(l),dtdiss*tetaurot(l), &
+     write(lunout,*)zvert(l),dtdiss*tetaudiv(l),dtdiss*tetaurot(l), &
           dtdiss*tetah(l)
   ENDDO
Index: /LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3dpar/inidissip.F90
===================================================================
--- /LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3dpar/inidissip.F90	(revision 1489)
+++ /LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3dpar/inidissip.F90	(revision 1490)
@@ -11,5 +11,5 @@
   !   -------------
 
-  USE control_mod
+  USE control_mod, only : idissip,iperiod
 
   IMPLICIT NONE
@@ -20,8 +20,11 @@
   include "comvert.h"
   include "logic.h"
-
-  LOGICAL lstardis
-  INTEGER nitergdiv,nitergrot,niterh
-  REAL    tetagdiv,tetagrot,tetatemp
+  include "iniprint.h"
+
+  LOGICAL,INTENT(in) :: lstardis
+  INTEGER,INTENT(in) :: nitergdiv,nitergrot,niterh
+  REAL,INTENT(in) :: tetagdiv,tetagrot,tetatemp
+
+! Local variables:
   REAL fact,zvert(llm),zz
   REAL zh(ip1jmp1),zu(ip1jmp1),zv(ip1jm),deltap(ip1jmp1,llm)
@@ -32,4 +35,5 @@
   REAL tetamin
   REAL pseudoz
+  character (len=80) :: abort_message
 
   REAL ran1
@@ -66,6 +70,7 @@
 
   IF ( zhmin .GE. zhmax  )     THEN
-     PRINT*,'  Inidissip  zh min max  ',zhmin,zhmax
-     STOP'probleme generateur alleatoire dans inidissip'
+     write(lunout,*)'  Inidissip  zh min max  ',zhmin,zhmax
+     abort_message='probleme generateur alleatoire dans inidissip'
+     call abort_gcm('inidissip',abort_message,1)
   ENDIF
 
@@ -95,5 +100,5 @@
   !   calcul des valeurs propres de gradiv (ii =1) et  nxgrarot(ii=2)
   !   -----------------------------------------------------------------
-  print*,'calcul des valeurs propres'
+  write(lunout,*)'inidissip: calcul des valeurs propres'
 
   DO    ii = 1, 2
@@ -168,7 +173,7 @@
   fact    = rad*24./REAL(jjm)
   fact    = fact*fact
-  PRINT*,'coef u ', fact/cdivu, 1./cdivu
-  PRINT*,'coef r ', fact/crot , 1./crot
-  PRINT*,'coef h ', fact/cdivh, 1./cdivh
+  write(lunout,*)'inidissip: coef u ', fact/cdivu, 1./cdivu
+  write(lunout,*)'inidissip: coef r ', fact/crot , 1./crot
+  write(lunout,*)'inidissip: coef h ', fact/cdivh, 1./cdivh
   !     ENDIF
 
@@ -196,5 +201,5 @@
 
 
-  PRINT*,'Constantes de temps de la diffusion horizontale'
+  write(lunout,*)'inidissip: Constantes de temps de la diffusion horizontale'
 
   tetamin =  1.e+6
@@ -210,13 +215,13 @@
   ENDDO
 
-  PRINT *,' INIDI tetamin dtvr ',tetamin,dtvr,iperiod
+  write(lunout,*)'inidissip: tetamin dtvr iperiod ',tetamin,dtvr,iperiod
   idissip = INT( tetamin/( 2.*dtvr*iperiod) ) * iperiod
-  PRINT *,' INIDI tetamin idissip ',tetamin,idissip
+  write(lunout,*)'inidissip: tetamin idissip ',tetamin,idissip
   idissip = MAX(iperiod,idissip)
   dtdiss  = idissip * dtvr
-  PRINT *,' INIDI idissip dtdiss ',idissip,dtdiss
+  write(lunout,*)'inidissip: idissip dtdiss ',idissip,dtdiss
 
   DO l = 1,llm
-     PRINT*,zvert(l),dtdiss*tetaudiv(l),dtdiss*tetaurot(l), &
+     write(lunout,*)zvert(l),dtdiss*tetaudiv(l),dtdiss*tetaurot(l), &
           dtdiss*tetah(l)
   ENDDO