--- trunk/Sources/dyn3d/gcm.f 2016/03/11 18:47:26 178 +++ trunk/Sources/dyn3d/gcm.f 2017/04/28 13:40:59 224 @@ -9,6 +9,7 @@ ! l'advection de "q", en modifiant "iadv" dans "traceur.def". use comconst, only: daysec, 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, periodav, & @@ -31,7 +32,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 @@ -57,6 +57,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) @@ -79,7 +80,7 @@ call init_dyn_phy ! Initialisation de la physique : - IF (iflag_phys == 1) THEN + IF (iflag_phys) THEN airephy = pack(aire_2d, dyn_phy) CALL suphec call yoethf @@ -91,10 +92,6 @@ CALL initdynav(dtvr, nqmx, t_ops = iperiod * dtvr, t_wrt = periodav * daysec) 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)