Index: /trunk/LMDZ.TITAN/libf/phytitan/ini_histday.h =================================================================== --- /trunk/LMDZ.TITAN/libf/phytitan/ini_histday.h (revision 901) +++ /trunk/LMDZ.TITAN/libf/phytitan/ini_histday.h (revision 902) @@ -16,5 +16,5 @@ CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlatd,zx_lat) CALL histbeg("histday", iim,zx_lon(:,1), jjmp1,zx_lat(1,:), - . 1,iim,1,jjmp1, itau_phy, zjulian, zsto, + . 1,iim,1,jjmp1, itau_phy, zjulian, dtime, . nhori, nid_day) write(*,*)'Journee ', itau_phy, zjulian Index: /trunk/LMDZ.TITAN/libf/phytitan/ini_histins.h =================================================================== --- /trunk/LMDZ.TITAN/libf/phytitan/ini_histins.h (revision 901) +++ /trunk/LMDZ.TITAN/libf/phytitan/ini_histins.h (revision 902) @@ -1,5 +1,4 @@ IF (ok_instan) THEN c - zsto1= dtime zsto = dtime * FLOAT(ecrit_ins) zout = dtime * FLOAT(ecrit_ins) @@ -15,5 +14,5 @@ CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlatd,zx_lat) CALL histbeg("histins", iim,zx_lon(:,1), jjmp1,zx_lat(1,:), - . 1,iim,1,jjmp1, itau_phy, zjulian, zsto1, + . 1,iim,1,jjmp1, itau_phy, zjulian, dtime, . nhori, nid_ins) write(*,*)'Inst ', itau_phy, zjulian Index: /trunk/LMDZ.TITAN/libf/phytitan/ini_histmth.h =================================================================== --- /trunk/LMDZ.TITAN/libf/phytitan/ini_histmth.h (revision 901) +++ /trunk/LMDZ.TITAN/libf/phytitan/ini_histmth.h (revision 902) @@ -16,5 +16,5 @@ CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlatd,zx_lat) CALL histbeg("histmth", iim,zx_lon(:,1), jjmp1,zx_lat(1,:), - . 1,iim,1,jjmp1, itau_phy, zjulian, zsto, + . 1,iim,1,jjmp1, itau_phy, zjulian, dtime, . nhori, nid_mth) write(*,*)'Journee ', itau_phy, zjulian Index: /trunk/LMDZ.VENUS/libf/phyvenus/ini_histday.h =================================================================== --- /trunk/LMDZ.VENUS/libf/phyvenus/ini_histday.h (revision 901) +++ /trunk/LMDZ.VENUS/libf/phyvenus/ini_histday.h (revision 902) @@ -6,5 +6,4 @@ zsto = dtime zout = dtime * REAL(ecrit_day) - zsto1= dtime * REAL(ecrit_day) idayref = day_ref @@ -12,5 +11,5 @@ call histbeg_phy("histday.nc",itau_phy, - . zjulian,zsto,nhori,nid_day) + . zjulian,dtime,nhori,nid_day) !$OMP MASTER @@ -39,11 +38,19 @@ . "ave(X)", zsto,zout) c - CALL histdef(nid_day, "ue", "Zonal energy transport", "-", - . iim,jj_nb,nhori, 1,1,1, nvert, 32, - . "ave(X)", zsto,zout) -c - CALL histdef(nid_day, "ve", "Merid energy transport", "-", - . iim,jj_nb,nhori, 1,1,1, nvert, 32, - . "ave(X)", zsto,zout) +c CALL histdef(nid_day, "ue", "Zonal energy transport", "-", +c . iim,jj_nb,nhori, 1,1,1, nvert, 32, +c . "ave(X)", zsto,zout) +c +c CALL histdef(nid_day, "ve", "Merid energy transport", "-", +c . iim,jj_nb,nhori, 1,1,1, nvert, 32, +c . "ave(X)", zsto,zout) +c +c CALL histdef(nid_day, "cdragh", "Drag coef on T", "-", +c . iim,jj_nb,nhori, 1,1,1, nvert, 32, +c . "ave(X)", zsto,zout) +c +c CALL histdef(nid_day, "cdragm", "Drag coef on U", "-", +c . iim,jj_nb,nhori, 1,1,1, nvert, 32, +c . "ave(X)", zsto,zout) c ENDIF !lev_histday.GE.1 @@ -78,4 +85,39 @@ . "ave(X)", zsto,zout) c + CALL histdef(nid_day, "dudyn", "Dynamics dU", "m/s2", + . iim,jj_nb,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zsto,zout) +c + CALL histdef(nid_day, "duvdf", "Boundary-layer dU", "m/s2", + . iim,jj_nb,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zsto,zout) +c +c CALL histdef(nid_day, "mang", "Angular momentum", "kg m2/s", +c . iim,jj_nb,nhori, klev,1,klev,nvert, 32, +c . "ave(X)", zsto,zout) +c +c CALL histdef(nid_day, "Kz", "vertical diffusion coef", "m2/s", +c . iim,jj_nb,nhori, klev,1,klev,nvert, 32, +c . "ave(X)", zsto,zout) +c +c plusieurs traceurs + if (iflag_trac.eq.1) THEN + DO iq=1,nqmax + IF (iq.LE.99) THEN + WRITE(str2,'(i2.2)') iq + CALL histdef(nid_day, tname(iq), ttext(iq), "ppm", + . iim,jj_nb,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zsto,zout) + ELSE + PRINT*, "Trop de traceurs" + CALL abort + ENDIF + ENDDO + endif +c + CALL histdef(nid_day, "tops", "Solar rad. at TOA", "W/m2", + . iim,jj_nb,nhori, 1,1,1, nvert, 32, + . "ave(X)", zsto,zout) +c ENDIF !lev_histday.GE.2 c @@ -87,19 +129,15 @@ c 2D c - CALL histdef(nid_day, "tops", "Solar rad. at TOA", "W/m2", - . iim,jj_nb,nhori, 1,1,1, nvert, 32, - . "ave(X)", zsto1,zout) -c CALL histdef(nid_day, "topl", "IR rad. at TOA", "W/m2", . iim,jj_nb,nhori, 1,1,1, nvert, 32, - . "ave(X)", zsto1,zout) + . "ave(X)", zsto,zout) c CALL histdef(nid_day, "sols", "Solar rad. at surf.", "W/m2", . iim,jj_nb,nhori, 1,1,1, nvert, 32, - . "ave(X)", zsto1,zout) + . "ave(X)", zsto,zout) c CALL histdef(nid_day, "soll", "IR rad. at surface", "W/m2", . iim,jj_nb,nhori, 1,1,1, nvert, 32, - . "ave(X)", zsto1,zout) + . "ave(X)", zsto,zout) c c 3D @@ -107,9 +145,25 @@ CALL histdef(nid_day, "SWnet", "Net SW flux","W/m2", . iim,jj_nb,nhori, klev,1,klev,nvert, - . 32, "ave(X)", zsto1,zout) + . 32, "ave(X)", zsto,zout) c CALL histdef(nid_day, "LWnet", "Net LW flux","W/m2", . iim,jj_nb,nhori, klev,1,klev,nvert, - . 32, "ave(X)", zsto1,zout) + . 32, "ave(X)", zsto,zout) +c + CALL histdef(nid_day, "fluxvdf", "PBL net flux","W/m2", + . iim,jj_nb,nhori, klev,1,klev,nvert, + . 32, "ave(X)", zsto,zout) +c + CALL histdef(nid_day, "fluxdyn", "Dyn. net flux","W/m2", + . iim,jj_nb,nhori, klev,1,klev,nvert, + . 32, "ave(X)", zsto,zout) +c + CALL histdef(nid_day, "fluxajs", "Dry adj. net flux","W/m2", + . iim,jj_nb,nhori, klev,1,klev,nvert, + . 32, "ave(X)", zsto,zout) +c +c CALL histdef(nid_day, "fluxec", "Cin. net flux","W/m2", +c . iim,jj_nb,nhori, klev,1,klev,nvert, +c . 32, "ave(X)", zsto,zout) c ENDIF !lev_histday.GE.3 @@ -122,7 +176,7 @@ . "ave(X)", zsto,zout) c -c CALL histdef(nid_day, "dtphy", "Physics dT", "K/s", -c . iim,jj_nb,nhori, klev,1,klev,nvert, 32, -c . "ave(X)", zsto,zout) +c CALL histdef(nid_day, "dtphy", "Physics dT", "K/s", +c . iim,jj_nb,nhori, klev,1,klev,nvert, 32, +c . "ave(X)", zsto,zout) c CALL histdef(nid_day, "dtvdf", "Boundary-layer dT", "K/s", @@ -142,15 +196,7 @@ . "ave(X)", zsto,zout) c -c CALL histdef(nid_day, "dtec", "Cinetic dissip dT", "K/s", -c . iim,jj_nb,nhori, klev,1,klev,nvert, 32, -c . "ave(X)", zsto,zout) -c - CALL histdef(nid_mth, "dudyn", "Dynamics dU", "m/s2", - . iim,jj_nb,nhori, klev,1,klev,nvert, 32, - . "ave(X)", zsto,zout) -c - CALL histdef(nid_mth, "duvdf", "Boundary-layer dU", "m/s2", - . iim,jj_nb,nhori, klev,1,klev,nvert, 32, - . "ave(X)", zsto,zout) +c CALL histdef(nid_day, "dtec", "Cinetic dissip dT", "K/s", +c . iim,jj_nb,nhori, klev,1,klev,nvert, 32, +c . "ave(X)", zsto,zout) c CALL histdef(nid_mth, "duajs", "Dry convection dU", "m/s2", @@ -174,18 +220,4 @@ c------------------------------------------------------- IF(lev_histday.GE.5) THEN -c - if (nqmax.GE.3) THEN - DO iq=1,nqmax-2 - IF (iq.LE.99) THEN - WRITE(str2,'(i2.2)') iq - CALL histdef(nid_day, "trac"//str2, "Tracer No."//str2, "-", - . iim,jj_nb,nhori, klev,1,klev,nvert, 32, - . "ave(X)", zsto,zout) - ELSE - PRINT*, "Trop de traceurs" - CALL abort - ENDIF - ENDDO - endif c c call histdef(nid_day, "taux", Index: /trunk/LMDZ.VENUS/libf/phyvenus/ini_histins.h =================================================================== --- /trunk/LMDZ.VENUS/libf/phyvenus/ini_histins.h (revision 901) +++ /trunk/LMDZ.VENUS/libf/phyvenus/ini_histins.h (revision 902) @@ -4,7 +4,6 @@ IF (ok_instan) THEN - zsto1= dtime - zsto = dtime * ecrit_ins - zout = dtime * ecrit_ins + zsto = dtime * ecrit_ins + zout = dtime * ecrit_ins idayref = day_ref @@ -12,5 +11,5 @@ call histbeg_phy("histins.nc",itau_phy, - . zjulian,zsto,nhori,nid_ins) + . zjulian,dtime,nhori,nid_ins) !$OMP MASTER @@ -47,11 +46,11 @@ c . "ins(X)", zsto,zout) c - CALL histdef(nid_ins, "cdragh", "Drag coef on T", "-", - . iim,jj_nb,nhori, 1,1,1, nvert, 32, - . "ins(X)", zsto,zout) -c - CALL histdef(nid_ins, "cdragm", "Drag coef on U", "-", - . iim,jj_nb,nhori, 1,1,1, nvert, 32, - . "ins(X)", zsto,zout) +c CALL histdef(nid_ins, "cdragh", "Drag coef on T", "-", +c . iim,jj_nb,nhori, 1,1,1, nvert, 32, +c . "ins(X)", zsto,zout) +c +c CALL histdef(nid_ins, "cdragm", "Drag coef on U", "-", +c . iim,jj_nb,nhori, 1,1,1, nvert, 32, +c . "ins(X)", zsto,zout) c ENDIF !lev_histday.GE.1 @@ -98,7 +97,7 @@ c . "ins(X)", zsto,zout) c - CALL histdef(nid_ins, "Kz", "vertical diffusion coef", "m2/s", - . iim,jj_nb,nhori, klev,1,klev,nvert, 32, - . "ins(X)", zsto,zout) +c CALL histdef(nid_ins, "Kz", "vertical diffusion coef", "m2/s", +c . iim,jj_nb,nhori, klev,1,klev,nvert, 32, +c . "ins(X)", zsto,zout) c c plusieurs traceurs Index: /trunk/LMDZ.VENUS/libf/phyvenus/ini_histmth.h =================================================================== --- /trunk/LMDZ.VENUS/libf/phyvenus/ini_histmth.h (revision 901) +++ /trunk/LMDZ.VENUS/libf/phyvenus/ini_histmth.h (revision 902) @@ -7,15 +7,9 @@ zout = dtime * ecrit_mth -c zsto1: pour des valeurs "instantanees" mensuelles - zsto1 = dtime * ecrit_mth -c zsto2: pour des flux radiatifs calcules avec un autre pas de temps - zsto2 = dtime * radpas - PRINT*,' zsto,zsto1,zsto2,zout=',zsto, zsto1, zsto2,zout - idayref = day_ref CALL ymds2ju(annee_ref, 1, idayref, zero, zjulian) call histbeg_phy("histmth.nc",itau_phy, - . zjulian,zsto,nhori,nid_mth) + . zjulian,dtime,nhori,nid_mth) !$OMP MASTER @@ -52,11 +46,11 @@ c . "ave(X)", zsto,zout) c - CALL histdef(nid_mth, "cdragh", "Drag coef on T", "-", - . iim,jj_nb,nhori, 1,1,1, nvert, 32, - . "ave(X)", zsto,zout) -c - CALL histdef(nid_mth, "cdragm", "Drag coef on U", "-", - . iim,jj_nb,nhori, 1,1,1, nvert, 32, - . "ave(X)", zsto,zout) +c CALL histdef(nid_mth, "cdragh", "Drag coef on T", "-", +c . iim,jj_nb,nhori, 1,1,1, nvert, 32, +c . "ave(X)", zsto,zout) +c +c CALL histdef(nid_mth, "cdragm", "Drag coef on U", "-", +c . iim,jj_nb,nhori, 1,1,1, nvert, 32, +c . "ave(X)", zsto,zout) c ENDIF !lev_histmth.GE.1 @@ -103,7 +97,7 @@ c . "ave(X)", zsto,zout) c - CALL histdef(nid_mth, "Kz", "vertical diffusion coef", "m2/s", - . iim,jj_nb,nhori, klev,1,klev,nvert, 32, - . "ave(X)", zsto,zout) +c CALL histdef(nid_mth, "Kz", "vertical diffusion coef", "m2/s", +c . iim,jj_nb,nhori, klev,1,klev,nvert, 32, +c . "ave(X)", zsto,zout) c c plusieurs traceurs @@ -124,5 +118,5 @@ CALL histdef(nid_mth, "tops", "Solar rad. at TOA", "W/m2", . iim,jj_nb,nhori, 1,1,1, nvert, 32, - . "ave(X)", zsto2,zout) + . "ave(X)", zsto,zout) c ENDIF !lev_histmth.GE.2 @@ -137,13 +131,13 @@ CALL histdef(nid_mth, "topl", "IR rad. at TOA", "W/m2", . iim,jj_nb,nhori, 1,1,1, nvert, 32, - . "ave(X)", zsto2,zout) + . "ave(X)", zsto,zout) c CALL histdef(nid_mth, "sols", "Solar rad. at surf.", "W/m2", . iim,jj_nb,nhori, 1,1,1, nvert, 32, - . "ave(X)", zsto2,zout) + . "ave(X)", zsto,zout) c CALL histdef(nid_mth, "soll", "IR rad. at surface", "W/m2", . iim,jj_nb,nhori, 1,1,1, nvert, 32, - . "ave(X)", zsto2,zout) + . "ave(X)", zsto,zout) c c 3D @@ -151,9 +145,9 @@ CALL histdef(nid_mth, "SWnet", "Net SW flux","W/m2", . iim,jj_nb,nhori, klev,1,klev,nvert, - . 32, "ave(X)", zsto2,zout) + . 32, "ave(X)", zsto,zout) c CALL histdef(nid_mth, "LWnet", "Net LW flux","W/m2", . iim,jj_nb,nhori, klev,1,klev,nvert, - . 32, "ave(X)", zsto2,zout) + . 32, "ave(X)", zsto,zout) c CALL histdef(nid_mth, "fluxvdf", "PBL net flux","W/m2", Index: /trunk/LMDZ.VENUS/libf/phyvenus/write_histday.h =================================================================== --- /trunk/LMDZ.VENUS/libf/phyvenus/write_histday.h (revision 901) +++ /trunk/LMDZ.VENUS/libf/phyvenus/write_histday.h (revision 902) @@ -4,6 +4,4 @@ IF (ok_journe) THEN - zsto = dtime - zout = dtime * REAL(ecrit_day) itau_w = itau_phy + itap @@ -54,8 +52,8 @@ ENDIF !lev_histday.GE.2 -c + c------------------------------------------------------- IF(lev_histday.GE.3) THEN -c + cccccccccccccccccc Radiative transfer @@ -76,5 +74,5 @@ ENDIF !lev_histday.GE.3 -c + c------------------------------------------------------- IF(lev_histday.GE.4) THEN @@ -105,5 +103,5 @@ ENDIF !lev_histday.GE.4 -c + c------------------------------------------------------- IF(lev_histday.GE.5) THEN @@ -116,5 +114,5 @@ ENDIF !lev_histday.GE.5 c------------------------------------------------------- -c + if (ok_sync) then call histsync(nid_day) Index: /trunk/LMDZ.VENUS/libf/phyvenus/write_histins.h =================================================================== --- /trunk/LMDZ.VENUS/libf/phyvenus/write_histins.h (revision 901) +++ /trunk/LMDZ.VENUS/libf/phyvenus/write_histins.h (revision 902) @@ -4,6 +4,4 @@ IF (ok_instan) THEN - zsto = dtime * ecrit_ins - zout = dtime * ecrit_ins itau_w = itau_phy + itap @@ -107,5 +105,5 @@ c------------------------------------------------------- - IF(lev_histday.GE.5) THEN + IF(lev_histday.GE.5) THEN c call histwrite_phy(nid_ins,.false.,"taux_",itau_w,fluxu) Index: /trunk/LMDZ.VENUS/libf/phyvenus/write_histmth.h =================================================================== --- /trunk/LMDZ.VENUS/libf/phyvenus/write_histmth.h (revision 901) +++ /trunk/LMDZ.VENUS/libf/phyvenus/write_histmth.h (revision 902) @@ -4,6 +4,4 @@ IF (ok_mensuel) THEN - zsto = dtime - zout = dtime * ecrit_mth itau_w = itau_phy + itap @@ -105,7 +103,7 @@ ENDIF !lev_histmth.GE.4 -c + c------------------------------------------------------- - IF(lev_histmth.GE.5) THEN + IF(lev_histmth.GE.5) THEN c call histwrite_phy(nid_mth,.false.,"taux_",itau_w,fluxu) @@ -116,5 +114,5 @@ ENDIF !lev_histmth.GE.5 c------------------------------------------------------- -c + if (ok_sync) then call histsync(nid_mth)