Skip to content

Commit 92077fb

Browse files
committed
Merge remote-tracking branch 'rneale/parcel_hdepth' into clean-up-bugfix
2 parents f7a8da3 + 6ace0bf commit 92077fb

File tree

5 files changed

+15
-4
lines changed

5 files changed

+15
-4
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
[submodule "atmos_phys"]
3737
path = src/atmos_phys
3838
url = https://github.com/ESCOMP/atmospheric_physics
39-
fxtag = atmos_phys0_10_000
39+
fxtag = atmos_phys0_10_001
4040
fxrequired = AlwaysRequired
4141
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
4242

bld/build-namelist

+1
Original file line numberDiff line numberDiff line change
@@ -3738,6 +3738,7 @@ if (!$simple_phys) {
37383738
add_default($nl, 'zmconv_tiedke_add');
37393739
add_default($nl, 'zmconv_capelmt');
37403740
add_default($nl, 'zmconv_tau');
3741+
add_default($nl, 'zmconv_parcel_hscale');
37413742
}
37423743

37433744
# moist convection rainwater coefficients

bld/namelist_files/namelist_defaults_cam.xml

+1
Original file line numberDiff line numberDiff line change
@@ -2844,6 +2844,7 @@
28442844
<zmconv_tau > 3600.0 </zmconv_tau>
28452845

28462846
<zmconv_parcel_pbl > .false. </zmconv_parcel_pbl>
2847+
<zmconv_parcel_hscale > 0.5 </zmconv_parcel_hscale>
28472848

28482849
<!-- Cloud sedimentation -->
28492850

bld/namelist_files/namelist_definition.xml

+6
Original file line numberDiff line numberDiff line change
@@ -3224,6 +3224,12 @@ Turn on ZM deep convection initial parcel properties as a function of a well mix
32243224
Default: .false.
32253225
</entry>
32263226

3227+
<entry id="zmconv_parcel_hscale" type="real" category="conv"
3228+
group="zmconv_nl" valid_values="" >
3229+
The fraction of the boundary layer (PBL) depth, over which to mix the initial ZM convective parcel properties (fraction).
3230+
Default: 0.5
3231+
</entry>
3232+
32273233
<entry id="zmconv_tau" type="real" category="conv"
32283234
group="zmconv_nl" valid_values="" >
32293235
Convective adjustment timescale in units of (s)

src/physics/cam/zm_conv_intr.F90

+6-3
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ module zm_conv_intr
7474
real(r8) :: zmconv_dmpdz = unset_r8 ! Parcel fractional mass entrainment rate
7575
real(r8) :: zmconv_tiedke_add = unset_r8 ! Convective parcel temperature perturbation
7676
real(r8) :: zmconv_capelmt = unset_r8 ! Triggering thereshold for ZM convection
77-
logical :: zmconv_parcel_pbl = .false. ! switch for parcel pbl calculation
77+
logical :: zmconv_parcel_pbl = .false. ! switch for parcel pbl calculation
78+
real(r8) :: zmconv_parcel_hscale = unset_r8 ! Fraction of PBL depth over which to mix initial parcel
7879
real(r8) :: zmconv_tau = unset_r8 ! Timescale for convection
7980

8081

@@ -163,7 +164,7 @@ subroutine zm_conv_readnl(nlfile)
163164
zmconv_ke, zmconv_ke_lnd, &
164165
zmconv_momcu, zmconv_momcd, &
165166
zmconv_dmpdz, zmconv_tiedke_add, zmconv_capelmt, &
166-
zmconv_parcel_pbl, zmconv_tau
167+
zmconv_parcel_pbl, zmconv_parcel_hscale, zmconv_tau
167168
!-----------------------------------------------------------------------------
168169

169170
if (masterproc) then
@@ -202,6 +203,8 @@ subroutine zm_conv_readnl(nlfile)
202203
if (ierr /= 0) call endrun("zm_conv_readnl: FATAL: mpi_bcast: zmconv_capelmt")
203204
call mpi_bcast(zmconv_parcel_pbl, 1, mpi_logical, masterprocid, mpicom, ierr)
204205
if (ierr /= 0) call endrun("zm_conv_readnl: FATAL: mpi_bcast: zmconv_parcel_pbl")
206+
call mpi_bcast(zmconv_parcel_hscale, 1, mpi_real8, masterprocid, mpicom, ierr)
207+
if (ierr /= 0) call endrun("zm_conv_readnl: FATAL: mpi_bcast: zmconv_parcel_hscale")
205208
call mpi_bcast(zmconv_tau, 1, mpi_real8, masterprocid, mpicom, ierr)
206209
if (ierr /= 0) call endrun("zm_conv_readnl: FATAL: mpi_bcast: zmconv_tau")
207210

@@ -345,7 +348,7 @@ subroutine zm_conv_init(pref_edge)
345348
pref_edge,zmconv_c0_lnd, zmconv_c0_ocn, zmconv_ke, zmconv_ke_lnd, &
346349
zmconv_momcu, zmconv_momcd, zmconv_num_cin, &
347350
no_deep_pbl, zmconv_tiedke_add, &
348-
zmconv_capelmt, zmconv_dmpdz,zmconv_parcel_pbl, zmconv_tau, &
351+
zmconv_capelmt, zmconv_dmpdz,zmconv_parcel_pbl, zmconv_parcel_hscale, zmconv_tau, &
349352
masterproc, iulog, errmsg, errflg)
350353

351354
if (errflg /= 0) then

0 commit comments

Comments
 (0)