Changeset 2961 for LMDZ5/trunk

Timestamp:

Jul 20, 2017, 8:55:20 PM (7 years ago)

Author:

jbmadeleine

Message:

Added iflag_t_glace=3 which uses a better function of the ice fraction:
iflag_t_glace.LT.3 uses icefrac = (1.-(T-Tmin)/(Tmax-Tmin))nx
iflag_t_glace.GE.3 uses icefrac = 1. - ((T-Tmin)/(Tmax-Tmin))nx

File:

• LMDZ5/trunk/libf/phylmd/icefrac_lsc_mod.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/icefrac_lsc_mod.F90

@@ -28 +28 @@
   REAL, DIMENSION(np), INTENT(OUT) :: icefrac
 
-  REAL :: sig0,www,tmin_tmp,icefrac_tmp
+  REAL :: sig0,www,tmin_tmp,liqfrac_tmp
   INTEGER :: ip
 
@@ -43 +43 @@
      ENDIF
      tmin_tmp=www*t_glace_max+(1.-www)*t_glace_min
-     icefrac_tmp= 1.0 - (temp(ip)-tmin_tmp) / (t_glace_max-tmin_tmp)
-     icefrac_tmp = MIN(MAX(icefrac_tmp,0.0),1.0)
-     icefrac(ip) = icefrac_tmp**exposant_glace
+     liqfrac_tmp=  (temp(ip)-tmin_tmp) / (t_glace_max-tmin_tmp)
+     liqfrac_tmp = MIN(MAX(liqfrac_tmp,0.0),1.0)
+     IF (iflag_t_glace.GE.3) THEN
+       icefrac(ip) = 1.0-liqfrac_tmp**exposant_glace
+     ELSE
+       icefrac(ip) = (1.0-liqfrac_tmp)**exposant_glace
+     ENDIF
   ENDDO