--- trunk/Sources/dyn3d/gcm.f 2016/05/09 19:56:28 191 +++ trunk/dyn3d/gcm.f 2018/03/20 09:35:59 265 @@ -8,14 +8,14 @@ ! "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 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, periodav, & - conf_gcm, iflag_phys + 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 dimensions, only: iim, jjm, llm, nqmx USE disvert_m, ONLY : disvert use dynetat0_m, only: dynetat0, day_ini use dynredem0_m, only: dynredem0 @@ -24,7 +24,6 @@ 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 @@ -81,7 +79,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 @@ -89,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)