Skip to content

Commit

Permalink
merge to cam6_3_133
Browse files Browse the repository at this point in the history
  • Loading branch information
@brian-eaton
brian-eaton committed Oct 19, 2023
2 parents 18efa42 + 559fdb7 commit 503ac0d
Show file tree
Hide file tree
Showing 18 changed files with 715 additions and 135 deletions.
6 changes: 3 additions & 3 deletions Externals.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[ccs_config]
tag = ccs_config_cesm0.0.79
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
Original file line number Diff line number Diff line change
Expand Up @@ -3150,7 +3150,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 @@ -3164,6 +3164,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 @@ -3495,7 +3496,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
22 changes: 17 additions & 5 deletions bld/namelist_files/namelist_defaults_cam.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
<ncdata dyn="se" hgrid="ne16np4" nlev="126" waccmx="1" aquaplanet="1">atm/waccm/ic/waccmx_aqua_ne16np4_126L_c191108.nc</ncdata>
<ncdata dyn="se" hgrid="ne16np4" nlev="126" waccmx="1" aquaplanet="1" ionosphere="none">atm/waccm/ic/waccmx4_neutral_aquap_ne16np4_126lev_c200827.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" nlev="130" waccmx="1" >atm/waccm/ic/fx2000_phys-ionos-cpl_ne30_spinup01.cam.i.0002-01-01-00000_c201014.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" npg="3" nlev="130" waccmx="1" >atm/waccm/ic/waccmx_ne30pg3_c231005.nc</ncdata>

<ncdata dyn="fv3" hgrid="C24" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/fv3/aqua_0006-01-01_C24_L32_c200625.nc</ncdata>
<ncdata dyn="fv3" hgrid="C48" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/fv3/aqua_0006-01-01_C48_L32_c200625.nc</ncdata>
Expand Down Expand Up @@ -2150,9 +2151,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 @@ -2310,20 +2312,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 @@ -2729,12 +2734,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 Expand Up @@ -3101,7 +3113,7 @@
<!-- ================================================================== -->

<se_pgf_formulation> 1</se_pgf_formulation>
<se_pgf_formulation waccmx="1">2</se_pgf_formulation>
<se_pgf_formulation waccmx="1">3</se_pgf_formulation>
<se_ftype> 2 </se_ftype>

<se_large_Courant_incr > .true. </se_large_Courant_incr>
Expand Down
36 changes: 32 additions & 4 deletions bld/namelist_files/namelist_definition.xml
View file
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 Expand Up @@ -8169,13 +8193,17 @@ Default: Set by build-namelist.
</entry>

<entry id="se_pgf_formulation" type="integer" category="se"
group="dyn_se_inparm" valid_values="1,2" >
group="dyn_se_inparm" valid_values="1,2,3" >

1: Exner version of pressure gradient force (PGF)
see Appendix A in https://agupubs.onlinelibrary.wiley.com/doi/epdf/10.1029/2022MS003192

2: Traditional pressure gradient formulation (grad p)

3: Hybrid (formulation 1 where hybm>0 else formulation 2)
Use hybrid PGF option for WACCM-x to make WACCM-x consistent with PGF
used in CAM in the troposphere and traditional PGF formulation above

Default: Set by build-namelist.
</entry>

Expand Down
103 changes: 103 additions & 0 deletions cime_config/config_pes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,27 @@
</rootpe>
</pes>
</mach>
<mach name="derecho">
<pes pesize="any" compset="_CAM\d0%WX">
<comment>none</comment>
<ntasks>
<ntasks_atm>-4</ntasks_atm>
<ntasks_lnd>-4</ntasks_lnd>
<ntasks_rof>-4</ntasks_rof>
<ntasks_ice>-4</ntasks_ice>
<ntasks_ocn>-4</ntasks_ocn>
<ntasks_cpl>-4</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
</pes>
</mach>
</grid>
<grid name="a%ne30" >
<mach name="cheyenne">
Expand Down Expand Up @@ -330,6 +351,46 @@
</rootpe>
</pes>
</mach>
<mach name="derecho">
<pes pesize="any" compset="_CAM\d0%WX">
<comment>none</comment>
<ntasks>
<ntasks_atm>-16</ntasks_atm>
<ntasks_lnd>-16</ntasks_lnd>
<ntasks_rof>-16</ntasks_rof>
<ntasks_ice>-16</ntasks_ice>
<ntasks_ocn>-16</ntasks_ocn>
<ntasks_cpl>-16</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
</pes>
<pes pesize="any" compset="_CAM%DEV%MT%CC">
<comment>none</comment>
<ntasks>
<ntasks_atm>-8</ntasks_atm>
<ntasks_lnd>-8</ntasks_lnd>
<ntasks_rof>-8</ntasks_rof>
<ntasks_ice>-8</ntasks_ice>
<ntasks_ocn>-8</ntasks_ocn>
<ntasks_cpl>-8</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
</pes>
</mach>
</grid>
<grid name="a%ne30" >
<mach name="cheyenne">
Expand Down Expand Up @@ -1105,6 +1166,27 @@
</rootpe>
</pes>
</mach>
<mach name="derecho">
<pes pesize="any" compset="_CAM\d0%WX">
<comment>none</comment>
<ntasks>
<ntasks_atm>-8</ntasks_atm>
<ntasks_lnd>-8</ntasks_lnd>
<ntasks_rof>-8</ntasks_rof>
<ntasks_ice>-8</ntasks_ice>
<ntasks_ocn>-8</ntasks_ocn>
<ntasks_cpl>-8</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
</pes>
</mach>
</grid>

<grid name="a%0.9x1.25">
Expand Down Expand Up @@ -1211,6 +1293,27 @@
</rootpe>
</pes>
</mach>
<mach name="derecho">
<pes pesize="any" compset="_(CAM50|CAM60)%(CC|CV|CF|WC)">
<comment>none</comment>
<ntasks>
<ntasks_atm>-8</ntasks_atm>
<ntasks_lnd>-8</ntasks_lnd>
<ntasks_rof>-8</ntasks_rof>
<ntasks_ice>-8</ntasks_ice>
<ntasks_ocn>-8</ntasks_ocn>
<ntasks_cpl>-8</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
</pes>
</mach>
</grid>
<grid name="a%0.47x0.63" >
<mach name="any">
Expand Down
14 changes: 7 additions & 7 deletions cime_config/testdefs/testlist_cam.xml
View file
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

0 comments on commit 503ac0d

Please sign in to comment.