Skip to content

Commit

Permalink
Merge pull request #900 from cacraigucar/cam_match_run_51
Browse files Browse the repository at this point in the history
cam6_3_132: Changes to capture changes made in run 51
  • Loading branch information
cacraigucar authored Oct 18, 2023
2 parents 00934bf + 311a23d commit 5ddccd8
Show file tree
Hide file tree
Showing 9 changed files with 296 additions and 107 deletions.
6 changes: 5 additions & 1 deletion bld/build-namelist
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
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
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
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
118 changes: 118 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,121 @@
===============================================================

Tag name:cam6_3_132
Originator(s): cacraig, adamher, Thomas Toniazzo, hannay
Date: Oct 18, 2023
One-line Summary: Bring in changes to match run 51
Github PR URL: https://github.com/ESCOMP/CAM/pull/900

Purpose of changes (include the issue number and title text for each relevant GitHub issue):
- Update cam_development to match current tuning runs: https://github.com/ESCOMP/CAM/issues/895
- Discussion also occurred at: https://github.com/NCAR/amwg_dev/discussions/412

Describe any changes made to build system: N/A

Describe any changes made to the namelist:
- When running cam_dev, change the values for:
micro_mg_dcs
clubb_gamma_coef
clubb_gamma_coefb
microp_aero_wsub_scale
microp_aero_wsubi_scale
microp_aero_wsub_min
micro_mg_vtrmi_factor

- New namelists implemented:
microp_aero_wsub_min_asf: min subgrid vertical velocity (after scale factor) See namelist definition for full description
cldfrc2m_do_avg_aist_algs: for small ice cloud concentrations, take the geometric mean of the iceopt=4 and 5 area fractions
cldfrc2m_qist_min: min in-stratus ice IWC constraint
cldfrc2m_qist_max: max in-stratus ice IWC constraint

List any changes to the defaults for the boundary datasets: N/A

Describe any substantial timing or memory changes: N/A

Code reviewed by: nusbaume, pel, adamrher

List all files eliminated: N/A

List all files added and what they do: N/A

List all existing files that have been modified, and describe the changes:
M bld/build-namelist
M bld/namelist_files/namelist_defaults_cam.xml
M src/physics/cam/cldfrc2m.F90
M src/physics/cam/microp_aero.F90
M src/physics/cam/ndrop.F90
M src/physics/spcam/crmclouds_camaerosols.F90
- Change namelist as discussed in the issue/PR and group discussion

M bld/namelist_files/namelist_definition.xml
- Update descriptions and add new ones

M cime_config/testdefs/testlist_cam.xml
- Change a few tests to have them work on derecho

If there were any failures reported from running test_driver.sh on any test
platform, and checkin with these failures has been OK'd by the gatekeeper,
then copy the lines from the td.*.status files for the failed tests to the
appropriate machine below. All failed tests must be justified.

cheyenne/intel/aux_cam:
ERP_Ln9_Vnuopc.C96_C96_mg17.F2000climo.cheyenne_intel.cam-outfrq9s_mg3 (Overall: PEND) details:
PEND ERP_Ln9_Vnuopc.C96_C96_mg17.F2000climo.cheyenne_intel.cam-outfrq9s_mg3 MODEL_BUILD RERUN
ERP_Ln9_Vnuopc.f09_f09_mg17.FCSD_HCO.cheyenne_intel.cam-outfrq9s (Overall: FAIL) details:
FAIL ERP_Ln9_Vnuopc.f09_f09_mg17.FCSD_HCO.cheyenne_intel.cam-outfrq9s COMPARE_base_rest
SMS_Lh12_Vnuopc.f09_f09_mg17.FCSD_HCO.cheyenne_intel.cam-outfrq3h (Overall: DIFF) details:
- pre-existing failure

ERC_D_Ln9_P144x1_Vnuopc.ne16pg3_ne16pg3_mg17.QPC6HIST.cheyenne_intel.cam-outfrq3s_ttrac_usecase (Overall: DIFF) details:
ERP_D_Ln9.ne30pg3_ne30pg3_mg17.FLTHIST.cheyenne_intel.cam-outfrq9s (Overall: DIFF) details:
ERP_Ln9_Vnuopc.ne30_ne30_mg17.FCnudged.cheyenne_intel.cam-outfrq9s (Overall: DIFF) details:
ERP_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FW2000climo.cheyenne_intel.cam-outfrq9s_wcm_ne30 (Overall: DIFF) details:
SMS_D_Ln9.ne30pg3_ne30pg3_mg17.FMTHIST.cheyenne_intel.cam-outfrq9s (Overall: DIFF) details:
SMS_D_Ln9_Vnuopc.ne16_ne16_mg17.FX2000.cheyenne_intel.cam-outfrq9s (Overall: DIFF) details:
SMS_D_Ln9_Vnuopc_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.cheyenne_intel.cam-outfrq9s (Overall: DIFF) details:
SMS_D_Ln9_Vnuopc_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.cheyenne_intel.cam-outfrq9s (Overall: DIFF) details:
SMS_D_Ln9_Vnuopc_P1280x1.ne30pg3_ne30pg3_mg17.FCLTHIST.cheyenne_intel.cam-outfrq9s (Overall: DIFF) details:
SMS_Ld1_Vnuopc.ne30pg3_ne30pg3_mg17.FC2010climo.cheyenne_intel.cam-outfrq1d (Overall: DIFF) details:
- expected baseline differences due to removal of cam6 tuning factor for SE dy

ERP_Ln9_Vnuopc.f09_f09_mg17.F2000dev.cheyenne_intel.cam-outfrq9s_mg3 (Overall: DIFF) details:
ERP_D_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.F2000dev.cheyenne_intel.cam-outfrq9s (Overall: DIFF) details:
ERS_Ld3_Vnuopc.f10_f10_mg37.F1850.cheyenne_intel.cam-outfrq1d_14dec_ghg_cam_dev (Overall: DIFF) details:
SMS_Ld1_Vnuopc.f19_f19.F2000dev.cheyenne_intel.cam-outfrq1d (Overall: DIFF) details:
- expected baseline differences for cam_dev runs

SMS_D_Ln9_Vnuopc_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.cheyenne_intel.cam-outfrq9s (Overall: DIFF) details:
SMS_D_Ln9_Vnuopc_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.cheyenne_intel.cam-outfrq9s (Overall: DIFF) details:
SMS_D_Ln9_Vnuopc_P1280x1.ne30pg3_ne30pg3_mg17.FCLTHIST.cheyenne_intel.cam-outfrq9s (Overall: DIFF) details:
-Changed layout and hence the testname, so no baselines to compare with

izumi/nag/aux_cam:
DAE_Vnuopc.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL)
- pre-existing failure

ERP_Ln9_Vnuopc.ne5pg3_ne5pg3_mg37.QPC6.izumi_nag.cam-outfrq9s_clubbmf (Overall: DIFF) details:
- expected baseline differences due to removal of cam6 tuning factor for SE dy

izumi/gnu/aux_cam:
SMS_D_Ln9.f10_f10_mg37.2000_CAM%DEV%GHGMAM4_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV_SESP.izumi_gnu.cam-outfrq9s (Overall: DIFF) details:
- expected baseline differences for cam_dev runs

NOTE: Most tests have namelist changes

CAM tag used for the baseline comparison tests if different than previous
tag: N/A

Summarize any changes to answers, i.e.,
- what code configurations: All cam_dev and SE cam6
- what platforms/compilers: All
- nature of change (roundoff; larger than roundoff but same climate; new
climate): Tuning changes - Climate changing for cam_dev

If this tag changes climate describe the run(s) done to evaluate the new
climate in enough detail that it(they) could be reproduced, i.e.,
- Run which was the prelimiary source of the changes: https://github.com/NCAR/amwg_dev/tree/b.e23_alpha16b.BLT1850.ne30_t232.051
- It is important to note that further changes were made to this tag as discussed in the issue/PR and discussion - Adam ran a test
to verify the final changes.

===============================================================

Expand Down
Loading

0 comments on commit 5ddccd8

Please sign in to comment.