Changeset 2258 for LMDZ5/branches/testing/libf/phylmd/cv3p1_closure.F90

Timestamp:

Apr 13, 2015, 10:21:09 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes 2216:2237 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/cv3p1_closure.F90 (modified) (3 diffs)

LMDZ5/branches/testing/libf/phylmd/cv3p1_closure.F90

@@ -53 +53 @@
 
   ! local variables:
-  INTEGER il, i, j, k, icbmax, i0(nloc), klfc
+  INTEGER il, i, j, k, icbmax, i0(nloc), klfc(nloc)
   REAL deltap, fac, w, amu
   REAL rhodp
@@ -525 +525 @@
 
 !CR:Compute k at plfc
+  DO il=1,ncum
+           klfc(il)=nl
+  ENDDO
   DO k=1,nl
      DO il=1,ncum
         if ((plfc(il).lt.ph(il,k)).and.(plfc(il).ge.ph(il,k+1))) then
-           klfc=k
+           klfc(il)=k
         endif
      ENDDO
@@ -540 +543 @@
 !CR: Add large-scale component to the mass-flux
 !encore connu sous le nom "Experience du tube de dentifrice"
-    if (coef_clos_ls.gt.0.) then 
-       cbmf1(il) = cbmf1(il) - coef_clos_ls*min(0.,1./RG*omega(il,klfc))
+    if ((coef_clos_ls.gt.0.).and.(plfc(il).gt.0.)) then 
+       cbmf1(il) = cbmf1(il) - coef_clos_ls*min(0.,1./RG*omega(il,klfc(il)))
     endif
 !RC