Index: LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd/ini_histrac.h =================================================================== --- LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd/ini_histrac.h (revision 758) +++ LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd/ini_histrac.h (revision 759) @@ -17,5 +17,5 @@ #ifdef INCA_AER - CALL histbeg("histrac_aer", iim,zx_lon, jjm+1,zx_lat, + CALL histbeg("histrac_aer", iim,zx_lon(:,1), jjm+1,zx_lat(1,:), . 1,iim,1,jjm+1, itau_phy, zjulian, pdtphys, . nhori, nid_tra2) @@ -25,5 +25,5 @@ . nhori, nid_tra3) - call histvert(nid_tra2, "presnivs", "presnivs", "mb", + call histvert(nid_tra2, "presnivs", "Vertical levels", "mb", . klev, presnivs, nvert) call histvert(nid_tra3, "presnivs", "presnivs", "mb", @@ -92,4 +92,6 @@ #ifdef INCA #ifdef INCAINFO + +#ifdef INCA_CH4 DO it=1, phtcnt WRITE(str2,'(i2.2)') it @@ -111,5 +113,25 @@ . "ave(X)", zsto,zout) ENDDO - +#endif +#ifdef INCA_NMHC + DO it=1, phtcnt + WRITE(str2,'(i2.2)') it + CALL histdef(nid_tra, "j"//str2,"j"//str2, "CM-3 S-1", + . iim,jjm+1,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zsto,zout) + ENDDO + DO it=1, hetcnt + WRITE(str2,'(i2.2)') it + CALL histdef(nid_tra, "w"//str2,"w"//str2, "S-1", + . iim,jjm+1,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zsto,zout) + ENDDO + DO it=1, extcnt + WRITE(str2,'(i2.2)') it + CALL histdef(nid_tra, "ext"//str2,"ext"//str2, "CM-3 S-1", + . iim,jjm+1,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zsto,zout) + ENDDO +#endif DO it=1, nfs WRITE(str2,'(i2.2)') it @@ -120,4 +142,6 @@ #else + +#ifdef INCA_NMHC CALL histdef(nid_tra, "jO3","jO3", "CM-3 S-1", . iim,jjm+1,nhori, klev,1,klev,nvert, 32, @@ -139,10 +163,31 @@ . "ave(X)", zsto,zout) #endif - - DO it=1, grpcnt - CALL histdef(nid_tra, grpsym(it), grpsym(it), "VMR", - . iim,jjm+1,nhori, klev,1,klev,nvert, 32, - . "ave(X)", zsto,zout) - ENDDO +#ifdef INCA_CH4 + CALL histdef(nid_tra, "jO3","jO3", "CM-3 S-1", + . iim,jjm+1,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zsto,zout) + CALL histdef(nid_tra, "jNO2","jNO2", "CM-3 S-1", + . iim,jjm+1,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zsto,zout) + CALL histdef(nid_tra, "jH2O2","jH2O2", "CM-3 S-1", + . iim,jjm+1,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zsto,zout) + CALL histdef(nid_tra, "wHNO3","wHNO3", "S-1", + . iim,jjm+1,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zsto,zout) + CALL histdef(nid_tra, "kN2O5", "kN2O5","CM-3 S-1", + . iim,jjm+1,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zsto,zout) + CALL histdef(nid_tra, "LghtNO","LghtNO", "CM-3 S-1", + . iim,jjm+1,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zsto,zout) +#endif +#endif + +! DO it=1, grpcnt +! CALL histdef(nid_tra, grpsym(it), grpsym(it), "VMR", +! . iim,jjm+1,nhori, klev,1,klev,nvert, 32, +! . "ave(X)", zsto,zout) +! ENDDO #endif @@ -349,4 +394,14 @@ #endif +#ifdef INCA_CH4 + DO it=1, grpcnt + CALL histdef(nid_tra, grpsym(it), grpsym(it), "VMR", + . iim,jjm+1,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zsto,zout) + ENDDO + +#endif + + #ifdef INCA_NMHC CALL histdef(nid_tra, "CO2_basprod", "CO2_basprod", "CM-3 S-1", @@ -371,4 +426,12 @@ . iim,jjm+1,nhori, klev,1,klev,nvert, 32, . "ave(X)", zsto,zout) + + DO it=1, grpcnt + CALL histdef(nid_tra, grpsym(it), grpsym(it), "VMR", + . iim,jjm+1,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zsto,zout) + ENDDO + + #endif ! Fin ajout Anne @@ -376,39 +439,39 @@ CALL histdef(nid_tra, "pyu1", "Vent niv 1", "-", . iim,jjm+1,nhori, 1,1,1, -99, 32, - . "inst(X)", zsto,zout) + . "inst(X)", zout,zout) CALL histdef(nid_tra, "pyv1", "Vent niv 1", "-", . iim,jjm+1,nhori, 1,1,1, -99, 32, - . "inst(X)", zsto,zout) + . "inst(X)", zout,zout) CALL histdef(nid_tra, "psrf1", "nature sol", "-", . iim,jjm+1,nhori, 1,1,1, -99, 32, - . "inst(X)", zsto,zout) + . "inst(X)", zout,zout) CALL histdef(nid_tra, "psrf2", "nature sol", "-", . iim,jjm+1,nhori, 1,1,1, -99, 32, - . "inst(X)", zsto,zout) + . "inst(X)", zout,zout) CALL histdef(nid_tra, "psrf3", "nature sol", "-", . iim,jjm+1,nhori, 1,1,1, -99, 32, - . "inst(X)", zsto,zout) + . "inst(X)", zout,zout) CALL histdef(nid_tra, "psrf4", "nature sol", "-", . iim,jjm+1,nhori, 1,1,1, -99, 32, - . "inst(X)", zsto,zout) + . "inst(X)", zout,zout) CALL histdef(nid_tra, "ftsol1", "temper sol", "-", . iim,jjm+1,nhori, 1,1,1, -99, 32, - . "inst(X)", zsto,zout) + . "inst(X)", zout,zout) CALL histdef(nid_tra, "ftsol2", "temper sol", "-", . iim,jjm+1,nhori, 1,1,1, -99, 32, - . "inst(X)", zsto,zout) + . "inst(X)", zout,zout) CALL histdef(nid_tra, "ftsol3", "temper sol", "-", . iim,jjm+1,nhori, 1,1,1, -99, 32, - . "inst", zsto,zout) + . "inst(X)", zout,zout) CALL histdef(nid_tra, "ftsol4", "temper sol", "-", . iim,jjm+1,nhori, 1,1,1, -99, 32, - . "inst(X)", zsto,zout) + . "inst(X)", zout,zout) CALL histdef(nid_tra, "pplay", "flux u mont","-", . iim,jjm+1,nhori, klev,1,klev,nvert, 32, - . "inst(X)", zsto,zout) + . "inst(X)", zout,zout) CALL histdef(nid_tra, "t", "flux u mont","-", . iim,jjm+1,nhori, klev,1,klev,nvert, 32, - . "inst(X)", zsto,zout) + . "inst(X)", zout,zout) CALL histdef(nid_tra, "mfu", "flux u mont","-", . iim,jjm+1,nhori, klev,1,klev,nvert, 32, Index: LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd/phytrac.F =================================================================== --- LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd/phytrac.F (revision 758) +++ LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd/phytrac.F (revision 759) @@ -68,12 +68,18 @@ USE species_names USE chem_mods +#ifdef INCA_NMHC USE pht_tables, ONLY : jrates + USE lightning, ONLY : prod_light +#endif +#ifdef INCA_CH4 + USE pht_tables, ONLY : jrates + USE lightning, ONLY : prod_light +#endif USE transport_controls, ONLY : conv_flg, pbl_flg USE airplane_src, ONLY : ptrop - USE lightning, ONLY : prod_light #ifdef INCA_AER USE AEROSOL_MOD, only : ntr,trmx,trnx USE AEROSOL_DIAG,only : cla,las,tausum,angst,aload,cload,totaerh2o,tau, - $ emiss20,sconc,scavcoef_st,scavcoef_cv + $ emiss20,sconc,scavcoef_st,scavcoef_cv, lambda $ ,cload05ss ,cload05bc ,cload05pom ,cload05dust ,cload05so4 $ ,cload125ss ,cload125bc ,cload125pom ,cload125dust ,cload125so4 @@ -108,4 +114,5 @@ #include "comgeomphy.h" #include "advtrac.h" + c====================================================================== @@ -335,30 +342,41 @@ INTEGER :: ncsec - INTEGER :: prt_flag_ts(nbtr)=(/1,1,1 + INTEGER :: prt_flag_ts(nbtr)=(/ #ifdef INCA_CH4 - . ,0,0,1,1,1,1,1, + . 1,1,1,0,0,1,1,1,1,1, . 0,1,0,0,0,0,0,1,0,0, . 0,1,1,1,1,0,1,1,1,0, . 1,1,1,1,1,1,1,1,1,1, . 1,0,0 -#ifdef INCA_AER - . ,1,1,1,1,0,1,1,1 -#endif -#endif -#ifdef INCA_AER -c aerosol tracers - . ,1,0,1,1,1,1,1,1,0,1, - . 0,1,1,1,1,1,0,1,0,1,1,1 +#ifdef INCA_AER + . ,1,1,1,1,0,1,1,1,1,0, + . 1,1,1,1,1,1,0,1,0,1, + . 1,1,1,1,0,1,0,1,1,1 +#endif #endif #ifdef INCA_NMHC - . , 1, 1, 1, 1, 1, 1, 1, - . 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - . 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - . 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - . 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - . 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - . 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - . 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - . 1, 1, 1, 1, 1, 1, 1 + . 1,1,1,1,1,1,1,1,1,1, + . 1,1,1,1,1,1,1,1,1,1, + . 1,1,1,1,1,1,1,1,1,1, + . 1,1,1,1,1,1,1,1,1,1, + . 1,1,1,1,1,1,1,1,1,1, + . 1,1,1,1,1,1,1,1,1,1, + . 1,1,1,1,1,1,1,1,1,1, + . 1,1,1,1,1,1,1,1,1,1, + . 1,1,1,1,1,1,1 +#ifdef INCA_AER + . ,1,1,1,1,0,1,1,1,1,0, + . 1,1,1,1,1,1,0,1,0,1, + . 1,1,1,1,0,1,0,1,1,1 +#endif +#endif +#if defined(INCA_AER) && !defined(INCA_CH4) && !defined(INCA_NMHC) + . 1,1,1,0,1,1,1,1,0,1, + . 1,1,1,1,1,0,1,0,1,1, + . 1,1,1,0,1,0,1,1,1 +#endif +#if defined(INCA) && !defined(INCA_CH4) && !defined(INCA_NMHC) && !defined(INCA_AER) + . 1,1,1,1,1,1,1,1,1,1, + . 1 #endif . /) @@ -374,4 +392,5 @@ #ifdef INCA_AER integer la + character*20 form #endif c Index: LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd/write_histrac.h =================================================================== --- LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd/write_histrac.h (revision 758) +++ LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd/write_histrac.h (revision 759) @@ -62,4 +62,5 @@ #ifdef INCA #ifdef INCAINFO +#ifdef INCA_NMHC DO it=1, phtcnt WRITE(str2,'(i2.2)') it @@ -85,4 +86,30 @@ . iim*(jjm+1)*klev,ndex3d) ENDDO +#endif +#ifdef INCA_CH4 + DO it=1, phtcnt + WRITE(str2,'(i2.2)') it + CALL gr_fi_ecrit(klev,klon,iim,jjm+1,jrates(1,1,it), + . zx_tmp_3d) + CALL histwrite(nid_tra,"j"//str2,itau_w,zx_tmp_3d, + . iim*(jjm+1)*klev,ndex3d) + ENDDO + + DO it=1, hetcnt + WRITE(str2,'(i2.2)') it + CALL gr_fi_ecrit(klev,klon,iim,jjm+1,hrates(1,1,it), + . zx_tmp_3d) + CALL histwrite(nid_tra,"w"//str2,itau_w,zx_tmp_3d, + . iim*(jjm+1)*klev,ndex3d) + ENDDO + + DO it=1, extcnt + WRITE(str2,'(i2.2)') it + CALL gr_fi_ecrit(klev,klon,iim,jjm+1,extflx(1,1,it), + . zx_tmp_3d) + CALL histwrite(nid_tra,"ext"//str2,itau_w,zx_tmp_3d, + . iim*(jjm+1)*klev,ndex3d) + ENDDO +#endif DO it=1, nfs @@ -94,4 +121,5 @@ ENDDO #else +#ifdef INCA_NMHC CALL gr_fi_ecrit(klev,klon,iim,jjm+1,jrates(1,1,2), . zx_tmp_3d) @@ -124,11 +152,42 @@ . iim*(jjm+1)*klev,ndex3d) #endif - DO it=1, grpcnt - - CALL gr_fi_ecrit(klev,klon,iim,jjm+1,nas(1,1,it),zx_tmp_3d) - zx_tmp_3d = zx_tmp_3d * dry_mass / nadv_mass(it) - CALL histwrite(nid_tra,grpsym(it),itau_w,zx_tmp_3d, - . iim*(jjm+1)*klev,ndex3d) - ENDDO +#ifdef INCA_CH4 + CALL gr_fi_ecrit(klev,klon,iim,jjm+1,jrates(1,1,2), + . zx_tmp_3d) + CALL histwrite(nid_tra,"jO3",itau_w,zx_tmp_3d, + . iim*(jjm+1)*klev,ndex3d) + + CALL gr_fi_ecrit(klev,klon,iim,jjm+1,jrates(1,1,4), + . zx_tmp_3d) + CALL histwrite(nid_tra,"jNO2",itau_w,zx_tmp_3d, + . iim*(jjm+1)*klev,ndex3d) + + CALL gr_fi_ecrit(klev,klon,iim,jjm+1,jrates(1,1,13), + . zx_tmp_3d) + CALL histwrite(nid_tra,"jH2O2",itau_w,zx_tmp_3d, + . iim*(jjm+1)*klev,ndex3d) + + CALL gr_fi_ecrit(klev,klon,iim,jjm+1,hrates(1,1,1), + . zx_tmp_3d) + CALL histwrite(nid_tra,"wHNO3",itau_w,zx_tmp_3d, + . iim*(jjm+1)*klev,ndex3d) + + CALL gr_fi_ecrit(klev,klon,iim,jjm+1,krates(1,1,1), + . zx_tmp_3d) + CALL histwrite(nid_tra,"kN2O5",itau_w,zx_tmp_3d, + . iim*(jjm+1)*klev,ndex3d) + CALL gr_fi_ecrit(klev,klon,iim,jjm+1,extflx(1,1,1), + . zx_tmp_3d) + CALL histwrite(nid_tra,"LghtNO",itau_w,zx_tmp_3d, + . iim*(jjm+1)*klev,ndex3d) +#endif +#endif +! DO it=1, grpcnt +! +! CALL gr_fi_ecrit(klev,klon,iim,jjm+1,nas(1,1,it),zx_tmp_3d) +! zx_tmp_3d = zx_tmp_3d * dry_mass / nadv_mass(it) +! CALL histwrite(nid_tra,grpsym(it),itau_w,zx_tmp_3d, +! . iim*(jjm+1)*klev,ndex3d) +! ENDDO #endif @@ -228,5 +287,10 @@ #endif else -#ifdef INCA +#ifdef INCA_CH4 + if ( solsym(it) == 'OX' ) then + zx_tmp_3d = zx_tmp_3d * dry_mass / nadv_mass(id_o3) + end if +#endif +#ifdef INCA_NMHC if ( solsym(it) == 'OX' ) then zx_tmp_3d = zx_tmp_3d * dry_mass / nadv_mass(id_o3) @@ -264,5 +328,4 @@ #ifdef INCA -!#ifdef INCA_CH4 CALL gr_fi_ecrit(1, klon,iim,jjm+1, o3_col(1), zx_tmp_2d) CALL histwrite(nid_tra,"O3_column",itau_w,zx_tmp_2d, @@ -363,4 +426,16 @@ #endif +#ifdef INCA_CH4 + DO it=1, grpcnt + + CALL gr_fi_ecrit(klev,klon,iim,jjm+1,nas(1,1,it),zx_tmp_3d) + zx_tmp_3d = zx_tmp_3d * dry_mass / nadv_mass(it) + CALL histwrite(nid_tra,grpsym(it),itau_w,zx_tmp_3d, + . iim*(jjm+1)*klev,ndex3d) + ENDDO + +#endif + + #ifdef INCA_NMHC CALL gr_fi_ecrit(klev,klon,iim,jjm+1,CO2_basprod(1,1), @@ -398,4 +473,13 @@ CALL histwrite(nid_tra,"CO_loss",itau_w,zx_tmp_3d, . iim*(jjm+1)*klev,ndex) + + DO it=1, grpcnt + + CALL gr_fi_ecrit(klev,klon,iim,jjm+1,nas(1,1,it),zx_tmp_3d) + zx_tmp_3d = zx_tmp_3d * dry_mass / nadv_mass(it) + CALL histwrite(nid_tra,grpsym(it),itau_w,zx_tmp_3d, + . iim*(jjm+1)*klev,ndex3d) + ENDDO + #endif