Changeset 1795 for LMDZ5/branches/testing/libf/phylmd/cv3_routines.F
- Timestamp:
- Jul 18, 2013, 10:20:28 AM (11 years ago)
- Location:
- LMDZ5/branches/testing
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/branches/testing
- Property svn:mergeinfo changed
/LMDZ5/trunk merged: 1747-1749,1751,1753-1767,1769,1771-1772,1774-1776,1778-1794
- Property svn:mergeinfo changed
-
LMDZ5/branches/testing/libf/phylmd/cv3_routines.F
r1750 r1795 3561 3561 SUBROUTINE cv3_tracer(nloc,len,ncum,nd,na, 3562 3562 & ment,sigij,da,phi,phi2,d1a,dam, 3563 & ep,Vprecip,elij,clw,icb,inb) 3563 & ep,Vprecip,elij,clw,epmlmMm,eplaMm, 3564 & icb,inb) 3564 3565 implicit none 3565 3566 … … 3577 3578 real phi2(nloc,na,na) 3578 3579 real d1a(nloc,na),dam(nloc,na) 3580 real epmlmMm(nloc,na,na),eplaMm(nloc,na) 3579 3581 ! variables pour tracer dans precip de l'AA et des mel 3580 3582 c local variables: … … 3595 3597 dam(:,:)=0. 3596 3598 epm(:,:,:)=0. 3597 c 3598 ! fraction deau condensee dans les melanges convertie en precip 3599 eplaMm(:,:)=0. 3600 epmlmMm(:,:,:)=0. 3601 phi(:,:,:)=0. 3602 phi2(:,:,:)=0. 3603 c 3604 ! fraction deau condensee dans les melanges convertie en precip : epm 3605 ! et eau condensée précipitée dans masse d'air saturé : l_m*dM_m/dzdz.dzdz 3599 3606 do j=1,na 3600 3607 do k=1,na 3601 3608 do i=1,ncum 3602 3609 if(k.ge.icb(i).and.k.le.inb(i).and. 3603 & j.ge.k.and.j.le.inb(i)) then 3604 epm(i,j,k)=1.-(1.-ep(i,j))*clw(i,j)/elij(i,k,j) 3610 !!jyg & j.ge.k.and.j.le.inb(i)) then 3611 !!jyg epm(i,j,k)=1.-(1.-ep(i,j))*clw(i,j)/elij(i,k,j) 3612 & j.gt.k.and.j.le.inb(i)) then 3613 epm(i,j,k)=1.-(1.-ep(i,j))*clw(i,j)/ 3614 & max(elij(i,k,j),1.e-16) 3615 !! 3605 3616 epm(i,j,k)=max(epm(i,j,k),0.0) 3606 3617 endif … … 3608 3619 end do 3609 3620 end do 3621 3622 ! 3623 do j=1,na 3624 do k=1,na 3625 do i=1,ncum 3626 if(k.ge.icb(i).and.k.le.inb(i)) then 3627 eplaMm(i,j)=eplaMm(i,j) + ep(i,j)*clw(i,j) 3628 & *ment(i,j,k)*(1.-sigij(i,j,k)) 3629 endif 3630 end do 3631 end do 3632 end do 3633 ! 3634 do j=1,na 3635 do k=1,j-1 3636 do i=1,ncum 3637 if(k.ge.icb(i).and.k.le.inb(i).and. 3638 & j.le.inb(i)) then 3639 epmlmMm(i,j,k)=epm(i,j,k)*elij(i,k,j)*ment(i,k,j) 3640 endif 3641 end do 3642 end do 3643 end do 3610 3644 3611 3645 ! matrices pour calculer la tendance des concentrations dans cvltr.F90 … … 3622 3656 3623 3657 phi2(i,j,k)=phi(i,j,k)*epm(i,j,k) 3624 else3625 dam(i,j)=0.3626 phi2(i,j,k)=0.3627 3658 endif 3628 3659 end do
Note: See TracChangeset
for help on using the changeset viewer.