Changeset 1322 for LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd/cv3p1_closure.F

Timestamp:

Mar 12, 2010, 11:54:11 AM (14 years ago)

Author:

Laurent Fairhead

Message:

Improvements concerning wake parametrisation (from JYG, NR, IT, with more to come).
Alp_offset is read in form physiq.def file

---

Améliorations à la paramétrisation des poches froides (de JYG, NR, IT, d'autres
sont à venir)
Alp_offset est rajouté à la liste des paramètres lus dans physiq.def

File:

• LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd/cv3p1_closure.F (modified) (4 diffs)

LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd/cv3p1_closure.F

@@ -63 +63 @@
       integer nsupmax(nloc)
       real supcrit,temp(nloc,nd)
-      real P1(nloc),Pmin(nloc)
+      real P1(nloc),Pmin(nloc),plfc(nloc)
       real asupmax0(nloc)
       logical ok(nloc)
@@ -385 +385 @@
       CALL cv3_cine (nloc,ncum,nd,icb,inb
      :                      ,pbase,plcl,p,ph,tv,tvp
-     :                      ,cina,cinb)
+     :                      ,cina,cinb,plfc)
 c
       DO il = 1,ncum
@@ -495 +495 @@
       do k= 1,nl
        do il = 1,ncum
-!IM       IF (k .ge. icb(il) .and. k .le. inb(il)) THEN
-        IF (k .ge. icb(il)+1 .and. k .le. inb(il)) THEN
+!old       IF (k .ge. icb(il) .and. k .le. inb(il)) THEN
+!IM        IF (k .ge. icb(il)+1 .and. k .le. inb(il)) THEN
+       IF (k .ge. icb(il) .and. k .le. inb(il)         !cor jyg
+     $     .and. icb(il)+1 .le. inb(il)) THEN          !cor jyg
          cbmflim(il) = cbmflim(il)+MLIM(il,k)
         ENDIF
@@ -548 +550 @@
         do il = 1,ncum
          IF ( k .ge. icb(il)+1 .AND. k .le. inb(il)) THEN
-         sig(il,k) = beta*sig(il,k)+(1.-beta)*coef(il)*siglim(il,k)
-cc         sig(il,k) = beta*sig(il,k)+siglim(il,k)
-         w0(il,k) = beta*w0(il,k)  +(1.-beta)*wlim(il,k)
-         AMU=SIG(il,k)*W0(il,k)
+         amu=beta*sig(il,k)*w0(il,k)+
+     :   (1.-beta)*coef(il)*siglim(il,k)*wlim(il,k)
+         w0(il,k) = wlim(il,k)
+         w0(il,k) =max(w0(il,k),1.e-10)
+         sig(il,k)=amu/w0(il,k)
+         sig(il,k)=min(sig(il,k),1.)
 cc         amu = 0.5*(SIG(il,k)+sigold(il,k))*W0(il,k)
          M(il,k)=AMU*0.007*P(il,k)*(PH(il,k)-PH(il,k+1))/TV(il,k)