--- trunk/phylmd/CV3_routines/cv3_param.f	2014/03/05 14:57:53	82
+++ trunk/Sources/phylmd/CV30_routines/cv30_param.f	2016/03/21 18:01:02	187
@@ -1,16 +1,21 @@
-module cv3_param_m
+module cv30_param_m
 
-  ! From LMDZ4/libf/phylmd/cvparam3.h, version 1.1.1.1 2004/05/19 12:53:09
+  ! From LMDZ4/libf/phylmd/cvparam3.h, version 1.1.1.1, 2004/05/19 12:53:09
 
-  ! Parameters for iflag_con=3:
+  ! Parameters for Emanuel convection scheme:
   ! - microphysical parameters
   ! - parameters that control the rate of approach to quasi-equilibrium
 
+  USE dimphy, ONLY: klev
+
   implicit none
 
-  integer noff ! integer limit for convection (nd - noff)
   integer minorig ! first level of convection
-  integer nl, nlp, nlm
+
+  integer, parameter:: nl = klev - 1
+  ! Limit for convection. The maximum number of levels to which
+  ! convection can penetrate, plus 1.  nl must be <= KLEV-1.
+
   real sigd ! FRACTIONAL AREA COVERED BY UNSATURATED DNDRAFT 
   real spfac ! FRACTION OF PRECIPITATION FALLING OUTSIDE OF CLOUD 
 
@@ -38,26 +43,22 @@
   real delta
   real betad
 
+  private klev
+
 contains
 
-  SUBROUTINE cv3_param(nd, delt)
+  SUBROUTINE cv30_param(delt)
 
-    ! From LMDZ4/libf/phylmd/cv3_routines.F, version 1.5 2005/07/11 15:20:02
+    ! From LMDZ4/libf/phylmd/cv3_routines.F, version 1.5, 2005/07/11 15:20:02
 
-    ! Set parameters for iflag_con = 3
+    ! Set parameters for Emanuel convection scheme
 
-    integer, intent(in):: nd
     real, intent(in):: delt ! timestep (seconds)
 
     !------------------------------------------------------------
 
     ! Limit levels for convection:
-
-    noff = 1
     minorig = 1
-    nl=nd-noff
-    nlp=nl+1
-    nlm=nl-1
 
     ! "Microphysical" parameters:
 
@@ -70,13 +71,11 @@
     omtrain = 45.0 ! used also for snow (no distinction rain/snow)
 
     ! Misc:
-
     dtovsh = -0.2 ! dT for overshoot
     dpbase = -40. ! definition cloud base (400m above LCL)
     dttrig = 5. ! (loose) condition for triggering
 
     ! Rate of approach to quasi-equilibrium:
-
     dtcrit = -2.0
     tau = 8000.
     beta = 1.0 - delt/tau
@@ -85,13 +84,11 @@
     alpha = alpha*1.5
 
     ! Interface cloud parameterization:
-
     delta=0.01 ! cld
 
     ! Interface with boundary-layer (gust factor): (sb)
-
     betad=10.0 ! original value (from convect 4.3)
 
-  end SUBROUTINE cv3_param
+  end SUBROUTINE cv30_param
 
-end module cv3_param_m
+end module cv30_param_m