diff --git a/physics/rrtmgp_lw_cloud_optics.F90 b/physics/rrtmgp_lw_cloud_optics.F90
index 38a54ca4c..56fcff2ba 100644
--- a/physics/rrtmgp_lw_cloud_optics.F90
+++ b/physics/rrtmgp_lw_cloud_optics.F90
@@ -267,33 +267,33 @@ subroutine rrtmgp_lw_cloud_optics_init(cld_optics_scheme, nrghice, rrtmgp_root_d
        if (mpirank==mpiroot) write (*,*) 'Broadcasting RRTMGP shortwave cloud data (LUT) ... '
        call MPI_BARRIER(mpicomm, ierr)
 #ifndef SINGLE_PREC
-       call MPI_BCAST(radliq_lwr_sw,           1,                            MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(radliq_upr_sw,           1,                            MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(radliq_fac_sw,           1,                            MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(radice_lwr_sw,           1,                            MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(radice_upr_sw,           1,                            MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(radice_fac_sw,           1,                            MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(lut_extliq_sw,           size(lut_extliq_sw),          MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(lut_ssaliq_sw,           size(lut_ssaliq_sw),          MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(lut_asyliq_sw,           size(lut_asyliq_sw),          MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(lut_extice_sw,           size(lut_extice_sw),          MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(lut_ssaice_sw,           size(lut_ssaice_sw),          MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(lut_asyice_sw,           size(lut_asyice_sw),          MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(band_lims_cldy_sw,       size(band_lims_cldy_sw),      MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)    
+       call MPI_BCAST(radliq_lwr,           1,                            MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(radliq_upr,           1,                            MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(radliq_fac,           1,                            MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(radice_lwr,           1,                            MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(radice_upr,           1,                            MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(radice_fac,           1,                            MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(lut_extliq,           size(lut_extliq),          MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(lut_ssaliq,           size(lut_ssaliq),          MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(lut_asyliq,           size(lut_asyliq),          MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(lut_extice,           size(lut_extice),          MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(lut_ssaice,           size(lut_ssaice),          MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(lut_asyice,           size(lut_asyice),          MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(band_lims_cldy,       size(band_lims_cldy),      MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)    
 #else
-       call MPI_BCAST(radliq_lwr_sw,           1,                            MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(radliq_upr_sw,           1,                            MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(radliq_fac_sw,           1,                            MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(radice_lwr_sw,           1,                            MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(radice_upr_sw,           1,                            MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(radice_fac_sw,           1,                            MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(lut_extliq_sw,           size(lut_extliq_sw),          MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(lut_ssaliq_sw,           size(lut_ssaliq_sw),          MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(lut_asyliq_sw,           size(lut_asyliq_sw),          MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(lut_extice_sw,           size(lut_extice_sw),          MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(lut_ssaice_sw,           size(lut_ssaice_sw),          MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(lut_asyice_sw,           size(lut_asyice_sw),          MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(band_lims_cldy_sw,       size(band_lims_cldy_sw),      MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(radliq_lwr,           1,                            MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(radliq_upr,           1,                            MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(radliq_fac,           1,                            MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(radice_lwr,           1,                            MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(radice_upr,           1,                            MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(radice_fac,           1,                            MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(lut_extliq,           size(lut_extliq),          MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(lut_ssaliq,           size(lut_ssaliq),          MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(lut_asyliq,           size(lut_asyliq),          MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(lut_extice,           size(lut_extice),          MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(lut_ssaice,           size(lut_ssaice),          MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(lut_asyice,           size(lut_asyice),          MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(band_lims_cldy,       size(band_lims_cldy),      MPI_REAL,               mpiroot, mpicomm, ierr)
 #endif 
        call MPI_BARRIER(mpicomm, ierr)
     endif
@@ -301,33 +301,33 @@ subroutine rrtmgp_lw_cloud_optics_init(cld_optics_scheme, nrghice, rrtmgp_root_d
        if (mpirank==mpiroot) write (*,*) 'Broadcasting RRTMGP shortwave cloud data (PADE) ... '
        call MPI_BARRIER(mpicomm, ierr)
 #ifndef SINGLE_PREC
-       call MPI_BCAST(pade_extliq_sw,          size(pade_extliq_sw),         MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_ssaliq_sw,          size(pade_ssaliq_sw),         MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_asyliq_sw,          size(pade_asyliq_sw),         MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_extice_sw,          size(pade_extice_sw),         MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_ssaice_sw,          size(pade_ssaice_sw),         MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_asyice_sw,          size(pade_asyice_sw),         MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_sizereg_extliq_sw,  size(pade_sizereg_extliq_sw), MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_sizereg_ssaliq_sw,  size(pade_sizereg_ssaliq_sw), MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_sizereg_asyliq_sw,  size(pade_sizereg_asyliq_sw), MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_sizereg_extice_sw,  size(pade_sizereg_extice_sw), MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_sizereg_ssaice_sw,  size(pade_sizereg_ssaice_sw), MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_sizereg_asyice_sw,  size(pade_sizereg_asyice_sw), MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
-       call MPI_BCAST(band_lims_cldy_sw,       size(band_lims_cldy_sw),      MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)    
+       call MPI_BCAST(pade_extliq,          size(pade_extliq),         MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_ssaliq,          size(pade_ssaliq),         MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_asyliq,          size(pade_asyliq),         MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_extice,          size(pade_extice),         MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_ssaice,          size(pade_ssaice),         MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_asyice,          size(pade_asyice),         MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_sizereg_extliq,  size(pade_sizereg_extliq), MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_sizereg_ssaliq,  size(pade_sizereg_ssaliq), MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_sizereg_asyliq,  size(pade_sizereg_asyliq), MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_sizereg_extice,  size(pade_sizereg_extice), MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_sizereg_ssaice,  size(pade_sizereg_ssaice), MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_sizereg_asyice,  size(pade_sizereg_asyice), MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)
+       call MPI_BCAST(band_lims_cldy,       size(band_lims_cldy),      MPI_DOUBLE_PRECISION,   mpiroot, mpicomm, ierr)    
 #else
-       call MPI_BCAST(pade_extliq_sw,          size(pade_extliq_sw),         MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_ssaliq_sw,          size(pade_ssaliq_sw),         MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_asyliq_sw,          size(pade_asyliq_sw),         MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_extice_sw,          size(pade_extice_sw),         MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_ssaice_sw,          size(pade_ssaice_sw),         MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_asyice_sw,          size(pade_asyice_sw),         MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_sizereg_extliq_sw,  size(pade_sizereg_extliq_sw), MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_sizereg_ssaliq_sw,  size(pade_sizereg_ssaliq_sw), MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_sizereg_asyliq_sw,  size(pade_sizereg_asyliq_sw), MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_sizereg_extice_sw,  size(pade_sizereg_extice_sw), MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_sizereg_ssaice_sw,  size(pade_sizereg_ssaice_sw), MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(pade_sizereg_asyice_sw,  size(pade_sizereg_asyice_sw), MPI_REAL,               mpiroot, mpicomm, ierr)
-       call MPI_BCAST(band_lims_cldy_sw,       size(band_lims_cldy_sw),      MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_extliq,          size(pade_extliq),         MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_ssaliq,          size(pade_ssaliq),         MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_asyliq,          size(pade_asyliq),         MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_extice,          size(pade_extice),         MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_ssaice,          size(pade_ssaice),         MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_asyice,          size(pade_asyice),         MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_sizereg_extliq,  size(pade_sizereg_extliq), MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_sizereg_ssaliq,  size(pade_sizereg_ssaliq), MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_sizereg_asyliq,  size(pade_sizereg_asyliq), MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_sizereg_extice,  size(pade_sizereg_extice), MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_sizereg_ssaice,  size(pade_sizereg_ssaice), MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(pade_sizereg_asyice,  size(pade_sizereg_asyice), MPI_REAL,               mpiroot, mpicomm, ierr)
+       call MPI_BCAST(band_lims_cldy,       size(band_lims_cldy),      MPI_REAL,               mpiroot, mpicomm, ierr)
 #endif
        call MPI_BARRIER(mpicomm, ierr)
     endif