Changeset 2113 for trunk/LMDZ.GENERIC/libf
- Timestamp:
- Mar 6, 2019, 7:10:00 PM (6 years ago)
- Location:
- trunk/LMDZ.GENERIC/libf/phystd
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90
r2107 r2113 1193 1193 CALL evap(ngrid,nlayer,nq,ptimestep,pt,pq,pdq,pdt,dqevap,dtevap,zqtherm,zttherm) 1194 1194 ELSE 1195 zttherm(:,:) = pt(:,:)1196 zqtherm(:,:,:) = pq(:,:,:) 1195 zttherm(:,:) = pt(:,:) + pdt(:,:) 1196 zqtherm(:,:,:) = pq(:,:,:) + pdq(:,:,:) 1197 1197 ENDIF 1198 1198 -
trunk/LMDZ.GENERIC/libf/phystd/thermcell_plume.F90
r2101 r2113 31 31 !============================================================================== 32 32 33 ! inputs:34 ! 33 ! Inputs: 34 ! ------- 35 35 36 36 INTEGER itap … … 52 52 REAL zpspsk(ngrid,nlay) ! Exner function 53 53 54 ! outputs:55 ! 54 ! Outputs: 55 ! -------- 56 56 57 57 INTEGER lmin(ngrid) ! plume base level (first unstable level) … … 81 81 REAL zqsatth(ngrid,nlay) ! saturation vapor pressure (after mixing) 82 82 83 ! local:84 ! 83 ! Local: 84 ! ------ 85 85 86 86 INTEGER ig, l, k … … 305 305 ! AB : own derivation for w_est (Rio 2010 formula with e=d=0) 306 306 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 307 zw2fact = 2. * fact_epsilon * zdz 308 zdw2 = 2. * afact * zbuoy(ig,l) * zdz 307 ! zw2fact = 2. * fact_epsilon * zdz 308 ! zdw2 = 2. * afact * zbuoy(ig,l) * zdz 309 zw2fact = 2. * fact_epsilon * zdz / (1. + betalpha) 310 zdw2 = 2. * afact * zbuoy(ig,l) * zdz / (1. + betalpha) 309 311 w_est(ig,l+1) = Max(0., exp(-zw2fact) * w_est(ig,l) + zdw2) 310 312 … … 459 461 ! zw2fact = fact_epsilon * 2. * zdz / (1. + betalpha) 460 462 ! zdw2 = afact * zbuoy(ig,l) / fact_epsilon 461 ! zdw2bis = afact * zbuoy(ig,l-1) / fact_epsilon462 463 ! zw2(ig,l+1) = Max(0.0001,exp(-zw2fact)*(zw2(ig,l)-zdw2)+zdw2) 463 464 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 464 465 ! AB : own derivation for zw2 (Rio 2010 formula) 465 466 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 466 zw2fact = 2. * (fact_epsilon * zdz + entr_star(ig,l) / f_star(ig,l)) 467 zdw2 = 2. * afact * zbuoy(ig,l) * zdz 467 ! zw2fact = 2. * (fact_epsilon * zdz + entr_star(ig,l) / f_star(ig,l)) 468 ! zdw2 = 2. * afact * zbuoy(ig,l) * zdz 469 zw2fact = 2. * fact_epsilon * zdz / (1. + betalpha) 470 zdw2 = 2. * afact * zbuoy(ig,l) * zdz / (1. + betalpha) 468 471 zw2(ig,l+1) = Max(0., exp(-zw2fact) * zw2(ig,l) + zdw2) 469 472
Note: See TracChangeset
for help on using the changeset viewer.