clean up unused code

Author: peverwhee

src/physics/rrtmgp/radiation.F90

@@ -413,7 +413,6 @@ end function radiation_do
 subroutine radiation_init(pbuf2d)
    use rrtmgp_pre,                only: rrtmgp_pre_init
    use rrtmgp_inputs_setup,       only: rrtmgp_inputs_setup_init
-   use rrtmgp_inputs_cam,         only: rrtmgp_inputs_cam_init
    use rrtmgp_cloud_optics_setup, only: rrtmgp_cloud_optics_setup_init
    use rrtmgp_sw_solar_var_setup, only: rrtmgp_sw_solar_var_setup_init
    use solar_irrad_data,          only: do_spctrl_scaling, has_spectrum
@@ -484,10 +483,6 @@ subroutine radiation_init(pbuf2d)
       call endrun(sub//': '//errmsg)
    end if
 
-   ! Set up CAM-side RRTMGP inputs - will go away once SW radiation is CCPPized
-   call rrtmgp_inputs_cam_init(ktopcam, ktoprad, idx_sw_diag, idx_nir_diag, idx_uv_diag, idx_sw_cloudsim, idx_lw_diag, &
-           idx_lw_cloudsim)
-
    ! Set radconstants module-level index variables that we're setting in CCPP-ized scheme now
    call radconstants_init(idx_sw_diag, idx_nir_diag, idx_uv_diag, idx_lw_diag)
 
@@ -1282,8 +1277,7 @@ subroutine radiation_tend( &
                ! Set SW aerosol optical properties in the aer_sw object.
                ! This call made even when no daylight columns because it does some
                ! diagnostic aerosol output.
-               call rrtmgp_set_aer_sw( &
-                  icall, state, pbuf, nday, idxday, nnite, idxnite, aer_sw)
+               call rrtmgp_set_aer_sw(ktopcam, ktoprad, icall, state, pbuf, nday, idxday, nnite, idxnite, aer_sw)
 
                if (nday > 0) then
 
@@ -1360,7 +1354,7 @@ subroutine radiation_tend( &
                end if
 
                ! Set LW aerosol optical properties in the aer_lw object.
-               call rrtmgp_set_aer_lw(icall, state, pbuf, aer_lw)
+               call rrtmgp_set_aer_lw(ktopcam, ktoprad, icall, state, pbuf, aer_lw)
 
                ! Call the main rrtmgp_lw driver
                call rrtmgp_lw_rte_run(dolw, dolw, .false., .false., .false., &

src/physics/rrtmgp/rrtmgp_inputs_cam.F90

@@ -53,16 +53,6 @@ module rrtmgp_inputs_cam
 ! This value is to match the arbitrary small value used in RRTMG to decide
 ! when a quantity is effectively zero.
 real(r8), parameter :: tiny = 1.0e-80_r8
-real(r8) :: sw_low_bounds(nswbands)
-real(r8) :: sw_high_bounds(nswbands)
-integer :: ktopcam
-integer :: ktoprad
-integer :: idx_sw_diag
-integer :: idx_nir_diag
-integer :: idx_uv_diag
-integer :: idx_sw_cloudsim
-integer :: idx_lw_diag
-integer :: idx_lw_cloudsim
 
 ! Mapping from RRTMG shortwave bands to RRTMGP.  Currently needed to continue using
 ! the SW optics datasets from RRTMG (even thought there is a slight mismatch in the
@@ -74,43 +64,6 @@ module rrtmgp_inputs_cam
 contains
 !==================================================================================================
 
-!==================================================================================================
-subroutine rrtmgp_inputs_cam_init(ktcam, ktrad, idx_sw_diag_in, idx_nir_diag_in, idx_uv_diag_in, &
-               idx_sw_cloudsim_in, idx_lw_diag_in, idx_lw_cloudsim_in)
-      
-   ! Note that this routine must be called after the calls to set_wavenumber_bands which set
-   ! the sw/lw band boundaries in the radconstants module.
-
-   integer, intent(in) :: ktcam
-   integer, intent(in) :: ktrad
-   integer, intent(in) :: idx_sw_diag_in
-   integer, intent(in) :: idx_nir_diag_in
-   integer, intent(in) :: idx_uv_diag_in
-   integer, intent(in) :: idx_sw_cloudsim_in
-   integer, intent(in) :: idx_lw_diag_in
-   integer, intent(in) :: idx_lw_cloudsim_in
-   character(len=512) :: errmsg
-   integer :: errflg
-
-   ktopcam = ktcam
-   ktoprad = ktrad
-   idx_sw_diag = idx_sw_diag_in
-   idx_nir_diag = idx_nir_diag_in
-   idx_uv_diag = idx_uv_diag_in
-   idx_sw_cloudsim = idx_sw_cloudsim_in
-   idx_lw_diag = idx_lw_diag_in
-   idx_lw_cloudsim = idx_lw_cloudsim_in
-
-   ! Initialize the module data containing the SW band boundaries.
-   call get_sw_spectral_boundaries_ccpp(sw_low_bounds, sw_high_bounds, 'cm^-1', errmsg, errflg)
-   if (errflg /= 0) then
-      call endrun('rrtmgp_inputs_cam_init: error during get_sw_spectral_boundaries_ccpp - message: '//errmsg)
-   end if
-
-end subroutine rrtmgp_inputs_cam_init
-
-!=========================================================================================
-
 subroutine rrtmgp_get_gas_mmrs(icall, state, pbuf, nlay, gas_mmrs)
 
    ! Retrieve mass mixing ratios for radiatively active gases from rad_constituents
@@ -137,11 +90,13 @@ end subroutine rrtmgp_get_gas_mmrs
 
 !==================================================================================================
 
-subroutine rrtmgp_set_aer_lw(icall, state, pbuf, aer_lw)
+subroutine rrtmgp_set_aer_lw(ktopcam, ktoprad, icall, state, pbuf, aer_lw)
 
    ! Load LW aerosol optical properties into the RRTMGP object.
 
    ! Arguments
+   integer,                     intent(in) :: ktopcam
+   integer,                     intent(in) :: ktoprad
    integer,                     intent(in) :: icall
    type(physics_state), target, intent(in) :: state
    type(physics_buffer_desc),   pointer    :: pbuf(:)
@@ -178,11 +133,13 @@ end subroutine rrtmgp_set_aer_lw
 !==================================================================================================
 
 subroutine rrtmgp_set_aer_sw( &
-   icall, state, pbuf, nday, idxday, nnite, idxnite, aer_sw)
+   ktopcam, ktoprad, icall, state, pbuf, nday, idxday, nnite, idxnite, aer_sw)
 
    ! Load SW aerosol optical properties into the RRTMGP object.
 
    ! Arguments
+   integer,                     intent(in) :: ktopcam
+   integer,                     intent(in) :: ktoprad
    integer,                     intent(in) :: icall
    type(physics_state), target, intent(in) :: state
    type(physics_buffer_desc), pointer      :: pbuf(:)