--- trunk/libf/phylmd/YOECUMF.f90	2008/04/18 14:45:53	10
+++ trunk/Sources/phylmd/Conflx/YOECUMF.f	2015/04/29 15:47:56	134
@@ -1,35 +1,56 @@
 module yoecumf
 
-  ! From phylmd/YOECUMF.h,v 1.1.1.1 2004/05/19 12:53:07
+  ! From phylmd/YOECUMF.h, version 1.1.1.1 2004/05/19 12:53:07
 
-  ! PARAMETERS FOR CUMULUS MASSFLUX SCHEME
+  ! M. Tiedtke, ECMWF, 18th Jan. 1989
+  ! Parameters for cumulus massflux scheme
 
   implicit none
 
-  LOGICAL          LMFPEN,LMFSCV,LMFMID,LMFDD,LMFDUDV
-  REAL ENTRPEN, ENTRSCV, ENTRMID, ENTRDD
-  REAL CMFCTOP, CMFCMAX, CMFCMIN, CMFDEPS, RHCDD, CPRCON
-
-  !     M.TIEDTKE       E. C. M. W. F.      18/1/89
-  !
-  !     NAME      TYPE      PURPOSE
-  !     ----      ----      -------
-  !
-  !     LMFPEN    LOGICAL  TRUE IF PENETRATIVE CONVECTION IS SWITCHED ON
-  !     LMFSCV    LOGICAL  TRUE IF SHALLOW     CONVECTION IS SWITCHED ON
-  !     LMFMID    LOGICAL  TRUE IF MIDLEVEL    CONVECTION IS SWITCHED ON
-  !     LMFDD     LOGICAL  TRUE IF CUMULUS DOWNDRAFT      IS SWITCHED ON
-  !     LMFDUDV   LOGICAL  TRUE IF CUMULUS FRICTION       IS SWITCHED ON
-  !     ENTRPEN   REAL     ENTRAINMENT RATE FOR PENETRATIVE CONVECTION
-  !     ENTRSCV   REAL     ENTRAINMENT RATE FOR SHALLOW CONVECTION
-  !     ENTRMID   REAL     ENTRAINMENT RATE FOR MIDLEVEL CONVECTION
-  !     ENTRDD    REAL     ENTRAINMENT RATE FOR CUMULUS DOWNDRAFTS
-  !     CMFCTOP   REAL     RELAT. CLOUD MASSFLUX AT LEVEL ABOVE NONBUOYANC
-  !     CMFCMAX   REAL     MAXIMUM MASSFLUX VALUE ALLOWED FOR
-  !     CMFCMIN   REAL     MINIMUM MASSFLUX VALUE (FOR SAFETY)
-  !     CMFDEPS   REAL     FRACTIONAL MASSFLUX FOR DOWNDRAFTS AT LFS
-  !     RHCDD     REAL     RELATIVE SATURATION IN DOWNDRAFTS
-  !     CPRCON    REAL     COEFFICIENTS FOR DETERMINING CONVERSION
-  !                        FROM CLOUD WATER TO RAIN
+  logical lmfpen ! penetrative convection switched on
+  logical lmfscv ! shallow convection switched on
+  logical lmfmid ! midlevel convection switched on
+  logical lmfdd ! cumulus downdraft switched on
+  logical lmfdudv ! cumulus friction switched on
+  real entrpen ! entrainment rate for penetrative convection
+  real entrscv ! entrainment rate for shallow convection
+  real entrmid ! entrainment rate for midlevel convection
+  real entrdd ! entrainment rate for cumulus downdrafts
+  real cmfctop ! relative cloud massflux at level above nonbuoyanc level
+  real cmfcmax ! maximum massflux value allowed for updrafts etc
+  real cmfcmin ! minimum massflux value (for safety)
+  real cmfdeps ! fractional massflux for downdrafts at lfs
+
+  real rhcdd
+  ! relative saturation in downdrafts (no longer used) (formulation
+  ! implies saturation)
+
+  real cprcon ! coefficients for determining conversion from cloud water to rain
+
+contains
+
+  SUBROUTINE flxsetup
+
+    ! This routine defines disposable parameters for massflux scheme.
+
+    !--------------------------------------------------------
+
+    ENTRPEN = 1E-4
+    ENTRSCV = 3E-4
+    ENTRMID = 1E-4
+    ENTRDD = 2E-4 
+    CMFCTOP = 0.33
+    CMFCMAX = 1.
+    CMFCMIN = 1E-10
+    CMFDEPS = 0.3
+    CPRCON = 2E-4
+    RHCDD = 1.
+    LMFPEN = .TRUE.
+    LMFSCV = .TRUE.
+    LMFMID = .TRUE.
+    LMFDD = .TRUE.
+    LMFDUDV = .TRUE.
+
+  END SUBROUTINE flxsetup
 
 end module yoecumf