--- trunk/Sources/dyn3d/gcm.f	2015/07/20 16:01:49	157
+++ trunk/dyn3d/gcm.f	2018/03/07 14:41:46	263
@@ -8,23 +8,22 @@
   ! "divgrad2", "nxgraro2"). Possibilit\'e de choisir le sch\'ema pour
   ! l'advection de "q", en modifiant "iadv" dans "traceur.def".
 
-  use comconst, only: daysec, dtvr, iniconst
-  use comgeom, only:  aire_2d, cu_2d, cv_2d, inigeom
-  use comgeomphy, only: airephy, cuphy, cvphy, rlatd, rlond
-  use conf_gcm_m, only: day_step, iperiod, iecri, iphysiq, nday, periodav, &
-       conf_gcm, iflag_phys
+  use comconst, only: dtvr, iniconst
+  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_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: rlatu, rlonv, dynetat0, day_ini
+  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 initdynav_m, only: initdynav
   use inithist_m, only: inithist
   use init_dynzon_m, only: init_dynzon
   USE ioconf_calendar_m, only: ioconf_calendar
@@ -32,7 +31,6 @@
   use leapfrog_m, only: leapfrog
   use netcdf95, only: nf95_close
   use suphec_m, only: suphec
-  use tracstoke, only: istdyn, istphy
   use unit_nml_m, only: unit_nml
   use yoethf_m, only: yoethf
   use createnewfield_m, only: NbField, Ncid
@@ -47,13 +45,7 @@
   REAL masse(iim + 1, jjm + 1, llm) ! masse d'air
   REAL phis(iim + 1, jjm + 1) ! g\'eopotentiel au sol
 
-  ! Calendrier :
   LOGICAL:: true_calendar = .false. ! default value
-
-  logical mask_v(iim + 1, jjm) 
-  ! (mask for points in the "v" grid, first index is for longitude,
-  ! second index is for latitude)
-
   integer i
 
   namelist /main_nml/true_calendar
@@ -64,6 +56,7 @@
   open(unit_nml, file="used_namelists.txt", status="replace", action="write")
 
   CALL conf_gcm
+  call read_comdissnew
 
   print *, "Enter namelist 'main_nml'."
   read (unit=*, nml=main_nml)
@@ -86,26 +79,7 @@
   call init_dyn_phy
 
   ! Initialisation de la physique :
-  IF (iflag_phys == 1) THEN
-     rlatd(1)=rlatu(1)
-     rlatd(2:klon-1) = pack(spread(rlatu(2:jjm), 1, iim), .true.)
-     rlatd(klon)= rlatu(jjm + 1)
-
-     rlond(1)=0.
-     rlond(2:klon-1) = pack(spread(rlonv(:iim), 2, jjm - 1), .true.)
-     rlond(klon)= 0.
-
-     cuphy = pack(cu_2d, dyn_phy)
-
-     ! Construct a mask for points in the "v" grid:
-     mask_v = .true.
-     mask_v(2:, 1) = .false.
-     mask_v(iim + 1, 2:) = .false.
-
-     cvphy(:klon - 1) = pack(cv_2d, mask_v)
-     cvphy(klon) = cv_2d(1, jjm)
-     ! (that value of "cv_2d" is used twice in "cvphy")
-
+  IF (iflag_phys) THEN
      airephy = pack(aire_2d, dyn_phy)
      CALL suphec
      call yoethf
@@ -113,14 +87,9 @@
 
   ! Initialisation des entr\'ees-sorties :
   CALL dynredem0(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 inithist(t_ops = iecri * dtvr, t_wrt = iecri * dtvr)
   call init_dynzon(dt_app = dtvr * iperiod)
 
-  ! Choix des fr\'equences de stockage pour le hors-ligne :
-  istdyn = day_step / 4 ! stockage toutes les 6 h = 1 jour / 4
-  istphy = istdyn / iphysiq     
-
   CALL conf_guide
   CALL leapfrog(ucov, vcov, teta, ps, masse, phis, q)