Skip to content

Commit cf7d39d

Browse files
cacraigucarcacraigucar
authored
Merge pull request ESCOMP#1281 from PeterHjortLauritzen/mv_mnt_upgrade
cam6_4_078: moving mountains update + turn off moving mountains for FV dycore
2 parents 44c1893 + fe92f1b commit cf7d39d

File tree

6 files changed

+143
-8
lines changed

6 files changed

+143
-8
lines changed

‎bld/build-namelist‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3851,7 +3851,15 @@ if (!$simple_phys) {
38513851
}
38523852

38533853
if ($phys =~ /cam7/) {
3854-
add_default($nl, 'use_gw_movmtn_pbl', 'val'=>'.true.');
3854+
#
3855+
# moving mountains only supported by SE dycore
3856+
# (since vorticity needs to be passed to physics in dp_coupling)
3857+
#
3858+
if ( $dyn =~ /se/ ) {
3859+
add_default($nl, 'use_gw_movmtn_pbl', 'val'=>'.true.');
3860+
} else {
3861+
add_default($nl, 'use_gw_movmtn_pbl', 'val'=>'.false.');
3862+
}
38553863
}
38563864

38573865
my $use_gw_movmtn_pbl = $nl->get_value('use_gw_movmtn_pbl');
@@ -3882,7 +3890,12 @@ if ($waccm_phys or
38823890
# QBO in the high vertical resolution configuration.
38833891
add_default($nl, 'use_gw_front' , 'val'=>'.true.');
38843892
$use_gw_convect_dp = '.true.';
3893+
#WACCM value
38853894
my $hdepth_scaling = '0.25D0' ;
3895+
#MT value
3896+
if ($cfg->get('model_top') eq 'mt') {
3897+
$hdepth_scaling = '0.32D0';
3898+
}
38863899
my $qbo_forcing = '.false.';
38873900
if ($dyn eq 'fv') {
38883901
my $nlon = $cfg->get('nlon');
@@ -3904,7 +3917,7 @@ if ($waccm_phys or
39043917
# cam7 settings for model_top = 'lt'
39053918
add_default($nl, 'use_gw_front' , 'val'=>'.true.');
39063919
$use_gw_convect_dp = '.true.';
3907-
add_default($nl, 'gw_qbo_hdepth_scaling', 'val'=>'1.0D0');
3920+
add_default($nl, 'gw_qbo_hdepth_scaling', 'val'=>'0.32D0');
39083921
} else {
39093922
add_default($nl, 'use_gw_front' , 'val'=>'.false.');
39103923
}

‎bld/namelist_files/namelist_defaults_cam.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -769,8 +769,8 @@
769769
<!-- gravity wave settings -->
770770

771771
<effgw_beres_dp >0.7D0</effgw_beres_dp>
772-
<effgw_beres_dp model_top="lt" >0.30D0</effgw_beres_dp>
773-
<effgw_beres_dp model_top="mt" >0.70D0</effgw_beres_dp>
772+
<effgw_beres_dp model_top="lt" >0.15D0</effgw_beres_dp>
773+
<effgw_beres_dp model_top="mt" >0.15D0</effgw_beres_dp>
774774
<effgw_beres_dp model_top="ht" phys="cam7" >0.25D0</effgw_beres_dp>
775775
<effgw_beres_dp model_top="xt" phys="cam7" >0.25D0</effgw_beres_dp>
776776
<effgw_beres_dp hgrid="0.9x1.25" >0.4D0</effgw_beres_dp>

‎cime‎

Submodule cime updated 31 files

‎doc/ChangeLog‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,126 @@
1+
2+
===============================================================
3+
4+
Tag name: cam6_4_078
5+
Originator(s): PeterHjortLauritzen, mbramberger, cacraig
6+
Date: March 19, 2025
7+
One-line Summary: Improvements to moving mountains parameterization
8+
Github PR URL: https://github.com/ESCOMP/CAM/pull/1281
9+
10+
Purpose of changes (include the issue number and title text for each relevant GitHub issue):
11+
- Updates to moving mountains scheme for tuning QBO in MT (same settings adopted for LT: https://github.com/ESCOMP/CAM/issues/1276
12+
- Turn off moving mountains for dycores not passing vorticity to physics: https://github.com/ESCOMP/CAM/issues/1270
13+
14+
Describe any changes made to build system: N/A
15+
16+
Describe any changes made to the namelist:
17+
- use_gw_movmtn_pbl is set to false if it is not CAM7 and SE dycore
18+
- change values for gw_qbo_hdepth_scaling and effgw_beres_dp for specific configurations
19+
20+
List any changes to the defaults for the boundary datasets: N/A
21+
22+
Describe any substantial timing or memory changes: N/A
23+
24+
Code reviewed by: cacraig
25+
26+
List all files eliminated:
27+
28+
List all files added and what they do:
29+
30+
List all existing files that have been modified, and describe the changes:
31+
M bld/build-namelist
32+
M bld/namelist_files/namelist_defaults_cam.xml
33+
- update namelist settings
34+
35+
M src/physics/cam/gw_convect.F90
36+
- Limit value for hdepth
37+
38+
M src/physics/cam/gw_drag.F90
39+
- Change the beres storm_shift setting
40+
41+
If there were any failures reported from running test_driver.sh on any test
42+
platform, and checkin with these failures has been OK'd by the gatekeeper,
43+
then copy the lines from the td.*.status files for the failed tests to the
44+
appropriate machine below. All failed tests must be justified.
45+
46+
derecho/intel/aux_cam:
47+
SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
48+
SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
49+
- pre-existing failures due to build-namelist error requiring CLM/CTSM external update
50+
51+
ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
52+
SMS_Lh12.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq3h (Overall: DIFF) details:
53+
- pre-existing failures due to HEMCO not having reproducible results (issues #1018 and #856)
54+
55+
ERP_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
56+
ERP_D_Ln9.ne30pg3_ne30pg3_mt232.QPC7.derecho_intel.cam-outfrq3s_cosp (Overall: FAIL) details:
57+
ERP_Ld3.ne16pg3_ne16pg3_mg17.FHISTC_WAt1ma.derecho_intel.cam-reduced_hist1d (Overall: DIFF) details:
58+
ERP_Ld3.ne30pg3_ne30pg3_mt232.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF) details:
59+
ERP_Lh12.f19_f19_mg17.FW4madSD.derecho_intel.cam-outfrq3h (Overall: DIFF) details:
60+
ERP_Ln9.f19_f19_mg17.FWsc1850.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
61+
ERP_Ln9.ne30pg3_ne30pg3_mg17.FCnudged.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
62+
ERP_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WAma.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
63+
ERS_Ln9.f09_f09_mg17.FX2000.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
64+
ERS_Ln9.f19_f19_mg17.FXSD.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
65+
ERS_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
66+
SMS_C2_D_Ln9.ne16pg3_ne16pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
67+
SMS_D_Ln9.f09_f09_mg17.FCts2nudged.derecho_intel.cam-outfrq9s_leapday (Overall: DIFF) details:
68+
SMS_D_Ln9.f09_f09_mg17.FCvbsxHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
69+
SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
70+
SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s_waccm_ma_mam4 (Overall: DIFF) details:
71+
SMS_D_Ln9.f19_f19_mg17.QPC2000climo.derecho_intel.cam-outfrq3s_usecase (Overall: DIFF) details:
72+
SMS_D_Ln9.ne16_ne16_mg17.QPX2000.derecho_intel.cam-outfrq9s_amie (Overall: DIFF) details:
73+
SMS_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
74+
SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mt232.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF) details:
75+
SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: DIFF) details:
76+
SMS_Ld1.f09_f09_mg17.FW2000climo.derecho_intel.cam-outfrq1d (Overall: DIFF) details:
77+
SMS_Ld1.ne30pg3_ne30pg3_mg17.FC2010climo.derecho_intel.cam-outfrq1d (Overall: DIFF) details:
78+
SMS_Ln9.f09_f09_mg17.FW1850.derecho_intel.cam-reduced_hist3s (Overall: DIFF) details:
79+
SMS_Ln9.ne30pg3_ne30pg3_mg17.FW2000climo.derecho_intel.cam-outfrq9s_rrtmgp (Overall: DIFF) details:
80+
- baseline changes due to upgrades described above
81+
82+
FAIL ERP_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq9s NLCOMP
83+
FAIL ERP_D_Ln9.ne30pg3_ne30pg3_mt232.QPC7.derecho_intel.cam-outfrq3s_cosp NLCOMP
84+
FAIL ERP_Ld3.ne30pg3_ne30pg3_mt232.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa NLCOMP
85+
FAIL SMS_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_MTso.derecho_intel.cam-outfrq9s NLCOMP
86+
FAIL SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mt232.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust NLCOMP
87+
-namelist changes as described above
88+
89+
derecho/nvhpc/aux_cam:
90+
ERS_Ln9.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: DIFF) details:
91+
- baseline and namelist changes due to upgrades described above
92+
93+
izumi/nag/aux_cam:
94+
ERC_D_Ln9.f10_f10_mg37.QPWmaC6.izumi_nag.cam-outfrq3s (Overall: DIFF) details:
95+
SMS_D_Ln3.ne5pg3_ne5pg3_mg37.QPX2000.izumi_nag.cam-outfrq3s (Overall: DIFF) details:
96+
SMS_D_Ln6.ne5_ne5_mg37.QPWmaC4.izumi_nag.cam-outfrq3s_physgrid_tem (Overall: DIFF) details:
97+
- baseline changes due to upgrades described above
98+
99+
izumi/gnu/aux_cam:
100+
ERC_D_Ln9.f10_f10_mg37.QPC4.izumi_gnu.cam-outfrq3s_diags (Overall: DIFF) details:
101+
ERP_D_Ln9.ne3pg3_ne3pg3_mg37.FHISTC_LTso.izumi_gnu.cam-outfrq9s (Overall: DIFF) details:
102+
ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC7.izumi_gnu.cam-outfrq9s (Overall: DIFF) details:
103+
ERP_Ln9_P24x2.f45_f45_mg37.QPWmaC6.izumi_gnu.cam-outfrq9s_mee_fluxes (Overall: DIFF) details:
104+
ERR_D_Ln9.ne3pg3_ne3pg3_mg37.FHISTC_LTso.izumi_gnu.cam-outfrq9s (Overall: DIFF) details:
105+
SMS_D_Ln9.f10_f10_mg37.QPWmaC4.izumi_gnu.cam-outfrq9s_apmee (Overall: DIFF) details:
106+
SMS_P48x1_D_Ln9.f19_f19_mg17.FW4madSD.izumi_gnu.cam-outfrq9s (Overall: DIFF) details:
107+
- baseline changes due to upgrades described above
108+
109+
FAIL ERP_D_Ln9.ne3pg3_ne3pg3_mg37.FHISTC_LTso.izumi_gnu.cam-outfrq9s NLCOMP
110+
FAIL ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC7.izumi_gnu.cam-outfrq9s NLCOMP
111+
FAIL ERR_D_Ln9.ne3pg3_ne3pg3_mg37.FHISTC_LTso.izumi_gnu.cam-outfrq9s NLCOMP
112+
-namelist changes as described above
113+
114+
CAM tag used for the baseline comparison tests if different than previous
115+
tag:
116+
117+
Summarize any changes to answers, i.e.,
118+
- what code configurations: All LT/MT/WACCM/WACCMX and codes which use Beres
119+
- what platforms/compilers: all
120+
- nature of change (roundoff; larger than roundoff but same climate; new
121+
climate): answer changing, more than roundoff
122+
123+
===============================================================
1124
===============================================================
2125

3126
Tag name: cam6_4_077

‎src/physics/cam/gw_convect.F90‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,7 @@ subroutine gw_beres_src(ncol, band, desc, u, v, &
190190
hdepth = [ ( (zm(i,topi(i))-zm(i,boti(i))), i = 1, ncol ) ]
191191

192192
! J. Richter: this is an effective reduction of the GW phase speeds (needed to drive the QBO)
193-
hdepth = hdepth*qbo_hdepth_scaling
194-
193+
hdepth = max(1000._r8, hdepth*qbo_hdepth_scaling)
195194
hd_idx = index_of_nearest(hdepth, desc%hd)
196195

197196
! hd_idx=0 signals that a heating depth is too shallow, i.e. that it is

‎src/physics/cam/gw_drag.F90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ subroutine gw_init()
11141114
ttend_dp_idx = pbuf_get_index('TTEND_DP')
11151115

11161116
! Set the deep scheme specification components.
1117-
beres_dp_desc%storm_shift = .true.
1117+
beres_dp_desc%storm_shift = .false.
11181118

11191119
do k = 0, pver
11201120
! 700 hPa index

0 commit comments

Comments
 (0)