update submodule; fix interfaces

Author: Courtney Peverley

.gitmodules

@@ -36,7 +36,7 @@
 [submodule "atmos_phys"]
 	path = src/atmos_phys
 	url = https://github.com/peverwhee/atmospheric_physics
-        fxtag = 403130ec1bb3e245255182a3c3167aba3a84d4f3
+        fxtag = 86fc6f9542b949af4e667c1be6d364a08102485b
         fxrequired = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 

src/atmos_phys

@@ -21,6 +21,11 @@ module cloud_rad_props
 
 use cam_logfile,      only: iulog
 use cam_abortutils,   only: endrun
+use rrtmgp_cloud_optics_setup, only: g_mu_ccpp => g_mu, g_lambda_ccpp => g_lambda, g_d_eff_ccpp => g_d_eff
+use rrtmgp_cloud_optics_setup, only: abs_lw_liq_ccpp => abs_lw_liq, abs_lw_ice_ccpp => abs_lw_ice
+use rrtmgp_cloud_optics_setup, only: ext_sw_liq_ccpp => ext_sw_liq, ext_sw_ice_ccpp => ext_sw_ice
+use rrtmgp_cloud_optics_setup, only: ssa_sw_liq_ccpp => ssa_sw_liq, ssa_sw_ice_ccpp => ssa_sw_ice
+use rrtmgp_cloud_optics_setup, only: asm_sw_liq_ccpp => asm_sw_liq, asm_sw_ice_ccpp => asm_sw_ice
 
 
 implicit none
@@ -78,9 +83,7 @@ module cloud_rad_props
 contains
 !==============================================================================
 
-subroutine cloud_rad_props_init(abs_lw_liq_out, abs_lw_ice_out, ext_sw_liq_out,   &
-                  ssa_sw_liq_out, asm_sw_liq_out, ext_sw_ice_out, ssa_sw_ice_out, &
-                  asm_sw_ice_out, g_mu_out, g_lambda_out, g_d_eff_out, tiny_out)
+subroutine cloud_rad_props_init(tiny_out)
    use netcdf
    use spmd_utils,                only: masterproc
    use ioFileMod,                 only: getfil
@@ -90,18 +93,7 @@ subroutine cloud_rad_props_init(abs_lw_liq_out, abs_lw_ice_out, ext_sw_liq_out,
 #if ( defined SPMD )
    use mpishorthand
 #endif
-   real(r8), allocatable, intent(out) :: abs_lw_liq_out(:,:,:)
-   real(r8), allocatable, intent(out) :: ext_sw_liq_out(:,:,:)
-   real(r8), allocatable, intent(out) :: asm_sw_liq_out(:,:,:)
-   real(r8), allocatable, intent(out) :: ssa_sw_liq_out(:,:,:)
-   real(r8), allocatable, intent(out) :: abs_lw_ice_out(:,:)
-   real(r8), allocatable, intent(out) :: ext_sw_ice_out(:,:)
-   real(r8), allocatable, intent(out) :: asm_sw_ice_out(:,:)
-   real(r8), allocatable, intent(out) :: ssa_sw_ice_out(:,:)
-   real(r8), allocatable, intent(out) :: g_mu_out(:)
-   real(r8), allocatable, intent(out) :: g_lambda_out(:,:)
-   real(r8), allocatable, intent(out) :: g_d_eff_out(:)
-   real(r8),              intent(out) :: tiny_out
+   real(r8), intent(out) :: tiny_out
 
    character(len=256) :: liquidfile
    character(len=256) :: icefile
@@ -142,51 +134,52 @@ subroutine cloud_rad_props_init(abs_lw_liq_out, abs_lw_ice_out, ext_sw_liq_out,
    call cnst_get_ind('CLDICE', ixcldice)
    call cnst_get_ind('CLDLIQ', ixcldliq)
 
-   call rrtmgp_cloud_optics_setup_init(liqopticsfile, iceopticsfile, abs_lw_liq,       &
-                  abs_lw_ice, ext_sw_liq, ext_sw_ice, ssa_sw_liq, ssa_sw_ice, asm_sw_liq, &
-                  asm_sw_ice, g_lambda, g_mu, g_d_eff, errmsg, err)
+   call rrtmgp_cloud_optics_setup_init(liqopticsfile, iceopticsfile, errmsg, err)
    if (err /= 0) then
       call endrun(sub//': '//errmsg)
    end if
 
+   ! Set module-level variables
+   ! Set output variables
+   nmu = size(g_mu_ccpp)
+   nlambda = size(g_lambda_ccpp, 2)
+   n_g_d = size(g_d_eff_ccpp)
+   allocate(abs_lw_liq(nmu,nlambda,nlwbands), stat=ierr)
+   call handle_allocate_error(ierr, sub, 'abs_lw_liq')
+   abs_lw_liq = abs_lw_liq_ccpp
+   allocate(ext_sw_liq(nmu,nlambda,nswbands), stat=ierr)
+   call handle_allocate_error(ierr, sub, 'ext_sw_liq')
+   ext_sw_liq = ext_sw_liq_ccpp
+   allocate(ssa_sw_liq(nmu,nlambda,nswbands), stat=ierr)
+   call handle_allocate_error(ierr, sub, 'ssa_sw_liq')
+   ssa_sw_liq = ssa_sw_liq_ccpp
+   allocate(asm_sw_liq(nmu,nlambda,nswbands), stat=ierr)
+   call handle_allocate_error(ierr, sub, 'asm_sw_liq')
+   asm_sw_liq = asm_sw_liq_ccpp
+   allocate(abs_lw_ice(n_g_d,nlwbands), stat=ierr)
+   call handle_allocate_error(ierr, sub, 'abs_lw_ice')
+   abs_lw_ice = abs_lw_ice_ccpp
+   allocate(ext_sw_ice(n_g_d,nswbands), stat=ierr)
+   call handle_allocate_error(ierr, sub, 'ext_sw_ice')
+   ext_sw_ice = ext_sw_ice_ccpp
+   allocate(ssa_sw_ice(n_g_d,nswbands), stat=ierr)
+   call handle_allocate_error(ierr, sub, 'ssa_sw_ice')
+   ssa_sw_ice = ssa_sw_ice_ccpp
+   allocate(asm_sw_ice(n_g_d,nswbands), stat=ierr)
+   call handle_allocate_error(ierr, sub, 'asm_sw_ice')
+   asm_sw_ice = asm_sw_ice_ccpp
+   allocate(g_mu(nmu), stat=ierr)
+   call handle_allocate_error(ierr, sub, 'g_mu')
+   g_mu = g_mu_ccpp
+   allocate(g_lambda(nmu,nlambda), stat=ierr)
+   call handle_allocate_error(ierr, sub, 'g_lambda')
+   g_lambda = g_lambda_ccpp
+   allocate(g_d_eff(n_g_d), stat=ierr)
+   call handle_allocate_error(ierr, sub, 'g_d_eff')
+   g_d_eff = g_d_eff_ccpp
+
    ! Set output variables
-   nmu = size(g_mu)
-   nlambda = size(g_lambda, 2)
-   n_g_d = size(g_d_eff)
    tiny_out = tiny
-   allocate(abs_lw_liq_out(nmu,nlambda,nlwbands), stat=ierr)
-   call handle_allocate_error(ierr, sub, 'abs_lw_liq_out')
-   abs_lw_liq_out = abs_lw_liq
-   allocate(ext_sw_liq_out(nmu,nlambda,nswbands), stat=ierr)
-   call handle_allocate_error(ierr, sub, 'ext_sw_liq_out')
-   ext_sw_liq_out = ext_sw_liq
-   allocate(ssa_sw_liq_out(nmu,nlambda,nswbands), stat=ierr)
-   call handle_allocate_error(ierr, sub, 'ssa_sw_liq_out')
-   ssa_sw_liq_out = ssa_sw_liq
-   allocate(asm_sw_liq_out(nmu,nlambda,nswbands), stat=ierr)
-   call handle_allocate_error(ierr, sub, 'asm_sw_liq_out')
-   asm_sw_liq_out = asm_sw_liq
-   allocate(abs_lw_ice_out(n_g_d,nlwbands), stat=ierr)
-   call handle_allocate_error(ierr, sub, 'abs_lw_ice_out')
-   abs_lw_ice_out = abs_lw_ice
-   allocate(ext_sw_ice_out(n_g_d,nswbands), stat=ierr)
-   call handle_allocate_error(ierr, sub, 'ext_sw_ice_out')
-   ext_sw_ice_out = ext_sw_ice
-   allocate(ssa_sw_ice_out(n_g_d,nswbands), stat=ierr)
-   call handle_allocate_error(ierr, sub, 'ssa_sw_ice_out')
-   ssa_sw_ice_out = ssa_sw_ice
-   allocate(asm_sw_ice_out(n_g_d,nswbands), stat=ierr)
-   call handle_allocate_error(ierr, sub, 'asm_sw_ice_out')
-   asm_sw_ice_out = asm_sw_ice
-   allocate(g_mu_out(nmu), stat=ierr)
-   call handle_allocate_error(ierr, sub, 'g_mu_out')
-   g_mu_out = g_mu
-   allocate(g_lambda_out(nmu,nlambda), stat=ierr)
-   call handle_allocate_error(ierr, sub, 'g_lambda_out')
-   g_lambda_out = g_lambda
-   allocate(g_d_eff_out(n_g_d), stat=ierr)
-   call handle_allocate_error(ierr, sub, 'g_d_eff_out')
-   g_d_eff_out = g_d_eff
    return
 
 end subroutine cloud_rad_props_init

src/physics/cam/cloud_rad_props.F90

@@ -382,18 +382,6 @@ subroutine radiation_init(pbuf2d)
    integer :: history_budget_histfile_num ! output history file number for budget fields
    integer :: err
 
-   ! Cloud optics variables
-   real(kind=r8), allocatable :: abs_lw_ice(:,:)
-   real(kind=r8), allocatable :: ext_sw_ice(:,:)
-   real(kind=r8), allocatable :: ssa_sw_ice(:,:)
-   real(kind=r8), allocatable :: asm_sw_ice(:,:)
-   real(kind=r8), allocatable :: abs_lw_liq(:,:,:)
-   real(kind=r8), allocatable :: ext_sw_liq(:,:,:)
-   real(kind=r8), allocatable :: ssa_sw_liq(:,:,:)
-   real(kind=r8), allocatable :: asm_sw_liq(:,:,:)
-   real(kind=r8), allocatable :: g_lambda(:,:)
-   real(kind=r8), allocatable :: g_mu(:)
-   real(kind=r8), allocatable :: g_d_eff(:)
    real(kind=r8) :: tiny
 
    integer :: dtime
@@ -404,9 +392,7 @@ subroutine radiation_init(pbuf2d)
    call rad_data_init(pbuf2d) ! initialize output fields for offline driver
    call radsw_init()
    call radlw_init()
-   call cloud_rad_props_init(abs_lw_liq, abs_lw_ice, ext_sw_liq, ssa_sw_liq, &
-                  asm_sw_liq, ext_sw_ice, ssa_sw_ice, asm_sw_ice, g_mu,      &
-                  g_lambda, g_d_eff, tiny)
+   call cloud_rad_props_init(tiny)
 
    cld_idx      = pbuf_get_index('CLD')
    cldfsnow_idx = pbuf_get_index('CLDFSNOW',errcode=err)

src/physics/rrtmg/radiation.F90

@@ -500,9 +500,7 @@ subroutine radiation_init(pbuf2d)
    call rad_data_init(pbuf2d)
 
    ! Read ice and liquid optics files
-   call cloud_rad_props_init(abs_lw_liq, abs_lw_ice, &
-                  ext_sw_liq, ssa_sw_liq, asm_sw_liq, ext_sw_ice, ssa_sw_ice, &
-                  asm_sw_ice, g_mu, g_lambda, g_d_eff, tiny)
+   call cloud_rad_props_init(tiny)
    if (errflg /= 0) then
       call endrun(sub//': '//errmsg)
    end if
@@ -1293,10 +1291,9 @@ subroutine radiation_tend( &
          ! Set cloud optical properties in cloud_lw object.
          call rrtmgp_lw_cloud_optics_run(dolw, ncol, nlay, nlaycam, cld(:ncol,:), cldfsnow_in,     &
              cldfgrau_in, cldfprime(:ncol,:), kdist_lw, cloud_lw, lambda(:ncol,:), mu(:ncol,:),    &
-             iclwp(:ncol,:), iciwp(:ncol,:), abs_lw_liq, abs_lw_ice, g_mu, g_lambda, g_d_eff,      &
-             tiny, dei(:ncol,:), icswp(:ncol,:), des(:ncol,:), icgrauwp(:ncol,:), degrau(:ncol,:), &
-             nlwbands, do_snow, do_graupel, pver, ktopcam, tauc, cldf, cld_lw_abs, snow_lw_abs,    &
-             grau_lw_abs, errmsg, errflg)
+             iclwp(:ncol,:), iciwp(:ncol,:), tiny, dei(:ncol,:), icswp(:ncol,:), des(:ncol,:),     &
+             icgrauwp(:ncol,:), degrau(:ncol,:), nlwbands, do_snow, do_graupel, pver, ktopcam,     &
+             tauc, cldf, cld_lw_abs, snow_lw_abs, grau_lw_abs, errmsg, errflg)
          if (errflg /= 0) then
             call endrun(sub//': '//errmsg)
          end if