Changeset 2516
- Timestamp:
- May 19, 2016, 8:58:23 PM (9 years ago)
- Location:
- LMDZ5/trunk/libf/phylmd
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/phylmd/phys_local_var_mod.F90
r2499 r2516 281 281 REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: zxfluxlat, zxtsol, snow_lsc, zxfqfonte 282 282 !$OMP THREADPRIVATE(zxfluxlat, zxtsol, snow_lsc, zxfqfonte) 283 REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: zxqsurf, rain_lsc 284 !$OMP THREADPRIVATE(zxqsurf, rain_lsc )283 REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: zxqsurf, rain_lsc, rain_num 284 !$OMP THREADPRIVATE(zxqsurf, rain_lsc, rain_num) 285 285 ! 286 286 !jyg+nrlmd< … … 541 541 ALLOCATE(zxtsol(klon), snow_lsc(klon), zxfqfonte(klon), zxqsurf(klon)) 542 542 ALLOCATE(rain_lsc(klon)) 543 ALLOCATE(rain_num(klon)) 543 544 ! 544 545 ALLOCATE(sens_x(klon), sens_w(klon)) … … 746 747 DEALLOCATE(zxtsol, snow_lsc, zxfqfonte, zxqsurf) 747 748 DEALLOCATE(rain_lsc) 749 DEALLOCATE(rain_num) 748 750 ! 749 751 DEALLOCATE(sens_x, sens_w) -
LMDZ5/trunk/libf/phylmd/phys_output_ctrlout_mod.F90
r2498 r2516 154 154 TYPE(ctrl_out), SAVE :: o_plul = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), & 155 155 'plul', 'Large-scale Precip.', 'kg/(s*m2)', (/ ('', i=1, 9) /)) 156 TYPE(ctrl_out), SAVE :: o_plun = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), & 157 'plun', 'Numerical Precip.', 'kg/(s*m2)', (/ ('', i=1, 9) /)) 156 158 TYPE(ctrl_out), SAVE :: o_pluc = ctrl_out((/ 1, 1, 1, 10, 5, 10, 11, 11, 11 /), & 157 159 'pluc', 'Convective Precip.', 'kg/(s*m2)', (/ ('', i=1, 9) /)) -
LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90
r2499 r2516 36 36 o_wind10m, o_wind10max, o_gusts, o_sicf, & 37 37 o_psol, o_mass, o_qsurf, o_qsol, & 38 o_precip, o_ndayrain, o_plul, o_pluc, &38 o_precip, o_ndayrain, o_plul, o_pluc, o_plun, & 39 39 o_snow, o_msnow, o_fsnow, o_evap, o_ep,o_epmax_diag, & ! epmax_cape 40 40 o_tops, o_tops0, o_topl, o_topl0, & … … 195 195 t2m_min_mon, t2m_max_mon, evap, & 196 196 zu10m, zv10m, zq2m, zustar, zxqsurf, & 197 rain_lsc, snow_lsc, bils, sens, fder, &197 rain_lsc, rain_num, snow_lsc, bils, sens, fder, & 198 198 zxffonte, zxfqcalving, zxfqfonte, fluxu, & 199 199 fluxv, zxsnow, qsnow, snowhgt, to_ice, & … … 441 441 ENDIF 442 442 CALL histwrite_phy(o_plul, zx_tmp_fi2d) 443 CALL histwrite_phy(o_plun, rain_num) 443 444 444 445 IF (vars_defined) THEN -
LMDZ5/trunk/libf/phylmd/physiq_mod.F90
r2513 r2516 432 432 REAL d_t_adjwk(klon,klev) !jyg 433 433 REAL d_q_adjwk(klon,klev) !jyg 434 435 REAL,SAVE :: oliqmax=999. ! Seuil en kg/kg pour le contenu max 436 !$OMP THREADPRIVATE(oliqmax) ! en eau liquide dans l'atmosphère. 437 434 438 LOGICAL,SAVE :: ok_adjwk=.FALSE. 435 439 !$OMP THREADPRIVATE(ok_adjwk) … … 1050 1054 CALL getin_p('random_notrig_max',random_notrig_max) 1051 1055 CALL getin_p('ok_adjwk',ok_adjwk) 1056 CALL getin_p('oliqmax',oliqmax) 1052 1057 ENDIF 1053 1058 … … 2879 2884 CALL add_phys_tend(du0,dv0,d_t_lsc,d_q_lsc,d_ql_lsc,d_qi_lsc,paprs, & 2880 2885 'lsc',abortphy) 2881 !--------------------------------------------------------------------------- 2886 2887 !--------------------------------------------------------------------------- 2888 ! Elimination d'eau liquide > oliqmax 2889 !--------------------------------------------------------------------------- 2890 rain_num(:)=0. 2891 DO k = 1, klev 2892 DO i = 1, klon 2893 IF (ql_seri(i,k)>oliqmax) THEN 2894 rain_num(i)=rain_num(i)+(ql_seri(i,k)-oliqmax)*zmasse(i,k)/pdtphys 2895 ql_seri(i,k)=oliqmax 2896 ENDIF 2897 ENDDO 2898 ENDDO 2899 rain_lsc(:)=rain_lsc(:)+rain_num(:) 2900 2882 2901 DO k = 1, klev 2883 2902 DO i = 1, klon
Note: See TracChangeset
for help on using the changeset viewer.