Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cam6_3_132: Changes to capture changes made in run 51 #900

Merged
merged 14 commits into from
Oct 18, 2023
Merged

cam6_3_132: Changes to capture changes made in run 51 #900

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f4ec0be
namelist changes to match run 51
cacraigucar Oct 10, 2023
221dc72
cloud ice fraction changes for cam_dev
adamrher Oct 10, 2023
46b65e2
Merge pull request #16 from adamrher/cam_match_run_51.arh
cacraigucar Oct 10, 2023
dd69c5d
added namelists for wsub_min_asf, modified namelist defaults to refle…
adamrher Oct 12, 2023
64f5873
Merge pull request #17 from adamrher/cam.wmixmin
cacraigucar Oct 12, 2023
84a256d
swap cam_dev conditional for a new namelist, remove se gamma namelist…
adamrher Oct 12, 2023
22f5897
Merge pull request #18 from adamrher/cam.aistnl
cacraigucar Oct 12, 2023
e28d2bc
Update externals to allow for derecho priority setting
cacraigucar Oct 13, 2023
672aaf1
address review requests
cacraigucar Oct 13, 2023
c50fcc6
Change namelist based on verbal request from Adam, Cecile and Peter
cacraigucar Oct 13, 2023
8b7a4ea
Change PE layout to fix some derecho failures
cacraigucar Oct 14, 2023
a35cef1
Fix failing SPCAM test
cacraigucar Oct 16, 2023
7139631
Merge tag 'cam6_3_131' into cam_match_run_51
cacraigucar Oct 17, 2023
311a23d
ChangeLog for cam6_3_132
cacraigucar Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[ccs_config]
tag = ccs_config_cesm0.0.78
tag = ccs_config_cesm0.0.80
protocol = git
repo_url = https://github.com/ESMCI/ccs_config_cesm
local_path = ccs_config
Expand All @@ -21,7 +21,7 @@ externals = Externals.cfg
required = True

[cmeps]
tag = cmeps0.14.39
tag = cmeps0.14.43
protocol = git
repo_url = https://github.com/ESCOMP/CMEPS.git
local_path = components/cmeps
Expand All @@ -36,7 +36,7 @@ externals = Externals_CDEPS.cfg
required = True

[cpl7]
tag = cpl77.0.6
tag = cpl77.0.7
protocol = git
repo_url = https://github.com/ESCOMP/CESM_CPL7andDataComps
local_path = components/cpl7
Expand Down
6 changes: 5 additions & 1 deletion bld/build-namelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3115,7 +3115,7 @@ if ($cfg->get('microphys') =~ /^mg/) {
$micro_mg_dcs = '500.D-6'; # default for cam6
}
elsif ($phys eq 'cam_dev') {
$micro_mg_dcs = '250.D-6'; # default for cam_dev
$micro_mg_dcs = '500.D-6'; # default for cam_dev
}
}

Expand All @@ -3129,6 +3129,7 @@ add_default($nl, 'microp_aero_npccn_scale');
add_default($nl, 'microp_aero_wsub_scale');
add_default($nl, 'microp_aero_wsubi_scale');
add_default($nl, 'microp_aero_wsub_min');
add_default($nl, 'microp_aero_wsub_min_asf');
add_default($nl, 'microp_aero_wsubi_min');

# Ice nucleation options
Expand Down Expand Up @@ -3460,7 +3461,10 @@ if (!$simple_phys) {
add_default($nl, 'cldfrc2m_rhmaxi');
add_default($nl, 'cldfrc2m_rhminis');
add_default($nl, 'cldfrc2m_rhmaxis');
add_default($nl, 'cldfrc2m_qist_min');
add_default($nl, 'cldfrc2m_qist_max');
add_default($nl, 'cldfrc2m_do_subgrid_growth');
add_default($nl, 'cldfrc2m_do_avg_aist_algs');
}

my $rk_strat_polstrat_rhmin = $nl->get_value('rk_strat_polstrat_rhmin');
Expand Down
19 changes: 15 additions & 4 deletions bld/namelist_files/namelist_defaults_cam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2065,9 +2065,10 @@
<clubb_do_energyfix > .true. </clubb_do_energyfix>
<clubb_do_liqsupersat > .false. </clubb_do_liqsupersat>
<clubb_gamma_coef > 0.308 </clubb_gamma_coef>
<clubb_gamma_coef phys="cam_dev" > 0.3 </clubb_gamma_coef>
<clubb_gamma_coef hgrid="1.9x2.5" phys="cam6" > 0.280 </clubb_gamma_coef>
<clubb_gamma_coef dyn="se" > 0.270 </clubb_gamma_coef>
<clubb_gamma_coefb > 0.32 </clubb_gamma_coefb>
<clubb_gamma_coefb phys="cam_dev" > 0.3 </clubb_gamma_coefb>
<clubb_ipdf_call_placement > 2 </clubb_ipdf_call_placement>
<clubb_lambda0_stability_coef > 0.04 </clubb_lambda0_stability_coef>
<clubb_lmin_coef > 0.1 </clubb_lmin_coef>
Expand Down Expand Up @@ -2225,20 +2226,23 @@
<microp_aero_npccn_scale > 1.D0 </microp_aero_npccn_scale>
<microp_aero_npccn_scale microphys="mg2" > 1.D0 </microp_aero_npccn_scale>

<microp_aero_wsub_scale > 1.D0 </microp_aero_wsub_scale>
<microp_aero_wsub_scale > 1.D0 </microp_aero_wsub_scale>
<microp_aero_wsub_scale phys="cam_dev" > 0.375D0 </microp_aero_wsub_scale>

<microp_aero_wsubi_scale > 1.D0 </microp_aero_wsubi_scale>
<microp_aero_wsubi_scale phys="cam_dev" > 2.5D0 </microp_aero_wsubi_scale>

<microp_aero_wsub_min > 0.2D0 </microp_aero_wsub_min>
<microp_aero_wsub_min phys="cam_dev" > 0.1D0 </microp_aero_wsub_min>

<microp_aero_wsub_min_asf > 0.1D0 </microp_aero_wsub_min_asf>
<microp_aero_wsub_min_asf phys="cam_dev" > 0.0D0 </microp_aero_wsub_min_asf>

<microp_aero_wsubi_min > 0.001D0 </microp_aero_wsubi_min>

<micro_mg_homog_size > 25.D-6 </micro_mg_homog_size>
<micro_mg_homog_size microphys="mg2" > 25.D-6 </micro_mg_homog_size>

<micro_mg_vtrmi_factor > 1.D0 </micro_mg_vtrmi_factor>
<micro_mg_vtrmi_factor phys="cam_dev" > 0.5D0 </micro_mg_vtrmi_factor>

<micro_mg_effi_factor > 1.D0 </micro_mg_effi_factor>
<micro_mg_effi_factor microphys="mg2" > 1.D0 </micro_mg_effi_factor>
Expand Down Expand Up @@ -2644,12 +2648,19 @@
<cldfrc2m_rhmaxis clubb_sgs="1" > 1.0D0 </cldfrc2m_rhmaxis>
<cldfrc2m_rhmaxis spcam_clubb_sgs="1" > 1.0D0 </cldfrc2m_rhmaxis>

<cldfrc2m_qist_min >1.e-7 </cldfrc2m_qist_min>
<cldfrc2m_qist_min phys="cam_dev">5.e-6 </cldfrc2m_qist_min>
<cldfrc2m_qist_max >5.e-3 </cldfrc2m_qist_max>

<micro_mg_adjust_cpt>.false.</micro_mg_adjust_cpt>

<cldfrc2m_do_subgrid_growth >.false.</cldfrc2m_do_subgrid_growth>
<cldfrc2m_do_subgrid_growth phys="cam6" >.true.</cldfrc2m_do_subgrid_growth>
<cldfrc2m_do_subgrid_growth phys="cam_dev">.true.</cldfrc2m_do_subgrid_growth>

<cldfrc2m_do_avg_aist_algs >.false.</cldfrc2m_do_avg_aist_algs>
<cldfrc2m_do_avg_aist_algs phys="cam_dev" >.true.</cldfrc2m_do_avg_aist_algs>

<!-- Cldwat -->
<rk_strat_icritc > 5.0e-6 </rk_strat_icritc>
<rk_strat_icritc dyn="fv" unicon="1" > 9.5e-6 </rk_strat_icritc>
Expand Down
30 changes: 27 additions & 3 deletions bld/namelist_files/namelist_definition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2916,7 +2916,7 @@ Default: 1.0
<entry id="microp_aero_wsub_scale" type="real" category="microphys"
group="microp_aero_nl" valid_values="" >
Unitless scaling factor for the liquid droplet subgrid scale vertical velocity during aerosol activation.
Default: 1.0
Default: set by build-namelist
</entry>

<entry id="microp_aero_wsubi_scale" type="real" category="microphys"
Expand All @@ -2927,8 +2927,14 @@ Default: 1.0

<entry id="microp_aero_wsub_min" type="real" category="microphys"
group="microp_aero_nl" valid_values="" >
Minimum subgrid vertical velocity for liquid droplets during aerosol activation with units of (m s-1).
Default: 0.2 m s-1
Minimum subgrid vertical velocity (before scale factor) for liquid droplets during aerosol activation with units of (m s-1).
Default: set by build-namelist
</entry>

<entry id="microp_aero_wsub_min_asf" type="real" category="microphys"
group="microp_aero_nl" valid_values="" >
Minimum subgrid vertical velocity (after scale factor) for liquid droplets during aerosol activation with units of (m s-1).
Default: set by build-namelist
</entry>

<entry id="microp_aero_wsubi_min" type="real" category="microphys"
Expand Down Expand Up @@ -3146,13 +3152,31 @@ rhi at which ice cloud fraction = 1 in the stratosphere.
Default: set by build-namelist
</entry>

<entry id="cldfrc2m_qist_min" type="real" category="conv"
group="cldfrc2m_nl" valid_values="" >
Minimum in-stratus IWC constraint [ kg/kg ]
Default: set by build-namelist
</entry>

<entry id="cldfrc2m_qist_max" type="real" category="conv"
group="cldfrc2m_nl" valid_values="" >
Maximum in-stratus IWC constraint [ kg/kg ]
Default: set by build-namelist
</entry>

<entry id="cldfrc2m_do_subgrid_growth" type="logical" category="conv"
group="cldfrc2m_nl" valid_values="" >
Use cloud fraction to determine whether to do growth of ice clouds below
RHice of 1 down to RHice = rhmini.
Default: .true. for CAM6; all others =&gt; .false.
</entry>

<entry id="cldfrc2m_do_avg_aist_algs" type="logical" category="conv"
group="cldfrc2m_nl" valid_values="" >
For small ice cloud concentrations, take the geometric mean of the iceopt=4 and iceopt=5 area fractions
Default: .true. for CAM_DEV; all others .false.
</entry>

<entry id="zmconv_momcu" type="real" category="conv"
group="zmconv_nl" valid_values="" >
Convective momentum transport parameter (upward)
Expand Down
14 changes: 7 additions & 7 deletions cime_config/testdefs/testlist_cam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1690,7 +1690,7 @@
<option name="comment">Zonal Mean Nudged</option>
</options>
</test>
<test compset="FCnudged" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_Vnuopc_P720x1" testmods="cam/outfrq9s">
<test compset="FCnudged" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_Vnuopc_P1280x1" testmods="cam/outfrq9s">
<machines>
<machine name="cheyenne" compiler="intel" category="prealpha"/>
<machine name="cheyenne" compiler="intel" category="camchem"/>
Expand All @@ -1700,7 +1700,7 @@
<option name="comment">"Nudged CAM-Chem on a regionally refined grid"</option>
</options>
</test>
<test compset="FHIST" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_Vnuopc_P720x1" testmods="cam/outfrq9s" supported="false">
<test compset="FHIST" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_Vnuopc_P1280x1" testmods="cam/outfrq9s" supported="false">
<machines>
<machine name="cheyenne" compiler="intel" category="prealpha"/>
<machine name="cheyenne" compiler="intel" category="cam_refined"/>
Expand All @@ -1709,7 +1709,7 @@
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="FHIST" grid="ne0ARCTICne30x4_ne0ARCTICne30x4_mt12" name="SMS_D_Ln9_Vnuopc_P720x1" testmods="cam/outfrq9s" supported="false">
<test compset="FHIST" grid="ne0ARCTICne30x4_ne0ARCTICne30x4_mt12" name="SMS_D_Ln9_Vnuopc_P1280x1" testmods="cam/outfrq9s" supported="false">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cam"/>
<machine name="cheyenne" compiler="intel" category="cam_refined"/>
Expand All @@ -1718,7 +1718,7 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test compset="FHIST" grid="ne0ARCTICGRISne30x8_ne0ARCTICGRISne30x8_mt12" name="SMS_D_Ln9_Vnuopc_P720x1" testmods="cam/outfrq9s" supported="false">
<test compset="FHIST" grid="ne0ARCTICGRISne30x8_ne0ARCTICGRISne30x8_mt12" name="SMS_D_Ln9_Vnuopc_P1280x1" testmods="cam/outfrq9s" supported="false">
<machines>
<machine name="cheyenne" compiler="intel" category="prebeta"/>
<machine name="cheyenne" compiler="intel" category="cam_refined"/>
Expand Down Expand Up @@ -1860,7 +1860,7 @@
<machine name="cheyenne" compiler="intel" category="camchem"/>
</machines>
</test>
<test compset="FCHIST" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_Vnuopc_P720x1" testmods="cam/outfrq9s">
<test compset="FCHIST" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_Vnuopc_P1280x1" testmods="cam/outfrq9s">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cam"/>
<machine name="cheyenne" compiler="intel" category="camchem"/>
Expand All @@ -1870,7 +1870,7 @@
<option name="comment">"Free running CAM-Chem on a reginally refined grid"</option>
</options>
</test>
<test compset="FCHIST" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="ERS_Lh3_P720x1" testmods="cam/outfrq3h">
<test compset="FCHIST" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="ERS_Lh3_P1280x1" testmods="cam/outfrq3h">
<machines>
<machine name="cheyenne" compiler="intel" category="camchem"/>
</machines>
Expand Down Expand Up @@ -2156,7 +2156,7 @@
<option name="wallclock">00:10:00</option>
</options>
</test>
<test compset="FCLTHIST" grid="ne30pg3_ne30pg3_mg17" name="SMS_D_Ln9_Vnuopc_P720x1" testmods="cam/outfrq9s">
<test compset="FCLTHIST" grid="ne30pg3_ne30pg3_mg17" name="SMS_D_Ln9_Vnuopc_P1280x1" testmods="cam/outfrq9s">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cam"/>
<machine name="cheyenne" compiler="intel" category="camchem"/>
Expand Down
Loading