Changeset 4613 for LMDZ6/trunk/libf/phylmdiso
- Timestamp:
- Jul 7, 2023, 4:01:37 AM (19 months ago)
- Location:
- LMDZ6/trunk/libf/phylmdiso
- Files:
-
- 1 added
- 7 edited
- 2 moved
-
concvl.F90 (modified) (6 diffs)
-
cv3_routines.F90 (modified) (12 diffs)
-
cv3a_uncompress.F90 (modified) (11 diffs)
-
cva_driver.F90 (modified) (15 diffs)
-
lmdz_ratqs_ini.F90 (added)
-
lmdz_ratqs_main.F90 (moved) (moved from LMDZ6/trunk/libf/phylmdiso/calcratqs.F90) (1 diff)
-
lmdz_ratqs_multi.F90 (moved) (moved from LMDZ6/trunk/libf/phylmdiso/calcratqs_multi_mod.F90) (1 diff)
-
phyetat0_mod.F90 (modified) (2 diffs)
-
phyredem.F90 (modified) (2 diffs)
-
physiq_mod.F90 (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/trunk/libf/phylmdiso/concvl.F90
r4143 r4613 3 3 t, q, t_wake, q_wake, s_wake, u, v, tra, ntra, & 4 4 Ale, Alp, sig1, w01, & 5 d_t, d_q, d_ u, d_v, d_tra, &5 d_t, d_q, d_qcomp, d_u, d_v, d_tra, & 6 6 rain, snow, kbas, ktop, sigd, & 7 7 cbmf, plcl, plfc, wbeff, convoccur, & … … 16 16 dd_t, dd_q, lalim_conv, wght_th, & ! RomP 17 17 evap, ep, epmlmMm, eplaMm, & ! RomP 18 wdtrainA, wdtrainS, wdtrainM, wght, qtc, sigt, &18 wdtrainA, wdtrainS, wdtrainM, wght, qtc, sigt, detrain, & 19 19 tau_cld_cv, coefw_cld_cv, & ! RomP+RL, AJ 20 20 !RomP <<< … … 138 138 REAL, DIMENSION(klon,klev), INTENT(INOUT) :: sig1, w01 139 139 140 REAL, DIMENSION(klon,klev), INTENT(OUT) :: d_t, d_q, d_ u, d_v140 REAL, DIMENSION(klon,klev), INTENT(OUT) :: d_t, d_q, d_qcomp, d_u, d_v 141 141 REAL, DIMENSION(klon,klev, nbtr),INTENT(OUT) :: d_tra 142 142 REAL, DIMENSION(klon), INTENT(OUT) :: rain, snow … … 186 186 REAL, DIMENSION(klon,klev), INTENT(OUT) :: wght !RL 187 187 REAL, DIMENSION(klon,klev), INTENT(OUT) :: qtc 188 REAL, DIMENSION(klon,klev), INTENT(OUT) :: sigt 188 REAL, DIMENSION(klon,klev), INTENT(OUT) :: sigt, detrain 189 189 REAL, INTENT(OUT) :: tau_cld_cv, coefw_cld_cv 190 190 REAL, DIMENSION(klon), INTENT(OUT) :: epmax_diag ! epmax_cape … … 588 588 Ale, Alp, omega, & 589 589 em_sig1feed, em_sig2feed, em_wght, & 590 iflag, d_t, d_q, d_ u, d_v, d_tra, rain, kbas, ktop, &590 iflag, d_t, d_q, d_qcomp, d_u, d_v, d_tra, rain, kbas, ktop, & 591 591 cbmf, plcl, plfc, wbeff, sig1, w01, ptop2, sigd, & 592 592 Ma, mip, Vprecip, Vprecipi, upwd, dnwd, dnwdbis, qcondc, wd, & … … 599 599 da, phi, mp, phii, d1a, dam, sij, wght, & ! RomP+RL 600 600 qta, clw, elij, evap, ep, epmlmMm, eplaMm, & ! RomP+RL 601 wdtrainA, wdtrainS, wdtrainM, qtc, sigt, &601 wdtrainA, wdtrainS, wdtrainM, qtc, sigt, detrain, & 602 602 tau_cld_cv, coefw_cld_cv, & ! RomP,AJ 603 603 !AC!+!RomP+jyg -
LMDZ6/trunk/libf/phylmdiso/cv3_routines.F90
r4143 r4613 4720 4720 tv, tvp, wghti, & 4721 4721 iflag, precip, Vprecip, Vprecipi, & ! jyg: Vprecipi 4722 ft, fr, f u, fv, ftra, & ! jyg4722 ft, fr, fr_comp, fu, fv, ftra, & ! jyg 4723 4723 cbmf, upwd, dnwd, dnwd0, ma, mip, & 4724 4724 !! tls, tps, ! useless . jyg 4725 4725 qcondc, wd, & 4726 ftd, fqd, qta, qtc, sigt, tau_cld_cv, coefw_cld_cv &4726 ftd, fqd, qta, qtc, sigt, detrain, tau_cld_cv, coefw_cld_cv & 4727 4727 #ifdef ISO 4728 4728 & ,xt,xt_wake,xtclw,xtp,xtwater,xtice,xtevap & … … 4816 4816 !outputs: 4817 4817 REAL, DIMENSION (nloc), INTENT (OUT) :: precip 4818 REAL, DIMENSION (nloc, nd), INTENT (OUT) :: ft, fr, fu, fv 4818 REAL, DIMENSION (nloc, nd), INTENT (OUT) :: ft, fr, fu, fv , fr_comp 4819 4819 REAL, DIMENSION (nloc, nd), INTENT (OUT) :: ftd, fqd 4820 4820 REAL, DIMENSION (nloc, nd, ntra), INTENT (OUT) :: ftra … … 4826 4826 REAL, DIMENSION (nloc, nd), INTENT (OUT) :: qcondc ! cld 4827 4827 REAL, DIMENSION (nloc, nd), INTENT (OUT) :: qtc, sigt ! cld 4828 REAL, DIMENSION (nloc, nd), INTENT (OUT) :: detrain ! Louis : pour le calcul de Klein du terme de variance qui détraine dans lenvironnement 4828 4829 REAL, DIMENSION (nloc), INTENT (OUT) :: wd ! gust 4829 4830 REAL, DIMENSION (nloc), INTENT (OUT) :: cbmf … … 4852 4853 REAL, DIMENSION (nloc) :: esum, fsum, gsum, hsum 4853 4854 REAL, DIMENSION (nloc, nd) :: th_wake 4855 REAL, DIMENSION (nloc, nd, nd) :: qdet 4854 4856 REAL, DIMENSION (nloc) :: alpha_qpos, alpha_qpos1 4855 4857 REAL, DIMENSION (nloc, nd) :: qcond, nqcond, wa ! cld … … 4940 4942 ft(il, i) = 0.0 4941 4943 fr(il, i) = 0.0 4944 fr_comp(il,i) = 0.0 4942 4945 fu(il, i) = 0.0 4943 4946 fv(il, i) = 0.0 … … 4950 4953 sigment(il, i) = 0.0 ! cld 4951 4954 sigt(il, i) = 0.0 ! cld 4955 qdet(il,i,:) = 0.0 ! cld 4956 detrain(il, i) = 0.0 ! cld 4952 4957 nqcond(il, i) = 0.0 ! cld 4953 4958 #ifdef ISO … … 5358 5363 IF (j<=inb(il) .AND. iflag(il)<=1) THEN 5359 5364 fr(il, 1) = fr(il, 1) + 0.01*grav*work(il)*ment(il, j, 1)*(qent(il,j,1)-rr(il,1)) 5365 fr_comp(il,1) = fr_comp(il,1) + 0.01*grav*work(il)*ment(il, j, 1)*(qent(il,j,1)-rr(il,1)) 5360 5366 5361 5367 #ifdef ISO … … 5627 5633 IF (i<=inb(il) .AND. iflag(il)<=1) num1 = num1 + 1 5628 5634 END DO 5635 qdet(il,i,i) = qent(il,i,i) ! cld Louis : specific humidity in detraining water 5629 5636 IF (num1<=0) GO TO 500 5630 5637 … … 6243 6250 fr(il, i) = fr(il, i) + 0.01*grav*dpinv*ment(il, k, i) * & 6244 6251 (qent(il,k,i)-awat(il)-rr(il,i)) 6252 fr_comp(il,i) = fr_comp(il,i) + 0.01*grav*dpinv*ment(il, k, i)*(qent(il,k,i)-awat(il)-rr(il,i)) 6245 6253 6246 6254 #ifdef ISO … … 6313 6321 ! (saturated updrafts resulting from mixing) ! cld 6314 6322 qcond(il, i) = qcond(il, i) + (elij(il,k,i)-awat(il)) ! cld 6323 qdet(il,k,i) = (qent(il,k,i)-awat(il)) ! cld Louis : specific humidity in detraining water 6315 6324 qtment(il, i) = qtment(il, i) + qent(il,k,i) ! cld 6316 6325 nqcond(il, i) = nqcond(il, i) + 1. ! cld … … 6460 6469 ! (saturated downdrafts resulting from mixing) ! cld 6461 6470 qcond(il, i) = qcond(il, i) + elij(il, k, i) ! cld 6471 qdet(il,k,i) = qent(il,k,i) ! cld Louis : specific humidity in detraining water 6462 6472 qtment(il, i) = qent(il,k,i) + qtment(il,i) ! cld 6463 6473 nqcond(il, i) = nqcond(il, i) + 1. ! cld … … 7255 7265 IF (k<=inb(il) .AND. i<=inb(il) .AND. iflag(il)<=1) THEN ! cld 7256 7266 sument(il) =sument(il) + abs(ment(il,k,i)) 7267 detrain(il,i) = detrain(il,i) + abs(ment(il,k,i))*(qdet(il,k,i) - rr(il,i))*(qdet(il,k,i) - rr(il,i)) ! Louis terme de détrainement dans le bilan de variance 7257 7268 ENDIF 7258 7269 ENDDO ! il -
LMDZ6/trunk/libf/phylmdiso/cv3a_uncompress.F90
r4143 r4613 2 2 iflag, kbas, ktop, & 3 3 precip, cbmf, plcl, plfc, wbeff, sig, w0, ptop2, & 4 ft, fq, f u, fv, ftra, &4 ft, fq, fqcomp, fu, fv, ftra, & 5 5 sigd, ma, mip, vprecip, vprecipi, upwd, dnwd, dnwd0, & 6 6 qcondc, wd, cape, cin, & … … 12 12 qta, clw, elij, evap, ep, epmlmMm, eplaMm, & ! RomP+jyg 13 13 wdtrainA, wdtrainS, wdtrainM, & ! RomP 14 qtc, sigt, &14 qtc, sigt, detrain, & 15 15 epmax_diag, & ! epmax_cape 16 16 iflag1, kbas1, ktop1, & 17 17 precip1, cbmf1, plcl1, plfc1, wbeff1, sig1, w01, ptop21, & 18 ft1, fq1, f u1, fv1, ftra1, &18 ft1, fq1, fqcomp1, fu1, fv1, ftra1, & 19 19 sigd1, ma1, mip1, vprecip1, vprecipi1, upwd1, dnwd1, dnwd01, & 20 20 qcondc1, wd1, cape1, cin1, & … … 26 26 qta1, clw1, elij1, evap1, ep1, epmlmMm1, eplaMm1, & ! RomP+jyg 27 27 wdtrainA1, wdtrainS1, wdtrainM1, & ! RomP 28 qtc1, sigt1, &28 qtc1, sigt1, detrain1, & 29 29 epmax_diag1 & ! epmax_cape 30 30 #ifdef ISO … … 72 72 REAL, DIMENSION (nloc), INTENT (IN) :: ptop2 73 73 REAL, DIMENSION (nloc), INTENT (IN) :: epmax_diag 74 REAL, DIMENSION (nloc, nd), INTENT (IN) :: ft, fq, f u, fv74 REAL, DIMENSION (nloc, nd), INTENT (IN) :: ft, fq, fqcomp, fu, fv 75 75 REAL, DIMENSION (nloc, nd, ntra), INTENT (IN) :: ftra 76 76 REAL, DIMENSION (nloc), INTENT (IN) :: sigd … … 99 99 REAL, DIMENSION (nloc, nd, nd), INTENT (IN) :: epmlmMm !RomP+jyg 100 100 REAL, DIMENSION (nloc, nd), INTENT (IN) :: eplamM !RomP+jyg 101 REAL, DIMENSION (nloc, nd), INTENT (IN) :: qtc, sigt !RomP101 REAL, DIMENSION (nloc, nd), INTENT (IN) :: qtc, sigt, detrain !RomP 102 102 REAL, DIMENSION (nloc, nd), INTENT (IN) :: wdtrainA, wdtrainS, wdtrainM !RomP 103 103 … … 120 120 REAL, DIMENSION (len), INTENT (OUT) :: epmax_diag1 ! epmax_cape 121 121 REAL, DIMENSION (len), INTENT (OUT) :: ptop21 122 REAL, DIMENSION (len, nd), INTENT (OUT) :: ft1, fq1, f u1, fv1122 REAL, DIMENSION (len, nd), INTENT (OUT) :: ft1, fq1, fqcomp1, fu1, fv1 123 123 REAL, DIMENSION (len, nd, ntra), INTENT (OUT) :: ftra1 124 124 REAL, DIMENSION (len), INTENT (OUT) :: sigd1 … … 147 147 REAL, DIMENSION (len, nd, nd), INTENT (OUT) :: epmlmMm1 !RomP+jyg 148 148 REAL, DIMENSION (len, nd), INTENT (OUT) :: eplamM1 !RomP+jyg 149 REAL, DIMENSION (len, nd), INTENT (OUT) :: qtc1, sigt1 !RomP149 REAL, DIMENSION (len, nd), INTENT (OUT) :: qtc1, sigt1, detrain1 !RomP 150 150 REAL, DIMENSION (len, nd), INTENT (OUT) :: wdtrainA1, wdtrainS1, wdtrainM1 !RomP 151 151 … … 244 244 ft1(idcum(i), k) = ft(i, k) 245 245 fq1(idcum(i), k) = fq(i, k) 246 fqcomp1(idcum(i), k) = fqcomp(i, k) 246 247 fu1(idcum(i), k) = fu(i, k) 247 248 fv1(idcum(i), k) = fv(i, k) … … 273 274 qtc1(idcum(i), k) = qtc(i, k) 274 275 sigt1(idcum(i), k) = sigt(i, k) 276 detrain1(idcum(i), k) = detrain(i, k) 275 277 276 278 #ifdef ISO … … 418 420 ft1(:, 1:nl) = ft(:, 1:nl) 419 421 fq1(:, 1:nl) = fq(:, 1:nl) 422 fqcomp1(:, 1:nl) = fqcomp(:, 1:nl) 420 423 fu1(:, 1:nl) = fu(:, 1:nl) 421 424 fv1(:, 1:nl) = fv(:, 1:nl) … … 447 450 qtc1(:, 1:nl) = qtc(:, 1:nl) 448 451 sigt1(:, 1:nl) = sigt(:, 1:nl) 452 detrain1(:, 1:nl) = detrain(:, 1:nl) 449 453 ! 450 454 ma1(:, nlp) = 0. -
LMDZ6/trunk/libf/phylmdiso/cva_driver.F90
r4143 r4613 11 11 Ale1, Alp1, omega1, & 12 12 sig1feed1, sig2feed1, wght1, & 13 iflag1, ft1, fq1, f u1, fv1, ftra1, &13 iflag1, ft1, fq1, fqcomp1, fu1, fv1, ftra1, & 14 14 precip1, kbas1, ktop1, & 15 15 cbmf1, plcl1, plfc1, wbeff1, & … … 26 26 da1, phi1, mp1, phi21, d1a1, dam1, sigij1, wghti1, & ! RomP, RL 27 27 qta1, clw1, elij1, evap1, ep1, epmlmMm1, eplaMm1, & ! RomP, RL 28 wdtrainA1, wdtrainS1, wdtrainM1, qtc1, sigt1, tau_cld_cv, & !!jygprl28 wdtrainA1, wdtrainS1, wdtrainM1, qtc1, sigt1, detrain1, tau_cld_cv, & !!jygprl 29 29 coefw_cld_cv, & ! RomP, AJ 30 30 epmax_diag1 & ! epmax_cape … … 88 88 ! ntra Integer Input number of tracors 89 89 ! nloc Integer Input dimension of arrays for compressed fields 90 ! fqcomp1 Real Output spec hum tend (only mixed draughts) 90 91 ! k_upper Integer Input upmost level for vertical loops 91 92 ! iflag_con Integer Input version of convect (3/4) … … 135 136 ! upwd1 Real Output total upward mass flux (adiab+mixed) 136 137 ! dnwd1 Real Output saturated downward mass flux (mixed) 138 ! detrain1 Real Output detrainment terme klein 137 139 ! dnwd01 Real Output unsaturated downward mass flux 138 140 ! qcondc1 Real Output in-cld mixing ratio of condensed water … … 209 211 LOGICAL, INTENT (IN) :: ok_conserv_q 210 212 REAL, INTENT (IN) :: tau_cld_cv 213 REAL, DIMENSION (len, nd), INTENT (OUT) :: fqcomp1 211 214 REAL, INTENT (IN) :: coefw_cld_cv 212 215 REAL, INTENT (IN) :: delt … … 248 251 REAL, DIMENSION (len), INTENT (OUT) :: cbmf1 249 252 REAL, DIMENSION (len), INTENT (OUT) :: plcl1 253 REAL, DIMENSION (len, nd), INTENT (OUT) :: detrain1 ! detrainement term of mixed draughts in environment 250 254 REAL, DIMENSION (len), INTENT (OUT) :: plfc1 251 255 REAL, DIMENSION (len), INTENT (OUT) :: wbeff1 … … 572 576 REAL, DIMENSION(len,nd) :: ice, fondue, b 573 577 REAL, DIMENSION(len,nd) :: frac_a, frac_s, faci !!jygprl 574 REAL ft(nloc, nd), fq(nloc, nd) 578 REAL ft(nloc, nd), fq(nloc, nd), fqcomp(nloc, nd) 575 579 REAL ftd(nloc, nd), fqd(nloc, nd) 576 580 REAL fu(nloc, nd), fv(nloc, nd) … … 598 602 REAL qtc(nloc, nd) ! cld 599 603 REAL sigt(nloc, nd) ! cld 604 REAL detrain(nloc, nd) ! cld 600 605 601 606 ! RomP >>> … … 706 711 ft1(:, :) = 0.0 707 712 fq1(:, :) = 0.0 713 fqcomp1(:, :) = 0.0 708 714 fu1(:, :) = 0.0 709 715 fv1(:, :) = 0.0 … … 766 772 ! RomP >>> 767 773 sigt1(:, :) = 0. 774 detrain1(:, :) = 0. 768 775 qtc1(:, :) = 0. 769 776 wdtrainA1(:, :) = 0. … … 1561 1568 if (prt_level >= 9) & 1562 1569 PRINT *, 'cva_driver -> cv3_yield' 1570 1563 1571 CALL cv3_yield(nloc, ncum, nd, nd, ntra, ok_conserv_q, & ! na->nd 1564 1572 icb, inb, delt, & … … 1570 1578 nent, elij, traent, sig, & 1571 1579 tv, tvp, wghti, & 1572 iflag, precip, Vprecip, Vprecipi, ft, fq, f u, fv, ftra, & ! jyg1580 iflag, precip, Vprecip, Vprecipi, ft, fq, fqcomp, fu, fv, ftra, & ! jyg 1573 1581 cbmf, upwd, dnwd, dnwd0, ma, mip, & 1574 1582 !! tls, tps, & ! useless . jyg 1575 1583 qcondc, wd, & 1576 1584 !! ftd, fqd, qnk, qtc, sigt, tau_cld_cv, coefw_cld_cv) 1577 ftd, fqd, qta, qtc, sigt, 1585 ftd, fqd, qta, qtc, sigt,detrain,tau_cld_cv, coefw_cld_cv & !!jygprl 1578 1586 #ifdef ISO 1579 1587 & ,xt,xt_wake,xtclw,xtp,xtwater,xtice,xtevap & … … 1673 1681 iflag, icb, inb, & 1674 1682 precip, cbmf, plcl, plfc, wbeff, sig, w0, ptop2, & 1675 ft, fq, f u, fv, ftra, &1683 ft, fq, fqcomp, fu, fv, ftra, & 1676 1684 sigd, ma, mip, vprecip, vprecipi, upwd, dnwd, dnwd0, & 1677 1685 qcondc, wd, cape, cin, & … … 1683 1691 qta, clw, elij, evap, ep, epmlmMm, eplaMm, & ! RomP 1684 1692 wdtrainA, wdtrainS, wdtrainM, & ! RomP 1685 qtc, sigt, epmax_diag, & ! epmax_cape1693 qtc, sigt, detrain, epmax_diag, & ! epmax_cape 1686 1694 iflag1, kbas1, ktop1, & 1687 1695 precip1, cbmf1, plcl1, plfc1, wbeff1, sig1, w01, ptop21, & 1688 ft1, fq1, f u1, fv1, ftra1, &1696 ft1, fq1, fqcomp1, fu1, fv1, ftra1, & 1689 1697 sigd1, ma1, mip1, vprecip1, vprecipi1, upwd1, dnwd1, dnwd01, & 1690 1698 qcondc1, wd1, cape1, cin1, & … … 1696 1704 qta1, clw1, elij1, evap1, ep1, epmlmMm1, eplaMm1, & ! RomP 1697 1705 wdtrainA1, wdtrainS1, wdtrainM1, & ! RomP 1698 qtc1, sigt1, 1706 qtc1, sigt1,detrain1,epmax_diag1 & ! epmax_cape 1699 1707 #ifdef ISO 1700 1708 & ,xtprecip,fxt,fxtd, xtVprecip,xtVprecipi, xtclw,xtevap,xtwdtraina & -
LMDZ6/trunk/libf/phylmdiso/lmdz_ratqs_main.F90
r4612 r4613 1 link ../phylmd/ calcratqs.F901 link ../phylmd/lmdz_ratqs_main.F90 -
LMDZ6/trunk/libf/phylmdiso/lmdz_ratqs_multi.F90
r4612 r4613 1 link ../phylmd/ calcratqs_multi_mod.F901 link ../phylmd/lmdz_ratqs_multi.F90 -
LMDZ6/trunk/libf/phylmdiso/phyetat0_mod.F90
r4581 r4613 36 36 zstd, zthe, zval, ale_bl, ale_bl_trig, alp_bl, u10m, v10m, treedrg, & 37 37 ale_wake, ale_bl_stat, ds_ns, dt_ns, delta_sst, delta_sal, dter, dser, & 38 dt_ds, ratqs_inter 38 dt_ds, ratqs_inter_ 39 39 !FC 40 40 USE geometry_mod, ONLY: longitude_deg, latitude_deg … … 510 510 511 511 ! fisrtilp/Clouds 0.002 could be ratqsbas. But can stay like this as well 512 found=phyetat0_get(ratqs_inter ,"RATQS_INTER","Relative width of the lsc sugrid scale water",0.002)512 found=phyetat0_get(ratqs_inter_,"RATQS_INTER","Relative width of the lsc sugrid scale water",0.002) 513 513 514 514 !=========================================== -
LMDZ6/trunk/libf/phylmdiso/phyredem.F90
r4523 r4613 30 30 du_gwd_rando, du_gwd_front, u10m, v10m, & 31 31 treedrg, solswfdiff, delta_sal, ds_ns, dt_ns, & 32 delta_sst, ratqs_inter , dter, dser, dt_ds32 delta_sst, ratqs_inter_, dter, dser, dt_ds 33 33 #ifdef ISO 34 34 USE phys_state_var_mod, ONLY: xtsol, fxtevap,xtrain_fall, xtsnow_fall, & … … 347 347 348 348 ! fisrtilp/clouds 349 CALL put_field(pass,"RATQS_INTER","Relative width of the lsc sugrid scale water",ratqs_inter )349 CALL put_field(pass,"RATQS_INTER","Relative width of the lsc sugrid scale water",ratqs_inter_) 350 350 351 351 -
LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90
r4612 r4613 87 87 USE blowing_snow_ini_mod, ONLY : blowing_snow_ini , qbst_bs 88 88 USE lscp_ini_mod, ONLY : lscp_ini 89 USE lmdz_ratqs_main, ONLY : ratqs_main 90 USE lmdz_ratqs_ini, ONLY : ratqs_ini 89 91 90 92 !USE cmp_seri_mod … … 519 521 SAVE seuil_inversion 520 522 !$OMP THREADPRIVATE(seuil_inversion) 521 INTEGER iflag_ratqs522 SAVE iflag_ratqs523 !$OMP THREADPRIVATE(iflag_ratqs)523 524 525 524 526 real facteur 525 527 … … 1401 1403 solarlong0,seuil_inversion, & 1402 1404 fact_cldcon, facttemps,ok_newmicro,iflag_radia, & 1403 iflag_cld_th, iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &1405 iflag_cld_th,ratqsbas,ratqshaut,tau_ratqs, & 1404 1406 ok_ade, ok_aie, ok_alw, ok_cdnc, ok_volcan, flag_volc_surfstrat, aerosol_couple, & 1405 1407 chemistry_couple, flag_aerosol, flag_aerosol_strat, flag_aer_feedback, & … … 1917 1919 CALL thermcell_ini(iflag_thermals,prt_level,tau_thermals,lunout, & 1918 1920 & RG,RD,RCPD,RKAPPA,RLVTT,RETV) 1921 CALL ratqs_ini(klon,klev,iflag_thermals,lunout,nbsrf,is_lic,is_ter,RG,RV,RD,RCPD,RLSTT,RLVTT,RTT) 1919 1922 CALL lscp_ini(pdtphys,ok_ice_sursat,RCPD, RLSTT, RLVTT, RLMLT, RVTMP2, RTT,RD,RG) 1920 1923 CALL blowing_snow_ini(prt_level,lunout, & … … 3777 3780 ALE,ALP, & 3778 3781 sig1,w01, & 3779 d_t_con,d_q_con, d_u_con,d_v_con,d_tr, &3782 d_t_con,d_q_con,fqcomp,d_u_con,d_v_con,d_tr, & 3780 3783 rain_con, snow_con, ibas_con, itop_con, sigd, & 3781 3784 ema_cbmf,plcl,plfc,wbeff,convoccur,upwd,dnwd,dnwd0, & … … 3788 3791 ftd,fqd,lalim_conv,wght_th, & 3789 3792 ev, ep,epmlmMm,eplaMm, & 3790 wdtrainA, wdtrainS, wdtrainM,wght_cvfd,qtc_cv,sigt_cv, &3793 wdtrainA, wdtrainS, wdtrainM,wght_cvfd,qtc_cv,sigt_cv,detrain_cv, & 3791 3794 tau_cld_cv,coefw_cld_cv,epmax_diag & 3792 3795 #ifdef ISO … … 3840 3843 clwcon0=qcondc 3841 3844 pmfu(:,:)=upwd(:,:)+dnwd(:,:) 3845 fm_cv(:,:)=upwd(:,:)+dnwd(:,:)+dnwd0(:,:) 3842 3846 ! 3843 3847 !jyg< … … 4688 4692 ENDDO 4689 4693 4690 CALL calcratqs(klon,klev,prt_level,lunout, &4694 CALL ratqs_main(klon,klev,nbsrf,prt_level,lunout, & 4691 4695 iflag_ratqs,iflag_con,iflag_cld_th,pdtphys, & 4692 4696 ratqsbas,ratqshaut,ratqsp0, ratqsdp, & 4697 pctsrf,s_pblh,zstd, & 4693 4698 tau_ratqs,fact_cldcon,wake_s, wake_deltaq, & 4694 4699 ptconv,ptconvth,clwcon0th, rnebcon0th, & 4695 paprs,pplay,t_seri,q_seri, qtc_cv, sigt_cv, zqsat, & 4696 pbl_tke(:,:,is_ave),tke_dissip_ave,l_mix_ave,wprime_ave,t2m,q2m,fm_therm,cell_area, & 4697 ratqs,ratqsc,ratqs_inter) 4700 paprs,pplay,t_seri,q_seri, & 4701 qtc_cv, sigt_cv,detrain_cv,fm_cv,fqd,fqcomp,sigd,zqsat, & 4702 omega,pbl_tke(:,:,is_ave),tke_dissip_ave,l_mix_ave,wprime_ave, & 4703 t2m,q2m,fm_therm,entr_therm,detr_therm,cell_area, & 4704 ratqs,ratqsc,ratqs_inter_) 4698 4705 4699 4706 ! … … 6206 6213 #endif 6207 6214 6215 6208 6216 !=============================================================== 6209 6217 ! Additional tendency of TKE due to orography
Note: See TracChangeset
for help on using the changeset viewer.
