move and rename zm_conv_readnl

Author: whannah1

components/eam/src/control/runtime_opts.F90

@@ -241,7 +241,7 @@ subroutine read_namelist(single_column_in, scmlon_in, scmlat_in, scm_multcols_in
    use cloud_fraction,      only: cldfrc_readnl
    use cldfrc2m,            only: cldfrc2m_readnl
    use cldwat,              only: cldwat_readnl
-   use zm_conv,             only: zmconv_readnl
+   use zm_conv_intr,        only: zm_conv_readnl
    use hk_conv,             only: hkconv_readnl
    use uwshcu,              only: uwshcu_readnl
    use pkg_cld_sediment,    only: cld_sediment_readnl
@@ -511,7 +511,7 @@ subroutine read_namelist(single_column_in, scmlon_in, scmlat_in, scm_multcols_in
    call subcol_readnl(nlfilename)
    call cldfrc_readnl(nlfilename)
    call cldfrc2m_readnl(nlfilename)
-   call zmconv_readnl(nlfilename)
+   call zm_conv_readnl(nlfilename)
    call cldwat_readnl(nlfilename)
    call hkconv_readnl(nlfilename)
    call uwshcu_readnl(nlfilename)

components/eam/src/physics/cam/zm_conv.F90

@@ -23,7 +23,6 @@ module zm_conv
    private                         ! Make default type private
    !----------------------------------------------------------------------------
    ! public methods
-   public zmconv_readnl            ! read zmconv_nl namelist
    public zm_convi                 ! ZM schemea
    public zm_convr                 ! ZM schemea
    public zm_conv_evap             ! evaporation of precip from ZM schemea
@@ -32,133 +31,14 @@ module zm_conv
    type(zm_const_t), public :: zm_const ! derived type to hold ZM constants
    type(zm_param_t), public :: zm_param ! derived type to hold ZM tunable parameters
    !----------------------------------------------------------------------------
-   ! private data
-   real(r8), parameter :: unset_r8     = huge(1.0_r8)
-   integer , parameter :: unset_int    = huge(1)
-
+   ! private variables
    real(r8), parameter :: capelmt      = 70._r8  ! threshold value for cape for deep convection
    real(r8), parameter :: trigdcapelmt = 0._r8   ! threshold value of dcape for deep convection
 
 !===================================================================================================
 contains
 !===================================================================================================
 
-subroutine zmconv_readnl(nlfile)
-   !----------------------------------------------------------------------------
-   ! Purpose: read namelist parameters for ZM deep convection
-   !----------------------------------------------------------------------------
-   use namelist_utils,  only: find_group_name
-   use units,           only: getunit, freeunit
-   use zm_conv_types,   only: zm_param_mpi_broadcast
-   use mpishorthand
-   !----------------------------------------------------------------------------
-   ! Arguments
-   character(len=*), intent(in) :: nlfile  ! filepath for file containing namelist input
-   !----------------------------------------------------------------------------
-   ! Local variables
-   integer :: unitn, ierr
-   character(len=*), parameter :: subname = 'zmconv_readnl'
-
-   real(r8) :: zmconv_tau                    = unset_r8
-   real(r8) :: zmconv_alfa                   = unset_r8
-   real(r8) :: zmconv_ke                     = unset_r8
-   real(r8) :: zmconv_dmpdz                  = unset_r8
-   logical  :: zmconv_tpert_fix              = .false.
-   real(r8) :: zmconv_tp_fac                 = unset_r8
-   real(r8) :: zmconv_tiedke_add             = unset_r8
-   real(r8) :: zmconv_c0_lnd                 = unset_r8
-   real(r8) :: zmconv_c0_ocn                 = unset_r8
-   integer  :: zmconv_cape_cin               = unset_int
-   integer  :: zmconv_mx_bot_lyr_adj         = unset_int
-   logical  :: zmconv_trig_dcape             = .false.
-   logical  :: zmconv_trig_ull               = .false.
-   logical  :: zmconv_clos_dyn_adj           = .false.
-   logical  :: zmconv_microp                 = .false.
-   real(r8) :: zmconv_auto_fac               = unset_r8
-   real(r8) :: zmconv_accr_fac               = unset_r8
-   real(r8) :: zmconv_micro_dcs              = unset_r8
-   real(r8) :: zmconv_MCSP_heat_coeff        = 0._r8
-   real(r8) :: zmconv_MCSP_moisture_coeff    = 0._r8
-   real(r8) :: zmconv_MCSP_uwind_coeff       = 0._r8
-   real(r8) :: zmconv_MCSP_vwind_coeff       = 0._r8
-   !----------------------------------------------------------------------------
-   namelist /zmconv_nl/ zmconv_tau, zmconv_alfa, zmconv_ke, zmconv_dmpdz,  &
-            zmconv_tpert_fix, zmconv_tp_fac, zmconv_tiedke_add, &
-            zmconv_c0_lnd, zmconv_c0_ocn,  & 
-            zmconv_cape_cin, zmconv_mx_bot_lyr_adj,  &
-            zmconv_trig_dcape, zmconv_trig_ull, zmconv_clos_dyn_adj, &
-            zmconv_microp, zmconv_auto_fac, zmconv_accr_fac, zmconv_micro_dcs, &
-            zmconv_MCSP_heat_coeff, zmconv_MCSP_moisture_coeff, &
-            zmconv_MCSP_uwind_coeff, zmconv_MCSP_vwind_coeff
-   !----------------------------------------------------------------------------
-
-   if (masterproc) then
-      unitn = getunit()
-      open( unitn, file=trim(nlfile), status='old' )
-      call find_group_name(unitn, 'zmconv_nl', status=ierr)
-      if (ierr == 0) then
-         read(unitn, zmconv_nl, iostat=ierr)
-         if (ierr /= 0) then
-            call endrun(subname // ':: ERROR reading namelist')
-         end if
-      end if
-      close(unitn)
-      call freeunit(unitn)
-
-      ! set zm_param values
-      zm_param%tau             = zmconv_tau
-      zm_param%ke              = zmconv_ke
-      zm_param%dmpdz           = zmconv_dmpdz
-      zm_param%tpert_fix       = zmconv_tpert_fix
-      zm_param%tpert_fac       = zmconv_tp_fac
-      zm_param%tiedke_add      = zmconv_tiedke_add
-      zm_param%c0_lnd          = zmconv_c0_lnd
-      zm_param%c0_ocn          = zmconv_c0_ocn
-      zm_param%num_cin         = zmconv_cape_cin
-      zm_param%mx_bot_lyr_adj  = zmconv_mx_bot_lyr_adj
-      zm_param%trig_dcape      = zmconv_trig_dcape
-      zm_param%trig_ull        = zmconv_trig_ull
-      zm_param%clos_dyn_adj    = zmconv_clos_dyn_adj
-      
-      ! ZM microphysics parameters
-      zm_param%zm_microp       = zmconv_microp
-      zm_param%auto_fac        = zmconv_auto_fac
-      zm_param%accr_fac        = zmconv_accr_fac
-      zm_param%micro_dcs       = zmconv_micro_dcs
-
-      ! mesoscale coherent structure parameterization (MCSP) parameters
-      zm_param%mcsp_t_coeff = zmconv_MCSP_heat_coeff
-      zm_param%mcsp_q_coeff = zmconv_MCSP_moisture_coeff
-      zm_param%mcsp_u_coeff = zmconv_MCSP_uwind_coeff
-      zm_param%mcsp_v_coeff = zmconv_MCSP_vwind_coeff
-      if ( abs(zm_param%mcsp_t_coeff)>0._r8 .or. abs(zm_param%mcsp_q_coeff)>0._r8 .or. &
-           abs(zm_param%mcsp_u_coeff)>0._r8 .or. abs(zm_param%mcsp_v_coeff)>0._r8 ) then
-         zm_param%mcsp_enabled = .true.
-      else
-         zm_param%mcsp_enabled = .false.
-      end if
-
-      if ( zmconv_alfa /= unset_r8 ) then
-         zm_param%alfa = zmconv_alfa
-      else
-         zm_param%alfa = 0.1_r8
-      end if
-
-   end if ! masterproc
-
-   !----------------------------------------------------------------------------
-   ! Broadcast namelist variables
-#ifdef SPMD
-   call zm_param_mpi_broadcast(zm_param)
-#endif
-
-   !----------------------------------------------------------------------------
-   return
-
-end subroutine zmconv_readnl
-
-!===================================================================================================
-
 subroutine zm_convi(limcnv_in, no_deep_pbl_in)
    !----------------------------------------------------------------------------
    ! Purpose: initialize quantities for ZM convection scheme

components/eam/src/physics/cam/zm_conv_intr.F90

@@ -28,6 +28,7 @@ module zm_conv_intr
    save
 
    ! public methods
+   public :: zm_conv_readnl    ! read zmconv_nl namelist
    public :: zm_conv_register  ! register fields in physics buffer
    public :: zm_conv_init      ! initialize donner_deep module
    public :: zm_conv_tend      ! return tendencies
@@ -70,6 +71,126 @@ module zm_conv_intr
 contains
 !===================================================================================================
 
+subroutine zm_conv_readnl(nlfile)
+   !----------------------------------------------------------------------------
+   ! Purpose: read namelist parameters for ZM deep convection
+   !----------------------------------------------------------------------------
+   use namelist_utils,  only: find_group_name
+   use units,           only: getunit, freeunit
+   use zm_conv,         only: zm_const, zm_param
+   use zm_conv_types,   only: zm_param_mpi_broadcast
+   use mpishorthand
+   !----------------------------------------------------------------------------
+   ! Arguments
+   character(len=*), intent(in) :: nlfile  ! filepath for file containing namelist input
+   !----------------------------------------------------------------------------
+   ! Local variables
+   integer :: unitn, ierr
+   character(len=*), parameter :: subname = 'zm_conv_readnl'
+
+   real(r8), parameter :: unset_r8     = huge(1.0_r8)
+   integer , parameter :: unset_int    = huge(1)
+
+   real(r8) :: zmconv_tau                    = unset_r8
+   real(r8) :: zmconv_alfa                   = unset_r8
+   real(r8) :: zmconv_ke                     = unset_r8
+   real(r8) :: zmconv_dmpdz                  = unset_r8
+   logical  :: zmconv_tpert_fix              = .false.
+   real(r8) :: zmconv_tp_fac                 = unset_r8
+   real(r8) :: zmconv_tiedke_add             = unset_r8
+   real(r8) :: zmconv_c0_lnd                 = unset_r8
+   real(r8) :: zmconv_c0_ocn                 = unset_r8
+   integer  :: zmconv_cape_cin               = unset_int
+   integer  :: zmconv_mx_bot_lyr_adj         = unset_int
+   logical  :: zmconv_trig_dcape             = .false.
+   logical  :: zmconv_trig_ull               = .false.
+   logical  :: zmconv_clos_dyn_adj           = .false.
+   logical  :: zmconv_microp                 = .false.
+   real(r8) :: zmconv_auto_fac               = unset_r8
+   real(r8) :: zmconv_accr_fac               = unset_r8
+   real(r8) :: zmconv_micro_dcs              = unset_r8
+   real(r8) :: zmconv_MCSP_heat_coeff        = 0._r8
+   real(r8) :: zmconv_MCSP_moisture_coeff    = 0._r8
+   real(r8) :: zmconv_MCSP_uwind_coeff       = 0._r8
+   real(r8) :: zmconv_MCSP_vwind_coeff       = 0._r8
+   !----------------------------------------------------------------------------
+   namelist /zmconv_nl/ zmconv_tau, zmconv_alfa, zmconv_ke, zmconv_dmpdz,  &
+            zmconv_tpert_fix, zmconv_tp_fac, zmconv_tiedke_add, &
+            zmconv_c0_lnd, zmconv_c0_ocn,  & 
+            zmconv_cape_cin, zmconv_mx_bot_lyr_adj,  &
+            zmconv_trig_dcape, zmconv_trig_ull, zmconv_clos_dyn_adj, &
+            zmconv_microp, zmconv_auto_fac, zmconv_accr_fac, zmconv_micro_dcs, &
+            zmconv_MCSP_heat_coeff, zmconv_MCSP_moisture_coeff, &
+            zmconv_MCSP_uwind_coeff, zmconv_MCSP_vwind_coeff
+   !----------------------------------------------------------------------------
+
+   if (masterproc) then
+      unitn = getunit()
+      open( unitn, file=trim(nlfile), status='old' )
+      call find_group_name(unitn, 'zmconv_nl', status=ierr)
+      if (ierr == 0) then
+         read(unitn, zmconv_nl, iostat=ierr)
+         if (ierr /= 0) then
+            call endrun(subname // ':: ERROR reading namelist')
+         end if
+      end if
+      close(unitn)
+      call freeunit(unitn)
+
+      ! set zm_param values
+      zm_param%tau             = zmconv_tau
+      zm_param%ke              = zmconv_ke
+      zm_param%dmpdz           = zmconv_dmpdz
+      zm_param%tpert_fix       = zmconv_tpert_fix
+      zm_param%tpert_fac       = zmconv_tp_fac
+      zm_param%tiedke_add      = zmconv_tiedke_add
+      zm_param%c0_lnd          = zmconv_c0_lnd
+      zm_param%c0_ocn          = zmconv_c0_ocn
+      zm_param%num_cin         = zmconv_cape_cin
+      zm_param%mx_bot_lyr_adj  = zmconv_mx_bot_lyr_adj
+      zm_param%trig_dcape      = zmconv_trig_dcape
+      zm_param%trig_ull        = zmconv_trig_ull
+      zm_param%clos_dyn_adj    = zmconv_clos_dyn_adj
+      
+      ! ZM microphysics parameters
+      zm_param%zm_microp       = zmconv_microp
+      zm_param%auto_fac        = zmconv_auto_fac
+      zm_param%accr_fac        = zmconv_accr_fac
+      zm_param%micro_dcs       = zmconv_micro_dcs
+
+      ! mesoscale coherent structure parameterization (MCSP) parameters
+      zm_param%mcsp_t_coeff = zmconv_MCSP_heat_coeff
+      zm_param%mcsp_q_coeff = zmconv_MCSP_moisture_coeff
+      zm_param%mcsp_u_coeff = zmconv_MCSP_uwind_coeff
+      zm_param%mcsp_v_coeff = zmconv_MCSP_vwind_coeff
+      if ( abs(zm_param%mcsp_t_coeff)>0._r8 .or. abs(zm_param%mcsp_q_coeff)>0._r8 .or. &
+           abs(zm_param%mcsp_u_coeff)>0._r8 .or. abs(zm_param%mcsp_v_coeff)>0._r8 ) then
+         zm_param%mcsp_enabled = .true.
+      else
+         zm_param%mcsp_enabled = .false.
+      end if
+
+      if ( zmconv_alfa /= unset_r8 ) then
+         zm_param%alfa = zmconv_alfa
+      else
+         zm_param%alfa = 0.1_r8
+      end if
+
+   end if ! masterproc
+
+   !----------------------------------------------------------------------------
+   ! Broadcast namelist variables
+#ifdef SPMD
+   call zm_param_mpi_broadcast(zm_param)
+#endif
+
+   !----------------------------------------------------------------------------
+   return
+
+end subroutine zm_conv_readnl
+
+!===================================================================================================
+
 subroutine zm_conv_register
    !----------------------------------------------------------------------------
    ! Purpose: register fields with the physics buffer