Index: /LMDZ5/trunk/libf/phylmd/nuage.h =================================================================== --- /LMDZ5/trunk/libf/phylmd/nuage.h (revision 2605) +++ /LMDZ5/trunk/libf/phylmd/nuage.h (revision 2606) @@ -14,5 +14,5 @@ & t_glace_min,exposant_glace,rei_min,rei_max, & & tau_cld_cv,coefw_cld_cv, & - & iflag_t_glace,iflag_cloudth_vert,iflag_cld_cv, & - & tmax_fonte_cv + & tmax_fonte_cv, & + & iflag_t_glace,iflag_cloudth_vert,iflag_cld_cv !$OMP THREADPRIVATE(/nuagecom/) Index: /LMDZ5/trunk/libf/phylmd/physiq_mod.F90 =================================================================== --- /LMDZ5/trunk/libf/phylmd/physiq_mod.F90 (revision 2605) +++ /LMDZ5/trunk/libf/phylmd/physiq_mod.F90 (revision 2606) @@ -34,5 +34,147 @@ USE change_srf_frac_mod USE surface_data, ONLY : type_ocean, ok_veget, ok_snow - USE phys_local_var_mod ! Variables internes non sauvegardees de la physique + USE phys_local_var_mod, ONLY: phys_local_var_init, phys_local_var_end, & + ! [Variables internes non sauvegardees de la physique] + ! Variables locales pour effectuer les appels en serie + t_seri,q_seri,ql_seri,qs_seri,u_seri,v_seri,tr_seri, & + ! Dynamic tendencies (diagnostics) + d_t_dyn,d_q_dyn,d_ql_dyn,d_qs_dyn,d_u_dyn,d_v_dyn,d_tr_dyn, & + d_q_dyn2d,d_ql_dyn2d,d_qs_dyn2d, & + ! Physic tendencies + d_t_con,d_q_con,d_u_con,d_v_con, & + d_tr, & !! to be removed?? (jyg) + d_t_wake,d_q_wake, & + d_t_lwr,d_t_lw0,d_t_swr,d_t_sw0, & + d_t_ajsb,d_q_ajsb, & + d_t_ajs,d_q_ajs,d_u_ajs,d_v_ajs, & + d_t_ajs_w,d_q_ajs_w, & + d_t_ajs_x,d_q_ajs_x, & + ! + d_t_eva,d_q_eva, & + d_t_lsc,d_q_lsc,d_ql_lsc,d_qi_lsc, & + d_t_lscst,d_q_lscst, & + d_t_lscth,d_q_lscth, & + plul_st,plul_th, & + ! + d_t_vdf,d_q_vdf,d_u_vdf,d_v_vdf,d_t_diss, & + d_t_vdf_w,d_q_vdf_w, & + d_t_vdf_x,d_q_vdf_x, & + d_ts, & + ! + d_t_oli,d_u_oli,d_v_oli, & + d_t_oro,d_u_oro,d_v_oro, & + d_t_lif,d_u_lif,d_v_lif, & + d_t_ec, & + ! + du_gwd_hines,dv_gwd_hines,d_t_hin, & + dv_gwd_rando,dv_gwd_front, & + east_gwstress,west_gwstress, & + d_q_ch4, & + ! Special RRTM + ZLWFT0_i,ZSWFT0_i,ZFLDN0, & + ZFLUP0,ZFSDN0,ZFSUP0, & + ! + topswad_aero,solswad_aero, & + topswai_aero,solswai_aero, & + topswad0_aero,solswad0_aero, & + !LW additional + toplwad_aero,sollwad_aero, & + toplwai_aero,sollwai_aero, & + toplwad0_aero,sollwad0_aero, & + ! + topsw_aero,solsw_aero, & + topsw0_aero,solsw0_aero, & + topswcf_aero,solswcf_aero, & + tausum_aero,tau3d_aero, & + ! + !variables CFMIP2/CMIP5 + topswad_aerop, solswad_aerop, & + topswai_aerop, solswai_aerop, & + topswad0_aerop, solswad0_aerop, & + topsw_aerop, topsw0_aerop, & + solsw_aerop, solsw0_aerop, & + topswcf_aerop, solswcf_aerop, & + !LW diagnostics + toplwad_aerop, sollwad_aerop, & + toplwai_aerop, sollwai_aerop, & + toplwad0_aerop, sollwad0_aerop, & + ! + ptstar, pt0, slp, & + ! + bils, & + ! + cldh, cldl,cldm, cldq, cldt, & + JrNt, & + dthmin, evap, fder, plcl, plfc, & + prw, prlw, prsw, & + s_lcl, s_pblh, s_pblt, s_therm, & + cdragm, cdragh, & + zustar, zu10m, zv10m, rh2m, qsat2m, & + zq2m, zt2m, weak_inversion, & + zt2m_min_mon, zt2m_max_mon, & ! pour calcul_divers.h + t2m_min_mon, t2m_max_mon, & ! pour calcul_divers.h + ! + s_pblh_x, s_pblh_w, & + s_lcl_x, s_lcl_w, & + ! + slab_wfbils, tpot, tpote, & + ue, uq, ve, vq, zxffonte, & + zxfqcalving, zxfluxlat, & + zxrunofflic, & + zxtsol, snow_lsc, zxfqfonte, zxqsurf, & + rain_lsc, rain_num, & + ! + sens_x, sens_w, & + zxfluxlat_x, zxfluxlat_w, & + ! + dtvdf_x, dtvdf_w, & + dqvdf_x, dqvdf_w, & + undi_tke, wake_tke, & + pbl_tke_input, & + t_therm, q_therm, u_therm, v_therm, & + cdragh_x, cdragh_w, & + cdragm_x, cdragm_w, & + kh, kh_x, kh_w, & + ! + ale_wake, alp_wake, & + wake_h, wbeff, zmax_th, & + sens, flwp, fiwp, & + ale_bl_stat,alp_bl_conv,alp_bl_det, & + alp_bl_fluct_m,alp_bl_fluct_tke, & + alp_bl_stat, n2, s2, & + proba_notrig, random_notrig, & + ! + dnwd, dnwd0, & + upwd, omega, & + epmax_diag, & + ep, & + cldemi, & + cldfra, cldtau, fiwc, & + fl, re, flwc, & + ref_liq, ref_ice, theta, & + ref_liq_pi, ref_ice_pi, & + zphi, wake_omg, zx_rh, & + pmfd, pmfu, & + ! + t2m, fluxlat, & + fsollw, evap_pot, & + fsolsw, wfbils, wfbilo, & + + pmflxr, pmflxs, prfl, & + psfl, fraca, Vprecip, & + zw2, & + + fluxu, fluxv, & + fluxt, & + + uwriteSTD, vwriteSTD, & !pour calcul_STDlev.h + wwriteSTD, phiwriteSTD, & !pour calcul_STDlev.h + qwriteSTD, twriteSTD, rhwriteSTD, & !pour calcul_STDlev.h + + wdtrainA, wdtrainM, & + beta_prec, & + rneb, & + zxsnow,snowhgt,qsnow,to_ice,sissnow,runoff,albsol3_lic + ! USE phys_state_var_mod ! Variables sauvegardees de la physique USE phys_output_var_mod ! Variables pour les ecritures des sorties @@ -2708,4 +2850,6 @@ t_therm(i,k) = t_seri(i,k) - wake_s(i)*wake_deltat(i,k) q_therm(i,k) = q_seri(i,k) - wake_s(i)*wake_deltaq(i,k) + u_therm(i,k) = u_seri(i,k) + v_therm(i,k) = v_seri(i,k) ENDDO ENDDO @@ -2716,4 +2860,6 @@ t_therm(i,k) = t_seri(i,k) q_therm(i,k) = q_seri(i,k) + u_therm(i,k) = u_seri(i,k) + v_therm(i,k) = v_seri(i,k) ENDDO ENDDO @@ -2722,7 +2868,6 @@ call calltherm(pdtphys & ,pplay,paprs,pphi,weak_inversion & - ! ,u_seri,v_seri,t_seri,q_seri,zqsat,debut & - !jyg - ,u_seri,v_seri,t_therm,q_therm,zqsat,debut & !jyg + ! ,u_seri,v_seri,t_seri,q_seri,zqsat,debut & !jyg + ,u_therm,v_therm,t_therm,q_therm,zqsat,debut & !jyg ,d_u_ajs,d_v_ajs,d_t_ajs,d_q_ajs & ,fm_therm,entr_therm,detr_therm & @@ -2753,6 +2898,7 @@ wake_deltat(i,k) = wake_deltat(i,k) - d_t_ajs(i,k) wake_deltaq(i,k) = wake_deltaq(i,k) - d_q_ajs(i,k) - t_seri(i,k) = t_therm(i,k) + wake_s(i)*wake_deltat(i,k) - q_seri(i,k) = q_therm(i,k) + wake_s(i)*wake_deltaq(i,k) + ! + !!!t_seri(i,k) = t_therm(i,k) + wake_s(i)*wake_deltat(i,k) + !!!q_seri(i,k) = q_therm(i,k) + wake_s(i)*wake_deltaq(i,k) ! d_u_ajs(i,k) = d_u_ajs(i,k)*(1.-wake_s(i)) @@ -2763,12 +2909,16 @@ ENDDO ENDDO - ELSE - DO k=1,klev - DO i=1,klon - t_seri(i,k) = t_therm(i,k) - q_seri(i,k) = q_therm(i,k) - ENDDO - ENDDO +!!! ELSE +!!! DO k=1,klev +!!! DO i=1,klon +!!! t_seri(i,k) = t_therm(i,k) +!!! q_seri(i,k) = q_therm(i,k) +!!! ENDDO +!!! ENDDO ENDIF + ! + CALL add_phys_tend(d_u_ajs,d_v_ajs,d_t_ajs,d_q_ajs, & + dql0,dqi0,paprs,'thermals', abortphy) + ! !>jyg !jyg<