Changeset 2109 for LMDZ5/trunk/libf/phylmd/icefrac_lsc_mod.F90

Timestamp:

Aug 22, 2014, 12:22:58 PM (10 years ago)

Author:

jbmadeleine

Message:

nettoyage de icefrac_lsc: les paramètres t_glace_min, t_glace_max et
exposant_glace sont à présents chargés à partir de nuage.h et non
donnés en argument;

cleaning of icefrac_lsc: parameters t_glace_min, t_glace_max and
exposant_glace are loaded from the nuage.h file instead of being
given as arguments;

File:

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

LMDZ5/trunk/libf/phylmd/icefrac_lsc_mod.F90

@@ -4 +4 @@
 MODULE icefrac_lsc_mod
 
+IMPLICIT NONE
+
 CONTAINS
 !*******************************************************************
 
-SUBROUTINE icefrac_lsc(np,temp, sig, tmin, tmax, nexpo,icefrac)
-  IMPLICIT NONE
+SUBROUTINE icefrac_lsc(np,temp, sig, icefrac)
   !
   ! Compute the ice fraction 1-xliq (see e.g.
   ! Doutriaux-Boucher & Quaas 2004, section 2.2.)
   !
-  ! (JBM 3/14)
+  ! (JBM 3/14 8/14)
+  
+  INCLUDE "nuage.h"
+
+  ! nuage.h contains:
+  ! t_glace_min: if T < Tmin, the cloud is only made of water ice
+  ! t_glace_max: if T > Tmax, the cloud is only made of liquid water
+  ! exposant_glace: controls the sharpness of the transition
   INTEGER :: np
   REAL, DIMENSION(np), INTENT(IN) :: temp ! temperature
@@ -19 +27 @@
   REAL, DIMENSION(np), INTENT(OUT) :: icefrac
 
-  REAL :: tmin ! if T < Tmin, the cloud is only made of water ice
-  REAL :: tmax ! if T > Tmax, the cloud is only made of liquid water
-  REAL :: nexpo ! controls the sharpness of the transition
   REAL :: sig0,www,tmin_tmp,icefrac_tmp
   INTEGER :: ip
@@ -29 +34 @@
   DO ip=1,np
      www=(max(sig(ip)-sig0,0.))/(1.-sig0) ! w=1 at the surface and 0 for sig < sig0
-     tmin_tmp=www*tmax+(1.-www)*tmin
-     icefrac_tmp= 1.0 - (temp(ip)-tmin_tmp) / (tmax-tmin_tmp)
+     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**nexpo
+     icefrac(ip) = icefrac_tmp**exposant_glace
   ENDDO