--- trunk/libf/dyn3d/gcm.f90	2011/12/12 13:25:01	55
+++ trunk/dyn3d/gcm.f	2014/09/16 14:00:41	108
@@ -8,37 +8,37 @@
   ! "divgrad2", "nxgraro2"). Possibilité de choisir le schéma pour
   ! 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
-  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
+       nday, raz_date, periodav, conf_gcm, iflag_phys
   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
+  use histclo_m, only: histclo
   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 calendar, only: ioconf_calendar
-  use histcom, only: histclo
+  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 logic, only: iflag_phys
+  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 write_field, only: NbField, FieldId
 
   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 
@@ -57,13 +57,20 @@
   ! (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.txt", status="replace", action="write")
+
+  CALL conf_gcm
+
   print *, "Enter namelist 'main_nml'."
   read (unit=*, nml=main_nml)
-  write(unit=*, nml=main_nml)
+  write(unit_nml, nml=main_nml)
 
   ! Choix du calendrier :
   if (true_calendar) then
@@ -72,47 +79,28 @@
      call ioconf_calendar('360d')
   endif
 
-  ! Lecture des fichiers "gcm.def" ou "run.def" :
-  call read_clesphys2
-  CALL conf_gcm
-
   ! Initialisation des traceurs
   ! Choix du schéma pour l'advection dans le fichier "traceur.def" ou via INCA
   call iniadvtrac
 
+  CALL iniconst
+
   ! 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.
+  ! 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
+     time_0 = 0.
+  else
+     print *, 'On garde les dates du fichier "start".'
   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 disvert
   CALL inigeom ! initialisation de la géometrie
   CALL inifilr ! initialisation du filtre
   CALL inidissip
@@ -150,10 +138,11 @@
   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, dtvr, nqmx, t_ops = iecri * daysec, &
+       t_wrt = iecri * daysec)
+  CALL initdynav(day_ref, annee_ref, 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
@@ -162,7 +151,13 @@
   ! Intégration temporelle du modèle :
   CALL leapfrog(ucov, vcov, teta, ps, masse, phis, q, time_0)
 
+  close(unit_nml)
   call histclo
+
+  do i = 1, nbfield
+     call nf95_close(FieldId(i))
+  end do
+
   print *, 'Simulation finished'
   print *, 'Everything is cool'