--- trunk/libf/dyn3d/gcm.f90	2011/01/06 17:52:19	38
+++ trunk/libf/dyn3d/gcm.f90	2012/01/10 19:02:02	56
@@ -9,8 +9,7 @@
   ! l'advection de "q", en modifiant "iadv" dans "traceur.def".
 
   use clesphys2, only: read_clesphys2
-  use com_io_dyn, only: histid, histvid, histaveid
-  use comconst, only: daysec, cpp, dtvr, g, rad, r, initialize
+  use comconst, only: daysec, cpp, dtvr, g, rad, r
   use comgeom, only: rlatu, aire_2d, cu_2d, cv_2d, rlonv
   use comgeomphy, only: airephy, cuphy, cvphy, rlatd, rlond
   use conf_gcm_m, only: day_step, iperiod, anneeref, dayref, iecri, iphysiq, &
@@ -22,6 +21,7 @@
   use grid_change, only: dyn_phy, init_dyn_phy
   use iniadvtrac_m, only: iniadvtrac
   use inidissip_m, only: inidissip
+  use inifilr_m, only: inifilr
   use inigeom_m, only: inigeom
   use initdynav_m, only: initdynav
   use inithist_m, only: inithist
@@ -29,7 +29,6 @@
   use histcom, only: histclo
   use leapfrog_m, only: leapfrog
   use logic, only: iflag_phys
-  use paramet_m, only: ip1jm, ip1jmp1
   use suphec_m, only: suphec
   use temps, only: day_ref, annee_ref, day_end, itau_dyn
   use tracstoke, only: istdyn, istphy
@@ -40,12 +39,11 @@
   REAL zdtvr ! time step for dynamics, in s
 
   ! Variables dynamiques :
-  REAL vcov(ip1jm, llm), ucov(ip1jmp1, llm) ! vents covariants
-  REAL teta(ip1jmp1, llm) ! température potentielle 
-  REAL q(ip1jmp1, llm, nqmx) ! champs advectés
-  REAL ps(ip1jmp1) ! pression au sol (Pa)
-
-  REAL masse(ip1jmp1, llm) ! masse d'air
+  REAL ucov(iim + 1, jjm + 1, llm), vcov(iim + 1, jjm, llm)  ! vent covariant
+  REAL teta(iim + 1, jjm + 1, llm) ! température potentielle 
+  REAL q(iim + 1, jjm + 1, llm, nqmx) ! champs advectés
+  REAL ps(iim + 1, jjm + 1) ! pression au sol (Pa)
+  REAL masse(iim + 1, jjm + 1, llm) ! masse d'air
   REAL phis(iim + 1, jjm + 1) ! géopotentiel au sol
 
   ! Variables pour le fichier histoire :
@@ -66,9 +64,6 @@
   read (unit=*, nml=main_nml)
   write(unit=*, nml=main_nml)
 
-  ! Initialisations:
-  call initialize
-
   ! Choix du calendrier :
   if (true_calendar) then
      call ioconf_calendar('gregorian')
@@ -154,10 +149,10 @@
   print *, "day_end = ", day_end
 
   CALL dynredem0("restart.nc", day_end, phis)
-  CALL inithist(day_ref, annee_ref, zdtvr, nqmx, histid, histvid, &
-       t_ops = iecri * daysec, t_wrt = iecri * daysec)
-  CALL initdynav(day_ref, annee_ref, zdtvr, nqmx, histaveid, &
-       t_ops = iperiod * zdtvr, t_wrt = periodav * daysec)
+  CALL inithist(day_ref, annee_ref, zdtvr, nqmx, t_ops = iecri * daysec, &
+       t_wrt = iecri * daysec)
+  CALL initdynav(day_ref, annee_ref, zdtvr, nqmx, t_ops = iperiod * zdtvr, &
+       t_wrt = periodav * daysec)
 
   ! Choix des fréquences de stockage pour le hors-ligne :
   istdyn = day_step / 4 ! stockage toutes les 6 h = 1 jour / 4