cam6_4_163: Refactor rad_constituents, aerosol_optics_cam for portability; extend abstract aerosol interface

src/chemistry/aerosol/aero_wetdep_cam.F90

@@ -16,16 +16,17 @@ module aero_wetdep_cam
   use cam_history,   only: addfld, add_default, horiz_only, outfld
   use wetdep,        only: wetdep_init
 
-  use rad_constituents, only: rad_cnst_get_info
+  use radiative_aerosol, only: rad_aer_get_info
 
   use aerosol_properties_mod, only: aero_name_len
   use aerosol_properties_mod, only: aerosol_properties
   use modal_aerosol_properties_mod, only: modal_aerosol_properties
   use carma_aerosol_properties_mod, only: carma_aerosol_properties
 
   use aerosol_state_mod, only: aerosol_state, ptr2d_t
-  use modal_aerosol_state_mod, only: modal_aerosol_state
-  use carma_aerosol_state_mod, only: carma_aerosol_state
+  use aerosol_instances_mod, only: aerosol_instances_get_state, &
+                                   aerosol_instances_get_props, &
+                                   aerosol_instances_get_num_models
 
   use aero_convproc, only: aero_convproc_readnl, aero_convproc_init, aero_convproc_intr
   use aero_convproc, only: convproc_do_evaprain_atonce
@@ -172,7 +173,7 @@ subroutine aero_wetdep_init( )
                       history_chemistry_out=history_chemistry, &
                       convproc_do_aer_out = convproc_do_aer)
 
-    call rad_cnst_get_info(0, nmodes=nmodes, nbins=nbins)
+    call rad_aer_get_info(0, nmodes=nmodes, nbins=nbins)
 
     if (nmodes>0) then
        aero_props => modal_aerosol_properties()
@@ -409,26 +410,30 @@ subroutine aero_wetdep_tend( state, dt, dlf, cam_out, ptend, pbuf)
     real(r8) :: sflxbc(pcols), sflxbcdp(pcols)  ! deposition flux
 
     class(aerosol_state), pointer :: aero_state
+    class(aerosol_properties), pointer :: props_tmp
+    integer :: iaermod
 
     nullify(aero_state)
 
     if (.not.wetdep_active) return
 
     dcondt_resusp3d(:,:,:) = 0._r8
 
-    if (nmodes>0) then
-       aero_state => modal_aerosol_state(state,pbuf)
-       if (.not.associated(aero_state)) then
-          call endrun(subrname//' : construction of aero_state modal_aerosol_state object failed')
-       end if
-    else if (nbins>0) then
-       aero_state => carma_aerosol_state(state,pbuf)
-       if (.not.associated(aero_state)) then
-          call endrun(subrname//' : construction of aero_state carma_aerosol_state object failed')
+    !REMOVECAM - get persistent state from factory; under CAM-SIMA states will be passed as scheme inputs
+    nullify(aero_state)
+    do iaermod = 1, aerosol_instances_get_num_models()
+       props_tmp => aerosol_instances_get_props(iaermod, 0)
+       if (associated(props_tmp)) then
+          if (.not. props_tmp%model_is('BAM')) then
+             aero_state => aerosol_instances_get_state(iaermod, 0, state%lchnk)
+             exit
+          end if
        end if
-    else
-       call endrun(subrname//' : cannot determine aerosol model')
-    endif
+    end do
+    if (.not.associated(aero_state)) then
+       call endrun(subrname//' : no non-BAM aerosol state available for wetdep')
+    end if
+    !REMOVECAM_END
 
     lchnk = state%lchnk
     ncol = state%ncol
@@ -796,10 +801,7 @@ subroutine aero_wetdep_tend( state, dt, dlf, cam_out, ptend, pbuf)
 
     end do bins_loop
 
-    if (associated(aero_state)) then
-       deallocate(aero_state)
-       nullify(aero_state)
-    end if
+    nullify(aero_state)
 
     ! if the user has specified prescribed aerosol dep fluxes then
     ! do not set cam_out dep fluxes according to the prognostic aerosols