--- trunk/libf/phylmd/nuage.f90	2011/09/23 12:28:01	52
+++ trunk/Sources/phylmd/nuage.f	2015/09/14 17:13:16	169
@@ -10,6 +10,7 @@
   !
   use dimens_m
   use dimphy
+  use nr_util, only: pi
   use SUPHEC_M
   IMPLICIT none
   !======================================================================
@@ -55,7 +56,7 @@
   PARAMETER (cetahb = 0.45, cetamb = 0.80)
   !
   INTEGER i, k
-  REAL zflwp, zradef, zfice, zmsac
+  REAL zflwp, zfice
   !
   REAL radius, rad_froid, rad_chaud, rad_chau1, rad_chau2
   PARAMETER (rad_chau1=13.0, rad_chau2=9.0, rad_froid=35.0)
@@ -78,7 +79,6 @@
   REAL re(klon, klev)       ! cloud droplet effective radius [um]
   REAL sulfate_pi(klon, klev)  ! sulfate aerosol mass concentration [ug m-3] (pre-industrial value)
   REAL cdnc_pi(klon, klev)     ! cloud droplet number concentration [m-3] (pi value)
-  REAL re_pi(klon, klev)       ! cloud droplet effective radius [um] (pi value)
 
   REAL fl(klon, klev)  ! xliq * rneb (denominator to re ; fraction of liquid water clouds within the grid cell)
 
@@ -123,7 +123,7 @@
            !
            rad_chaud =  &
                 1.1 * ( (pqlwp(i,k) * pplay(i,k) / (RD * T(i,k)) )   &
-                / (4./3. * RPI * 1000. * cdnc(i,k)) )**(1./3.)
+                / (4./3. * PI * 1000. * cdnc(i,k)) )**(1./3.)
            !
            ! Convert to um. CDR shall be at least 3 um.
            !
@@ -148,7 +148,7 @@
            ! ice cloud contribution) but using cdnc_pi instead of
            ! cdnc.
            radius = MAX(1.1e6 * ( (pqlwp(i,k)*pplay(i,k)/(RD*T(i,k)))   &
-                / (4./3.*RPI*1000.*cdnc_pi(i,k)) )**(1./3.),  &
+                / (4./3.*PI*1000.*cdnc_pi(i,k)) )**(1./3.),  &
                 3.) * (1.-zfice) + rad_froid * zfice
            cldtaupi(i,k) = 3.0/2.0 * zflwp / radius