cam6_4_078: moving mountains update + turn off moving mountains for FV dycore

bld/build-namelist

@@ -3847,7 +3847,15 @@ if (!$simple_phys) {
     }
 
     if ($phys =~ /cam7/) {
-       add_default($nl, 'use_gw_movmtn_pbl',        'val'=>'.true.');
+	#
+	# moving mountains only supported by SE dycore
+	# (since vorticity needs to be passed to physics in dp_coupling)
+	#
+	if ( $dyn =~ /se/ ) {
+	    add_default($nl, 'use_gw_movmtn_pbl',        'val'=>'.true.');
+	} else {
+	    add_default($nl, 'use_gw_movmtn_pbl',        'val'=>'.false.');
+	}
     }
 
     my $use_gw_movmtn_pbl = $nl->get_value('use_gw_movmtn_pbl');
@@ -3878,7 +3886,12 @@ if ($waccm_phys or
     # QBO in the high vertical resolution configuration.
     add_default($nl, 'use_gw_front'     , 'val'=>'.true.');
     $use_gw_convect_dp = '.true.';
+    #WACCM value
     my $hdepth_scaling = '0.25D0' ;
+    #MT value
+    if ($cfg->get('model_top') eq 'mt') {
+	$hdepth_scaling = '0.32D0';
+    }
     my $qbo_forcing = '.false.';
     if ($dyn eq 'fv') {
 	my $nlon = $cfg->get('nlon');
@@ -3900,7 +3913,7 @@ if ($waccm_phys or
     # cam7 settings for model_top = 'lt'
     add_default($nl, 'use_gw_front'     , 'val'=>'.true.');
     $use_gw_convect_dp = '.true.';
-    add_default($nl, 'gw_qbo_hdepth_scaling', 'val'=>'1.0D0');
+    add_default($nl, 'gw_qbo_hdepth_scaling', 'val'=>'0.32D0');
 } else {
     add_default($nl, 'use_gw_front'     , 'val'=>'.false.');
 }

bld/namelist_files/namelist_defaults_cam.xml

@@ -769,8 +769,8 @@
 <!-- gravity wave settings -->
 
 <effgw_beres_dp                                               >0.7D0</effgw_beres_dp>
-<effgw_beres_dp model_top="lt"                                >0.30D0</effgw_beres_dp>
-<effgw_beres_dp model_top="mt"                                >0.70D0</effgw_beres_dp>
+<effgw_beres_dp model_top="lt"                                >0.15D0</effgw_beres_dp>
+<effgw_beres_dp model_top="mt"                                >0.15D0</effgw_beres_dp>
 <effgw_beres_dp hgrid="0.9x1.25"                              >0.4D0</effgw_beres_dp>
 <effgw_beres_dp waccm_phys="0"                                >0.55D0</effgw_beres_dp>
 <effgw_beres_dp waccm_phys="1" hgrid="0.9x1.25"               >0.5D0</effgw_beres_dp>

doc/ChangeLog

@@ -1,3 +1,21 @@
+
+Tag name: cam6_4_0XX
+Originator(s): PeterHjortLauritzen, mbramberger
+Date:
+One-line Summary: Improvements to moving mountains parameterization
+Github PR URL:
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+
+Updates to moving mountains scheme for tuning QBO in MT (same settings adopted for LT; issue 1276).
+Turn off moving mountains for dycores not passing vorticity to physics (1270).
+
+Resolves #1276 - tune QBO in MT.
+
+Resolves #1270 - Crash when running moving mountains with FV dycore.
+
+Only SE dycore in LT and MT regression tests should be affected.
+
 ===============================================================
 
 Tag name: cam6_4_075

src/physics/cam/gw_convect.F90

@@ -190,8 +190,8 @@ subroutine gw_beres_src(ncol, band, desc, u, v, &
   hdepth = [ ( (zm(i,topi(i))-zm(i,boti(i))), i = 1, ncol ) ]
 
   ! J. Richter: this is an effective reduction of the GW phase speeds (needed to drive the QBO)
-  hdepth = hdepth*qbo_hdepth_scaling
-
+  ! hdepth = hdepth*qbo_hdepth_scaling
+  hdepth = max(1000._r8, hdepth*qbo_hdepth_scaling)
   hd_idx = index_of_nearest(hdepth, desc%hd)
 
   ! hd_idx=0 signals that a heating depth is too shallow, i.e. that it is

src/physics/cam/gw_drag.F90

@@ -1114,7 +1114,7 @@ subroutine gw_init()
      ttend_dp_idx    = pbuf_get_index('TTEND_DP')
 
      ! Set the deep scheme specification components.
-     beres_dp_desc%storm_shift = .true.
+     beres_dp_desc%storm_shift = .false.
 
      do k = 0, pver
         ! 700 hPa index