--- trunk/dyn3d/gcm.f90	2013/11/15 18:45:49	76
+++ trunk/dyn3d/gcm.f	2015/02/13 18:22:38	129
@@ -8,14 +8,15 @@
   ! "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, cpp, dtvr, g, rad, r
-  use comgeom, only: rlatu, aire_2d, cu_2d, cv_2d, rlonv
+  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_gcm_m, only: day_step, iperiod, iecri, iphysiq, nday, 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
   use dynetat0_m, only: dynetat0, day_ini
   use dynredem0_m, only: dynredem0
   use grid_change, only: dyn_phy, init_dyn_phy
@@ -23,22 +24,21 @@
   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
   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
 
-  REAL zdtvr ! time step for dynamics, in s
-
   ! Variables dynamiques :
   REAL ucov(iim + 1, jjm + 1, llm), vcov(iim + 1, jjm, llm)  ! vent covariant
   REAL teta(iim + 1, jjm + 1, llm) ! température potentielle 
@@ -47,9 +47,6 @@
   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 :
-  REAL time_0 ! time in day, as a fraction of day, in [0, 1[
-
   ! Calendrier :
   LOGICAL:: true_calendar = .false. ! default value
 
@@ -57,12 +54,14 @@
   ! (mask for points in the "v" grid, first index is for longitude,
   ! second index is for latitude)
 
+  integer i
+
   namelist /main_nml/true_calendar
 
   !------------------------------------------------------------
 
   call new_unit(unit_nml)
-  open(unit_nml, file="used_namelists", status="replace", action="write")
+  open(unit_nml, file="used_namelists.txt", status="replace", action="write")
 
   CALL conf_gcm
 
@@ -77,43 +76,10 @@
      call ioconf_calendar('360d')
   endif
 
-  ! Initialisation des traceurs
-  ! Choix du schéma pour l'advection dans le fichier "traceur.def" ou via INCA
   call iniadvtrac
-
-  ! Lecture du fichier "start.nc" :
-  CALL dynetat0(vcov, ucov, teta, q, masse, ps, phis, time_0)
-
-  ! 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.
-  endif
-
-  ! On recalcule éventuellement le pas de temps :
-  zdtvr = daysec / REAL(day_step)
-  IF (dtvr /= zdtvr) THEN
-     print *, 'Warning: the time steps in the ".def" file and in ' // &
-          '"start.nc" are different'
-     print *, 'dtvr (from "start.nc") = ', dtvr
-     print *, 'zdtvr (from ".def") = ', zdtvr
-     print *, 'Using the value from the ".def" file.'
-     dtvr = zdtvr
-  ENDIF
-
-  CALL iniconst 
+  CALL iniconst
+  CALL dynetat0(vcov, ucov, teta, q, masse, ps, phis)
+  CALL disvert
   CALL inigeom ! initialisation de la géometrie
   CALL inifilr ! initialisation du filtre
   CALL inidissip
@@ -146,26 +112,25 @@
   ENDIF
 
   ! Initialisation des entrées-sorties :
-  day_end = day_ini + nday
-  print *, "day_ini = ", day_ini
-  print *, "day_end = ", day_end
-
-  CALL dynredem0("restart.nc", day_end, phis)
-  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)
+  CALL dynredem0("restart.nc", day_ini + nday, phis)
+  CALL inithist(dtvr, nqmx, t_ops = iecri * daysec, t_wrt = iecri * daysec)
+  CALL initdynav(dtvr, nqmx, t_ops = iperiod * dtvr, t_wrt = periodav * daysec)
   call init_dynzon(dt_app = dtvr * iperiod)
 
   ! Choix des fréquences de stockage pour le hors-ligne :
   istdyn = day_step / 4 ! stockage toutes les 6 h = 1 jour / 4
   istphy = istdyn / iphysiq     
 
-  ! Intégration temporelle du modèle :
-  CALL leapfrog(ucov, vcov, teta, ps, masse, phis, q, time_0)
+  CALL conf_guide
+  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'