Skip to content

Commit 53b2695

Browse files
cacraigucarcacraigucar
committed
Merge tag 'cam6_3_026' into cam_ml_tau
Merge pull request ESCOMP#398 from PUMASDevelopment/cam_dev_ppe_aerosol_name
2 parents f1eec56 + 3a95fb8 commit 53b2695

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1614
-738
lines changed

‎Externals_CAM.cfg‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ required = True
3737
local_path = src/physics/pumas
3838
protocol = git
3939
repo_url = https://github.com/cacraigucar/PUMAS
40-
hash = 39710e2
40+
hash = 5cbae830c
4141
required = True
4242

4343
[atmos_phys]
44-
tag = version0_00_007
44+
tag = atmos_phys0_00_011
4545
protocol = git
4646
repo_url = https://github.com/NCAR/atmospheric_physics
4747
required = True
@@ -59,7 +59,7 @@ local_path = src/dynamics/mpas/dycore
5959
protocol = git
6060
repo_url = https://github.com/MPAS-Dev/MPAS-Model.git
6161
sparse = ../.mpas_sparse_checkout
62-
hash = 224740a
62+
hash = 8fb89189
6363
required = True
6464

6565
[externals_description]

‎bld/build-namelist‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,11 +2881,28 @@ if ($cfg->get('microphys') =~ /^mg/) {
28812881
add_default($nl, 'micro_mg_do_graupel');
28822882
add_default($nl, 'graupel_in_rad');
28832883
add_default($nl, 'micro_do_massless_droplet_destroyer');
2884+
add_default($nl, 'micro_mg_accre_enhan_fact');
2885+
add_default($nl, 'micro_mg_autocon_fact');
2886+
add_default($nl, 'micro_mg_autocon_nd_exp');
2887+
add_default($nl, 'micro_mg_autocon_lwp_exp');
2888+
add_default($nl, 'micro_mg_homog_size');
2889+
add_default($nl, 'micro_mg_vtrmi_factor');
2890+
add_default($nl, 'micro_mg_effi_factor');
2891+
add_default($nl, 'micro_mg_iaccr_factor');
2892+
add_default($nl, 'micro_mg_max_nicons');
28842893

28852894
# For CESM2, the decision was made to set micro_do_sb_physics to false
28862895
add_default($nl, 'micro_do_sb_physics', 'val'=>'.false.');
28872896
}
28882897

2898+
# Aerosol Namelist options
2899+
add_default($nl, 'microp_aero_bulk_scale');
2900+
add_default($nl, 'microp_aero_npccn_scale');
2901+
add_default($nl, 'microp_aero_wsub_scale');
2902+
add_default($nl, 'microp_aero_wsubi_scale');
2903+
add_default($nl, 'microp_aero_wsub_min');
2904+
add_default($nl, 'microp_aero_wsubi_min');
2905+
28892906
# Ice nucleation options
28902907
if (!$simple_phys) {
28912908
if ($chem =~ /_mam/) {
@@ -3002,6 +3019,12 @@ if ($clubb_sgs =~ /$TRUE/io) {
30023019
add_default($nl, 'clubb_C2thl');
30033020
add_default($nl, 'clubb_C2rtthl');
30043021
add_default($nl, 'clubb_C4');
3022+
add_default($nl, 'clubb_c6rt');
3023+
add_default($nl, 'clubb_c6rtb');
3024+
add_default($nl, 'clubb_c6rtc');
3025+
add_default($nl, 'clubb_c6thl');
3026+
add_default($nl, 'clubb_c6thlb');
3027+
add_default($nl, 'clubb_c6thlc');
30053028
add_default($nl, 'clubb_C7');
30063029
add_default($nl, 'clubb_C7b');
30073030
add_default($nl, 'clubb_C8');
@@ -3020,6 +3043,10 @@ if ($clubb_sgs =~ /$TRUE/io) {
30203043
add_default($nl, 'clubb_skw_max_mag');
30213044
add_default($nl, 'clubb_up2_vp2_factor');
30223045
add_default($nl, 'clubb_C_wp2_splat');
3046+
add_default($nl, 'clubb_wpxp_L_thresh');
3047+
add_default($nl, 'clubb_detliq_rad');
3048+
add_default($nl, 'clubb_detice_rad');
3049+
add_default($nl, 'clubb_detphase_lowtemp');
30233050

30243051
add_default($nl, 'clubb_l_brunt_vaisala_freq_moist');
30253052
add_default($nl, 'clubb_l_call_pdf_closure_twice');
@@ -3135,6 +3162,9 @@ if (!$simple_phys) {
31353162
add_default($nl, 'zmconv_org');
31363163
add_default($nl, 'zmconv_microp');
31373164
add_default($nl, 'zmconv_num_cin');
3165+
add_default($nl, 'zmconv_dmpdz');
3166+
add_default($nl, 'zmconv_tiedke_add');
3167+
add_default($nl, 'zmconv_capelmt');
31383168
}
31393169

31403170
# moist convection rainwater coefficients

‎bld/configure‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2091,6 +2091,7 @@ sub write_filepath
20912091
if ($simple_phys) {
20922092
print $fh "$camsrcdir/src/physics/simple\n";
20932093
print $fh "$camsrcdir/src/atmos_phys/kessler\n";
2094+
print $fh "$camsrcdir/src/atmos_phys/held_suarez\n";
20942095
}
20952096

20962097
# Weak scaling fix. This has to come before physics/cam and before dycores
@@ -2303,6 +2304,7 @@ sub write_mpas_makefile
23032304
print $fh_out <<"EOF";
23042305
23052306
MPAS_SRC_ROOT := $cam_dir/src/dynamics/mpas
2307+
COMP_INTERFACE:= $cpl
23062308
23072309
EOF
23082310

‎bld/namelist_files/namelist_defaults_cam.xml‎

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1794,6 +1794,12 @@
17941794
<clubb_C2thl > 1.0 </clubb_C2thl>
17951795
<clubb_C2rtthl > 1.3 </clubb_C2rtthl>
17961796
<clubb_C4 > 5.2 </clubb_C4>
1797+
<clubb_c6rt > 4.0 </clubb_c6rt>
1798+
<clubb_c6rtb > 6.0 </clubb_c6rtb>
1799+
<clubb_c6rtc > 1.0 </clubb_c6rtc>
1800+
<clubb_c6thl > 4.0 </clubb_c6thl>
1801+
<clubb_c6thlb > 6.0 </clubb_c6thlb>
1802+
<clubb_c6thlc > 1.0 </clubb_c6thlc>
17971803
<clubb_C7 > 0.5 </clubb_C7>
17981804
<clubb_C7b > 0.5 </clubb_C7b>
17991805
<clubb_C8 > 4.2 </clubb_C8>
@@ -1807,6 +1813,7 @@
18071813
<clubb_c_K10 > 0.5 </clubb_c_K10>
18081814
<clubb_c_K10h > 0.3 </clubb_c_K10h>
18091815
<clubb_do_liqsupersat > .false. </clubb_do_liqsupersat>
1816+
<clubb_wpxp_L_thresh > 60.0 </clubb_wpxp_L_thresh>
18101817
<clubb_gamma_coef > 0.308 </clubb_gamma_coef>
18111818
<clubb_gamma_coef hgrid="1.9x2.5" > 0.280 </clubb_gamma_coef>
18121819
<clubb_gamma_coef dyn="se" > 0.270 </clubb_gamma_coef>
@@ -1819,6 +1826,9 @@
18191826
<clubb_skw_max_mag > 4.5 </clubb_skw_max_mag>
18201827
<clubb_up2_vp2_factor > 2.0 </clubb_up2_vp2_factor>
18211828
<clubb_C_wp2_splat > 0.0 </clubb_C_wp2_splat>
1829+
<clubb_detliq_rad > 8.0D-6 </clubb_detliq_rad>
1830+
<clubb_detice_rad > 25.0D-6 </clubb_detice_rad>
1831+
<clubb_detphase_lowtemp > 238.15D0 </clubb_detphase_lowtemp>
18221832

18231833
<clubb_l_brunt_vaisala_freq_moist > .false. </clubb_l_brunt_vaisala_freq_moist>
18241834
<clubb_l_call_pdf_closure_twice > .true. </clubb_l_call_pdf_closure_twice>
@@ -1931,8 +1941,49 @@
19311941
<micro_mg_precip_frac_method > max_overlap </micro_mg_precip_frac_method>
19321942
<micro_mg_precip_frac_method clubb_sgs="1" > in_cloud </micro_mg_precip_frac_method>
19331943

1934-
<micro_mg_berg_eff_factor > 1.0D0 </micro_mg_berg_eff_factor>
1935-
<micro_mg_berg_eff_factor microphys="mg2" > 1.0D0 </micro_mg_berg_eff_factor>
1944+
<micro_mg_berg_eff_factor > 1.D0 </micro_mg_berg_eff_factor>
1945+
<micro_mg_berg_eff_factor microphys="mg2" > 1.D0 </micro_mg_berg_eff_factor>
1946+
1947+
<micro_mg_accre_enhan_fact > 1.D0 </micro_mg_accre_enhan_fact>
1948+
<micro_mg_accre_enhan_fact microphys="mg2" > 1.D0 </micro_mg_accre_enhan_fact>
1949+
1950+
<micro_mg_autocon_fact > 0.01D0 </micro_mg_autocon_fact>
1951+
<micro_mg_autocon_fact microphys="mg2" > 0.01D0 </micro_mg_autocon_fact>
1952+
1953+
<micro_mg_autocon_nd_exp > -1.1D0 </micro_mg_autocon_nd_exp>
1954+
<micro_mg_autocon_nd_exp microphys="mg2" > -1.1D0 </micro_mg_autocon_nd_exp>
1955+
1956+
<micro_mg_autocon_lwp_exp > 2.47D0 </micro_mg_autocon_lwp_exp>
1957+
<micro_mg_autocon_lwp_exp microphys="mg2" > 2.47D0 </micro_mg_autocon_lwp_exp>
1958+
1959+
<microp_aero_bulk_scale > 2.D0 </microp_aero_bulk_scale>
1960+
1961+
<microp_aero_npccn_scale > 1.D0 </microp_aero_npccn_scale>
1962+
<microp_aero_npccn_scale microphys="mg2" > 1.D0 </microp_aero_npccn_scale>
1963+
1964+
<microp_aero_wsub_scale > 1.D0 </microp_aero_wsub_scale>
1965+
1966+
<microp_aero_wsubi_scale > 1.D0 </microp_aero_wsubi_scale>
1967+
1968+
<microp_aero_wsub_min > 0.2D0 </microp_aero_wsub_min>
1969+
1970+
<microp_aero_wsubi_min > 0.001D0 </microp_aero_wsubi_min>
1971+
1972+
<micro_mg_homog_size > 25.D-6 </micro_mg_homog_size>
1973+
<micro_mg_homog_size microphys="mg2" > 25.D-6 </micro_mg_homog_size>
1974+
1975+
<micro_mg_vtrmi_factor > 1.D0 </micro_mg_vtrmi_factor>
1976+
<micro_mg_vtrmi_factor microphys="mg2" > 1.D0 </micro_mg_vtrmi_factor>
1977+
1978+
<micro_mg_effi_factor > 1.D0 </micro_mg_effi_factor>
1979+
<micro_mg_effi_factor microphys="mg2" > 1.D0 </micro_mg_effi_factor>
1980+
1981+
<micro_mg_iaccr_factor > 1.D0 </micro_mg_iaccr_factor>
1982+
<micro_mg_iaccr_factor microphys="mg2" > 1.D0 </micro_mg_iaccr_factor>
1983+
1984+
<micro_mg_max_nicons > 1.D8 </micro_mg_max_nicons>
1985+
<micro_mg_max_nicons microphys="mg2" > 1.D8 </micro_mg_max_nicons>
1986+
19361987

19371988
<cld_macmic_num_steps> 1 </cld_macmic_num_steps>
19381989
<cld_macmic_num_steps microphys="mg2" clubb_sgs="1" > 3 </cld_macmic_num_steps>
@@ -2383,6 +2434,10 @@
23832434
<zmconv_num_cin > 5 </zmconv_num_cin>
23842435
<zmconv_num_cin phys="cam6" > 1 </zmconv_num_cin>
23852436

2437+
<zmconv_dmpdz > -1.0E-3 </zmconv_dmpdz>
2438+
<zmconv_tiedke_add > 0.5 </zmconv_tiedke_add>
2439+
<zmconv_capelmt > 70.0 </zmconv_capelmt>
2440+
23862441
<!-- Cloud sedimentation -->
23872442

23882443
<cldsed_ice_stokes_fac > 1.0D0 </cldsed_ice_stokes_fac>

‎bld/namelist_files/namelist_definition.xml‎

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2539,6 +2539,60 @@ Efficiency factor for berg
25392539
Default: 1
25402540
</entry>
25412541

2542+
<entry id="micro_mg_accre_enhan_fact" type="real" category="microphys"
2543+
group="micro_mg_nl" valid_values="" >
2544+
Unitless ratio to increase the accretion process in microphysics as a method of accounting for unrepresented subgridscale variability.
2545+
Default: 1
2546+
</entry>
2547+
2548+
<entry id="micro_mg_autocon_fact" type="real" category="microphys"
2549+
group="micro_mg_nl" valid_values="" >
2550+
Unitless ratio to directly scale the autoconversion process in microphysics as a method of accounting for unrepresented subgridscale variability.
2551+
Default: 0.01
2552+
</entry>
2553+
2554+
<entry id="micro_mg_autocon_nd_exp" type="real" category="microphys"
2555+
group="micro_mg_nl" valid_values="" >
2556+
Unitless exponent of cloud number condensation in the KK autoconversion parameterization equation. See Khairoutdinov and Kogan, 2002.
2557+
Default: -1.1
2558+
</entry>
2559+
2560+
<entry id="micro_mg_autocon_lwp_exp" type="real" category="microphys"
2561+
group="micro_mg_nl" valid_values="" >
2562+
Unitless exponent of liquid water path in the KK autoconversion parameterization equation. See Khairoutdinov and Kogan, 2002.
2563+
Default: 2.47
2564+
</entry>
2565+
2566+
<entry id="micro_mg_homog_size" type="real" category="microphys"
2567+
group="micro_mg_nl" valid_values="" >
2568+
Mean volume radius of droplets used in the process of homogeneously freezing below -40C in (m). Default value is currently the previously assumed 25 microns.
2569+
Default: 25.e-6 m
2570+
</entry>
2571+
2572+
<entry id="micro_mg_vtrmi_factor" type="real" category="microphys"
2573+
group="micro_mg_nl" valid_values="" >
2574+
Unitless scaling factor for ice fall speed to account for sub-grid scale ice crystal shape variability.
2575+
Default: 1.0
2576+
</entry>
2577+
2578+
<entry id="micro_mg_effi_factor" type="real" category="microphys"
2579+
group="micro_mg_nl" valid_values="" >
2580+
Unitless scaling factor for ice effective radius as seen by radiation. This scaling factor adjusts for sub-grid scale ice crystal shape variability.
2581+
Default: 1.0
2582+
</entry>
2583+
2584+
<entry id="micro_mg_iaccr_factor" type="real" category="microphys"
2585+
group="micro_mg_nl" valid_values="" >
2586+
Ice accrete cloud droplet factor
2587+
Default: 1
2588+
</entry>
2589+
2590+
<entry id="micro_mg_max_nicons" type="real" category="microphys"
2591+
group="micro_mg_nl" valid_values="" >
2592+
Maximum allowed ice number concentration
2593+
Default: 1.0e8
2594+
</entry>
2595+
x
25422596
<entry id="micro_do_sb_physics" type="logical" category="microphys"
25432597
group="micro_mg_nl" valid_values="" >
25442598
Do Seifert and Behang (2001) autoconversion and accretion physics when set to true.
@@ -2684,6 +2738,36 @@ prescribed aerosol bulk sulfur scale factor
26842738
Default: 2
26852739
</entry>
26862740

2741+
<entry id="microp_aero_npccn_scale" type="real" category="microphys"
2742+
group="microp_aero_nl" valid_values="" >
2743+
Unitless scaling factor for the activated number concentration of cloud condensation nuclei.
2744+
Default: 1.0
2745+
</entry>
2746+
2747+
<entry id="microp_aero_wsub_scale" type="real" category="microphys"
2748+
group="microp_aero_nl" valid_values="" >
2749+
Unitless scaling factor for the liquid droplet subgrid scale vertical velocity during aerosol activation.
2750+
Default: 1.0
2751+
</entry>
2752+
2753+
<entry id="microp_aero_wsubi_scale" type="real" category="microphys"
2754+
group="microp_aero_nl" valid_values="" >
2755+
Unitless scaling factor for ice droplet subgrid scale vertical velocity during aerosol activation.
2756+
Default: 1.0
2757+
</entry>
2758+
2759+
<entry id="microp_aero_wsub_min" type="real" category="microphys"
2760+
group="microp_aero_nl" valid_values="" >
2761+
Minimum subgrid vertical velocity for liquid droplets during aerosol activation with units of (m s-1).
2762+
Default: 0.2 m s-1
2763+
</entry>
2764+
2765+
<entry id="microp_aero_wsubi_min" type="real" category="microphys"
2766+
group="microp_aero_nl" valid_values="" >
2767+
Minimum subgrid vertical velocity for ice droplets during aerosol activation with units of (m s-1).
2768+
Default: 0.001 m s-1
2769+
</entry>
2770+
26872771
<entry id="use_hetfrz_classnuc" type="logical" category="microphys"
26882772
group="phys_ctl_nl" valid_values="" >
26892773
Switch to turn on heterogeneous freezing code.
@@ -2945,6 +3029,23 @@ Default: =&gt; 1 for CAM6;
29453029
=&gt; 5 for all other
29463030
</entry>
29473031

3032+
<entry id="zmconv_dmpdz" type="real" category="conv"
3033+
group="zmconv_nl" valid_values="" >
3034+
Tunable entrainment rate in ZM deep convection scheme in units of (m-1).
3035+
Default: -1.0e-3 m-1
3036+
</entry>
3037+
3038+
<entry id="zmconv_tiedke_add" type="real" category="conv"
3039+
group="zmconv_nl" valid_values="" >
3040+
Tunable parcel temperature perturbation in ZM deep convection scheme in units of (K).
3041+
Default: 0.5K perturbation
3042+
</entry>
3043+
3044+
<entry id="zmconv_capelmt" type="real" category="conv"
3045+
group="zmconv_nl" valid_values="" >
3046+
Tunable triggering threshold for convection in ZM deep scheme in units of (J kg-1).
3047+
Default: 70.0 J kg-1
3048+
</entry>
29483049

29493050
<!-- Cloud sedimentation -->
29503051

@@ -3414,6 +3515,36 @@ C2 coef. for the thlp2_dp1 term
34143515
C2 coef. for the rtpthlp_dp1 term
34153516
</entry>
34163517

3518+
<entry id="clubb_c6rt" type="real" category="pblrad"
3519+
group="clubb_params_nl" valid_values="" >
3520+
CLUBB tunable parameter - Low Skewness in C6rt Skw. Function
3521+
</entry>
3522+
3523+
<entry id="clubb_c6rtb" type="real" category="pblrad"
3524+
group="clubb_params_nl" valid_values="" >
3525+
CLUBB tunable parameter - High Skewness in C6rt Skw. Function
3526+
</entry>
3527+
3528+
<entry id="clubb_c6rtc" type="real" category="pblrad"
3529+
group="clubb_params_nl" valid_values="" >
3530+
CLUBB tunable parameter - Degree of Slope of C6rt Skw. Function
3531+
</entry>
3532+
3533+
<entry id="clubb_c6thl" type="real" category="pblrad"
3534+
group="clubb_params_nl" valid_values="" >
3535+
CLUBB tunable parameter - Low Skewness in C6thl Skw. Function
3536+
</entry>
3537+
3538+
<entry id="clubb_c6thlb" type="real" category="pblrad"
3539+
group="clubb_params_nl" valid_values="" >
3540+
CLUBB tunable parameter - High Skewness in C6thl Skw. Function
3541+
</entry>
3542+
3543+
<entry id="clubb_c6thlc" type="real" category="pblrad"
3544+
group="clubb_params_nl" valid_values="" >
3545+
CLUBB tunable parameter - Degree of Slope of C6thl Skw. Function
3546+
</entry>
3547+
34173548
<entry id="clubb_C4" type="real" category="pblrad"
34183549
group="clubb_params_nl" valid_values="" >
34193550
C4 coefficient in the wp2 return-to-isotropy term. A higher value of C4
@@ -3468,6 +3599,11 @@ Thermo of Kh_zm
34683599
Default: 0.3
34693600
</entry>
34703601

3602+
<entry id="clubb_wpxp_L_thresh" type="real" category="pblrad"
3603+
group="clubb_params_nl" valid_values="" >
3604+
CLUBB tunable parameter - Lscale threshold: damp C6 and C7 (units: m)
3605+
</entry>
3606+
34713607
<entry id="clubb_do_liqsupersat" type="logical" category="conv"
34723608
group="clubb_params_nl" valid_values="" >
34733609
Apply liquid supersaturation adjustment code
@@ -3529,6 +3665,24 @@ clubb_up2_vp2_factor increases the values of up2 and vp2 at the surface.
35293665
Coefficient for gustiness near ground.
35303666
</entry>
35313667

3668+
<entry id="clubb_detliq_rad" type="real" category="pblrad"
3669+
group="clubb_params_nl" valid_values="" >
3670+
Radius of detrained liquid drops as they are used in the CLUBB parameterization in units of (m).
3671+
Default: 8.0e-6 m
3672+
</entry>
3673+
3674+
<entry id="clubb_detice_rad" type="real" category="pblrad"
3675+
group="clubb_params_nl" valid_values="" >
3676+
Radius of detrained ice drops as they are used in the CLUBB parameterization in units of (m).
3677+
Default: 25.0e-6 m
3678+
</entry>
3679+
3680+
<entry id="clubb_detphase_lowtemp" type="real" category="pblrad"
3681+
group="clubb_params_nl" valid_values="" >
3682+
Temperature at which detrained water is classified as entirely ice (no liquid)
3683+
in the CLUBB parameterization in units of (K).
3684+
Default: 238.15 K
3685+
</entry>
35323686

35333687
<!-- CLUBB logical parameters -->
35343688
<entry id="clubb_l_brunt_vaisala_freq_moist" type="logical" category="pblrad"

‎cime_config/buildcpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22

33
"""
44
API for cam's configure

0 commit comments

Comments
 (0)