Changeset 2226 for LMDZ5/trunk/libf

Timestamp:

Mar 11, 2015, 4:18:55 PM (10 years ago)

Author:

Laurent Fairhead

Message:

correction sur le niveau de detrainement

File:

• LMDZ5/trunk/libf/phylmd/cv3p_mixing.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phylmd/cv3p_mixing.F90

@@ -58 +58 @@
   REAL, DIMENSION (nloc)             :: Smid, Sjmin, Sjmax
   REAL, DIMENSION (nloc)             :: Sbef, sup, smin
-  REAL, DIMENSION (nloc)             :: ASij, smax, Scrit
+!jyg  REAL, DIMENSION (nloc)             :: ASij, smax, Scrit
+  REAL, DIMENSION (nloc)             :: ASij, ASij_inv, smax, Scrit
   REAL, DIMENSION (nloc, nd, nd)     :: Sij
   REAL, DIMENSION (nloc, nd)         :: csum
@@ -524 +525 @@
       IF (i>=icb(il) .AND. i<=inb(il) .AND. lwork(il)) THEN
         ASij(il) = amax1(1.0E-16, ASij(il))
-        ASij(il) = 1.0/ASij(il)
+!jyg+lluis<
+!!        ASij(il) = 1.0/ASij(il)
+        ASij_inv(il) = 1.0/ASij(il)
+!   IF the F-interval spanned by possible mixtures is less than 0.01, no mixing occurs
+        IF (ASij_inv(il) > 100.)  ASij_inv(il) = 0.
+!>jyg+lluis
         csum(il, i) = 0.0
       END IF
@@ -533 +539 @@
         IF (i>=icb(il) .AND. i<=inb(il) .AND. lwork(il) .AND. &
             j>=(icb(il)-1) .AND. j<=inb(il)) THEN
-          Ment(il, i, j) = Ment(il, i, j)*ASij(il)
+!jyg          Ment(il, i, j) = Ment(il, i, j)*ASij(il)
+          Ment(il, i, j) = Ment(il, i, j)*ASij_inv(il)
         END IF
       END DO