Changeset 2205 for LMDZ5/trunk/libf/phylmd/physiq.F90
- Timestamp:
- Feb 13, 2015, 8:22:32 AM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/phylmd/physiq.F90
r2200 r2205 636 636 !$OMP THREADPRIVATE(fact_cldcon,facttemps) 637 637 638 integer iflag_cld con639 save iflag_cld con640 !$OMP THREADPRIVATE(iflag_cld con)638 integer iflag_cldth 639 save iflag_cldth 640 !$OMP THREADPRIVATE(iflag_cldth) 641 641 logical ptconv(klon,klev) 642 642 !IM cf. AM 081204 BEG … … 913 913 solarlong0,seuil_inversion, & 914 914 fact_cldcon, facttemps,ok_newmicro,iflag_radia, & 915 iflag_cld con,iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &915 iflag_cldth,iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, & 916 916 ok_ade, ok_aie, ok_cdnc, aerosol_couple, & 917 917 flag_aerosol, flag_aerosol_strat, new_aod, & … … 1014 1014 print*,'CYCLE_DIURNE', cycle_diurne 1015 1015 ! 1016 IF (iflag_con.EQ.2.AND.iflag_cld con.GT.-1) THEN1017 abort_message = 'Tiedtke needs iflag_cld con=-2 or -1'1016 IF (iflag_con.EQ.2.AND.iflag_cldth.GT.-1) THEN 1017 abort_message = 'Tiedtke needs iflag_cldth=-2 or -1' 1018 1018 CALL abort_gcm (modname,abort_message,1) 1019 1019 ENDIF … … 1130 1130 ,alp_bl_prescr, ale_bl_prescr) 1131 1131 ! 11/09/06 rajout initialisation ALE et ALP du wake et PBL(YU) 1132 ! print*,'apres ini_wake iflag_cld con=', iflag_cldcon1132 ! print*,'apres ini_wake iflag_cldth=', iflag_cldth 1133 1133 endif 1134 1134 … … 2170 2170 ftd,fqd,lalim_conv,wght_th, & 2171 2171 ev, ep,epmlmMm,eplaMm, & 2172 wdtrainA,wdtrainM,wght_cvfd) 2172 wdtrainA,wdtrainM,wght_cvfd,qtc_cv,sigt_cv, & 2173 tau_cld_cv,coefw_cld_cv) 2173 2174 ! RomP <<< 2174 2175 … … 2220 2221 ! calcul des proprietes des nuages convectifs 2221 2222 clwcon0(:,:)=fact_cldcon*clwcon0(:,:) 2223 IF (iflag_cld_cv <= 1) THEN 2222 2224 call clouds_gno & 2223 2225 (klon,klev,q_seri,zqsat,clwcon0,ptconv,ratqsc,rnebcon0) 2226 ELSE 2227 call clouds_bigauss & 2228 (klon,klev,q_seri,zqsat,qtc_cv,sigt_cv,ptconv,ratqsc,rnebcon0) 2229 ENDIF 2230 2224 2231 2225 2232 ! =================================================================== c … … 2454 2461 END IF 2455 2462 2456 ! print*,'apres callwake iflag_cld con=', iflag_cldcon2463 ! print*,'apres callwake iflag_cldth=', iflag_cldth 2457 2464 ! 2458 2465 !=================================================================== … … 2775 2782 ! water distribution 2776 2783 CALL calcratqs(klon,klev,prt_level,lunout, & 2777 iflag_ratqs,iflag_con,iflag_cld con,pdtphys, &2784 iflag_ratqs,iflag_con,iflag_cldth,pdtphys, & 2778 2785 ratqsbas,ratqshaut,tau_ratqs,fact_cldcon, & 2779 2786 ptconv,ptconvth,clwcon0th, rnebcon0th, & … … 2797 2804 frac_impa, frac_nucl, beta_prec_fisrt, & 2798 2805 prfl, psfl, rhcl, & 2799 zqasc, fraca,ztv,zpspsk,ztla,zthl,iflag_cld con, &2806 zqasc, fraca,ztv,zpspsk,ztla,zthl,iflag_cldth, & 2800 2807 iflag_ice_thermo) 2801 2808 ! … … 2853 2860 ! 2854 2861 !IM cf FH 2855 ! IF (iflag_cld con.eq.-1) THEN ! seulement pour Tiedtke2856 IF (iflag_cld con.le.-1) THEN ! seulement pour Tiedtke2862 ! IF (iflag_cldth.eq.-1) THEN ! seulement pour Tiedtke 2863 IF (iflag_cldth.le.-1) THEN ! seulement pour Tiedtke 2857 2864 snow_tiedtke=0. 2858 2865 ! print*,'avant calcul de la pseudo precip ' 2859 ! print*,'iflag_cld con',iflag_cldcon2860 if (iflag_cld con.eq.-1) then2866 ! print*,'iflag_cldth',iflag_cldth 2867 if (iflag_cldth.eq.-1) then 2861 2868 rain_tiedtke=rain_con 2862 2869 else … … 2891 2898 ENDDO 2892 2899 2893 ELSE IF (iflag_cld con.ge.3) THEN2900 ELSE IF (iflag_cldth.ge.3) THEN 2894 2901 ! On prend pour les nuages convectifs le max du calcul de la 2895 2902 ! convection et du calcul du pas de temps precedent diminue d'un facteur … … 2978 2985 ! On prend la somme des fractions nuageuses et des contenus en eau 2979 2986 2980 if (iflag_cld con>=5) then2987 if (iflag_cldth>=5) then 2981 2988 2982 2989 do k=1,klev
Note: See TracChangeset
for help on using the changeset viewer.