Ignore:
Timestamp:
Nov 5, 2018, 3:24:59 PM (6 years ago)
Author:
Laurent Fairhead
Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:
LMDZ6/branches/DYNAMICO-conv
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/DYNAMICO-conv

  • LMDZ6/branches/DYNAMICO-conv/libf/phylmd/phys_output_write_mod.F90

    r3356 r3411  
    1414CONTAINS
    1515
    16   ! ug Routine pour définir (lors du premier passage) ET sortir les variables
     16  ! ug Routine pour définir (los du premier passageà) ET sortir les variables
    1717  SUBROUTINE phys_output_write(itap, pdtphys, paprs, pphis, &
    1818       pplay, lmax_th, aerosol_couple,         &
    … …  
    3131    USE vertical_layers_mod, ONLY : ap, bp, aps, bps
    3232    USE phys_output_ctrlout_mod, ONLY: o_phis, o_aire, is_ter, is_lic, is_oce, &
    33          o_longitude, o_latitude, &
    3433         o_Ahyb, o_Bhyb,o_Ahyb_inter, o_Bhyb_inter, &
    3534         is_ave, is_sic, o_contfracATM, o_contfracOR, &
    … …  
    4039         o_wind10m, o_wind10max, o_gusts, o_sicf, &
    4140         o_psol, o_mass, o_qsurf, o_qsol, &
    42          o_precip, o_rain_fall, o_rain_con, o_ndayrain, o_plul, o_pluc, o_plun, &
     41         o_precip, o_ndayrain, o_plul, o_pluc, o_plun, &
    4342         o_snow, o_msnow, o_fsnow, o_evap, o_ep,o_epmax_diag, & ! epmax_cape
    4443         o_tops, o_tops0, o_topl, o_topl0, &
    45          o_SWupTOA, o_SWupTOAclr, o_SWupTOAcleanclr, o_SWdnTOA, &
     44         o_SWupTOA, o_SWupTOAclr, o_SWdnTOA, &
    4645         o_SWdnTOAclr, o_nettop, o_SWup200, &
    4746         o_SWup200clr, o_SWdn200, o_SWdn200clr, &
    … …  
    4948         o_LWdn200clr, o_sols, o_sols0, &
    5049         o_soll, o_radsol, o_soll0, o_SWupSFC, &
    51          o_SWupSFCclr, o_SWupSFCcleanclr, o_SWdnSFC, o_SWdnSFCclr, o_SWdnSFCcleanclr, &
     50         o_SWupSFCclr, o_SWdnSFC, o_SWdnSFCclr, &
    5251         o_LWupSFC, o_LWdnSFC, o_LWupSFCclr, &
    53          o_LWdnSFCclr, o_LWupTOAcleanclr, o_LWdnSFCcleanclr, o_bils, o_bils_diss, &
     52         o_LWdnSFCclr, o_bils, o_bils_diss, &
    5453         o_bils_ec,o_bils_ech, o_bils_tke, o_bils_kinetic, &
    5554         o_bils_latent, o_bils_enthalp, o_sens, &
    56          o_fder, o_ffonte, o_fqcalving, o_fqfonte, o_mrroli, o_runofflic, &
     55         o_fder, o_ffonte, o_fqcalving, o_fqfonte, o_runofflic, &
    5756         o_taux, o_tauy, o_snowsrf, o_qsnow, &
    5857         o_snowhgt, o_toice, o_sissnow, o_runoff, &
    … …  
    7069         o_cldhjn, o_cldtjn, o_cldq, o_lwp, o_iwp, &
    7170         o_ue, o_ve, o_uq, o_vq, o_cape, o_pbase, &
    72          o_uwat, o_vwat, &
    7371         o_ptop, o_fbase, o_plcl, o_plfc, &
    7472         o_wbeff, o_convoccur, o_cape_max, o_upwd, o_ep,o_epmax_diag, o_Ma, &
    75          o_dnwd, o_dnwd0, o_ftime_deepcv, o_ftime_con, o_mc, &
     73         o_dnwd, o_dnwd0, o_ftime_con, o_mc, &
    7674         o_prw, o_prlw, o_prsw, o_s_pblh, o_s_pblt, o_s_lcl, &
    7775         o_s_therm, o_uSTDlevs, o_vSTDlevs, &
    … …  
    8482         o_cdragh_x   , o_cdragh_w   , o_cdragm_x   , o_cdragm_w   , &
    8583         o_kh         , o_kh_x       , o_kh_w       , &
    86          o_ale, o_alp, o_cin, o_WAPE, o_wake_h, o_cv_gen, o_wake_dens, &
     84         o_ale, o_alp, o_cin, o_WAPE, o_wake_h, &
    8785         o_wake_s, o_wake_deltat, o_wake_deltaq, &
    8886         o_wake_omg, o_dtwak, o_dqwak, o_dqwak2d, o_Vprecip, &
    … …  
    9997         o_cldemi, o_pr_con_l, o_pr_con_i, &
    10098         o_pr_lsc_l, o_pr_lsc_i, o_re, o_fl, &
    101          o_rh2m, &
     99         o_rh2m, o_rh2m_min, o_rh2m_max, &
    102100         o_qsat2m, o_tpot, o_tpote, o_SWnetOR, &
    103          o_LWdownOR, o_snowl, &
     101         o_SWdownOR, o_LWdownOR, o_snowl, &
    104102         o_solldown, o_dtsvdfo, o_dtsvdft, &
    105103         o_dtsvdfg, o_dtsvdfi, o_z0m, o_z0h,  o_od443aer, o_od550aer, &
    … …  
    121119         o_swtoacf_zero, o_swsrfcf_zero, &
    122120         o_topswai, o_solswai, o_toplwai, o_sollwai, o_scdnc, &
    123          o_cldncl, o_reffclws, o_reffclwc, o_solbnd, o_stratomask,&
     121         o_cldncl, o_reffclws, o_reffclwc, o_stratomask,&
    124122         o_cldnvi, o_lcc, o_lcc3d, o_lcc3dcon, &
    125          o_lcc3dstra, o_icc3dcon, o_icc3dstra, &
    126          o_cldicemxrat, o_cldwatmxrat, o_reffclwtop, o_ec550aer, &
     123         o_lcc3dstra, o_reffclwtop, o_ec550aer, &
    127124         o_lwcon, o_iwcon, o_temp, o_theta, &
    128125         o_ovapinit, o_ovap, o_oliq, o_ocond, o_geop, &
    … …  
    156153         o_du_gwd_front, o_dv_gwd_front, &
    157154         o_east_gwstress, o_west_gwstress, &
    158          o_rsd, o_rlu, o_rld, o_rsucs, o_rsdcs, o_rsucsaf, o_rsdcsaf, &
     155         o_rsd, o_rlu, o_rld, o_rsucs, o_rsdcs, &
    159156         o_rlucs, o_rldcs, o_tnt, o_tntr, &
    160157         o_tntscpbl, o_tnhus, o_tnhusscpbl, &
    … …  
    169166         o_uxv, o_vxq, o_vxT, o_wxq, o_vxphi, &
    170167         o_wxT, o_uxu, o_vxv, o_TxT, o_trac, &
    171 #ifdef REPROBUS
    172          o_nas, &
    173 #endif
    174168         o_dtr_vdf, o_dtr_the, o_dtr_con, &
    175169         o_dtr_lessi_impa, o_dtr_lessi_nucl, &
    … …  
    183177         o_lat_prec_liq_oce, o_lat_prec_liq_sic, &
    184178         o_lat_prec_sol_oce, o_lat_prec_sol_sic, &
    185          o_sza, &
    186179! Marine
    187180         o_map_prop_hc, o_map_prop_hist, o_map_emis_hc, o_map_iwp_hc, &
    … …  
    204197         o_budg_sed_part, o_R2SO4, o_OCS_lifetime, o_SO2_lifetime, &
    205198         o_budg_3D_backgr_ocs, o_budg_3D_backgr_so2, &
    206          o_budg_dep_dry_ocs, o_budg_dep_wet_ocs, &
    207          o_budg_dep_dry_so2, o_budg_dep_wet_so2, &
    208199         o_budg_dep_dry_h2so4, o_budg_dep_wet_h2so4, &
    209200         o_budg_dep_dry_part, o_budg_dep_wet_part, &
    … …  
    218209         nday_rain, rain_con, snow_con, &
    219210         topsw, toplw, toplw0, swup, swdn, &
    220          topsw0, swupc0, swdnc0, swup0, swdn0, SWup200, SWup200clr, &
     211         topsw0, swup0, swdn0, SWup200, SWup200clr, &
    221212         SWdn200, SWdn200clr, LWup200, LWup200clr, &
    222213         LWdn200, LWdn200clr, solsw, solsw0, sollw, &
    223214         radsol, swradcorr, sollw0, sollwdown, sollw, gustiness, &
    224          sollwdownclr, lwdnc0, lwdn0, ftsol, ustar, u10m, &
     215         sollwdownclr, lwdn0, ftsol, ustar, u10m, &
    225216         v10m, pbl_tke, wake_delta_pbl_TKE, &
    226217         delta_tsurf, &
    227218         wstar, cape, ema_pcb, ema_pct, &
    228219         ema_cbmf, Ma, fm_therm, ale_bl, alp_bl, ale, &
    229          alp, cin, wake_pe, wake_dens, wake_s, wake_deltat, &
     220         alp, cin, wake_pe, wake_s, wake_deltat, &
    230221         wake_deltaq, ftd, fqd, ale_bl_trig, albsol1, &
    231          ale_wake, ale_bl_stat, &
    232222         rnebcon, wo, falb1, albsol2, coefh, clwcon0, &
    233223         ratqs, entr_therm, zqasc, detr_therm, f0, &
    234          lwup, lwdn, lwupc0, lwup0, coefm, &
    235          swupp, lwupp, swupc0p, swup0p, lwupc0p, lwup0p, swdnp, lwdnp, &
    236          swdnc0p, swdn0p, lwdnc0p, lwdn0p, tnondef, O3sumSTD, uvsumSTD, &
     224         lwup, lwdn, lwup0, coefm, &
     225         swupp, lwupp, swup0p, lwup0p, swdnp, lwdnp, &
     226         swdn0p, lwdn0p, tnondef, O3sumSTD, uvsumSTD, &
    237227         vqsumSTD, vTsumSTD, O3daysumSTD, wqsumSTD, &
    238228         vphisumSTD, wTsumSTD, u2sumSTD, v2sumSTD, &
    … …  
    255245         cldh, cldt, JrNt, cldljn, cldmjn, cldhjn, &
    256246         cldtjn, cldq, flwp, fiwp, ue, ve, uq, vq, &
    257          uwat, vwat, &
    258247         plcl, plfc, wbeff, convoccur, upwd, dnwd, dnwd0, prw, prlw, prsw, &
    259248         s_pblh, s_pblt, s_lcl, s_therm, uwriteSTD, &
    260249         vwriteSTD, wwriteSTD, phiwriteSTD, qwriteSTD, &
    261          twriteSTD, alp_wake, &
    262 !!         dtvdf_x    ,dtvdf_w    ,dqvdf_x    ,dqvdf_w    , &
    263          d_t_vdf_x    ,d_t_vdf_w    ,d_q_vdf_x    ,d_q_vdf_w    , &
     250         twriteSTD, ale_wake, alp_wake, &
     251         dtvdf_x    ,dtvdf_w    ,dqvdf_x    ,dqvdf_w    , &
    264252         sens_x     ,sens_w     ,zxfluxlat_x,zxfluxlat_w, &
    265253         cdragh_x   ,cdragh_w   ,cdragm_x   ,cdragm_w   , &
    266254         kh         ,kh_x       ,kh_w       , &
    267          cv_gen, wake_h, &
     255         wake_h, &
    268256         wake_omg, d_t_wake, d_q_wake, Vprecip, &
    269257         wdtrainA, wdtrainM, n2, s2, proba_notrig, &
    270          random_notrig, &
     258         random_notrig, ale_bl_stat, &
    271259         alp_bl_det, alp_bl_fluct_m, alp_bl_conv, &
    272260         alp_bl_stat, alp_bl_fluct_tke, slab_wfbils, &
    … …  
    285273         sollwad0_aero, toplwai_aero, sollwai_aero, &
    286274         scdnc, cldncl, reffclws, reffclwc, cldnvi, stratomask,&
    287          lcc, lcc3d, lcc3dcon, lcc3dstra, &
    288          icc3dcon, icc3dstra, zfice, reffclwtop, &
     275         lcc, lcc3d, lcc3dcon, lcc3dstra, reffclwtop, &
    289276         ec550aer, flwc, fiwc, t_seri, theta, q_seri, &
    290277         ql_seri, qs_seri, tr_seri, &
    … …  
    314301         budg_sed_part, R2SO4, OCS_lifetime, SO2_lifetime, &
    315302         budg_3D_backgr_ocs, budg_3D_backgr_so2, &
    316          budg_dep_dry_ocs, budg_dep_wet_ocs, &
    317          budg_dep_dry_so2, budg_dep_wet_so2, &
    318303         budg_dep_dry_h2so4, budg_dep_wet_h2so4, &
    319304         budg_dep_dry_part, budg_dep_wet_part, &
    … …  
    324309#endif
    325310
    326 #ifdef REPROBUS
    327     USE CHEM_REP, ONLY : nas, nbnas, tnamenas, ttextnas
    328 #endif
    329 
    330311    USE phys_output_var_mod, ONLY: vars_defined, snow_o, zfra_o, bils_diss, &
    331312         bils_ec,bils_ech, bils_tke, bils_kinetic, bils_latent, bils_enthalp, &
    332313         itau_con, nfiles, clef_files, nid_files, dryaod_diag, &
    333314         zustr_gwd_hines, zvstr_gwd_hines,zustr_gwd_rando, zvstr_gwd_rando, &
    334          zustr_gwd_front, zvstr_gwd_front, sza_o,    &
     315         zustr_gwd_front, zvstr_gwd_front,     &
    335316         sens_prec_liq_o, sens_prec_sol_o, lat_prec_liq_o, lat_prec_sol_o, &
    336317         cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv, &
    … …  
    355336    USE indice_sol_mod, ONLY: nbsrf
    356337    USE infotrac_phy, ONLY: nqtot, nqo, type_trac, tname, niadv
    357     USE geometry_mod, ONLY: cell_area, latitude_deg, longitude_deg
     338    USE geometry_mod, ONLY: cell_area
    358339    USE surface_data, ONLY: type_ocean, version_ocean, ok_veget, ok_snow
    359340    USE aero_mod, ONLY: naero_tot, id_STRAT_phy
    … …  
    405386    INTEGER :: itau_w
    406387    INTEGER :: i, iinit, iinitend=1, iff, iq, iiq, nsrf, k, ll, naero
    407     REAL, DIMENSION (klon) :: zx_tmp_fi2d, zpt_conv2d
     388    REAL, DIMENSION (klon) :: zx_tmp_fi2d
    408389    REAL, DIMENSION (klon,klev) :: zx_tmp_fi3d, zpt_conv
    409390    REAL, DIMENSION (klon,klev+1) :: zx_tmp_fi3d1
    410     REAL, DIMENSION (klon,NSW) :: zx_tmp_fi3dsp
    411391    CHARACTER (LEN=4)              :: bb2
    412392    INTEGER, DIMENSION(nbp_lon*nbp_lat)  :: ndex2d
    … …  
    570550       CALL histwrite_phy(o_Ahyb_inter, Ahyb_bounds)
    571551       CALL histwrite_phy(o_Bhyb_inter, Bhyb_bounds)
    572        CALL histwrite_phy(o_longitude, longitude_deg)
    573        CALL histwrite_phy(o_latitude, latitude_deg)
    574552!
    575553#ifdef CPP_RRTM
    … …  
    631609     ENDIF
    632610
    633        CALL histwrite_phy(o_sza, sza_o)
    634611       CALL histwrite_phy(o_flat, zxfluxlat)
    635612       CALL histwrite_phy(o_ptstar, ptstar)
    … …  
    690667
    691668       CALL histwrite_phy(o_precip, zx_tmp_fi2d)
    692        CALL histwrite_phy(o_rain_fall, rain_fall)
    693669       CALL histwrite_phy(o_ndayrain, nday_rain)
    694670
    … …  
    711687       ENDIF
    712688       CALL histwrite_phy(o_pluc, zx_tmp_fi2d)
    713        CALL histwrite_phy(o_rain_con, rain_con)
    714689       CALL histwrite_phy(o_snow, snow_fall)
    715690       CALL histwrite_phy(o_msnow, zxsnow)
    … …  
    739714       ENDIF
    740715       CALL histwrite_phy(o_SWupTOAclr, zx_tmp_fi2d)
    741 
    742        IF (vars_defined) THEN
    743           zx_tmp_fi2d(:) = swupc0(:,klevp1)*swradcorr(:)
    744        ENDIF
    745        CALL histwrite_phy(o_SWupTOAcleanclr, zx_tmp_fi2d)
    746716
    747717       IF (vars_defined) THEN
    … …  
    811781
    812782       IF (vars_defined) THEN
    813           zx_tmp_fi2d(:) = swupc0(:,1)*swradcorr(:)
    814        ENDIF
    815        CALL histwrite_phy(o_SWupSFCcleanclr, zx_tmp_fi2d)
    816 
    817        IF (vars_defined) THEN
    818783          zx_tmp_fi2d(:) = swdn(:,1)*swradcorr(:)
    819784       ENDIF
    … …  
    824789       ENDIF
    825790       CALL histwrite_phy(o_SWdnSFCclr, zx_tmp_fi2d)
    826 
    827        IF (vars_defined) THEN
    828           zx_tmp_fi2d(:) = swdnc0(:,1)*swradcorr(:)
    829        ENDIF
    830        CALL histwrite_phy(o_SWdnSFCcleanclr, zx_tmp_fi2d)
    831791
    832792       IF (vars_defined) THEN
    … …  
    842802       CALL histwrite_phy(o_LWupSFCclr, zx_tmp_fi2d)
    843803       CALL histwrite_phy(o_LWdnSFCclr, sollwdownclr)
    844 
    845        IF (vars_defined) THEN
    846           zx_tmp_fi2d(:) = lwupc0(:,klevp1)
    847        ENDIF
    848        CALL histwrite_phy(o_LWupTOAcleanclr, zx_tmp_fi2d)
    849        IF (vars_defined) THEN
    850           zx_tmp_fi2d(:) = -1.*lwdnc0(:,1)
    851        ENDIF
    852        CALL histwrite_phy(o_LWdnSFCcleanclr, zx_tmp_fi2d)
    853 
    854804       CALL histwrite_phy(o_bils, bils)
    855805       CALL histwrite_phy(o_bils_diss, bils_diss)
    … …  
    869819       CALL histwrite_phy(o_fqcalving, zxfqcalving)
    870820       CALL histwrite_phy(o_fqfonte, zxfqfonte)
    871        IF (vars_defined) THEN
    872           zx_tmp_fi2d(1:klon)=(zxfqfonte(1:klon)+rain_fall(1:klon))*pctsrf(1:klon,is_lic)
    873        ENDIF
    874        CALL histwrite_phy(o_mrroli, zx_tmp_fi2d)
    875821       CALL histwrite_phy(o_runofflic, zxrunofflic)
    876822       IF (vars_defined) THEN
    … …  
    1012958       CALL histwrite_phy(o_uq, uq)
    1013959       CALL histwrite_phy(o_vq, vq)
    1014        CALL histwrite_phy(o_uwat, uwat)
    1015        CALL histwrite_phy(o_vwat, vwat)
    1016960       IF (iflag_con.GE.3) THEN ! sb
    1017961          CALL histwrite_phy(o_cape, cape)
    … …  
    1032976          CALL histwrite_phy(o_dnwd, dnwd)
    1033977          CALL histwrite_phy(o_dnwd0, dnwd0)
    1034           !! The part relative to the frequency of occurence of convection
    1035           !! is now grouped with the part relative to thermals and shallow
    1036           !! convection (output of the 3 fields: ftime_deepcv, ftime_th and
    1037           !!  ftime_con).
     978          IF (vars_defined)         zx_tmp_fi2d=float(itau_con)/float(itap)
     979          CALL histwrite_phy(o_ftime_con, zx_tmp_fi2d)
    1038980          IF (vars_defined) THEN
    1039981             IF (iflag_thermals>=1)THEN
    1040                 zx_tmp_fi3d=-dnwd+dnwd0+upwd+fm_therm(:,1:klev)
     982                zx_tmp_fi3d=dnwd+dnwd0+upwd+fm_therm(:,1:klev)
    1041983             ELSE
    1042                 zx_tmp_fi3d=-dnwd+dnwd0+upwd
     984                zx_tmp_fi3d=dnwd+dnwd0+upwd
    1043985             ENDIF
    1044986          ENDIF
    … …  
    11571099             CALL histwrite_phy(o_alp_wk, alp_wake)
    11581100             IF (iflag_pbl_split>=1) THEN
    1159                IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_t_vdf_x(1:klon,1:klev)/pdtphys
    1160                CALL histwrite_phy(o_dtvdf_x    ,zx_tmp_fi3d)
    1161                IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_t_vdf_w(1:klon,1:klev)/pdtphys
    1162                CALL histwrite_phy(o_dtvdf_w    ,zx_tmp_fi3d)
    1163                IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_q_vdf_x(1:klon,1:klev)/pdtphys
    1164                CALL histwrite_phy(o_dqvdf_x    ,zx_tmp_fi3d)
    1165                IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_q_vdf_w(1:klon,1:klev)/pdtphys
    1166 
    1167 !
     1101               !ym warning : dtvdf_x, dtvdf_w, dqvdf_x, dqvdf_w are not defined by model
     1102               !ym => init to 0 in phys_local_var_mod
     1103               IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=dtvdf_x(1:klon,1:klev)/pdtphys
     1104               CALL histwrite_phy(o_dtvdf_x    ,zx_tmp_fi3d)
     1105               IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=dtvdf_w(1:klon,1:klev)/pdtphys
     1106               CALL histwrite_phy(o_dtvdf_w    ,zx_tmp_fi3d)
     1107               IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=dqvdf_x(1:klon,1:klev)/pdtphys
     1108               CALL histwrite_phy(o_dqvdf_x    ,zx_tmp_fi3d)
     1109               IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=dqvdf_w(1:klon,1:klev)/pdtphys
    11681110               CALL histwrite_phy(o_dqvdf_w    ,zx_tmp_fi3d)
    11691111               CALL histwrite_phy(o_sens_x     ,sens_x     )
    … …  
    11841126             CALL histwrite_phy(o_cin, cin)
    11851127             CALL histwrite_phy(o_WAPE, wake_pe)
    1186              CALL histwrite_phy(o_cv_gen, cv_gen)
    11871128             CALL histwrite_phy(o_wake_h, wake_h)
    1188              CALL histwrite_phy(o_wake_dens, wake_dens)
    11891129             CALL histwrite_phy(o_wake_s, wake_s)
    11901130             CALL histwrite_phy(o_wake_deltat, wake_deltat)
    … …  
    12811221       CALL histwrite_phy(o_rh2m, zx_tmp_fi2d)
    12821222
    1283 !       IF (vars_defined) THEN
    1284 !          DO i=1, klon
    1285 !             zx_tmp_fi2d(i)=MIN(100.,rh2m(i)*100.)
    1286 !          ENDDO
    1287 !       ENDIF
    1288 !       CALL histwrite_phy(o_rh2m_min, zx_tmp_fi2d)
    1289 
    1290 !       IF (vars_defined) THEN
    1291 !          DO i=1, klon
    1292 !             zx_tmp_fi2d(i)=MIN(100.,rh2m(i)*100.)
    1293 !          ENDDO
    1294 !       ENDIF
    1295 !       CALL histwrite_phy(o_rh2m_max, zx_tmp_fi2d)
     1223       IF (vars_defined) THEN
     1224          DO i=1, klon
     1225             zx_tmp_fi2d(i)=MIN(100.,rh2m(i)*100.)
     1226          ENDDO
     1227       ENDIF
     1228       CALL histwrite_phy(o_rh2m_min, zx_tmp_fi2d)
     1229
     1230       IF (vars_defined) THEN
     1231          DO i=1, klon
     1232             zx_tmp_fi2d(i)=MIN(100.,rh2m(i)*100.)
     1233          ENDDO
     1234       ENDIF
     1235       CALL histwrite_phy(o_rh2m_max, zx_tmp_fi2d)
    12961236
    12971237       CALL histwrite_phy(o_qsat2m, qsat2m)
    … …  
    13001240       IF (vars_defined) zx_tmp_fi2d(1 : klon) = fsolsw( 1 : klon, is_ter)
    13011241       CALL histwrite_phy(o_SWnetOR,  zx_tmp_fi2d)
     1242       IF (vars_defined) zx_tmp_fi2d(1:klon) = solsw(1:klon)/(1.-albsol1(1:klon))
     1243       CALL histwrite_phy(o_SWdownOR,  zx_tmp_fi2d)
    13021244       CALL histwrite_phy(o_LWdownOR, sollwdown)
    13031245       CALL histwrite_phy(o_snowl, snow_lsc)
    … …  
    13881330          CALL histwrite_phy(o_budg_3D_nucl,         budg_3D_nucl)
    13891331          CALL histwrite_phy(o_budg_3D_cond_evap,    budg_3D_cond_evap)
    1390           CALL histwrite_phy(o_budg_dep_dry_ocs,     budg_dep_dry_ocs)
    1391           CALL histwrite_phy(o_budg_dep_wet_ocs,     budg_dep_wet_ocs)
    1392           CALL histwrite_phy(o_budg_dep_dry_so2,     budg_dep_dry_so2)
    1393           CALL histwrite_phy(o_budg_dep_wet_so2,     budg_dep_wet_so2)
    13941332          CALL histwrite_phy(o_budg_dep_dry_h2so4,   budg_dep_dry_h2so4)
    13951333          CALL histwrite_phy(o_budg_dep_wet_h2so4,   budg_dep_wet_h2so4)
    … …  
    14971435          CALL histwrite_phy(o_lcc3dcon, lcc3dcon)
    14981436          CALL histwrite_phy(o_lcc3dstra, lcc3dstra)
    1499           CALL histwrite_phy(o_icc3dcon, icc3dcon)
    1500           CALL histwrite_phy(o_icc3dstra, icc3dstra)
    1501           CALL histwrite_phy(o_cldicemxrat, zfice)
    1502           zx_tmp_fi3d(:,:)=1-zfice(:,:)
    1503           CALL histwrite_phy(o_cldwatmxrat, zx_tmp_fi3d)
    15041437          CALL histwrite_phy(o_reffclwtop, reffclwtop)
    15051438       ENDIF
    … …  
    15291462       CALL histwrite_phy(o_zfull,zx_tmp_fi3d)
    15301463
    1531 #ifdef CPP_XIOS
    1532 !solbnd begin
    1533 #ifdef CPP_RRTM
    1534       IF (iflag_rrtm.EQ.1) THEN
    1535        IF (vars_defined) THEN
    1536         DO ISW=1, NSW
    1537           zx_tmp_fi3dsp(:,ISW) = swdn(:,klevp1)*swradcorr(:)*RSUN(ISW)
    1538         ENDDO
    1539         CALL histwrite_phy(o_solbnd, zx_tmp_fi3dsp)
    1540        ENDIF
    1541       ENDIF
    1542 #endif
    1543 !solbnd end
    1544 #endif
    1545 
    15461464       IF (flag_aerosol_strat.EQ.2) THEN
    15471465         CALL histwrite_phy(o_stratomask, stratomask)
    … …  
    15521470        DO k = 2, klev
    15531471         DO i = 1, klon
    1554             zx_tmp_fi3d(i,k) = zphi(i,k-1)/RG + &
     1472            zx_tmp_fi3d(i,k) = zphi(i,k)/RG + &
    15551473                          (zphi(i,k)-zphi(i,k-1))/RG * &
    1556                           (paprs(i,k)-pplay(i,k-1))/(pplay(i,k)-pplay(i,k-1))
     1474                          (paprs(i,k)-pplay(i,k))/(pplay(i,k)-pplay(i,k-1))
    15571475         ENDDO
    15581476        ENDDO
    … …  
    17241642          CALL histwrite_phy(o_plulst, plul_st)
    17251643          IF (vars_defined) THEN
    1726              do i=1,klon
    1727                 zx_tmp_fi2d(1:klon)=lmax_th(:)
    1728              enddo
    1729           ENDIF
    1730           CALL histwrite_phy(o_lmaxth, zx_tmp_fi2d)
    1731           IF (vars_defined) THEN
    17321644             DO k=1,klev
    17331645                DO i=1,klon
    … …  
    17411653          ENDIF
    17421654          CALL histwrite_phy(o_ptconvth, zx_tmp_fi3d)
     1655          IF (vars_defined) THEN
     1656             do i=1,klon
     1657                zx_tmp_fi2d(1:klon)=lmax_th(:)
     1658             enddo
     1659          ENDIF
     1660          CALL histwrite_phy(o_lmaxth, zx_tmp_fi2d)
    17431661       ENDIF ! iflag_thermals>=1
    1744 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    1745        zpt_conv = 0.
    1746        WHERE (ptconv) zpt_conv = 1.
    1747        CALL histwrite_phy(o_ptconv, zpt_conv)
    1748 !!       IF (vars_defined)         zx_tmp_fi2d=float(itau_con)/float(itap)
    1749 !!       CALL histwrite_phy(o_ftime_con, zx_tmp_fi2d)
    1750        IF (vars_defined) THEN
    1751           zpt_conv2d(:) = 0.
    1752           DO k=1,klev
    1753             WHERE (ptconv(:,k)) zpt_conv2d(:) = 1.
    1754           ENDDO
    1755        ENDIF
    1756        CALL histwrite_phy(o_ftime_deepcv, zpt_conv2d)
    1757        IF (vars_defined) THEN
    1758           zx_tmp_fi2d(:) = 0.
    1759           DO k=1,klev
    1760             WHERE (ptconvth(:,k)) zx_tmp_fi2d(:) = 1.
    1761           ENDDO
    1762        ENDIF
    1763        CALL histwrite_phy(o_ftime_th, zx_tmp_fi2d)
    1764        IF (vars_defined) THEN
    1765            zx_tmp_fi2d(:) = max(zx_tmp_fi2d(:),zpt_conv2d(:))
    1766        ENDIF
    1767        CALL histwrite_phy(o_ftime_con, zx_tmp_fi2d)
    17681662!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    17691663       IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_t_vdf(1:klon,1:klev)/pdtphys
    … …  
    17811675       IF (vars_defined) CALL water_int(klon,klev,zx_tmp_fi3d,zmasse,zx_tmp_fi2d)
    17821676       CALL histwrite_phy(o_dqeva2d, zx_tmp_fi2d)
     1677       zpt_conv = 0.
     1678       WHERE (ptconv) zpt_conv = 1.
     1679       CALL histwrite_phy(o_ptconv, zpt_conv)
    17831680       CALL histwrite_phy(o_ratqs, ratqs)
    17841681       IF (vars_defined) THEN
    … …  
    17981695       IF (iflag_thermals>=1) THEN
    17991696          ! Pour l instant 0 a y reflichir pour les thermiques
    1800           ! regroupe avec ftime_deepcv et ftime_con
    1801           !!zx_tmp_fi2d=0.
    1802           !!CALL histwrite_phy(o_ftime_th, zx_tmp_fi2d)
     1697          zx_tmp_fi2d=0.
     1698          CALL histwrite_phy(o_ftime_th, zx_tmp_fi2d)
    18031699          CALL histwrite_phy(o_f_th, fm_therm)
    18041700          CALL histwrite_phy(o_e_th, entr_therm)
    … …  
    19321828       ENDIF
    19331829       CALL histwrite_phy(o_rsdcs, zx_tmp_fi3d1)
    1934        DO k=1, klevp1
    1935          zx_tmp_fi3d1(:,k)=swdnc0(:,k)*swradcorr(:)
    1936        ENDDO
    1937        CALL histwrite_phy(o_rsdcsaf, zx_tmp_fi3d1)
    19381830
    19391831       CALL histwrite_phy(o_rlu, lwup)
    … …  
    21702062            IF (type_trac == 'lmdz' .OR. type_trac == 'repr' .OR. type_trac == 'coag') THEN
    21712063             !--3D fields
    2172              CALL histwrite_phy(o_trac(iq-nqo), tr_seri(:,:,iq-nqo))
    2173              CALL histwrite_phy(o_dtr_vdf(iq-nqo),d_tr_cl(:,:,iq-nqo))
    2174              CALL histwrite_phy(o_dtr_the(iq-nqo),d_tr_th(:,:,iq-nqo))
    2175              CALL histwrite_phy(o_dtr_con(iq-nqo),d_tr_cv(:,:,iq-nqo))
    2176              CALL histwrite_phy(o_dtr_lessi_impa(iq-nqo),d_tr_lessi_impa(:,:,iq-nqo))
    2177              CALL histwrite_phy(o_dtr_lessi_nucl(iq-nqo),d_tr_lessi_nucl(:,:,iq-nqo))
    2178              CALL histwrite_phy(o_dtr_insc(iq-nqo),d_tr_insc(:,:,iq-nqo))
    2179              CALL histwrite_phy(o_dtr_bcscav(iq-nqo),d_tr_bcscav(:,:,iq-nqo))
    2180              CALL histwrite_phy(o_dtr_evapls(iq-nqo),d_tr_evapls(:,:,iq-nqo))
    2181              CALL histwrite_phy(o_dtr_ls(iq-nqo),d_tr_ls(:,:,iq-nqo))
    2182              CALL histwrite_phy(o_dtr_trsp(iq-nqo),d_tr_trsp(:,:,iq-nqo))
    2183              CALL histwrite_phy(o_dtr_sscav(iq-nqo),d_tr_sscav(:,:,iq-nqo))
    2184              CALL histwrite_phy(o_dtr_sat(iq-nqo),d_tr_sat(:,:,iq-nqo))
    2185              CALL histwrite_phy(o_dtr_uscav(iq-nqo),d_tr_uscav(:,:,iq-nqo))
     2064!             CALL histwrite_phy(o_trac(iq-nqo), tr_seri(:,:,iq-nqo))
     2065!             CALL histwrite_phy(o_dtr_vdf(iq-nqo),d_tr_cl(:,:,iq-nqo))
     2066!             CALL histwrite_phy(o_dtr_the(iq-nqo),d_tr_th(:,:,iq-nqo))
     2067!             CALL histwrite_phy(o_dtr_con(iq-nqo),d_tr_cv(:,:,iq-nqo))
     2068!             CALL histwrite_phy(o_dtr_lessi_impa(iq-nqo),d_tr_lessi_impa(:,:,iq-nqo))
     2069!             CALL histwrite_phy(o_dtr_lessi_nucl(iq-nqo),d_tr_lessi_nucl(:,:,iq-nqo))
     2070!             CALL histwrite_phy(o_dtr_insc(iq-nqo),d_tr_insc(:,:,iq-nqo))
     2071!             CALL histwrite_phy(o_dtr_bcscav(iq-nqo),d_tr_bcscav(:,:,iq-nqo))
     2072!             CALL histwrite_phy(o_dtr_evapls(iq-nqo),d_tr_evapls(:,:,iq-nqo))
     2073!             CALL histwrite_phy(o_dtr_ls(iq-nqo),d_tr_ls(:,:,iq-nqo))
     2074!             CALL histwrite_phy(o_dtr_trsp(iq-nqo),d_tr_trsp(:,:,iq-nqo))
     2075!             CALL histwrite_phy(o_dtr_sscav(iq-nqo),d_tr_sscav(:,:,iq-nqo))
     2076!             CALL histwrite_phy(o_dtr_sat(iq-nqo),d_tr_sat(:,:,iq-nqo))
     2077!             CALL histwrite_phy(o_dtr_uscav(iq-nqo),d_tr_uscav(:,:,iq-nqo))
    21862078             !--2D fields
    2187              CALL histwrite_phy(o_dtr_dry(iq-nqo), flux_tr_dry(:,iq-nqo))
     2079!             CALL histwrite_phy(o_dtr_dry(iq-nqo), flux_tr_dry(:,iq-nqo))
    21882080             zx_tmp_fi2d=0.
    21892081             IF (vars_defined) THEN
    … …  
    21922084                ENDDO
    21932085             ENDIF
    2194 #ifndef REPROBUS
    2195              CALL histwrite_phy(o_trac_cum(iq-nqo), zx_tmp_fi2d)
    2196 #endif
     2086!             CALL histwrite_phy(o_trac_cum(iq-nqo), zx_tmp_fi2d)
    21972087            ENDIF
    21982088          ENDDO
    21992089       ENDIF
    2200 
    2201        IF (type_trac == 'repr') THEN
    2202 #ifdef REPROBUS
    2203            DO iq=1,nbnas
    2204              CALL histwrite_phy(o_nas(iq), nas(:,:,iq))
    2205            ENDDO
    2206 #endif
    2207        ENDIF
    2208 
    22092090       ENDIF   !(iflag_phytrac==1)
    22102091
Note: See TracChangeset for help on using the changeset viewer.