shift USE statements into subroutine scope when possible

Author: hplin-ucar

src/chemistry/aerosol/bulk_aerosol_properties_mod.F90

@@ -7,10 +7,9 @@ module bulk_aerosol_properties_mod
   use cam_abortutils, only: endrun
   use string_utils, only : to_lower
 
-  use aerosol_properties_mod, only: aerosol_properties, aero_name_len
+  use aerosol_properties_mod, only: aerosol_properties
 
-  use radiative_aerosol, only: rad_aer_get_info, rad_aer_get_props, &
-                               rad_aer_bulk_physprop_id
+  use radiative_aerosol, only: rad_aer_get_info, rad_aer_get_props
   use shr_infnan_mod, only: nan => shr_infnan_nan, assignment(=)
 
   implicit none
@@ -225,6 +224,8 @@ end subroutine get
   ! returns the physprop ID for a given bin (aerosol) index
   !------------------------------------------------------------------------
   integer function physprop_id(self, bin_ndx)
+    use radiative_aerosol, only: rad_aer_bulk_physprop_id
+
     class(bulk_aerosol_properties), intent(in) :: self
     integer, intent(in) :: bin_ndx
 
@@ -425,6 +426,8 @@ end function min_mass_mean_rad
   ! returns name for a given aerosol bin
   !------------------------------------------------------------------------------
   function bin_name(self, bin_ndx) result(name)
+    use aerosol_properties_mod, only: aero_name_len
+
     class(bulk_aerosol_properties), intent(in) :: self
     integer, intent(in) :: bin_ndx  ! bin number
 

src/chemistry/aerosol/modal_aerosol_properties_mod.F90

@@ -2,8 +2,7 @@ module modal_aerosol_properties_mod
   use shr_kind_mod, only: r8 => shr_kind_r8
   use physconst, only: pi
   use aerosol_properties_mod, only: aerosol_properties, aero_name_len
-  use radiative_aerosol, only: rad_aer_get_info, rad_aer_get_mode_props, rad_aer_get_props, &
-                               rad_aer_mode_physprop_id
+  use radiative_aerosol, only: rad_aer_get_info, rad_aer_get_mode_props, rad_aer_get_props
 
   implicit none
 
@@ -454,6 +453,8 @@ end subroutine get
   ! returns the physprop ID for a given bin (mode) index
   !------------------------------------------------------------------------
   integer function physprop_id(self, bin_ndx)
+    use radiative_aerosol, only: rad_aer_mode_physprop_id
+
     class(modal_aerosol_properties), intent(in) :: self
     integer, intent(in) :: bin_ndx
 

src/chemistry/aerosol/modal_aerosol_state_mod.F90

@@ -10,7 +10,7 @@ module modal_aerosol_state_mod
   use physics_buffer, only: physics_buffer_desc, pbuf_get_field, pbuf_get_index
   use physics_types, only: physics_state
   !REMOVECAM_END
-  use aerosol_properties_mod, only: aerosol_properties, aero_name_len
+  use aerosol_properties_mod, only: aerosol_properties
   use physconst,  only: rhoh2o
   use cam_abortutils, only: endrun
 
@@ -215,6 +215,8 @@ end subroutine get_states
   ! return aerosol bin size weights for a given bin
   !------------------------------------------------------------------------------
   subroutine icenuc_size_wght_arr(self, bin_ndx, ncol, nlev, species_type, use_preexisting_ice, wght)
+    use aerosol_properties_mod, only: aero_name_len
+
     class(modal_aerosol_state), intent(in) :: self
     integer, intent(in) :: bin_ndx                ! bin number
     integer, intent(in) :: ncol                ! number of columns