Ignore:
Timestamp:
Oct 9, 2012, 3:29:15 PM (12 years ago)
Author:
Laurent Fairhead
Message:

Version testing basée sur la r1575


Testing release based on r1575

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phylmd/cv3p1_closure.F

    r1518 r1664  
    516516        wb2(il) = sqrt(2.*max(Ale(il)+cin(il),0.))
    517517      ENDDO
    518 c
    519       IF (flag_wb==0) THEN
    520         wbeff(:) = wbmax
    521       ELSE IF (flag_wb==1) THEN
    522         wbeff(1:ncum) = wbmax/(1.+500./(ph(1:ncum,1)-plfc(1:ncum)))
    523       ELSE IF (flag_wb==2) THEN
    524         wbeff(1:ncum) = wbmax*(0.01*(ph(1:ncum,1)-plfc(1:ncum)))**2
    525       ENDIF
    526 c
     518
     519      DO il = 1, ncum
     520         IF (plfc(il) .lt. 100.) THEN
     521c        This is an irealistic value for plfc => no calculation of wbeff
     522            wbeff(il) = 100.1
     523         ELSE
     524c        Calculate wbeff
     525            IF (flag_wb==0) THEN
     526               wbeff(il) = wbmax
     527            ELSE IF (flag_wb==1) THEN
     528               wbeff(il) = wbmax/(1.+500./(ph(il,1)-plfc(il)))
     529            ELSE IF (flag_wb==2) THEN
     530               wbeff(il) = wbmax*(0.01*(ph(il,1)-plfc(il)))**2
     531            ENDIF
     532         END IF
     533      END DO
     534
     535
    527536      DO il = 1,ncum
    528537cjyg    Modification du coef de wb*wb pour conformite avec papier Wake
Note: See TracChangeset for help on using the changeset viewer.