--- trunk/libf/phylmd/ini_hist.f90 2008/08/07 12:29:13 18 +++ trunk/libf/phylmd/ini_hist.f90 2010/04/01 09:07:28 30 @@ -6,18 +6,19 @@ contains - subroutine ini_histhf(dtime, presnivs, nid_hf, nid_hf3d) + subroutine ini_histhf(dtime, nid_hf, nid_hf3d) ! From phylmd/ini_histhf.h, version 1.3 2005/05/25 13:10:09 use dimens_m, only: iim, jjm, llm use temps, only: day_ref, annee_ref, itau_phy use dimphy, only: klon - USE ioipsl, only: ymds2ju, histbeg_totreg, histvert, histend + USE calendar, only: ymds2ju + use histcom, only: histbeg_totreg, histvert, histend use phyetat0_m, only: rlon, rlat + use comvert, only: presnivs REAL, intent(in):: dtime ! pas temporel de la physique (s) - real, intent(in):: presnivs(:) integer, intent(out):: nid_hf, nid_hf3d REAL zx_lon(iim, jjm + 1), zx_lat(iim, jjm + 1) @@ -43,14 +44,14 @@ CALL histvert(nid_hf, "presnivs", "Vertical levels", "mb", & llm, presnivs/100., nvert) - call ini_histhf3d(dtime, presnivs, nid_hf3d) + call ini_histhf3d(dtime, nid_hf3d) CALL histend(nid_hf) end subroutine ini_histhf !****************************************************************** - subroutine ini_histhf3d(dtime, presnivs, nid_hf3d) + subroutine ini_histhf3d(dtime, nid_hf3d) ! From phylmd/ini_histhf3d.h, v 1.2 2005/05/25 13:10:09 @@ -61,10 +62,11 @@ use temps, only: itau_phy, day_ref, annee_ref use clesphys, only: ecrit_hf use phyetat0_m, only: rlon, rlat - USE ioipsl, only: ymds2ju, histbeg_totreg, histvert, histend, histdef + USE calendar, only: ymds2ju + use histcom, only: histbeg_totreg, histvert, histend, histdef + use comvert, only: presnivs REAL, intent(in):: dtime ! pas temporel de la physique (s) - real, intent(in):: presnivs(:) integer, intent(out):: nid_hf3d real zstohf, zout @@ -123,19 +125,20 @@ !****************************************************************** - subroutine ini_histday(dtime, presnivs, ok_journe, nid_day, nq) + subroutine ini_histday(dtime, ok_journe, nid_day, nq) ! From phylmd/ini_histday.h, v 1.3 2005/05/25 13:10:09 use dimens_m, only: iim, jjm, llm use temps, only: itau_phy, day_ref, annee_ref - USE ioipsl, only: ymds2ju, histbeg_totreg, histvert, histend, histdef + USE calendar, only: ymds2ju + use histcom, only: histbeg_totreg, histvert, histend, histdef use phyetat0_m, only: rlon, rlat use clesphys, only: ecrit_day use grid_change, only: gr_phy_write_2d + use comvert, only: presnivs REAL, intent(in):: dtime ! pas temporel de la physique (s) - real, intent(in):: presnivs(:) logical, intent(in):: ok_journe integer, intent(out):: nid_day INTEGER, intent(in):: nq ! nombre de traceurs (y compris vapeur d'eau) @@ -168,7 +171,7 @@ !**************************************************** - subroutine ini_histins(dtime, presnivs, ok_instan, nid_ins) + subroutine ini_histins(dtime, ok_instan, nid_ins) ! From phylmd/ini_histins.h, v 1.2 2005/05/25 13:10:09 @@ -177,11 +180,12 @@ use temps, only: itau_phy, day_ref, annee_ref use clesphys, only: ecrit_ins use indicesol, only: nbsrf, clnsurf - USE ioipsl, only: ymds2ju, histbeg_totreg, histvert, histend, histdef + USE calendar, only: ymds2ju + use histcom, only: histbeg_totreg, histvert, histend, histdef use phyetat0_m, only: rlon, rlat + use comvert, only: presnivs REAL, intent(in):: dtime ! pas temporel de la physique (s) - real, intent(in):: presnivs(:) logical, intent(in):: ok_instan integer, intent(out):: nid_ins @@ -463,22 +467,23 @@ !************************************************* - subroutine ini_histrac(nid_tra, pdtphys, presnivs, nq_phys, lessivage) + subroutine ini_histrac(nid_tra, pdtphys, nq_phys, lessivage) ! From phylmd/ini_histrac.h, version 1.10 2006/02/21 08:08:30 use dimens_m, only: iim, jjm, llm - use ioipsl, only: ymds2ju, histbeg_totreg, histvert, histdef, histend + USE calendar, only: ymds2ju + use histcom, only: histbeg_totreg, histvert, histend, histdef use temps, only: annee_ref, day_ref, itau_phy use iniadvtrac_m, only: niadv, tnom, ttext use dimphy, only: klon use clesphys, only: ecrit_tra use grid_change, only: gr_phy_write_2d use phyetat0_m, only: rlon, rlat + use comvert, only: presnivs INTEGER, intent(out):: nid_tra real, intent(in):: pdtphys ! pas d'integration pour la physique (s) - REAL, intent(in):: presnivs(:) integer, intent(in):: nq_phys ! (nombre de traceurs auxquels on applique la physique) @@ -547,9 +552,8 @@ CALL histdef(nid_tra, "pplay", "", "-", & iim, jjm+1, nhori, llm, 1, llm, nvert, & "inst(X)", zout, zout) - CALL histdef(nid_tra, "t", "", "-", & - iim, jjm+1, nhori, llm, 1, llm, nvert, & - "inst(X)", zout, zout) + CALL histdef(nid_tra, "T", "temperature", "K", iim, jjm+1, nhori, llm, & + 1, llm, nvert, "inst(X)", zout, zout) CALL histend(nid_tra)