--- trunk/Sources/phylmd/ini_histins.f 2017/10/16 12:35:41 225 +++ trunk/phylmd/ini_histins.f 2018/08/02 17:23:07 301 @@ -6,13 +6,14 @@ contains - subroutine ini_histins(dtime, ok_newmicro) + subroutine ini_histins(ok_newmicro) ! From phylmd/ini_histins.h, version 1.2, 2005/05/25 13:10:09 use clesphys, only: ecrit_ins, ok_instan use clesphys2, only: conv_emanuel - use dimens_m, only: iim, jjm, llm, nqmx + use comconst, only: dtphys + use dimensions, only: iim, jjm, llm, nqmx use disvert_m, only: presnivs use dynetat0_m, only: day_ref, annee_ref, rlatu, rlonv USE histbeg_totreg_m, ONLY : histbeg_totreg @@ -25,7 +26,6 @@ use phyetat0_m, only: itau_phy USE ymds2ju_m, only: ymds2ju - REAL, intent(in):: dtime ! pas temporel de la physique (s) logical, intent(in):: ok_newmicro ! Local: @@ -37,18 +37,18 @@ print *, 'Call sequence information: ini_histins' test_ok_instan: IF (ok_instan) THEN - zsto = dtime * ecrit_ins - zout = dtime * ecrit_ins + zsto = dtphys * ecrit_ins + zout = dtphys * ecrit_ins CALL ymds2ju(annee_ref, 1, day_ref, 0.0, zjulian) CALL histbeg_totreg("histins", rlonv(:iim) / pi * 180., & rlatu / pi * 180., 1, iim, & - 1, jjm + 1, itau_phy, zjulian, dtime, nhori, nid_ins) + 1, jjm + 1, itau_phy, zjulian, dtphys, nhori, nid_ins) print *, 'itau_phy = ', itau_phy print *, "zjulian = ", zjulian CALL histvert(nid_ins, "presnivs", "Vertical levels", "mb", & presnivs/100., nvert) - CALL histdef(nid_ins, "phis", "Surface geop. height", "-", & + CALL histdef(nid_ins, "phis", "surface geopotential", "m2 s-2", & iim, (jjm + 1), nhori, 1, 1, 1, -99, & "once", zsto, zout) CALL histdef(nid_ins, "aire", "Grid area", "-", & @@ -132,6 +132,11 @@ "inst(X)", zsto, zout) CALL histdef(nid_ins, "msnow", "surface snow amount", "kg/m2", & iim, jjm + 1, nhori, 1, 1, 1, -99, "inst(X)", zsto, zout) + CALL histdef(nid_ins, "zxfqcalving", "ice calving", "kg m-2 s-1", & + iim, jjm + 1, nhori, 1, 1, 1, -99, "inst(X)", zsto, zout) + CALL histdef(nid_ins, "run_off_lic", "land ice melt to ocean", & + "kg m-2 s-1", iim, jjm + 1, nhori, 1, 1, 1, -99, "inst(X)", zsto, & + zout) DO nsrf = 1, nbsrf call histdef(nid_ins, "pourc_"//clnsurf(nsrf), & @@ -196,8 +201,9 @@ CALL histdef(nid_ins, "s_lcl", "Condensation level", "m", & iim, (jjm + 1), nhori, 1, 1, 1, -99, & "inst(X)", zsto, zout) - CALL histdef(nid_ins, "s_capCL", "Conv avlbl pot ener for ABL", "J/m2", & - iim, (jjm + 1), nhori, 1, 1, 1, -99, & + CALL histdef(nid_ins, "s_capCL", & + "Convective available potential energy for atmospheric boundary " & + // "layer", "J/m2", iim, (jjm + 1), nhori, 1, 1, 1, -99, & "inst(X)", zsto, zout) CALL histdef(nid_ins, "s_oliqCL", "Liq Water in BL", "kg/m2", & iim, (jjm + 1), nhori, 1, 1, 1, -99, & @@ -208,15 +214,6 @@ CALL histdef(nid_ins, "s_therm", "Exces du thermique", "K", & iim, (jjm + 1), nhori, 1, 1, 1, -99, & "inst(X)", zsto, zout) - CALL histdef(nid_ins, "s_trmb1", "deep_cape(HBTM2)", "J/m2", & - iim, (jjm + 1), nhori, 1, 1, 1, -99, & - "inst(X)", zsto, zout) - CALL histdef(nid_ins, "s_trmb2", "inhibition (HBTM2)", "J/m2", & - iim, (jjm + 1), nhori, 1, 1, 1, -99, & - "inst(X)", zsto, zout) - CALL histdef(nid_ins, "s_trmb3", "Point Omega (HBTM2)", "m", & - iim, (jjm + 1), nhori, 1, 1, 1, -99, & - "inst(X)", zsto, zout) CALL histdef(nid_ins, "qsurf", "Surface Air humidity", "", & iim, (jjm + 1), nhori, 1, 1, 1, -99, & "inst(X)", zsto, zout)