Changeset 2258 for LMDZ5/branches/testing/libf/phylmd/cv3p_mixing.F90
- Timestamp:
- Apr 13, 2015, 10:21:09 AM (9 years ago)
- Location:
- LMDZ5/branches/testing
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/branches/testing
- Property svn:mergeinfo changed
/LMDZ5/trunk merged: 2218,2221-2237
- Property svn:mergeinfo changed
-
LMDZ5/branches/testing/libf/phylmd/cv3p_mixing.F90
r2056 r2258 58 58 REAL, DIMENSION (nloc) :: Smid, Sjmin, Sjmax 59 59 REAL, DIMENSION (nloc) :: Sbef, sup, smin 60 REAL, DIMENSION (nloc) :: ASij, smax, Scrit 60 !jyg REAL, DIMENSION (nloc) :: ASij, smax, Scrit 61 REAL, DIMENSION (nloc) :: ASij, ASij_inv, smax, Scrit 61 62 REAL, DIMENSION (nloc, nd, nd) :: Sij 62 63 REAL, DIMENSION (nloc, nd) :: csum … … 524 525 IF (i>=icb(il) .AND. i<=inb(il) .AND. lwork(il)) THEN 525 526 ASij(il) = amax1(1.0E-16, ASij(il)) 526 ASij(il) = 1.0/ASij(il) 527 !jyg+lluis< 528 !! ASij(il) = 1.0/ASij(il) 529 ASij_inv(il) = 1.0/ASij(il) 530 ! IF the F-interval spanned by possible mixtures is less than 0.01, no mixing occurs 531 IF (ASij_inv(il) > 100.) ASij_inv(il) = 0. 532 !>jyg+lluis 527 533 csum(il, i) = 0.0 528 534 END IF … … 533 539 IF (i>=icb(il) .AND. i<=inb(il) .AND. lwork(il) .AND. & 534 540 j>=(icb(il)-1) .AND. j<=inb(il)) THEN 535 Ment(il, i, j) = Ment(il, i, j)*ASij(il) 541 !jyg Ment(il, i, j) = Ment(il, i, j)*ASij(il) 542 Ment(il, i, j) = Ment(il, i, j)*ASij_inv(il) 536 543 END IF 537 544 END DO
Note: See TracChangeset
for help on using the changeset viewer.