Skip to content

Commit 09d3f29

Browse files
author
Kai Huang
committed
Kai's ZM_MCSP modifications
1 parent b35f615 commit 09d3f29

File tree

5 files changed

+575
-4
lines changed

5 files changed

+575
-4
lines changed

bld/namelist_files/namelist_defaults_cam.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2891,6 +2891,12 @@
28912891
<zmconv_parcel_pbl > .false. </zmconv_parcel_pbl>
28922892
<zmconv_parcel_hscale > 0.5 </zmconv_parcel_hscale>
28932893

2894+
<!-- MCSP scheme added by KH -->
2895+
<zmconv_MCSP_heat_coeff > 0.0D0 </zmconv_MCSP_heat_coeff >
2896+
<zmconv_MCSP_moisture_coeff > 0.0D0 </zmconv_MCSP_moisture_coeff >
2897+
<zmconv_MCSP_uwind_coeff > 0.0D0 </zmconv_MCSP_uwind_coeff >
2898+
<zmconv_MCSP_vwind_coeff > 0.0D0 </zmconv_MCSP_vwind_coeff >
2899+
28942900
<!-- Cloud sedimentation -->
28952901

28962902
<cldsed_ice_stokes_fac > 1.0D0 </cldsed_ice_stokes_fac>

bld/namelist_files/namelist_definition.xml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3508,8 +3508,6 @@ Number of subcolumns in VAMP Generator
35083508
Default: 10
35093509
</entry>
35103510

3511-
3512-
35133511
<!-- Moist Convection and Microphysics -->
35143512

35153513
<entry id="deep_scheme" type="char*16" category="conv"
@@ -3678,6 +3676,33 @@ the zonally averaged zonal wind in the sponge layer.
36783676
Default: 0.0
36793677
</entry>
36803678

3679+
<!-- MCSP nl added by KH -->
3680+
3681+
<entry id="zmconv_MCSP_heat_coeff" type="real" category="conv"
3682+
group="zmconv_mcsp_nl" valid_values="" >
3683+
MCSP heating coefficient controlling the tendency intensity added.
3684+
Default: 0.0
3685+
</entry>
3686+
3687+
<entry id="zmconv_MCSP_moisture_coeff" type="real" category="conv"
3688+
group="zmconv_mcsp_nl" valid_values="" >
3689+
MCSP moistening coefficient controlling the tendency intensity added.
3690+
Default: 0.0
3691+
</entry>
3692+
3693+
<entry id="zmconv_MCSP_uwind_coeff" type="real" category="conv"
3694+
group="zmconv_mcsp_nl" valid_values="" >
3695+
MCSP uwnd tendency coefficient controlling the tendency intensity added.
3696+
Default: 0.0
3697+
</entry>
3698+
3699+
<entry id="zmconv_MCSP_vwind_coeff" type="real" category="conv"
3700+
group="zmconv_mcsp_nl" valid_values="" >
3701+
MCSP vwnd tendency coefficient controlling the tendency intensity added.
3702+
Default: 0.0
3703+
</entry>
3704+
3705+
36813706
<!-- CLUBB PBL Diff nl -->
36823707

36833708
<entry id="clubb_cloudtop_cooling" type="logical" category="pblrad"

src/control/runtime_opts.F90

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ subroutine read_namelist(nlfilename, single_column, scmlat, scmlon)
4949
use cloud_fraction, only: cldfrc_readnl
5050
use cldfrc2m, only: cldfrc2m_readnl
5151
use rk_stratiform_cam, only: rk_stratiform_cam_readnl
52-
use zm_conv_intr, only: zm_conv_readnl
52+
use zm_conv_intr, only: zm_conv_readnl
53+
!KH:++++++++++++++++
54+
use zm_conv_mcsp, only: zm_conv_mcsp_readnl
55+
!KH:++++++++++++++++
5356
use hk_conv, only: hkconv_readnl
5457
use uwshcu, only: uwshcu_readnl
5558
use pkg_cld_sediment, only: cld_sediment_readnl
@@ -153,6 +156,9 @@ subroutine read_namelist(nlfilename, single_column, scmlat, scmlon)
153156
call cldfrc_readnl(nlfilename)
154157
call cldfrc2m_readnl(nlfilename)
155158
call zm_conv_readnl(nlfilename)
159+
!KH:+++++++++++++++++
160+
call zm_conv_mcsp_readnl(nlfilename)
161+
!KH:+++++++++++++++++
156162
call rk_stratiform_cam_readnl(nlfilename)
157163
call hkconv_readnl(nlfilename)
158164
call uwshcu_readnl(nlfilename)

0 commit comments

Comments
 (0)