Skip to content

Commit

Permalink
Merge singhbalwinder/atm/v2compset (PR #2789)
Browse files Browse the repository at this point in the history
Implements remaining changes for gustiness feature for EAMv2

This PR completes the gustiness feature in EAM by implementing all the right namelist settings for gustiness. A new use case file 2000_cam5_av1c-04p2_gust.xml has all the namelist values for invoking this feature using FC5AV1C-L compset. Several new namelist variables required for this feature will now appear in the namelist (atm_in).

A test mod directory is also created to add a test for this feature in the nightly testing.

[BFB]
[NML]
  • Loading branch information
wlin7 committed Mar 12, 2019
2 parents 6ccbce1 + 4f0fb8a commit e1d76d9
Show file tree
Hide file tree
Showing 40 changed files with 398 additions and 27 deletions.
1 change: 1 addition & 0 deletions cime/config/e3sm/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"PEM_Ln5.ne4_ne4.FC5AV1C-L",
"SMS_D_Ln5.ne4_ne4.FC5AV1C-L.cam-cosplite_nhtfrq5",
"ERS_Ld5.ne4_ne4.FC5AV1C-L.cam-rrtmgp",
"ERS_Ld5.ne4_ne4.FC5AV1C-L.cam-gust_param",
"REP_Ln5.ne4_ne4.FC5AV1C-L",
)
},
Expand Down
43 changes: 43 additions & 0 deletions components/cam/bld/namelist_files/namelist_definition.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3055,6 +3055,18 @@ Constant associated with the dissipation of the variance of vertical velocity
Default: 1.0. See clubb/parameters_tunable.F90
</entry>

<entry id="clubb_C1b" type="real" category="pblrad"
group="clubb_param_nl" valid_values="" >
Constant associated with the dissipation of the variance of vertical velocity
Default: 1.0. See clubb/parameters_tunable.F90
</entry>

<entry id="clubb_C1c" type="real" category="pblrad"
group="clubb_param_nl" valid_values="" >
Constant associated with the dissipation of the variance of vertical velocity
Default: 1.0. See clubb/parameters_tunable.F90
</entry>

<entry id="clubb_C2rt" type="real" category="pblrad"
group="clubb_param_nl" valid_values="" >
Constant associated with the dissipation of the variance of total water
Expand Down Expand Up @@ -3085,6 +3097,25 @@ High skewness of Newtonian damping of water flux
Default: 6.0
</entry>

<entry id="clubb_C6rtc" type="real" category="pblrad"
group="clubb_param_nl" valid_values="" >
High skewness of Newtonian damping of water flux
Default: 1.0
</entry>

<entry id="clubb_C6thlb" type="real" category="pblrad"
group="clubb_param_nl" valid_values="" >
Low skewness of Newtonian damping of water flux
Default: 1.0
</entry>

<entry id="clubb_C6thlc" type="real" category="pblrad"
group="clubb_param_nl" valid_values="" >
Low skewness of Newtonian damping of water flux
Default: 6.0
</entry>


<entry id="clubb_C7" type="real" category="pblrad"
group="clubb_param_nl" valid_values="" >
Low skewness of buoyancy damping of water flux
Expand Down Expand Up @@ -3115,6 +3146,12 @@ High skewnes of buoyancy damping of the third moment of vertical velocity
Default: 0.35
</entry>

<entry id="clubb_C11c" type="real" category="pblrad"
group="clubb_param_nl" valid_values="" >
High skewnes of buoyancy damping of the third moment of vertical velocity
Default: 0.5
</entry>

<entry id="clubb_C14" type="real" category="pblrad"
group="clubb_param_nl" valid_values="" >
Constant of Newtonian damping of the variances of u-wind and v-wind
Expand All @@ -3139,6 +3176,12 @@ High Skw. gamma coef. Skw. Fnct.
Default: 0.32 or clubb_gamma_coef if it is specified
</entry>

<entry id="clubb_gamma_coefc" type="real" category="pblrad"
group="clubb_param_nl" valid_values="" >
High Skw. gamma coef. Skw. Fnct.
Default: 5.0or clubb_gamma_coef if it is specified
</entry>

<entry id="clubb_mu" type="real" category="pblrad"
group="clubb_param_nl" valid_values="" >
Fractional parcel entrainment rate per unit height (1/m)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
<seasalt_emis_scale > 0.85 </seasalt_emis_scale>
<dust_emis_fact > 2.05D0 </dust_emis_fact>
<clubb_gamma_coef > 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<clubb_C8 > 4.3 </clubb_C8>
<cldfrc2m_rhmaxi > 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10 > 0.3 </clubb_c_K10>
Expand All @@ -85,6 +86,7 @@
<zmconv_mx_bot_lyr_adj > 2 </zmconv_mx_bot_lyr_adj>
<taubgnd > 2.5D-3 </taubgnd>
<clubb_C1 > 1.335 </clubb_C1>
<clubb_C1b > 1.335 </clubb_C1b>
<raytau0 > 5.0D0 </raytau0>
<prc_coef1 > 30500.0D0 </prc_coef1>
<prc_exp > 3.19D0 </prc_exp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
<seasalt_emis_scale > 0.85 </seasalt_emis_scale>
<dust_emis_fact > 2.05D0 </dust_emis_fact>
<clubb_gamma_coef > 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<clubb_C8 > 4.3 </clubb_C8>
<cldfrc2m_rhmaxi > 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10 > 0.3 </clubb_c_K10>
Expand All @@ -85,6 +86,7 @@
<zmconv_mx_bot_lyr_adj > 2 </zmconv_mx_bot_lyr_adj>
<taubgnd > 2.5D-3 </taubgnd>
<clubb_C1 > 1.335 </clubb_C1>
<clubb_C1b > 1.335 </clubb_C1b>
<raytau0 > 5.0D0 </raytau0>
<prc_coef1 > 30500.0D0 </prc_coef1>
<prc_exp > 3.19D0 </prc_exp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
<seasalt_emis_scale> 0.7 </seasalt_emis_scale>
<dust_emis_fact> 2.05D0 </dust_emis_fact>
<clubb_gamma_coef> 0.25 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.25 </clubb_gamma_coefb>
<clubb_C8> 5.2 </clubb_C8>
<cldfrc2m_rhmaxi> 1.1D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.4 </clubb_c_K10>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
<seasalt_emis_scale> 1.05 </seasalt_emis_scale>
<dust_emis_fact> 2.05D0 </dust_emis_fact>
<clubb_gamma_coef> 0.29 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.29 </clubb_gamma_coefb>
<clubb_C8> 5.2 </clubb_C8>
<cldfrc2m_rhmaxi> 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.3 </clubb_c_K10>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
<seasalt_emis_scale> 0.85 </seasalt_emis_scale>
<dust_emis_fact> 2.05D0 </dust_emis_fact>
<clubb_gamma_coef> 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<clubb_C8> 4.3 </clubb_C8>
<cldfrc2m_rhmaxi> 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.3 </clubb_c_K10>
Expand All @@ -75,6 +76,7 @@
<zmconv_mx_bot_lyr_adj >2</zmconv_mx_bot_lyr_adj>
<taubgnd >2.5D-3 </taubgnd>
<clubb_C1 >1.3</clubb_C1>
<clubb_C1b >1.3</clubb_C1b>
<raytau0 >5.0D0</raytau0>
<prc_coef1 >30500.0D0</prc_coef1>
<prc_exp >3.19D0</prc_exp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
<seasalt_emis_scale> 0.85 </seasalt_emis_scale>
<dust_emis_fact> 2.05D0 </dust_emis_fact>
<clubb_gamma_coef> 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<clubb_C8> 4.3 </clubb_C8>
<cldfrc2m_rhmaxi> 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.3 </clubb_c_K10>
Expand All @@ -75,6 +76,7 @@
<zmconv_mx_bot_lyr_adj >2</zmconv_mx_bot_lyr_adj>
<taubgnd >2.5D-3 </taubgnd>
<clubb_C1 >1.3</clubb_C1>
<clubb_C1b >1.3</clubb_C1b>
<raytau0 >5.0D0</raytau0>
<prc_coef1 >30500.0D0</prc_coef1>
<prc_exp >3.19D0</prc_exp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
<seasalt_emis_scale> 0.85 </seasalt_emis_scale>
<dust_emis_fact> 2.05D0 </dust_emis_fact>
<clubb_gamma_coef> 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<clubb_C8> 4.3 </clubb_C8>
<cldfrc2m_rhmaxi> 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.3 </clubb_c_K10>
Expand All @@ -75,6 +76,7 @@
<zmconv_mx_bot_lyr_adj >2</zmconv_mx_bot_lyr_adj>
<taubgnd >2.5D-3 </taubgnd>
<clubb_C1 >1.335</clubb_C1>
<clubb_C1b >1.335</clubb_C1b>
<raytau0 >5.0D0</raytau0>
<prc_coef1 >30500.0D0</prc_coef1>
<prc_exp >3.19D0</prc_exp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
<seasalt_emis_scale> 0.85 </seasalt_emis_scale>
<dust_emis_fact> 2.05D0 </dust_emis_fact>
<clubb_gamma_coef> 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<cldfrc2m_rhmaxi> 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.3 </clubb_c_K10>
<effgw_beres> 0.4 </effgw_beres>
Expand All @@ -69,6 +70,7 @@
<zmconv_mx_bot_lyr_adj >2</zmconv_mx_bot_lyr_adj>
<taubgnd >2.5D-3 </taubgnd>
<clubb_C1 >1.335</clubb_C1>
<clubb_C1b >1.335</clubb_C1b>
<raytau0 >5.0D0</raytau0>
<prc_coef1 >30500.0D0</prc_coef1>
<prc_exp >3.19D0</prc_exp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
<seasalt_emis_scale> 0.85 </seasalt_emis_scale>
<dust_emis_fact> 2.05D0 </dust_emis_fact>
<clubb_gamma_coef> 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<clubb_C8> 4.3 </clubb_C8>
<cldfrc2m_rhmaxi> 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.3 </clubb_c_K10>
Expand All @@ -70,6 +71,7 @@
<zmconv_mx_bot_lyr_adj >2</zmconv_mx_bot_lyr_adj>
<taubgnd >2.5D-3 </taubgnd>
<clubb_C1 >1.335</clubb_C1>
<clubb_C1b >1.335</clubb_C1b>
<raytau0 >5.0D0</raytau0>
<prc_coef1 >30500.0D0</prc_coef1>
<prc_exp >3.19D0</prc_exp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<effgw_oro> 0.25 </effgw_oro>
<seasalt_emis_scale> 0.85 </seasalt_emis_scale>
<clubb_gamma_coef> 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<cldfrc2m_rhmaxi> 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.3 </clubb_c_K10>
<effgw_beres> 0.4 </effgw_beres>
Expand Down Expand Up @@ -87,6 +88,7 @@
<zmconv_ke >6.0E-6</zmconv_ke>
<cldfrc_dp1 >0.039D0</cldfrc_dp1>
<clubb_C1 >1.50D0</clubb_C1>
<clubb_C1b >1.50D0</clubb_C1b>
<clubb_C8 >4.73D0</clubb_C8>
<clubb_C14 >1.75D0</clubb_C14>
<se_nsplit >6</se_nsplit>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
<seasalt_emis_scale> 0.85 </seasalt_emis_scale>
<dust_emis_fact> 2.5D0 </dust_emis_fact>
<clubb_gamma_coef> 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<cldfrc2m_rhmaxi> 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.3 </clubb_c_K10>
<effgw_beres> 0.4 </effgw_beres>
Expand All @@ -79,6 +80,7 @@
<zmconv_mx_bot_lyr_adj >2</zmconv_mx_bot_lyr_adj>
<taubgnd >2.5D-3 </taubgnd>
<clubb_C1 >1.5</clubb_C1>
<clubb_C1b >1.5</clubb_C1b>
<raytau0 >5.0D0</raytau0>
<prc_coef1 >30500.0D0</prc_coef1>
<prc_exp >3.19D0</prc_exp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
<seasalt_emis_scale > 0.85 </seasalt_emis_scale>
<dust_emis_fact > 2.05D0 </dust_emis_fact>
<clubb_gamma_coef > 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<clubb_C8 > 4.3 </clubb_C8>
<cldfrc2m_rhmaxi > 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10 > 0.3 </clubb_c_K10>
Expand All @@ -85,6 +86,7 @@
<zmconv_mx_bot_lyr_adj > 2 </zmconv_mx_bot_lyr_adj>
<taubgnd > 2.5D-3 </taubgnd>
<clubb_C1 > 1.335 </clubb_C1>
<clubb_C1b > 1.335 </clubb_C1b>
<raytau0 > 5.0D0 </raytau0>
<prc_coef1 > 30500.0D0 </prc_coef1>
<prc_exp > 3.19D0 </prc_exp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
<seasalt_emis_scale> 0.85 </seasalt_emis_scale>
<dust_emis_fact> 2.5D0 </dust_emis_fact>
<clubb_gamma_coef> 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<cldfrc2m_rhmaxi> 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.3 </clubb_c_K10>
<effgw_beres> 0.4 </effgw_beres>
Expand All @@ -79,6 +80,7 @@
<zmconv_mx_bot_lyr_adj >2</zmconv_mx_bot_lyr_adj>
<taubgnd >2.5D-3 </taubgnd>
<clubb_C1 >1.5</clubb_C1>
<clubb_C1b >1.5</clubb_C1b>
<raytau0 >5.0D0</raytau0>
<prc_coef1 >30500.0D0</prc_coef1>
<prc_exp >3.19D0</prc_exp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
<seasalt_emis_scale> 0.7 </seasalt_emis_scale>
<dust_emis_fact> 2.05D0 </dust_emis_fact>
<clubb_gamma_coef> 0.25 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.25 </clubb_gamma_coefb>
<clubb_C8> 5.2 </clubb_C8>
<cldfrc2m_rhmaxi> 1.1D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.4 </clubb_c_K10>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
<seasalt_emis_scale> 1.05 </seasalt_emis_scale>
<dust_emis_fact> 2.05D0 </dust_emis_fact>
<clubb_gamma_coef> 0.29 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.29 </clubb_gamma_coefb>
<clubb_C8> 5.2 </clubb_C8>
<cldfrc2m_rhmaxi> 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.3 </clubb_c_K10>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
<seasalt_emis_scale> 0.85 </seasalt_emis_scale>
<dust_emis_fact> 2.05D0 </dust_emis_fact>
<clubb_gamma_coef> 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<clubb_C8> 4.3 </clubb_C8>
<cldfrc2m_rhmaxi> 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.3 </clubb_c_K10>
Expand All @@ -75,6 +76,7 @@
<zmconv_mx_bot_lyr_adj >2</zmconv_mx_bot_lyr_adj>
<taubgnd >2.5D-3 </taubgnd>
<clubb_C1 >1.3</clubb_C1>
<clubb_C1b >1.3</clubb_C1b>
<raytau0 >5.0D0</raytau0>
<prc_coef1 >30500.0D0</prc_coef1>
<prc_exp >3.19D0</prc_exp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
<seasalt_emis_scale> 0.85 </seasalt_emis_scale>
<dust_emis_fact> 2.05D0 </dust_emis_fact>
<clubb_gamma_coef> 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<clubb_C8> 4.3 </clubb_C8>
<cldfrc2m_rhmaxi> 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.3 </clubb_c_K10>
Expand All @@ -75,6 +76,7 @@
<zmconv_mx_bot_lyr_adj >2</zmconv_mx_bot_lyr_adj>
<taubgnd >2.5D-3 </taubgnd>
<clubb_C1 >1.3</clubb_C1>
<clubb_C1b >1.3</clubb_C1b>
<raytau0 >5.0D0</raytau0>
<prc_coef1 >30500.0D0</prc_coef1>
<prc_exp >3.19D0</prc_exp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
<seasalt_emis_scale> 0.85 </seasalt_emis_scale>
<dust_emis_fact> 2.05D0 </dust_emis_fact>
<clubb_gamma_coef> 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<clubb_C8> 4.3 </clubb_C8>
<cldfrc2m_rhmaxi> 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.3 </clubb_c_K10>
Expand All @@ -75,6 +76,7 @@
<zmconv_mx_bot_lyr_adj >2</zmconv_mx_bot_lyr_adj>
<taubgnd >2.5D-3 </taubgnd>
<clubb_C1 >1.335</clubb_C1>
<clubb_C1b >1.335</clubb_C1b>
<raytau0 >5.0D0</raytau0>
<prc_coef1 >30500.0D0</prc_coef1>
<prc_exp >3.19D0</prc_exp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<seasalt_emis_scale> 0.85 </seasalt_emis_scale>
<dust_emis_fact> 2.05D0 </dust_emis_fact>
<clubb_gamma_coef> 0.32 </clubb_gamma_coef>
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
<clubb_C8> 4.3 </clubb_C8>
<cldfrc2m_rhmaxi> 1.05D0 </cldfrc2m_rhmaxi>
<clubb_c_K10> 0.3 </clubb_c_K10>
Expand All @@ -78,6 +79,7 @@
<zmconv_mx_bot_lyr_adj >2</zmconv_mx_bot_lyr_adj>
<taubgnd >2.5D-3 </taubgnd>
<clubb_C1 >1.335</clubb_C1>
<clubb_C1b >1.335</clubb_C1b>
<raytau0 >5.0D0</raytau0>
<prc_coef1 >30500.0D0</prc_coef1>
<prc_exp >3.19D0</prc_exp>
Expand Down
Loading

0 comments on commit e1d76d9

Please sign in to comment.