Index: LMDZ6/branches/ICOLMDZISO_SN/libf/phylmd/inifis_mod.F90
===================================================================
--- LMDZ6/branches/ICOLMDZISO_SN/libf/phylmd/inifis_mod.F90	(revision 6043)
+++ LMDZ6/branches/ICOLMDZISO_SN/libf/phylmd/inifis_mod.F90	(revision 6043)
@@ -0,0 +1,124 @@
+! $Id$
+MODULE inifis_mod
+
+CONTAINS
+
+  SUBROUTINE inifis(punjours, prad, pg, pr, pcpp)
+  ! Initialize some physical constants and settings
+  USE init_print_control_mod, ONLY : init_print_control
+  USE print_control_mod, ONLY: lunout
+  USE yomcst_mod_h
+IMPLICIT NONE
+
+
+  REAL,INTENT(IN) :: prad, pg, pr, pcpp, punjours
+
+  CHARACTER (LEN=20) :: modname = 'inifis'
+  CHARACTER (LEN=80) :: abort_message
+
+  ! Initialize flags lunout, prt_level, debug
+  CALL init_print_control
+
+  ! suphel => initialize some physical constants (orbital parameters,
+  !           geoid, gravity, thermodynamical constants, etc.) in the
+  !           physics
+  CALL suphel
+
+  ! check that physical constants set in 'suphel' are coherent
+  ! with values set in the dynamics:
+  IF (rday/=punjours) THEN
+    WRITE (lunout, *) 'inifis: length of day discrepancy!!!'
+    WRITE (lunout, *) '  in the dynamics punjours=', punjours
+    WRITE (lunout, *) '   but in the physics RDAY=', rday
+    IF (abs(rday-punjours)>0.01*punjours) THEN
+        ! stop here if the relative difference is more than 1%
+      abort_message = 'length of day discrepancy'
+      CALL abort_physic(modname, abort_message, 1)
+    END IF
+  END IF
+  IF (rg/=pg) THEN
+    WRITE (lunout, *) 'inifis: gravity discrepancy !!!'
+    WRITE (lunout, *) '     in the dynamics pg=', pg
+    WRITE (lunout, *) '  but in the physics RG=', rg
+    IF (abs(rg-pg)>0.01*pg) THEN
+        ! stop here if the relative difference is more than 1%
+      abort_message = 'gravity discrepancy'
+      CALL abort_physic(modname, abort_message, 1)
+    END IF
+  END IF
+  IF (ra/=prad) THEN
+    WRITE (lunout, *) 'inifis: planet radius discrepancy !!!'
+    WRITE (lunout, *) '   in the dynamics prad=', prad
+    WRITE (lunout, *) '  but in the physics RA=', ra
+    IF (abs(ra-prad)>0.01*prad) THEN
+        ! stop here if the relative difference is more than 1%
+      abort_message = 'planet radius discrepancy'
+      CALL abort_physic(modname, abort_message, 1)
+    END IF
+  END IF
+  IF (rd/=pr) THEN
+    WRITE (lunout, *) 'inifis: reduced gas constant discrepancy !!!'
+    WRITE (lunout, *) '     in the dynamics pr=', pr
+    WRITE (lunout, *) '  but in the physics RD=', rd
+    IF (abs(rd-pr)>0.01*pr) THEN
+        ! stop here if the relative difference is more than 1%
+      abort_message = 'reduced gas constant discrepancy'
+      CALL abort_physic(modname, abort_message, 1)
+    END IF
+  END IF
+  IF (rcpd/=pcpp) THEN
+    WRITE (lunout, *) 'inifis: specific heat discrepancy !!!'
+    WRITE (lunout, *) '     in the dynamics pcpp=', pcpp
+    WRITE (lunout, *) '  but in the physics RCPD=', rcpd
+    IF (abs(rcpd-pcpp)>0.01*pcpp) THEN
+        ! stop here if the relative difference is more than 1%
+      abort_message = 'specific heat discrepancy'
+      CALL abort_physic(modname, abort_message, 1)
+    END IF
+  END IF
+
+  CALL init_isotopes
+
+  END SUBROUTINE inifis
+
+
+  SUBROUTINE init_isotopes
+  USE infotrac_phy,ONLY : niso, nzone, ntraciso=>ntiso
+  USE isotrac_mod, ONLY: iso_traceurs_init
+  USE isotopes_mod, ONLY: iso_init
+  USE isotopes_verif_mod, ONLY: iso_verif_init
+IMPLICIT NONE
+
+ ! C Risi: vérifier compatibilité des options isotopiques entre 
+ ! dyn3dmem et physiq
+#ifdef ISO
+    write(*,*) 'ok_isotopes,ntraciso,niso=',niso>0,ntraciso,niso
+    IF(niso  <= 0) CALL abort_physic('init_isotopes','options iso incompatibles',1)
+#ifdef ISOTRAC
+    IF(nzone <= 0) CALL abort_physic('init_isotopes','options isotrac incompatibles',1)
+#else
+    IF(nzone  > 0) CALL abort_physic('init_isotopes','options isotrac incompatibles',1)
+#endif
+#else
+    if(niso   > 0) CALL abort_physic('init_isotopes','options iso incompatibles',1)
+#endif
+
+#ifdef ISO
+        ! initialisations isotopiques
+#ifdef ISOVERIF
+           write(*,*) 'ok_isotopes=',niso > 0
+#endif
+        if (niso > 0) call iso_init()
+#ifdef ISOTRAC
+IF(nzone > 0) then
+        call iso_traceurs_init()
+endif
+#endif
+#ifdef ISOVERIF
+        call iso_verif_init()
+#endif
+#endif
+
+  END SUBROUTINE init_isotopes  
+  
+END MODULE inifis_mod
Index: LMDZ6/branches/ICOLMDZISO_SN/libf/phylmd/inifis_mod.f90
===================================================================
--- LMDZ6/branches/ICOLMDZISO_SN/libf/phylmd/inifis_mod.f90	(revision 6042)
+++ 	(revision )
@@ -1,124 +1,0 @@
-! $Id$
-MODULE inifis_mod
-
-CONTAINS
-
-  SUBROUTINE inifis(punjours, prad, pg, pr, pcpp)
-  ! Initialize some physical constants and settings
-  USE init_print_control_mod, ONLY : init_print_control
-  USE print_control_mod, ONLY: lunout
-  USE yomcst_mod_h
-IMPLICIT NONE
-
-
-  REAL,INTENT(IN) :: prad, pg, pr, pcpp, punjours
-
-  CHARACTER (LEN=20) :: modname = 'inifis'
-  CHARACTER (LEN=80) :: abort_message
-
-  ! Initialize flags lunout, prt_level, debug
-  CALL init_print_control
-
-  ! suphel => initialize some physical constants (orbital parameters,
-  !           geoid, gravity, thermodynamical constants, etc.) in the
-  !           physics
-  CALL suphel
-
-  ! check that physical constants set in 'suphel' are coherent
-  ! with values set in the dynamics:
-  IF (rday/=punjours) THEN
-    WRITE (lunout, *) 'inifis: length of day discrepancy!!!'
-    WRITE (lunout, *) '  in the dynamics punjours=', punjours
-    WRITE (lunout, *) '   but in the physics RDAY=', rday
-    IF (abs(rday-punjours)>0.01*punjours) THEN
-        ! stop here if the relative difference is more than 1%
-      abort_message = 'length of day discrepancy'
-      CALL abort_physic(modname, abort_message, 1)
-    END IF
-  END IF
-  IF (rg/=pg) THEN
-    WRITE (lunout, *) 'inifis: gravity discrepancy !!!'
-    WRITE (lunout, *) '     in the dynamics pg=', pg
-    WRITE (lunout, *) '  but in the physics RG=', rg
-    IF (abs(rg-pg)>0.01*pg) THEN
-        ! stop here if the relative difference is more than 1%
-      abort_message = 'gravity discrepancy'
-      CALL abort_physic(modname, abort_message, 1)
-    END IF
-  END IF
-  IF (ra/=prad) THEN
-    WRITE (lunout, *) 'inifis: planet radius discrepancy !!!'
-    WRITE (lunout, *) '   in the dynamics prad=', prad
-    WRITE (lunout, *) '  but in the physics RA=', ra
-    IF (abs(ra-prad)>0.01*prad) THEN
-        ! stop here if the relative difference is more than 1%
-      abort_message = 'planet radius discrepancy'
-      CALL abort_physic(modname, abort_message, 1)
-    END IF
-  END IF
-  IF (rd/=pr) THEN
-    WRITE (lunout, *) 'inifis: reduced gas constant discrepancy !!!'
-    WRITE (lunout, *) '     in the dynamics pr=', pr
-    WRITE (lunout, *) '  but in the physics RD=', rd
-    IF (abs(rd-pr)>0.01*pr) THEN
-        ! stop here if the relative difference is more than 1%
-      abort_message = 'reduced gas constant discrepancy'
-      CALL abort_physic(modname, abort_message, 1)
-    END IF
-  END IF
-  IF (rcpd/=pcpp) THEN
-    WRITE (lunout, *) 'inifis: specific heat discrepancy !!!'
-    WRITE (lunout, *) '     in the dynamics pcpp=', pcpp
-    WRITE (lunout, *) '  but in the physics RCPD=', rcpd
-    IF (abs(rcpd-pcpp)>0.01*pcpp) THEN
-        ! stop here if the relative difference is more than 1%
-      abort_message = 'specific heat discrepancy'
-      CALL abort_physic(modname, abort_message, 1)
-    END IF
-  END IF
-
-  CALL init_isotopes
-
-  END SUBROUTINE inifis
-
-
-  SUBROUTINE init_isotopes
-  USE infotrac_phy,ONLY : niso, nzone, ntraciso=>ntiso
-  USE isotrac_mod, ONLY: iso_traceurs_init
-  USE isotopes_mod, ONLY: iso_init
-  USE isotopes_verif_mod, ONLY: iso_verif_init
-IMPLICIT NONE
-
- ! C Risi: vérifier compatibilité des options isotopiques entre 
- ! dyn3dmem et physiq
-#ifdef ISO
-    write(*,*) 'ok_isotopes,ntraciso,niso=',niso>0,ntraciso,niso
-    IF(niso  <= 0) CALL abort_physic('init_isotopes','options iso incompatibles',1)
-#ifdef ISOTRAC
-    IF(nzone <= 0) CALL abort_physic('init_isotopes','options isotrac incompatibles',1)
-#else
-    IF(nzone  > 0) CALL abort_physic('init_isotopes','options isotrac incompatibles',1)
-#endif
-#else
-    if(niso   > 0) CALL abort_physic('init_isotopes','options iso incompatibles',1)
-#endif
-
-#ifdef ISO
-        ! initialisations isotopiques
-#ifdef ISOVERIF
-           write(*,*) 'ok_isotopes=',niso > 0
-#endif
-        if (niso > 0) call iso_init()
-#ifdef ISOTRAC
-IF(nzone > 0) then
-        call iso_traceurs_init()
-endif
-#endif
-#ifdef ISOVERIF
-        call iso_verif_init()
-#endif
-#endif
-
-  END SUBROUTINE init_isotopes  
-  
-END MODULE inifis_mod