misc fixes

Author: whannah1

components/eam/src/dynamics/se/gravity_waves_sources.F90

@@ -1,6 +1,6 @@
 module gravity_waves_sources
   use derivative_mod, only : derivative_t
-  use dimensions_mod, only : np,nlev
+  use dimensions_mod, only : np,nlev,nlevp
   use edgetype_mod, only       : EdgeBuffer_t
   use element_mod, only    : element_t
   use hybrid_mod, only     : hybrid_t
@@ -123,7 +123,7 @@ subroutine compute_frontogenesis( frontgf, frontga, tl, &
     use dyn_comp,           only: hvcoord
     use spmd_utils,         only: iam 
     use parallel_mod,       only: par 
-    use element_ops,        only: get_temperature, get_hydro_pressure, get_phi
+    use element_ops,        only: get_temperature, get_hydro_pressure_i, get_phi
     use dyn_grid,           only: fv_nphys
     use prim_driver_mod,    only: deriv1
     use gllfvremap_mod,     only: gfr_g2f_scalar, gfr_g2f_vector
@@ -141,9 +141,9 @@ subroutine compute_frontogenesis( frontgf, frontga, tl, &
     integer :: k,kptr,i,j,ie,component
     real(kind=real_kind) :: frontgf_gll(np,np,nlev,nets:nete)
     real(kind=real_kind) :: gradth_gll(np,np,2,nlev,nets:nete)  ! grad(theta)
-    real(kind=real_kind) :: zint(np,np,nlev)            ! interface altitude
+    real(kind=real_kind) :: zint(np,np,nlevp)           ! interface altitude
     real(kind=real_kind) :: zmid(np,np,nlev)            ! mid-point altitude
-    real(kind=real_kind) :: pint(np,np,nlev)            ! interface hydrostatic pressure
+    real(kind=real_kind) :: pint(np,np,nlevp)           ! interface hydrostatic pressure
     real(kind=real_kind) :: pmid(np,np,nlev)            ! mid-point hydrostatic pressure
     real(kind=real_kind) :: temperature(np,np,nlev)     ! Temperature
     real(kind=real_kind) :: C(np,np,2), wf1(nphys*nphys,nlev), wf2(nphys*nphys,nlev)
@@ -193,7 +193,7 @@ subroutine compute_frontogenesis( frontgf, frontga, tl, &
       if (use_fgf_pgrad_correction .or. use_fgf_zgrad_correction) then
 
         ! compute pressure at interfaces and mid-points
-        call get_hydro_pressure_interface(pint,elem(ie)%state%dp3d(:,:,:,tl),hvcoord)
+        call get_hydro_pressure_i(pint,elem(ie)%state%dp3d(:,:,:,tl),hvcoord)
 
         call get_temperature(elem(ie),temperature,hvcoord,tl)
 
@@ -343,8 +343,8 @@ subroutine compute_vertical_derivative(vert_int, data_mid, ddata_dvert)
       else
         data_above = ( data_mid(:,:,k-1) + data_mid(:,:,k) ) / 2.0 ! interpolate to interface k
         data_below = ( data_mid(:,:,k+1) + data_mid(:,:,k) ) / 2.0 ! interpolate to interface k+1
-        vert_above = pint(:,:,k)
-        vert_below = pint(:,:,k+1)
+        vert_above = vert_int(:,:,k)
+        vert_below = vert_int(:,:,k+1)
       end if
       ddata_dvert(:,:,k) = ( data_above - data_below ) / ( vert_above - vert_below )
     end do

components/homme/src/theta-l/share/element_ops.F90

@@ -43,7 +43,7 @@
 !  get_pottemp()
 !  get_dpnh_dp()
 !  get_hydro_pressure()
-!  get_hydro_pressure_interface()
+!  get_hydro_pressure_i()
 !  get_nonhydro_pressure()
 !  get_phi()
 !  get_cp_star()
@@ -69,7 +69,7 @@ module element_ops
   type(elem_state_t), dimension(:), allocatable :: state0 ! storage for save_initial_state routine
 
   public get_field, get_field_i, get_state, get_pottemp
-  public get_temperature, get_phi, get_R_star, get_hydro_pressure, get_hydro_pressure_interface
+  public get_temperature, get_phi, get_R_star, get_hydro_pressure, get_hydro_pressure_i
   public set_thermostate, set_state, set_state_i, set_elem_state
   public set_forcing_rayleigh_friction
   public initialize_reference_states, set_theta_ref
@@ -309,11 +309,11 @@ subroutine get_hydro_pressure(p,dp,hvcoord)
   end subroutine get_hydro_pressure
 
   !_____________________________________________________________________
-  subroutine get_hydro_pressure_interface(p_i,dp,hvcoord)
+  subroutine get_hydro_pressure_i(p_i,dp,hvcoord)
   !
   implicit none
 
-  real (kind=real_kind), intent(out)  :: p_i(np,np,nlev)
+  real (kind=real_kind), intent(out)  :: p_i(np,np,nlevp)
   real (kind=real_kind), intent(in)   :: dp(np,np,nlev)
   type (hvcoord_t),     intent(in)    :: hvcoord                      ! hybrid vertical coordinate struct
 
@@ -324,7 +324,7 @@ subroutine get_hydro_pressure_interface(p_i,dp,hvcoord)
      p_i(:,:,k+1)=p_i(:,:,k) + dp(:,:,k)
   enddo
 
-  end subroutine get_hydro_pressure_interface
+  end subroutine get_hydro_pressure_i
 
 
   !_____________________________________________________________________