--- trunk/dyn3d/gcm.f	2018/03/20 09:35:59	265
+++ trunk/dyn3d/gcm.f	2018/12/11 22:48:09	321
@@ -12,27 +12,25 @@
   use comdissnew, only: read_comdissnew
   use comgeom, only:  aire_2d, inigeom
   use comgeomphy, only: airephy
-  use conf_gcm_m, only: day_step, iperiod, iecri, iphysiq, nday, conf_gcm, &
-       iflag_phys
+  use conf_gcm_m, only: day_step, iperiod, iphysiq, nday, conf_gcm, iflag_phys
   use conf_guide_m, only: conf_guide
   use dimensions, only: iim, jjm, llm, nqmx
   USE disvert_m, ONLY : disvert
   use dynetat0_m, only: dynetat0, day_ini
+  use dynetat0_chosen_m, only: dynetat0_chosen
   use dynredem0_m, only: dynredem0
   use grid_change, only: dyn_phy, init_dyn_phy
   use histclo_m, only: histclo
-  use iniadvtrac_m, only: iniadvtrac
+  use infotrac_init_m, only: infotrac_init
   use inidissip_m, only: inidissip
   use inifilr_m, only: inifilr
   use inithist_m, only: inithist
   use init_dynzon_m, only: init_dynzon
   USE ioconf_calendar_m, only: ioconf_calendar
-  use jumble, only: new_unit
   use leapfrog_m, only: leapfrog
   use netcdf95, only: nf95_close
   use suphec_m, only: suphec
-  use unit_nml_m, only: unit_nml
-  use yoethf_m, only: yoethf
+  use unit_nml_m, only: unit_nml, set_unit_nml
   use createnewfield_m, only: NbField, Ncid
 
   IMPLICIT NONE
@@ -52,7 +50,7 @@
 
   !------------------------------------------------------------
 
-  call new_unit(unit_nml)
+  call set_unit_nml
   open(unit_nml, file="used_namelists.txt", status="replace", action="write")
 
   CALL conf_gcm
@@ -69,8 +67,9 @@
      call ioconf_calendar('360d')
   endif
 
-  call iniadvtrac
+  call infotrac_init
   CALL iniconst
+  CALL dynetat0_chosen
   CALL dynetat0(vcov, ucov, teta, q, masse, ps, phis)
   CALL disvert
   CALL inigeom ! initialisation de la g\'eometrie
@@ -82,12 +81,11 @@
   IF (iflag_phys) THEN
      airephy = pack(aire_2d, dyn_phy)
      CALL suphec
-     call yoethf
   ENDIF
 
   ! Initialisation des entr\'ees-sorties :
   CALL dynredem0(day_ini + nday, phis)
-  CALL inithist(t_ops = iecri * dtvr, t_wrt = iecri * dtvr)
+  CALL inithist(t_ops = dtvr, t_wrt = dtvr)
   call init_dynzon(dt_app = dtvr * iperiod)
 
   CALL conf_guide