Changeset 2490

Timestamp:

Apr 4, 2016, 7:05:44 PM (9 years ago)

Author:

jyg

Message:

Bug fix in cv3_unsat (in cv3_routines.F90) in
order to guarantee water conservation.

File:

• LMDZ5/trunk/libf/phylmd/cv3_routines.F90 (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/cv3_routines.F90

@@ -2605 +2605 @@
 !
 
-          d6 = bfac*wdtrain(il) - 100.*sigd(il)*bfac*(ph(il,i)-ph(il,i+1))*evap(il, i)
-          e6 = bfac*wdtrain(il)
-          f6 = -100.*sigd(il)*bfac*(ph(il,i)-ph(il,i+1))*evap(il, i)
-
+!jyg<
+          d6 = prec(il,i)-prec(il,i+1)
+
+!!          d6 = bfac*wdtrain(il) - 100.*sigd(il)*bfac*(ph(il,i)-ph(il,i+1))*evap(il, i)
+!!          e6 = bfac*wdtrain(il)
+!!          f6 = -100.*sigd(il)*bfac*(ph(il,i)-ph(il,i+1))*evap(il, i)
+!>jyg
 !CR:tmax_fonte_cv: T for which ice is totally melted (used to be 275.15)
           thaw = (t(il,i)-273.15)/(tmax_fonte_cv-273.15)
           thaw = min(max(thaw,0.0), 1.0)
+!jyg<
           water(il, i) = water(il, i+1) + (1-fraci(il,i))*d6
-          water(il, i) = max(water(il,i), 0.)
-          ice(il, i) = ice(il, i+1) + fraci(il, i)*d6
-          ice(il, i) = max(ice(il,i), 0.)
+          ice(il, i)   = ice(il, i+1)   + fraci(il, i)*d6
+          water(il, i) = min(prec(il,i), max(water(il,i), 0.))
+          ice(il, i)   = min(prec(il,i), max(ice(il,i),   0.))
+
+!!          water(il, i) = water(il, i+1) + (1-fraci(il,i))*d6
+!!          water(il, i) = max(water(il,i), 0.)
+!!          ice(il, i) = ice(il, i+1) + fraci(il, i)*d6
+!!          ice(il, i) = max(ice(il,i), 0.)
+!>jyg
           fondue(il, i) = ice(il, i)*thaw
           water(il, i) = water(il, i) + fondue(il, i)