Fixes and remove state_v stuff that was never used

Author: jgfouca

components/eam/src/physics/cam/zm/zm_conv_mcsp.F90

@@ -99,25 +99,19 @@ subroutine zm_conv_mcsp_calculate_shear( pcols, ncol, pver, state_pmid, state_u,
    ! Local variables
    integer  :: i
    real(r8), dimension(pcols) :: storm_u         ! u wind at storm reference level set by MCSP_storm_speed_pref
-   real(r8), dimension(pcols) :: storm_v         ! v wind at storm reference level set by MCSP_storm_speed_pref
-   real(r8), dimension(pcols) :: storm_u_shear   ! u shear at storm reference level set by MCSP_storm_speed_pref
-   real(r8), dimension(pcols) :: storm_v_shear   ! v shear at storm reference level set by MCSP_storm_speed_pref
+
    !----------------------------------------------------------------------------
    ! Interpolate wind to pressure level specified by MCSP_storm_speed_pref
    call vertinterp( ncol, pcols, pver, state_pmid, MCSP_storm_speed_pref, state_u, storm_u )
-   call vertinterp( ncol, pcols, pver, state_pmid, MCSP_storm_speed_pref, state_v, storm_v )
 
    !----------------------------------------------------------------------------
    ! calculate low-level shear
    do i = 1,ncol
       if (state_pmid(i,pver).gt.MCSP_storm_speed_pref) then
-         storm_u_shear(i) = storm_u(i)-state_u(i,pver)
-         storm_v_shear(i) = storm_v(i)-state_v(i,pver)
+         mcsp_shear(i) = storm_u(i)-state_u(i,pver)
       else
-         storm_u_shear(i) = -999
-         storm_v_shear(i) = -999
+         mcsp_shear(i) = -999
       end if
-      mcsp_shear(i) = storm_u_shear(i)
    end do
 
    !----------------------------------------------------------------------------

components/eamxx/src/physics/zm/fortran_bridge/zm_eamxx_bridge_methods.F90

@@ -19,9 +19,9 @@ module zm_eamxx_bridge_methods
 subroutine cldfrc_fice(ncol, t, fice, fsnow)
   !
   ! Compute the fraction of the total cloud water which is in ice phase.
-  ! The fraction depends on temperature only. 
+  ! The fraction depends on temperature only.
   ! This is the form that was used for radiation, the code came from cldefr originally
-  ! 
+  !
   ! Author: B. A. Boville Sept 10, 2002
   !  modified: PJR 3/13/03 (added fsnow to ascribe snow production for convection )
   !-----------------------------------------------------------------------
@@ -61,7 +61,7 @@ subroutine cldfrc_fice(ncol, t, fice, fsnow)
       else if (t(i,k) < tmin_fice) then
         fice(i,k) = 1.0_r8
       ! Otherwise mixed phase, with ice fraction decreasing linearly from tmin to tmax
-      else 
+      else
         fice(i,k) =(tmax_fice - t(i,k)) / (tmax_fice - tmin_fice)
       end if
       ! snow fraction partitioning
@@ -72,7 +72,7 @@ subroutine cldfrc_fice(ncol, t, fice, fsnow)
       else if (t(i,k) < tmin_fsnow) then
         fsnow(i,k) = 1.0_r8
       ! Otherwise mixed phase, with ice fraction decreasing linearly from tmin to tmax
-      else 
+      else
         fsnow(i,k) =(tmax_fsnow - t(i,k)) / (tmax_fsnow - tmin_fsnow)
       end if
     end do
@@ -142,7 +142,7 @@ subroutine zm_physics_update( ncol, dt, state_phis, state_zm, state_zi, &
       state_t(i,k) = state_t(i,k) + ptend_s(i,k)/cpair * dt
     end do
   end do
-    
+
   call zm_geopotential_t( ncol, state_p_int, state_p_mid, state_p_del, state_t, state_qv, state_zi, state_zm )
 
   ! skip DSE update for EAMxx
@@ -152,15 +152,15 @@ subroutine zm_physics_update( ncol, dt, state_phis, state_zm, state_zi, &
   !     state_dse(i,k) = state_t(i,k)*cpair + gravit*state_zm(i,k) + state_phis(i)
   !   end do
   ! end do
-  
+
 end subroutine zm_physics_update
 
 !===================================================================================================
 
 ! copied and modified from geopotential.F90
 subroutine zm_geopotential_t( ncol, pint, pmid, pdel, t, q, zi, zm )
   use zm_eamxx_bridge_physconst, only: zvir, rair, gravit
-  !----------------------------------------------------------------------- 
+  !-----------------------------------------------------------------------
   ! Purpose: Compute the geopotential height (above the surface) at the
   ! midpoints and interfaces using the input temperatures and pressures
   !-----------------------------------------------------------------------------
@@ -187,7 +187,7 @@ subroutine zm_geopotential_t( ncol, pint, pmid, pdel, t, q, zi, zm )
   end do
   ! Compute zi, zm from bottom up
   do k = pver, 1, -1
-    ! First set hydrostatic elements consistent with dynamics   
+    ! First set hydrostatic elements consistent with dynamics
     do i = 1,ncol
       hkl(i) = pdel(i,k) / pmid(i,k)
       hkk(i) = 0.5_r8 * hkl(i)

components/eamxx/src/physics/zm/impl/zm_zm_conv_mcsp_calculate_shear_impl.hpp

@@ -29,9 +29,6 @@ void Functions<S,D>::zm_conv_mcsp_calculate_shear(
 
   // Local variables
   Real storm_u = 0.0;         // u wind at storm reference level set by MCSP_storm_speed_pref
-  Real storm_v = 0.0;         // v wind at storm reference level set by MCSP_storm_speed_pref
-  Real storm_u_shear = 0.0;   // u shear at storm reference level set by MCSP_storm_speed_pref
-  Real storm_v_shear = 0.0;   // v shear at storm reference level set by MCSP_storm_speed_pref
 
   //----------------------------------------------------------------------------
   // Interpolate wind to pressure level specified by MCSP_storm_speed_pref
@@ -40,7 +37,7 @@ void Functions<S,D>::zm_conv_mcsp_calculate_shear(
   Int k_below = pver - 1; // default to lowest level
   Kokkos::parallel_reduce(Kokkos::TeamVectorRange(team, pver - 1),
     [&] (const Int& k, Int& min_k) {
-      if (state_pmid(k) >= ZMC::MCSP_storm_speed_pref && state_pmid(k + 1) < ZMC::MCSP_storm_speed_pref) {
+      if (state_pmid(k) < ZMC::MCSP_storm_speed_pref && state_pmid(k+1) >= ZMC::MCSP_storm_speed_pref) {
         if (k < min_k) {
           min_k = k;
         }
@@ -51,29 +48,25 @@ void Functions<S,D>::zm_conv_mcsp_calculate_shear(
 
   // Linear interpolation
   Kokkos::single(Kokkos::PerTeam(team), [&] () {
-    if (k_below < pver - 1) {
-      const Real p_above = state_pmid(k_below);
-      const Real p_below = state_pmid(k_below + 1);
-      const Real weight = (ZMC::MCSP_storm_speed_pref - p_below) / (p_above - p_below);
-
-      storm_u = state_u(k_below + 1) + weight * (state_u(k_below) - state_u(k_below + 1));
-      storm_v = state_v(k_below + 1) + weight * (state_v(k_below) - state_v(k_below + 1));
-    } else {
-      // Target pressure is below all model levels or exact match at lowest level
+    if (state_pmid(0) >= ZMC::MCSP_storm_speed_pref) {
+      storm_u = state_u(0);
+    }
+    else if (state_pmid(pver - 1) < ZMC::MCSP_storm_speed_pref) {
       storm_u = state_u(pver - 1);
-      storm_v = state_v(pver - 1);
+    }
+    else {
+      const Real dpu = ZMC::MCSP_storm_speed_pref - state_pmid(k_below);
+      const Real dpl = state_pmid(k_below+1) - ZMC::MCSP_storm_speed_pref;
+      storm_u = (state_u(k_below)*dpl + state_u(k_below+1)*dpu) / (dpl + dpu);
     }
 
     //----------------------------------------------------------------------------
     // calculate low-level shear
     if (state_pmid(pver - 1) > ZMC::MCSP_storm_speed_pref) {
-      storm_u_shear = storm_u - state_u(pver - 1);
-      storm_v_shear = storm_v - state_v(pver - 1);
+      mcsp_shear = storm_u - state_u(pver - 1);
     } else {
-      storm_u_shear = -999.0;
-      storm_v_shear = -999.0;
+      mcsp_shear = -999.0;
     }
-    mcsp_shear = storm_u_shear;
   });
 }