--- trunk/dyn3d/gcm.f90	2014/02/28 17:52:47	79
+++ trunk/dyn3d/gcm.f	2015/02/12 16:23:33	128
@@ -8,12 +8,12 @@
   ! "divgrad2", "nxgraro2"). Possibilité de choisir le schéma pour
   ! l'advection de "q", en modifiant "iadv" dans "traceur.def".
 
-  USE calendar, only: ioconf_calendar
   use comconst, only: daysec, dtvr, iniconst
   use comgeom, only: rlatu, aire_2d, cu_2d, cv_2d, rlonv, inigeom
   use comgeomphy, only: airephy, cuphy, cvphy, rlatd, rlond
   use conf_gcm_m, only: day_step, iperiod, anneeref, dayref, iecri, iphysiq, &
        nday, raz_date, periodav, conf_gcm, iflag_phys
+  use conf_guide_m, only: conf_guide
   use dimens_m, only: iim, jjm, llm, nqmx
   use dimphy, only: klon
   USE disvert_m, ONLY : disvert
@@ -27,13 +27,16 @@
   use initdynav_m, only: initdynav
   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 temps, only: day_ref, annee_ref, day_end, itau_dyn
   use tracstoke, only: istdyn, istphy
   use unit_nml_m, only: unit_nml
   use yoethf_m, only: yoethf
+  use createnewfield_m, only: NbField, Ncid
 
   IMPLICIT NONE
 
@@ -55,6 +58,8 @@
   ! (mask for points in the "v" grid, first index is for longitude,
   ! second index is for latitude)
 
+  integer i
+
   namelist /main_nml/true_calendar
 
   !------------------------------------------------------------
@@ -82,24 +87,17 @@
   CALL iniconst
 
   ! Lecture du fichier "start.nc" :
-  CALL dynetat0(vcov, ucov, teta, q, masse, ps, phis, time_0)
+  CALL dynetat0(vcov, ucov, teta, q, masse, ps, phis)
 
-  ! On remet le calendrier à zero si demandé :
-  if (annee_ref /= anneeref .or. day_ref /= dayref) then
-     print *, 'Attention : les dates initiales lues dans le fichier ' // &
-          '"start" ne correspondent pas à celles lues dans "gcm.def".'
-     if (raz_date) then
-        print *, 'On réinitialise à la date lue dans "gcm.def".'
-        annee_ref = anneeref
-        day_ref = dayref
-        day_ini = dayref
-        itau_dyn = 0
-        time_0 = 0.
-     else
-        print *, 'On garde les dates du fichier "start".'
-     endif
-  ELSE
-     raz_date = .false.
+  ! On remet le calendrier à zéro si demandé :
+  if (raz_date) then
+     print *, 'On réinitialise à la date lue dans la namelist.'
+     annee_ref = anneeref
+     day_ref = dayref
+     day_ini = dayref
+     itau_dyn = 0
+  else
+     print *, 'On garde les dates du fichier "start".'
   endif
 
   CALL disvert
@@ -150,11 +148,18 @@
   istdyn = day_step / 4 ! stockage toutes les 6 h = 1 jour / 4
   istphy = istdyn / iphysiq     
 
+  CALL conf_guide
+
   ! Intégration temporelle du modèle :
-  CALL leapfrog(ucov, vcov, teta, ps, masse, phis, q, time_0)
+  CALL leapfrog(ucov, vcov, teta, ps, masse, phis, q)
 
   close(unit_nml)
   call histclo
+
+  do i = 1, nbfield
+     call nf95_close(Ncid(i))
+  end do
+
   print *, 'Simulation finished'
   print *, 'Everything is cool'