Changeset 2253 for LMDZ5/trunk/libf/phylmd/cv3p1_closure.F90

Timestamp:

Mar 30, 2015, 11:08:45 AM (9 years ago)

Author:

jyg

Message:

1/ Introduction of two variables in the ".def" files: (i) cvl_sig2feed is
the top of the convective feeding layer in sigma coordinates (D=0.97);
(ii) cvl_comp_threshold is the threshold fraction of convective points
below which compression occurs (D=1.).
2/ Corrections of various bugs revealed by the changes in compression:

• correct bugs in cv3a_uncompress.F90 for 3 fields used for convective

scavenging.

• add a reset to zero of "sig" and "w0" for non-convective points

(cva_driver.F90).

• in cv3_routines.F90, correct bounds of a few loops in cv3_undilute2,

correct the reset of the no-convection counter in cv3_yield.

• in phys_output_write_mod.F90, correct output of wdtrainA and wdtrainM.

3/ Improve declarations in various subroutines.

Modified files:

conema3.h
cv3param.h
cv3p1_closure.F90
conf_phys_m.F90
cv3a_compress.F90
phys_output_write_mod.F90
cv3_routines.F90
concvl.F90
cva_driver.F90
cv3a_uncompress.F90

File:

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

LMDZ5/trunk/libf/phylmd/cv3p1_closure.F90

@@ -29 +29 @@
 
   ! input:
-  INTEGER ncum, nd, nloc
-  INTEGER icb(nloc), inb(nloc)
-  REAL pbase(nloc), plcl(nloc)
-  REAL p(nloc, nd), ph(nloc, nd+1)
-  REAL tv(nloc, nd), tvp(nloc, nd), buoy(nloc, nd)
-  REAL supmax(nloc, nd)
-  LOGICAL ok_inhib ! enable convection inhibition by dryness
-  REAL ale(nloc), alp(nloc)
-  REAL omega(nloc,nd)
+  INTEGER, INTENT (IN)                               :: ncum, nd, nloc
+  INTEGER, DIMENSION (nloc), INTENT (IN)             :: icb, inb
+  REAL, DIMENSION (nloc), INTENT (IN)                :: pbase, plcl
+  REAL, DIMENSION (nloc, nd), INTENT (IN)            :: p
+  REAL, DIMENSION (nloc, nd+1), INTENT (IN)          :: ph
+  REAL, DIMENSION (nloc, nd), INTENT (IN)            :: tv, tvp, buoy
+  REAL, DIMENSION (nloc, nd), INTENT (IN)            :: supmax
+  LOGICAL, INTENT (IN)                               :: ok_inhib ! enable convection inhibition by dryness
+  REAL, DIMENSION (nloc), INTENT (IN)                :: ale, alp
+  REAL, DIMENSION (nloc, nd), INTENT (IN)            :: omega
 
   ! input/output:
-  REAL sig(nloc, nd), w0(nloc, nd), ptop2(nloc)
+  REAL, DIMENSION (nloc, nd), INTENT (INOUT)         :: sig, w0
+  REAL, DIMENSION (nloc), INTENT (INOUT)             :: ptop2
 
   ! output:
-  REAL cape(nloc), cin(nloc)
-  REAL m(nloc, nd)
-  REAL plim1(nloc), plim2(nloc)
-  REAL asupmax(nloc, nd), supmax0(nloc)
-  REAL asupmaxmin(nloc)
-  REAL cbmf(nloc), plfc(nloc)
-  REAL wbeff(nloc)
-  INTEGER iflag(nloc)
+  REAL, DIMENSION (nloc), INTENT (OUT)               :: cape, cin
+  REAL, DIMENSION (nloc, nd), INTENT (OUT)           :: m
+  REAL, DIMENSION (nloc), INTENT (OUT)               :: plim1, plim2
+  REAL, DIMENSION (nloc, nd), INTENT (OUT)           :: asupmax
+  REAL, DIMENSION (nloc), INTENT (OUT)               :: supmax0
+  REAL, DIMENSION (nloc), INTENT (OUT)               :: asupmaxmin
+  REAL, DIMENSION (nloc), INTENT (OUT)               :: cbmf, plfc
+  REAL, DIMENSION (nloc), INTENT (OUT)               :: wbeff
+  INTEGER, DIMENSION (nloc), INTENT (OUT)            :: iflag
 
   ! local variables:
@@ -91 +94 @@
 
 
-
   DO il = 1, ncum
     alp2(il) = max(alp(il), 1.E-5)
@@ -498 +500 @@
   IF (prt_level>=20) PRINT *, 'cv3p1_param apres cbmflim'
 
-  ! c 1.5 Compute cloud base mass flux given by Alp closure (Cbmf1), maximum
-  ! c     allowed mass flux (Cbmfmax) and final target mass flux (Cbmf)
-  ! c     Cbmf is set to zero if Cbmflim (the mass flux of elementary cloud)
-  ! is
-  ! --    exceedingly small.
+  ! 1.5 Compute cloud base mass flux given by Alp closure (Cbmf1), maximum
+  !     allowed mass flux (Cbmfmax) and final target mass flux (Cbmf)
+  !     Cbmf is set to zero if Cbmflim (the mass flux of elementary cloud)
+  !     is exceedingly small.
 
   DO il = 1, ncum