Fix merge conflicts in RRTMGP code

NCAR · Feb 25, 2021 · 4f16a3e · 4f16a3e
1 parent 93fa29e
commit 4f16a3e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/physics/GFS_rrtmgp_sw_pre.F90 b/physics/GFS_rrtmgp_sw_pre.F90
@@ -31,7 +31,7 @@ subroutine GFS_rrtmgp_sw_pre_run(me, nCol, nLev, lndp_type, n_var_lndp,lndp_var_
        lndp_prt_list, doSWrad, solhr, lon, coslat, sinlat,  snowd, sncovr, snoalb, zorl,    &
        tsfg, tsfa, hprime, alvsf, alnsf, alvwf, alnwf, facsf, facwf, fice, tisfc, albdvis,  &
        albdnir, albivis, albinir, lsmask, sfc_wts, p_lay, tv_lay, relhum, p_lev,            &
-       sw_gas_props, nday, idxday, coszen, coszdg, sfc_alb_nir_dir, sfc_alb_nir_dif,        &
+       nday, idxday, coszen, coszdg, sfc_alb_nir_dir, sfc_alb_nir_dif,                      &
        sfc_alb_uvvis_dir, sfc_alb_uvvis_dif, sfc_alb_dif, errmsg, errflg)
 
     ! Inputs   

diff --git a/physics/rrtmgp_lw_pre.F90 b/physics/rrtmgp_lw_pre.F90
@@ -26,7 +26,7 @@ end subroutine rrtmgp_lw_pre_init
 !! \htmlinclude rrtmgp_lw_pre_run.html
 !!
   subroutine rrtmgp_lw_pre_run (doLWrad, nCol, xlon, xlat, slmsk, zorl, snowd, sncovr, &
-       tsfg, tsfa, hprime, lw_gas_props, sfc_emiss_byband, emiss, semis, errmsg, errflg)
+       tsfg, tsfa, hprime, sfc_emiss_byband, emiss, semis, errmsg, errflg)
 
     ! Inputs
     logical, intent(in) :: &
@@ -45,8 +45,6 @@ subroutine rrtmgp_lw_pre_run (doLWrad, nCol, xlon, xlat, slmsk, zorl, snowd, snc
          hprime           ! Standard deviation of subgrid orography
     real(kind_phys), dimension(:), intent(in) :: &
          emiss            ! Surface emissivity from Noah MP
-    type(ty_gas_optics_rrtmgp),intent(in) :: &
-         lw_gas_props     ! RRTMGP DDT: spectral information for LW calculation
 
     ! Outputs 
     real(kind_phys), dimension(lw_gas_props%get_nband(),ncol), intent(out) :: &

diff --git a/physics/rrtmgp_lw_pre.meta b/physics/rrtmgp_lw_pre.meta
@@ -104,14 +104,6 @@
   kind = kind_phys
   intent = in
   optional = F
-[lw_gas_props]
-  standard_name = coefficients_for_lw_gas_optics
-  long_name = DDT containing spectral information for RRTMGP LW radiation scheme
-  units = DDT
-  dimensions = ()
-  type = ty_gas_optics_rrtmgp
-  intent = in
-  optional = F
 [emiss]
   standard_name = surface_emissivity_lsm
   long_name = surface emissivity from lsm