Changeset 1403 for LMDZ4/trunk/libf/phylmd/cv3p1_closure.F
- Timestamp:
- Jul 1, 2010, 11:02:53 AM (14 years ago)
- Location:
- LMDZ4/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ4/trunk
- Property svn:mergeinfo changed
-
LMDZ4/trunk/libf/phylmd/cv3p1_closure.F
r973 r1403 1 ! 2 ! $Id$ 3 ! 1 4 SUBROUTINE cv3p1_closure(nloc,ncum,nd,icb,inb 2 5 : ,pbase,plcl,p,ph,tv,tvp,buoy … … 60 63 integer nsupmax(nloc) 61 64 real supcrit,temp(nloc,nd) 62 real P1(nloc),Pmin(nloc) 65 real P1(nloc),Pmin(nloc),plfc(nloc) 63 66 real asupmax0(nloc) 64 67 logical ok(nloc) … … 74 77 real wb,sigmax 75 78 data wb /2./, sigmax /0.1/ 79 80 CHARACTER (LEN=20) :: modname='cv3p1_closure' 81 CHARACTER (LEN=80) :: abort_message 76 82 c 77 83 c print *,' -> cv3p1_closure, Ale ',ale(1) … … 379 385 CALL cv3_cine (nloc,ncum,nd,icb,inb 380 386 : ,pbase,plcl,p,ph,tv,tvp 381 : ,cina,cinb )387 : ,cina,cinb,plfc) 382 388 c 383 389 DO il = 1,ncum … … 489 495 do k= 1,nl 490 496 do il = 1,ncum 491 !IM IF (k .ge. icb(il) .and. k .le. inb(il)) THEN 492 IF (k .ge. icb(il)+1 .and. k .le. inb(il)) THEN 497 !old IF (k .ge. icb(il) .and. k .le. inb(il)) THEN 498 !IM IF (k .ge. icb(il)+1 .and. k .le. inb(il)) THEN 499 IF (k .ge. icb(il) .and. k .le. inb(il) !cor jyg 500 $ .and. icb(il)+1 .le. inb(il)) THEN !cor jyg 493 501 cbmflim(il) = cbmflim(il)+MLIM(il,k) 494 502 ENDIF … … 509 517 cbmf1(il) = alp2(il)/(0.5*wb*wb-Cin(il)) 510 518 if(cbmf1(il).EQ.0.AND.alp2(il).NE.0.) THEN 511 print*,'cv3p1_closure cbmf1=0 and alp NE 0 il alp2 alp cin ',il, 519 write(lunout,*) 520 & 'cv3p1_closure cbmf1=0 and alp NE 0 il alp2 alp cin ',il, 512 521 . alp2(il),alp(il),cin(il) 513 STOP 522 abort_message = '' 523 CALL abort_gcm (modname,abort_message,1) 514 524 endif 515 525 cbmfmax(il) = sigmax*wb2(il)*100.*p(il,icb(il)) … … 540 550 do il = 1,ncum 541 551 IF ( k .ge. icb(il)+1 .AND. k .le. inb(il)) THEN 542 sig(il,k) = beta*sig(il,k)+(1.-beta)*coef(il)*siglim(il,k) 543 cc sig(il,k) = beta*sig(il,k)+siglim(il,k) 544 w0(il,k) = beta*w0(il,k) +(1.-beta)*wlim(il,k) 545 AMU=SIG(il,k)*W0(il,k) 552 amu=beta*sig(il,k)*w0(il,k)+ 553 : (1.-beta)*coef(il)*siglim(il,k)*wlim(il,k) 554 w0(il,k) = wlim(il,k) 555 w0(il,k) =max(w0(il,k),1.e-10) 556 sig(il,k)=amu/w0(il,k) 557 sig(il,k)=min(sig(il,k),1.) 546 558 cc amu = 0.5*(SIG(il,k)+sigold(il,k))*W0(il,k) 547 559 M(il,k)=AMU*0.007*P(il,k)*(PH(il,k)-PH(il,k+1))/TV(il,k)
Note: See TracChangeset
for help on using the changeset viewer.