--- trunk/phylmd/CV3_routines/cv3_yield.f 2014/09/04 10:40:24 105 +++ trunk/Sources/phylmd/CV30_routines/cv30_yield.f 2016/03/21 15:36:26 186 @@ -1,10 +1,10 @@ -module cv3_yield_m +module cv30_yield_m implicit none contains - SUBROUTINE cv3_yield(nloc,ncum,nd,na & + SUBROUTINE cv30_yield(nloc,ncum,nd,na & ,icb,inb,delt & ,t,rr,u,v,gz,p,ph,h,hp,lv,cpn,th & ,ep,clw,m,tp,mp,rp,up,vp & @@ -14,7 +14,7 @@ ,iflag,precip,VPrecip,ft,fr,fu,fv & ,upwd,dnwd,dnwd0,ma,mike,tls,tps,qcondc,wd) use conema3_m - use cv3_param_m + use cv30_param_m use cvthermo use cvflag @@ -54,7 +54,7 @@ real rat, awat, delti real ax, bx, cx, dx real cpinv, rdcp, dpinv - real lvcp(nloc,na), mke(nloc,na) + real lvcp(nloc,na) real am(nloc), work(nloc), ad(nloc), amp1(nloc) !!! real up1(nloc), dn1(nloc) real up1(nloc,nd,nd), dn1(nloc,nd,nd) @@ -230,8 +230,8 @@ enddo if(num1.le.0) cycle - call zilch(amp1,ncum) - call zilch(ad,ncum) + amp1(:ncum) = 0. + ad(:ncum) = 0. do k=i+1,nl+1 do il=1,ncum @@ -627,12 +627,6 @@ !ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc do i=1,nd - do il=1,ncum - mke(il,i)=upwd(il,i)+dnwd(il,i) - enddo - enddo - - do i=1,nd DO il=1,ncum rdcp=(rrd*(1.-rr(il,i))-rr(il,i)*rrv) & /(cpd*(1.-rr(il,i))+rr(il,i)*cpv) @@ -703,6 +697,6 @@ enddo ! cld enddo ! cld - end SUBROUTINE cv3_yield + end SUBROUTINE cv30_yield -end module cv3_yield_m +end module cv30_yield_m