Index: /LMDZ5/trunk/libf/phylmd/concvl.F =================================================================== --- /LMDZ5/trunk/libf/phylmd/concvl.F (revision 1773) +++ /LMDZ5/trunk/libf/phylmd/concvl.F (revision 1774) @@ -387,8 +387,9 @@ $ dd_t,dd_q,Plim1,Plim2,asupmax,supmax0, $ asupmaxmin,lalim_conv, -!AC!+!RomP - $ da,phi,mp,phi2,d1a,dam,sij,clw, ! RomP - $ elij,evap,ep,wdtrainA,wdtrainM) ! RomP -!AC!+!RomP +!AC!+!RomP+jyg + $ da,phi,mp,phi2,d1a,dam,sij,clw,elij, ! RomP + $ evap,ep,epmlmMm,eplaMm, ! RomP + $ wdtrainA,wdtrainM) ! RomP +!AC!+!RomP+jyg endif C------------------------------------------------------------------ Index: /LMDZ5/trunk/libf/phylmd/cv3_routines.F =================================================================== --- /LMDZ5/trunk/libf/phylmd/cv3_routines.F (revision 1773) +++ /LMDZ5/trunk/libf/phylmd/cv3_routines.F (revision 1774) @@ -3561,5 +3561,6 @@ SUBROUTINE cv3_tracer(nloc,len,ncum,nd,na, & ment,sigij,da,phi,phi2,d1a,dam, - & ep,Vprecip,elij,clw,icb,inb) + & ep,Vprecip,elij,clw,epmlmMm,eplaMm, + & icb,inb) implicit none @@ -3577,4 +3578,5 @@ real phi2(nloc,na,na) real d1a(nloc,na),dam(nloc,na) + real epmlmMm(nloc,na,na),eplaMm(nloc,na) ! variables pour tracer dans precip de l'AA et des mel c local variables: @@ -3595,15 +3597,21 @@ dam(:,:)=0. epm(:,:,:)=0. -c -! fraction deau condensee dans les melanges convertie en precip + eplaMm(:,:)=0. + epmlmMm(:,:,:)=0. + phi(:,:,:)=0. + phi2(:,:,:)=0. +c +! fraction deau condensee dans les melanges convertie en precip : epm +! et eau condensée précipitée dans masse d'air saturé : l_m*dM_m/dzdz.dzdz do j=1,na do k=1,na do i=1,ncum if(k.ge.icb(i).and.k.le.inb(i).and. - & j.ge.k.and.j.le.inb(i)) then +!!jyg & j.ge.k.and.j.le.inb(i)) then !!jyg epm(i,j,k)=1.-(1.-ep(i,j))*clw(i,j)/elij(i,k,j) + & j.gt.k.and.j.le.inb(i)) then epm(i,j,k)=1.-(1.-ep(i,j))*clw(i,j)/ & max(elij(i,k,j),1.e-16) - +!! epm(i,j,k)=max(epm(i,j,k),0.0) endif @@ -3611,4 +3619,27 @@ end do end do + +! + do j=1,na + do k=1,na + do i=1,ncum + if(k.ge.icb(i).and.k.le.inb(i)) then + eplaMm(i,j)=eplaMm(i,j) + ep(i,j)*clw(i,j) + & *ment(i,j,k)*(1.-sigij(i,j,k)) + endif + end do + end do + end do +! + do j=1,na + do k=1,j-1 + do i=1,ncum + if(k.ge.icb(i).and.k.le.inb(i).and. + & j.le.inb(i)) then + epmlmMm(i,j,k)=epm(i,j,k)*elij(i,k,j)*ment(i,k,j) + endif + end do + end do + end do ! matrices pour calculer la tendance des concentrations dans cvltr.F90 @@ -3625,7 +3656,4 @@ phi2(i,j,k)=phi(i,j,k)*epm(i,j,k) - else - dam(i,j)=0. - phi2(i,j,k)=0. endif end do Index: /LMDZ5/trunk/libf/phylmd/cv3a_uncompress.F =================================================================== --- /LMDZ5/trunk/libf/phylmd/cv3a_uncompress.F (revision 1773) +++ /LMDZ5/trunk/libf/phylmd/cv3a_uncompress.F (revision 1774) @@ -10,23 +10,21 @@ : ,asupmaxmin ! - : ,da,phi !AC! - : ,mp,phi2,d1a,dam,sigij !RomP - : ,wdtrainA,wdtrainM,elij,clw !RomP - : ,evap,ep !RomP + : ,da,phi,mp,phi2,d1a,dam,sigij ! RomP+AC+jyg + : ,clw,elij,evap,ep,epmlmMm,eplaMm ! RomP + : ,wdtrainA,wdtrainM ! RomP ! o ,iflag1,kbas1,ktop1 - : ,precip1,cbmf1,plcl1,plfc1,wbeff1,sig1,w01,ptop21 - : ,ft1,fq1,fu1,fv1,ftra1 - : ,sigd1,Ma1,mip1,Vprecip1,upwd1,dnwd1,dnwd01 - : ,qcondc1,wd1,cape1,cin1 - : ,tvp1 - : ,ftd1,fqd1 - : ,Plim11,Plim21,asupmax1,supmax01 - : ,asupmaxmin1 -! - o ,da1,phi1 !AC! - o ,mp1,phi21,d1a1,dam1,sigij1 !RomP - o ,wdtrainA1,wdtrainM1,elij1,clw1 !RomP - o ,evap1,ep1) !RomP + o ,precip1,cbmf1,plcl1,plfc1,wbeff1,sig1,w01,ptop21 + o ,ft1,fq1,fu1,fv1,ftra1 + o ,sigd1,Ma1,mip1,Vprecip1,upwd1,dnwd1,dnwd01 + o ,qcondc1,wd1,cape1,cin1 + o ,tvp1 + o ,ftd1,fqd1 + o ,Plim11,Plim21,asupmax1,supmax01 + o ,asupmaxmin1 +! + o ,da1,phi1,mp1,phi21,d1a1,dam1,sigij1 ! RomP+AC+jyg + o ,clw1,elij1,evap1,ep1,epmlmMm1,eplaMm1! RomP + o ,wdtrainA1,wdtrainM1) ! RomP ! *************************************************************** @@ -67,8 +65,9 @@ real phi2(nloc,nd,nd) !RomP real d1a(nloc,nd),dam(nloc,nd) !RomP + real sigij(nloc,nd,nd) !RomP + real clw(nloc,nd),elij(nloc,nd,nd) !RomP + real evap(nloc,nd),ep(nloc,nd) !RomP + real epmlmMm(nloc,nd,nd),eplaMm(nloc,nd) !RomP+jyg real wdtrainA(nloc,nd), wdtrainM(nloc,nd) !RomP - real sigij(nloc,nd,nd) !RomP - real elij(nloc,nd,nd),clw(nloc,nd) !RomP - real evap(nloc,nd),ep(nloc,nd) !RomP ! c outputs: @@ -94,12 +93,14 @@ real phi21(nloc,nd,nd) !RomP real d1a1(nloc,nd),dam1(nloc,nd) !RomP + real sigij1(len,nd,nd) !RomP + real clw1(len,nd),elij1(len,nd,nd) !RomP + real evap1(len,nd),ep1(len,nd) !RomP + real epmlmMm1(len,nd,nd),eplaMm1(len,nd) !RomP+jyg real wdtrainA1(len,nd), wdtrainM1(len,nd) !RomP - real sigij1(len,nd,nd) !RomP - real elij1(len,nd,nd),clw1(len,nd) !RomP - real evap1(len,nd),ep1(len,nd) !RomP ! c c local variables: - integer i,k,j,k1,k2 + integer i,k,j +cc integer k1,k2 do 2000 i=1,ncum @@ -147,9 +148,10 @@ d1a1(idcum(i),k) = d1a(i,k) !RomP dam1(idcum(i),k) = dam(i,k) !RomP - wdtrainA1(idcum(i),k)= wdtrainA(i,k) !RomP - wdtrainM1(idcum(i),k)= wdtrainM(i,k) !RomP clw1(idcum(i),k) = clw(i,k) !RomP evap1(idcum(i),k) = evap(i,k) !RomP ep1(idcum(i),k) = ep(i,k) !RomP + eplaMm(idcum(i),k) = eplaMm(i,k) !RomP+jyg + wdtrainA1(idcum(i),k)= wdtrainA(i,k) !RomP + wdtrainM1(idcum(i),k)= wdtrainM(i,k) !RomP ! 2010 continue @@ -171,11 +173,12 @@ !AC! - do k2=1,nd - do k1=1,nd + do j=1,nd + do k=1,nd do i=1,ncum - phi1(idcum(i),k1,k2)=phi(i,k1,k2) !AC! - phi21(idcum(i),k1,k2)= phi2(idcum(i),k1,k2) !RomP - sigij1(idcum(i),k1,k2) = sigij(idcum(i),k1,k2) !RomP - elij1(idcum(i),k1,k2)= elij(idcum(i),k1,k2) !RomP + phi1(idcum(i),k,j) = phi(i,k,j) !AC! + phi21(idcum(i),k,j) = phi2(i,k,j) !RomP + sigij1(idcum(i),k,j) = sigij(i,k,j) !RomP + elij1(idcum(i),k,j) = elij(i,k,j) !RomP + epmlmMm(idcum(i),k,j)= epmlmMm(i,k,j) !RomP+jyg end do end do Index: /LMDZ5/trunk/libf/phylmd/cv_driver.F =================================================================== --- /LMDZ5/trunk/libf/phylmd/cv_driver.F (revision 1773) +++ /LMDZ5/trunk/libf/phylmd/cv_driver.F (revision 1774) @@ -9,7 +9,7 @@ & icb1,inb1, & delt,Ma1,upwd1,dnwd1,dnwd01,qcondc1,wd1,cape1, - & da1,phi1,mp1,phi21,d1a1,dam1,sij1,clw1,elij1, - & evap1,ep1,epmlmMm1,eplaMm1, - & wdtrainA1,wdtrainM1) + & da1,phi1,mp1,phi21,d1a1,dam1,sij1,clw1,elij1, ! RomP + & evap1,ep1,epmlmMm1,eplaMm1, ! RomP + & wdtrainA1,wdtrainM1) ! RomP C USE dimphy @@ -18,4 +18,8 @@ C.............................START PROLOGUE............................ C +! +! All argument names (except len,nd,ntra,nloc,delt and the flags) have a "1" appended. +! The "1" is removed for the corresponding compressed (local) variables. +! C PARAMETERS: C Name Type Usage Description @@ -54,4 +58,22 @@ C wd1 Real Output downdraft velocity scale for sfc fluxes C cape1 Real Output CAPE +! +! wdtrainA1 Real Output precipitation detrained from adiabatic draught; +! used in tracer transport (cvltr) +! wdtrainM1 Real Output precipitation detrained from mixed draughts; +! used in tracer transport (cvltr) +! da1 Real Output used in tracer transport (cvltr) +! phi1 Real Output used in tracer transport (cvltr) +! mp1 Real Output used in tracer transport (cvltr) +! +! phi21 Real Output used in tracer transport (cvltr) +! +! d1a1 Real Output used in tracer transport (cvltr) +! dam1 Real Output used in tracer transport (cvltr) +! +! evap1 Real Output +! ep1 Real Output +! sij1 Real Output +! elij1 Real Output C C S. Bony, Mar 2002: @@ -119,6 +141,7 @@ real epmlmMm1(len,nd,nd),eplaMm1(len,nd) ! RomP <<< - - +! +!------------------------------------------------------------------- +! Original Prologue by Kerry Emanuel. !------------------------------------------------------------------- ! --- ARGUMENTS @@ -291,12 +314,4 @@ real ments(nloc,klev,klev), qents(nloc,klev,klev) real sij(nloc,klev,klev), elij(nloc,klev,klev) -! RomP >>> - real da(nloc,klev),phi(nloc,klev,klev),mp(nloc,klev) - real epmlmMm(nloc,klev,klev),eplaMm(nloc,klev) - real phi2(nloc,klev,klev) - real d1a(nloc,klev), dam(nloc,klev) - real wdtrainA(nloc,klev),wdtrainM(nloc,klev) - real sigd(nloc) -! RomP <<< real qp(nloc,klev), up(nloc,klev), vp(nloc,klev) real wt(nloc,klev), water(nloc,klev), evap(nloc,klev) @@ -312,4 +327,13 @@ real qcondc(nloc,klev) ! cld real wd(nloc) ! gust +! +! RomP >>> + real da(nloc,klev),phi(nloc,klev,klev),mp(nloc,klev) + real epmlmMm(nloc,klev,klev),eplaMm(nloc,klev) + real phi2(nloc,klev,klev) + real d1a(nloc,klev), dam(nloc,klev) + real wdtrainA(nloc,klev),wdtrainM(nloc,klev) + real sigd(nloc) +! RomP <<< nent(:,:)=0 @@ -380,4 +404,21 @@ enddo endif + +! RomP >>> + wdtrainA1(:,:) =0. + wdtrainM1(:,:) =0. + da1(:,:) =0. + phi1(:,:,:) =0. + epmlmMm1(:,:,:) =0. + eplaMm1(:,:) =0. + mp1(:,:) =0. + evap1(:,:) =0. + ep1(:,:) =0. + sij1(:,:,:) =0. + elij1(:,:,:) =0. + phi21(:,:,:) =0. + d1a1(:,:) =0. + dam1(:,:) =0. +! RomP <<< !-------------------------------------------------------------------- @@ -729,3 +770,2 @@ return end - Index: /LMDZ5/trunk/libf/phylmd/cva_driver.F =================================================================== --- /LMDZ5/trunk/libf/phylmd/cva_driver.F (revision 1773) +++ /LMDZ5/trunk/libf/phylmd/cva_driver.F (revision 1774) @@ -22,5 +22,5 @@ & ,lalim_conv, & da1,phi1,mp1,phi21,d1a1,dam1,sigij1,clw1, ! RomP - & elij1,evap1,ep1, ! RomP + & elij1,evap1,ep1,epmlmMm1,eplaMm1, ! RomP & wdtrainA1,wdtrainM1) ! RomP *************************************************************** @@ -39,4 +39,7 @@ C.............................START PROLOGUE............................ C +! +! All argument names (except len,nd,ntra,nloc,delt and the flags) have a "1" appended. +! The "1" is removed for the corresponding compressed variables. C PARAMETERS: C Name Type Usage Description @@ -99,4 +102,33 @@ C supmax01 Real Output C asupmaxmin1 Real Output +! +! ftd1 Real Output Array of temperature tendency due to precipitations (K/s) of dimension ND, +! defined at same grid levels as T, Q, QS and P. +! +! fqd1 Real Output Array of specific humidity tendencies due to precipitations ((gm/gm)/s) +! of dimension ND, defined at same grid levels as T, Q, QS and P. +! +! wdtrainA1 Real Output precipitation detrained from adiabatic draught; +! used in tracer transport (cvltr) +! wdtrainM1 Real Output precipitation detrained from mixed draughts; +! used in tracer transport (cvltr) +! da1 Real Output used in tracer transport (cvltr) +! phi1 Real Output used in tracer transport (cvltr) +! mp1 Real Output used in tracer transport (cvltr) +! +! phi21 Real Output used in tracer transport (cvltr) +! +! d1a1 Real Output used in tracer transport (cvltr) +! dam1 Real Output used in tracer transport (cvltr) +! +! epmlmMm1 Real Output used in tracer transport (cvltr) +! eplaMm1 Real Output used in tracer transport (cvltr) +! +! evap1 Real Output +! ep1 Real Output +! sigij1 Real Output +! elij1 Real Output + +C C S. Bony, Mar 2002: C * Several modules corresponding to different physical processes @@ -188,14 +220,14 @@ ! RomP >>> real wdtrainA1(len,nd), wdtrainM1(len,nd) - real wdtrainA(nloc,klev),wdtrainM(nloc,klev) real da1(len,nd),phi1(len,nd,nd),mp1(len,nd) - real da(len,nd),phi(len,nd,nd) + real epmlmMm1(len,nd,nd),eplaMm1(len,nd) real evap1(len,nd),ep1(len,nd) real sigij1(len,nd,nd),elij1(len,nd,nd) - real phi2(len,nd,nd) - real d1a(len,nd), dam(len,nd) real phi21(len,nd,nd) real d1a1(len,nd), dam1(len,nd) ! RomP <<< +! +!------------------------------------------------------------------- +! Prolog by Kerry Emanuel. !------------------------------------------------------------------- ! --- ARGUMENTS @@ -320,11 +352,4 @@ ! ! det: Array of detrainment mass flux of dimension ND. -! -! ftd: Array of temperature tendency due to precipitations (K/s) of dimension ND, -! defined at same grid levels as T, Q, QS and P. -! -! fqd: Array of specific humidity tendencies due to precipitations ((gm/gm)/s) -! of dimension ND, defined at same grid levels as T, Q, QS and P. -! !------------------------------------------------------------------- c @@ -446,4 +471,13 @@ real wghti(nloc,nd) real hnk(nloc),unk(nloc),vnk(nloc) +! +! RomP >>> + real wdtrainA(nloc,klev),wdtrainM(nloc,klev) + real da(len,nd),phi(len,nd,nd) + real epmlmMm(nloc,klev,klev),eplaMm(nloc,klev) + real phi2(len,nd,nd) + real d1a(len,nd), dam(len,nd) +! RomP <<< +! logical, save :: first=.true. c$OMP THREADPRIVATE(first) @@ -498,45 +532,34 @@ nword4=len*nd*nd -! call izilch(iflag1 ,nword1) -! call zilch(iflag1 ,nword1) - do i=1,len - iflag1(i)=0 - ktop1(i)=0 - kbas1(i)=0 - enddo - call zilch(ft1 ,nword2) - call zilch(fq1 ,nword2) - call zilch(fu1 ,nword2) - call zilch(fv1 ,nword2) - call zilch(ftra1 ,nword3) - call zilch(precip1 ,nword1) -! call izilch(kbas1 ,nword1) -! call zilch(kbas1 ,nword1) -! call izilch(ktop1 ,nword1) -! call zilch(ktop1 ,nword1) - call zilch(cbmf1 ,nword1) - call zilch(ptop21 ,nword1) - sigd1(:)=0. - call zilch(Ma1 ,nword2) - call zilch(mip1 ,nword2) -! call zilch(Vprecip1,nword2) - Vprecip1=0. - call zilch(upwd1 ,nword2) - call zilch(dnwd1 ,nword2) - call zilch(dnwd01 ,nword2) - call zilch(qcondc1 ,nword2) -!test -! call zilch(qcondc ,nword2) - call zilch(wd1 ,nword1) - call zilch(cape1 ,nword1) - call zilch(cin1 ,nword1) - call zilch(tvp1 ,nword2) - call zilch(ftd1 ,nword2) - call zilch(fqd1 ,nword2) - call zilch(Plim11 ,nword1) - call zilch(Plim21 ,nword1) - call zilch(asupmax1,nword2) - call zilch(supmax01,nword1) - call zilch(asupmaxmin1,nword1) + iflag1(:) = 0 + ktop1(:) = 0 + kbas1(:) = 0 + ft1(:,:) = 0.0 + fq1(:,:) = 0.0 + fu1(:,:) = 0.0 + fv1(:,:) = 0.0 + ftra1(:,:,:) = 0. + precip1(:) = 0. + cbmf1(:) = 0. + ptop21(:) = 0. + sigd1(:) = 0. + Ma1(:,:) = 0. + mip1(:,:) = 0. + Vprecip1(:,:) = 0. + upwd1 (:,:) = 0. + dnwd1 (:,:) = 0. + dnwd01 (:,:) = 0. + qcondc1 (:,:) = 0. + wd1 (:) = 0. + cape1 (:) = 0. + cin1 (:) = 0. + tvp1 (:,:) = 0. + ftd1 (:,:) = 0. + fqd1 (:,:) = 0. + Plim11 (:) = 0. + Plim21 (:) = 0. + asupmax1(:,:) = 0. + supmax01(:) = 0. + asupmaxmin1(:)= 0. c DO il = 1,len @@ -552,4 +575,20 @@ endif +! RomP >>> + wdtrainA1(:,:) = 0. + wdtrainM1(:,:) = 0. + da1(:,:) = 0. + phi1(:,:,:) = 0. + epmlmMm1(:,:,:) = 0. + eplaMm1(:,:) = 0. + mp1(:,:) = 0. + evap1(:,:) = 0. + ep1(:,:) = 0. + sigij1(:,:,:) = 0. + elij1(:,:,:) = 0. + phi21(:,:,:) = 0. + d1a1(:,:) = 0. + dam1(:,:) = 0. +! RomP <<< !--------------------------------------------------------------------- ! --- INITIALIZE LOCAL ARRAYS AND PARAMETERS @@ -941,5 +980,6 @@ CALL cv3_tracer(nloc,len,ncum,nd,nd, : ment,sigij,da,phi,phi2,d1a,dam, - : ep,Vprecip,elij,clw,icb,inb) + : ep,Vprecip,elij,clw,epmlmMm,eplaMm, + : icb,inb) !RomP <<< endif @@ -964,6 +1004,6 @@ : ,asupmaxmin : ,da,phi,mp,phi2,d1a,dam,sigij ! RomP - : ,wdtrainA,wdtrainM,elij,clw ! RomP - : ,evap,ep ! RomP + : ,clw,elij,evap,ep,epmlmMm,eplaMm ! RomP + : ,wdtrainA,wdtrainM ! RomP o ,iflag1,kbas1,ktop1 o ,precip1,cbmf1,plcl1,plfc1,wbeff1,sig1,w01,ptop21 @@ -976,6 +1016,6 @@ o ,asupmaxmin1 o ,da1,phi1,mp1,phi21,d1a1,dam1,sigij1 ! RomP - o ,wdtrainA1,wdtrainM1,elij1,clw1 ! RomP - o ,evap1,ep1) ! RomP + o ,clw1,elij1,evap1,ep1,epmlmMm1,eplaMm1! RomP + o ,wdtrainA1,wdtrainM1) ! RomP endif