Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
373ac91
Initial commit
dustinswales Feb 23, 2021
c985cee
Initial commit. Save temperature from previous timestep when using RR…
dustinswales Mar 1, 2021
7aee096
Jacobian of LW (Up/Down) applied to adjustment of radiation tendency …
dustinswales Mar 4, 2021
1d598ee
Bug fixes for l127 configuration using RRTMGP
dustinswales Mar 4, 2021
4e85c8b
Changes to metadata.
dustinswales Mar 4, 2021
bc460cc
Merge remote-tracking branch 'upstream/hotfix_tlay_for_c768l127' into…
dustinswales Mar 4, 2021
0fd915f
Some small changes
dustinswales Mar 4, 2021
0c37afd
Full profile LW flux adjustment using RRTMGP Jacobians.
dustinswales Mar 5, 2021
049fdbe
Removed redundant code.
dustinswales Mar 8, 2021
0aa3bfc
Merge remote-tracking branch 'upstream/add_RRFS_to_GP' into addLWadj_…
dustinswales Mar 8, 2021
d550e98
Added adjustment with Jacobian to surface flux, used for coupling.
dustinswales Mar 9, 2021
568c65b
Pass cloud-fraction through GP-2-mpinterfaces when using SGS clouds.
dustinswales Mar 11, 2021
84dcabc
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into ad…
dustinswales Mar 11, 2021
c94849f
Updated rte-rrtmgp hash
dustinswales Mar 18, 2021
9a338f1
physics/rrtmgp_aux.F90: fix bug for integer variable that should be a…
climbfuji Mar 19, 2021
dbd65a8
CMakeLists.txt: compile certain files without OpenMP
climbfuji Mar 19, 2021
f814c92
Merge pull request #15 from climbfuji/rrtmgp_noopenmp_dom
dustinswales Mar 19, 2021
4e9b59a
Moved allocation of LW interstitials to GFS_typedefs. Removed downwar…
dustinswales Mar 24, 2021
5b38f90
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into HEAD
dustinswales Mar 24, 2021
ad4515a
Moved assignment of spectral information from _init()'s to _run() for…
dustinswales Mar 26, 2021
ead8bd6
Bugfixes for GP/ThompsonMP coupling
dustinswales Apr 9, 2021
cc85d94
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into HEAD
dustinswales Apr 9, 2021
c86bb23
Fix conflict bug from previous merge.
dustinswales Apr 9, 2021
330f971
Added default values in RRTMGP sw gas-optics initialization routine. …
dustinswales Apr 23, 2021
0cdc94b
Some housekeeping in GP-ThompsonMP interface.
dustinswales Apr 23, 2021
ff590a7
Added call to compute_optimal_angle call before rte_lw(). New field p…
dustinswales Apr 23, 2021
75cd6eb
Added ngauss_angles back into rte_lw() clear-sky calculation.
dustinswales Apr 23, 2021
a91a5cf
Updated rte-rrtmgp submodule.
dustinswales Apr 23, 2021
dd9b7b5
Cleanup from PR.
dustinswales Apr 27, 2021
e39824a
Removed call to compute_heating_rate. Compute in-line.
dustinswales Apr 27, 2021
64b6fae
Changes from code review
dustinswales Apr 28, 2021
d52656b
Renamed rrtmgp_aux.F90
dustinswales Apr 28, 2021
aa27739
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into HEAD
dustinswales Apr 28, 2021
f3ef953
Reverted deprecated code.
dustinswales Apr 28, 2021
2ff5d1c
Update CMakeLists.txt so that local compiler flag modifications also …
climbfuji Apr 29, 2021
d22cb6d
Merge pull request #16 from climbfuji/cmakelists_symlinks_in_path
dustinswales Apr 29, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
266 changes: 142 additions & 124 deletions CMakeLists.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion physics/GFS_rrtmgp_cloud_overlap_pre.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
! ########################################################################################
module GFS_rrtmgp_cloud_overlap_pre
use machine, only: kind_phys
use rrtmgp_aux, only: check_error_msg
use radiation_tools, only: check_error_msg
use module_radiation_cloud_overlap, only: cmp_dcorr_lgth, get_alpha_exp

public GFS_rrtmgp_cloud_overlap_pre_init, GFS_rrtmgp_cloud_overlap_pre_run, GFS_rrtmgp_cloud_overlap_pre_finalize
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_rrtmgp_cloud_overlap_pre.meta
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = GFS_rrtmgp_cloud_overlap_pre
type = scheme
dependencies = rrtmgp_aux.F90, radiation_cloud_overlap.F90
dependencies = radiation_tools.F90, radiation_cloud_overlap.F90

########################################################################
[ccpp-arg-table]
Expand Down
5 changes: 3 additions & 2 deletions physics/GFS_rrtmgp_gfdlmp_pre.F90
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
! ########################################################################################
module GFS_rrtmgp_gfdlmp_pre
use machine, only: kind_phys
use rrtmgp_aux, only: check_error_msg
use radiation_tools, only: check_error_msg
use module_radiation_cloud_overlap, only: cmp_dcorr_lgth, get_alpha_exp
use rrtmgp_lw_cloud_optics, only: radliq_lwr => radliq_lwrLW, radliq_upr => radliq_uprLW,&
radice_lwr => radice_lwrLW, radice_upr => radice_uprLW
Expand Down Expand Up @@ -166,7 +166,8 @@ subroutine GFS_rrtmgp_gfdlmp_pre_run(nCol, nLev, nTracers, ncnd, i_cldliq, i_cld
where(cld_reice .gt. radice_upr) cld_reice = radice_upr
endif

! Cloud-fraction
! Cloud-fraction. For mynnedmf, cld_frac is adjusted for precipitation here, otherwise
! it passes through this interface. It is adjusted prior in sgscloudradpre.
if (do_mynnedmf .and. kdt .gt. 1) then
do iLay = 1, nLev
do iCol = 1, nCol
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_rrtmgp_gfdlmp_pre.meta
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = GFS_rrtmgp_gfdlmp_pre
type = scheme
dependencies = rrtmgp_aux.F90, radiation_cloud_overlap.F90, rrtmgp_lw_cloud_optics.F90
dependencies = radiation_tools.F90, radiation_cloud_overlap.F90, rrtmgp_lw_cloud_optics.F90

########################################################################
[ccpp-arg-table]
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_rrtmgp_lw_post.F90
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module GFS_rrtmgp_lw_post
use mo_gas_optics_rrtmgp, only: ty_gas_optics_rrtmgp
use mo_fluxes_byband, only: ty_fluxes_byband
use mo_heating_rates, only: compute_heating_rate
use rrtmgp_aux, only: check_error_msg
use radiation_tools, only: check_error_msg
implicit none

public GFS_rrtmgp_lw_post_init,GFS_rrtmgp_lw_post_run,GFS_rrtmgp_lw_post_finalize
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_rrtmgp_lw_post.meta
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = GFS_rrtmgp_lw_post
type = scheme
dependencies = iounitdef.f,machine.F,radiation_aerosols.f,radlw_param.f,rte-rrtmgp/extensions/mo_fluxes_byband.F90,rte-rrtmgp/extensions/mo_fluxes_byband_kernels.F90,rrtmgp_aux.F90,rte-rrtmgp/rte/mo_fluxes.F90,rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90,rte-rrtmgp/extensions/mo_heating_rates.F90
dependencies = iounitdef.f,machine.F,radiation_aerosols.f,radlw_param.f,rte-rrtmgp/extensions/mo_fluxes_byband.F90,rte-rrtmgp/extensions/mo_fluxes_byband_kernels.F90,radiation_tools.F90,rte-rrtmgp/rte/mo_fluxes.F90,rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90,rte-rrtmgp/extensions/mo_heating_rates.F90

########################################################################
[ccpp-arg-table]
Expand Down
45 changes: 4 additions & 41 deletions physics/GFS_rrtmgp_pre.F90
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module GFS_rrtmgp_pre
getozn ! Routine to setup ozone
! RRTMGP types
use mo_gas_concentrations, only: ty_gas_concs
use rrtmgp_aux, only: check_error_msg
use radiation_tools, only: check_error_msg,cmp_tlev

real(kind_phys), parameter :: &
amd = 28.9644_kind_phys, & ! Molecular weight of dry-air (g/mol)
Expand Down Expand Up @@ -163,7 +163,7 @@ subroutine GFS_rrtmgp_pre_run(nCol, nLev, nTracers, i_o3, lsswr, lslwr, fhswr, f
logical :: top_at_1
real(kind_phys),dimension(nCol,nLev) :: vmr_o3, vmr_h2o
real(kind_phys) :: es, tem1, tem2
real(kind_phys), dimension(nCol,nLev) :: o3_lay, tem2da, tem2db
real(kind_phys), dimension(nCol,nLev) :: o3_lay
real(kind_phys), dimension(nCol,nLev, NF_VGAS) :: gas_vmr
character(len=32), dimension(gas_concentrations%get_num_gases()) :: active_gases

Expand Down Expand Up @@ -206,49 +206,13 @@ subroutine GFS_rrtmgp_pre_run(nCol, nLev, nTracers, i_o3, lsswr, lslwr, fhswr, f
do iCol=1,NCOL
do iLay=1,nLev
if (t_lay(iCol,iLay) .le. minGPtemp) then
t_lay = minGPtemp + epsilon(minGPtemp)
t_lay(iCol,iLay) = minGPtemp + epsilon(minGPtemp)
endif
enddo
enddo

! Temperature at layer-interfaces
if (top_at_1) then
tem2da(1:nCol,2:iSFC) = log(p_lay(1:nCol,2:iSFC))
tem2db(1:nCol,2:iSFC) = log(p_lev(1:nCol,2:iSFC))
do iCol = 1, nCol
tem2da(iCol,1) = log(p_lay(iCol,1) )
tem2db(iCol,1) = log(max(minGPpres, p_lev(iCol,1)) )
tem2db(iCol,iSFC) = log(p_lev(iCol,iSFC) )
enddo
!
t_lev(1:NCOL,1) = t_lay(1:NCOL,iTOA)
do iLay = 2, iSFC
do iCol = 1, nCol
t_lev(iCol,iLay) = t_lay(iCol,iLay) + (t_lay(iCol,iLay-1) - t_lay(iCol,iLay))&
* (tem2db(iCol,iLay) - tem2da(iCol,iLay)) &
/ (tem2da(iCol,iLay-1) - tem2da(iCol,iLay))
enddo
enddo
t_lev(1:NCOL,iSFC+1) = tsfc(1:NCOL)
else
tem2da(1:nCol,2:iTOA) = log(p_lay(1:nCol,2:iTOA))
tem2db(1:nCol,2:iTOA) = log(p_lev(1:nCol,2:iTOA))
do iCol = 1, nCol
tem2da(iCol,1) = log(p_lay(iCol,1))
tem2db(iCol,1) = log(p_lev(iCol,1))
tem2db(iCol,iTOA) = log(max(minGPpres, p_lev(iCol,iTOA)) )
enddo
!
t_lev(1:NCOL,1) = tsfc(1:NCOL)
do iLay = 1, iTOA-1
do iCol = 1, nCol
t_lev(iCol,iLay+1) = t_lay(iCol,iLay) + (t_lay(iCol,iLay+1) - t_lay(iCol,iLay))&
* (tem2db(iCol,iLay+1) - tem2da(iCol,iLay)) &
/ (tem2da(iCol,iLay+1) - tem2da(iCol,iLay))
enddo
enddo
t_lev(1:NCOL,iTOA+1) = t_lay(1:NCOL,iTOA)
endif
call cmp_tlev(nCol,nLev,minGPpres,p_lay,t_lay,p_lev,tsfc,t_lev)

! Compute a bunch of thermodynamic fields needed by the cloud microphysics schemes.
! Relative humidity, saturation mixing-ratio, vapor mixing-ratio, virtual temperature,
Expand Down Expand Up @@ -319,5 +283,4 @@ end subroutine GFS_rrtmgp_pre_run
! #########################################################################################
subroutine GFS_rrtmgp_pre_finalize ()
end subroutine GFS_rrtmgp_pre_finalize

end module GFS_rrtmgp_pre
4 changes: 2 additions & 2 deletions physics/GFS_rrtmgp_pre.meta
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = GFS_rrtmgp_pre
type = scheme
dependencies = funcphys.f90,iounitdef.f,machine.F,module_bfmicrophysics.f,physcons.F90,physparam.f,radcons.f90,radiation_aerosols.f
dependencies = radiation_astronomy.f,radiation_clouds.f,module_mp_thompson.F90,radiation_gases.f,radiation_surface.f,rrtmgp_aux.F90,rrtmg_lw_cloud_optics.F90
dependencies = radiation_astronomy.f,radiation_clouds.f,module_mp_thompson.F90,radiation_gases.f,radiation_surface.f,radiation_tools.F90,rrtmg_lw_cloud_optics.F90

########################################################################
[ccpp-arg-table]
Expand Down Expand Up @@ -237,7 +237,7 @@
dimensions = ()
type = real
kind = kind_phys
intent = out
intent = in
optional = F
[raddt]
standard_name = time_step_for_radiation
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_rrtmgp_sw_post.F90
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module GFS_rrtmgp_sw_post
use mo_gas_optics_rrtmgp, only: ty_gas_optics_rrtmgp
use mo_fluxes_byband, only: ty_fluxes_byband
use mo_heating_rates, only: compute_heating_rate
use rrtmgp_aux, only: check_error_msg
use radiation_tools, only: check_error_msg
use rrtmgp_sw_gas_optics, only: sw_gas_props
implicit none

Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_rrtmgp_sw_post.meta
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = GFS_rrtmgp_sw_post
type = scheme
dependencies = iounitdef.f,machine.F,radiation_aerosols.f,radsw_param.f,rte-rrtmgp/extensions/mo_fluxes_byband.F90,rte-rrtmgp/extensions/mo_fluxes_byband_kernels.F90
dependencies = rte-rrtmgp/rte/mo_fluxes.F90,rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90,rte-rrtmgp/extensions/mo_heating_rates.F90,rrtmgp_aux.F90
dependencies = rte-rrtmgp/rte/mo_fluxes.F90,rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90,rte-rrtmgp/extensions/mo_heating_rates.F90,radiation_tools.F90

########################################################################
[ccpp-arg-table]
Expand Down
78 changes: 41 additions & 37 deletions physics/GFS_rrtmgp_thompsonmp_pre.F90
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
module GFS_rrtmgp_thompsonmp_pre
use machine, only: &
kind_phys
use rrtmgp_aux, only: &
use radiation_tools, only: &
check_error_msg
use module_mp_thompson, only: &
calc_effectRad, Nt_c, &
Expand Down Expand Up @@ -40,9 +40,9 @@ end subroutine GFS_rrtmgp_thompsonmp_pre_init
subroutine GFS_rrtmgp_thompsonmp_pre_run(nCol, nLev, nTracers, ncnd, doSWrad, doLWrad, &
i_cldliq, i_cldice, i_cldrain, i_cldsnow, i_cldgrpl, i_cldtot, i_cldliq_nc, &
i_cldice_nc, i_twa, effr_in, p_lev, p_lay, tv_lay, t_lay, effrin_cldliq, &
effrin_cldice, effrin_cldsnow, tracer, qs_lay, q_lay, relhum, cld_frac_mg, con_g, &
con_rd, con_eps, uni_cld, lmfshal, lmfdeep2, ltaerosol, do_mynnedmf, imfdeepcnv, &
imfdeepcnv_gf, doGP_cldoptics_PADE, doGP_cldoptics_LUT, &
effrin_cldice, effrin_cldsnow, tracer, qs_lay, q_lay, relhum, con_g, con_rd, &
con_eps, lmfshal, ltaerosol, do_mynnedmf, imfdeepcnv, imfdeepcnv_gf, &
doGP_cldoptics_PADE, doGP_cldoptics_LUT, &
cld_frac, cld_lwp, cld_reliq, cld_iwp, cld_reice, cld_swp, cld_resnow, cld_rwp, &
cld_rerain, precip_frac, errmsg, errflg)

Expand All @@ -67,9 +67,7 @@ subroutine GFS_rrtmgp_thompsonmp_pre_run(nCol, nLev, nTracers, ncnd, doSWrad, do
doSWrad, & ! Call SW radiation?
doLWrad, & ! Call LW radiation
effr_in, & ! Use cloud effective radii provided by model?
uni_cld, & ! Use provided cloud-fraction?
lmfshal, & ! Flag for mass-flux shallow convection scheme used by Xu-Randall
lmfdeep2, & ! Flag for some scale-aware mass-flux convection scheme active
ltaerosol, & ! Flag for aerosol option
do_mynnedmf, & ! Flag to activate MYNN-EDMF
doGP_cldoptics_LUT,& ! Flag to do GP cloud-optics (LUTs)
Expand All @@ -85,8 +83,7 @@ subroutine GFS_rrtmgp_thompsonmp_pre_run(nCol, nLev, nTracers, ncnd, doSWrad, do
qs_lay, & ! Saturation vapor pressure (Pa)
q_lay, & ! water-vapor mixing ratio (kg/kg)
relhum, & ! Relative humidity
p_lay, & ! Pressure at model-layers (Pa)
cld_frac_mg ! Cloud-fraction from MG scheme. WTF?????
p_lay ! Pressure at model-layers (Pa)
real(kind_phys), dimension(nCol,nLev+1), intent(in) :: &
p_lev ! Pressure at model-level interfaces (Pa)
real(kind_phys), dimension(nCol, nLev, nTracers),intent(in) :: &
Expand Down Expand Up @@ -161,9 +158,9 @@ subroutine GFS_rrtmgp_thompsonmp_pre_run(nCol, nLev, nTracers, ncnd, doSWrad, do
qc_mp(iCol,iLay) = tracer(iCol,iLay,i_cldliq) / (1.-q_lay(iCol,iLay))
qi_mp(iCol,iLay) = tracer(iCol,iLay,i_cldice) / (1.-q_lay(iCol,iLay))
qs_mp(iCol,iLay) = tracer(iCol,iLay,i_cldsnow) / (1.-q_lay(iCol,iLay))
nc_mp(iCol,iLay) = tracer(iCol,iLay,i_cldliq_nc) / (1.-q_lay(iCol,iLay))
ni_mp(iCol,iLay) = tracer(iCol,iLay,i_cldice_nc) / (1.-q_lay(iCol,iLay))
if (ltaerosol) then
nc_mp(iCol,iLay) = tracer(iCol,iLay,i_cldliq_nc) / (1.-q_lay(iCol,iLay))
nwfa(iCol,iLay) = tracer(iCol,iLay,i_twa)
if (qc_mp(iCol,iLay) > 1.e-12 .and. nc_mp(iCol,iLay) < 100.) then
nc_mp(iCol,iLay) = make_DropletNumber(qc_mp(iCol,iLay)*rho, nwfa(iCol,iLay)*rho) * orho
Expand All @@ -187,48 +184,55 @@ subroutine GFS_rrtmgp_thompsonmp_pre_run(nCol, nLev, nTracers, ncnd, doSWrad, do
re_cloud(iCol,iLay) = MAX(re_qc_min, MIN(re_cloud(iCol,iLay), re_qc_max))
re_ice(iCol,iLay) = MAX(re_qi_min, MIN(re_ice(iCol,iLay), re_qi_max))
re_snow(iCol,iLay) = MAX(re_qs_min, MIN(re_snow(iCol,iLay), re_qs_max))
end do
enddo
enddo

! Scale Thompson's effective radii from meter to micron
effrin_cldliq(1:nCol,1:nLev) = re_cloud(1:nCol,1:nLev)*1.e6
effrin_cldice(1:nCol,1:nLev) = re_ice(1:nCol,1:nLev)*1.e6
effrin_cldsnow(1:nCol,1:nLev) = re_snow(1:nCol,1:nLev)*1.e6
do iLay = 1, nLev
do iCol = 1, nCol
effrin_cldliq(iCol,iLay) = re_cloud(iCol,iLay)*1.e6
effrin_cldice(iCol,iLay) = re_ice(iCol,iLay)*1.e6
effrin_cldsnow(iCol,iLay) = re_snow(iCol,iLay)*1.e6
enddo
enddo

! Bound effective radii for RRTMGP, LUT's for cloud-optics go from
! 2.5 - 21.5 microns for liquid clouds,
! 10 - 180 microns for ice-clouds
if (doGP_cldoptics_PADE .or. doGP_cldoptics_LUT) then
where(effrin_cldliq .lt. radliq_lwr) effrin_cldliq = radliq_lwr
where(effrin_cldliq .gt. radliq_upr) effrin_cldliq = radliq_upr
where(effrin_cldice .lt. radice_lwr) effrin_cldice = radice_lwr
where(effrin_cldice .gt. radice_upr) effrin_cldice = radice_upr
do iLay = 1, nLev
do iCol = 1, nCol
if (effrin_cldliq(iCol,iLay) .lt. radliq_lwr) effrin_cldliq(iCol,iLay) = radliq_lwr
if (effrin_cldliq(iCol,iLay) .gt. radliq_upr) effrin_cldliq(iCol,iLay) = radliq_upr
if (effrin_cldice(iCol,iLay) .lt. radice_lwr) effrin_cldice(iCol,iLay) = radice_lwr
if (effrin_cldice(iCol,iLay) .gt. radice_upr) effrin_cldice(iCol,iLay) = radice_upr
enddo
enddo
endif

! Update global effective radii arrays.
cld_reliq(1:nCol,1:nLev) = effrin_cldliq(1:nCol,1:nLev)
cld_reice(1:nCol,1:nLev) = effrin_cldice(1:nCol,1:nLev)
cld_resnow(1:nCol,1:nLev) = effrin_cldsnow(1:nCol,1:nLev)
cld_rerain(1:nCol,1:nLev) = rerain_def

do iLay = 1, nLev
do iCol = 1, nCol
cld_reliq(iCol,iLay) = effrin_cldliq(iCol,iLay)
cld_reice(iCol,iLay) = effrin_cldice(iCol,iLay)
cld_resnow(iCol,iLay) = effrin_cldsnow(iCol,iLay)
cld_rerain(iCol,iLay) = rerain_def
enddo
enddo
! Compute cloud-fraction. Else, use value provided
if(.not. do_mynnedmf .or. imfdeepcnv .ne. imfdeepcnv_gf ) then ! MYNN PBL or GF conv
if(.not. do_mynnedmf .and. imfdeepcnv .ne. imfdeepcnv_gf ) then ! MYNN PBL or GF conv
! Cloud-fraction
if (uni_cld) then
cld_frac(1:nCol,1:nLev) = cld_frac_mg(1:nCol,1:nLev)
else
if( lmfshal) alpha0 = 100. ! Default (from GATE simulations)
if(.not. lmfshal) alpha0 = 2000.
! Xu-Randall (1996) cloud-fraction
do iLay = 1, nLev
do iCol = 1, nCol
cld_mr = cld_condensate(iCol,iLay,1) + cld_condensate(iCol,iLay,2) + &
cld_condensate(iCol,iLay,4)
cld_frac(iCol,iLay) = cld_frac_XuRandall(p_lay(iCol,iLay), &
qs_lay(iCol,iLay), relhum(iCol,iLay), cld_mr, alpha0)
enddo
if( lmfshal) alpha0 = 100. ! Default (from GATE simulations)
if(.not. lmfshal) alpha0 = 2000.
! Xu-Randall (1996) cloud-fraction
do iLay = 1, nLev
do iCol = 1, nCol
cld_mr = cld_condensate(iCol,iLay,1) + cld_condensate(iCol,iLay,2) + &
cld_condensate(iCol,iLay,4)
cld_frac(iCol,iLay) = cld_frac_XuRandall(p_lay(iCol,iLay), &
qs_lay(iCol,iLay), relhum(iCol,iLay), cld_mr, alpha0)
enddo
endif
enddo
endif

! Precipitation fraction (Hack. For now use cloud-fraction)
Expand Down
33 changes: 4 additions & 29 deletions physics/GFS_rrtmgp_thompsonmp_pre.meta
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = GFS_rrtmgp_thompsonmp_pre
type = scheme
dependencies = rrtmgp_aux.F90, module_mp_thompson_make_number_concentrations.F90, module_mp_thompson.F90, rrtmgp_lw_cloud_optics.F90
dependencies = radiation_tools.F90, module_mp_thompson_make_number_concentrations.F90, module_mp_thompson.F90, rrtmgp_lw_cloud_optics.F90

########################################################################
[ccpp-arg-table]
Expand Down Expand Up @@ -63,14 +63,6 @@
type = logical
intent = in
optional = F
[uni_cld]
standard_name = flag_for_uni_cld
long_name = flag for uni_cld
units = flag
dimensions = ()
type = logical
intent = in
optional = F
[lmfshal]
standard_name = flag_for_lmfshal
long_name = flag for lmfshal
Expand All @@ -79,14 +71,6 @@
type = logical
intent = in
optional = F
[lmfdeep2]
standard_name = flag_for_scale_aware_mass_flux_convection
long_name = flag for some scale-aware mass-flux convection scheme active
units = flag
dimensions = ()
type = logical
intent = in
optional = F
[ltaerosol]
standard_name = flag_for_aerosol_physics
long_name = flag for aerosol physics
Expand Down Expand Up @@ -194,15 +178,6 @@
kind = kind_phys
intent = inout
optional = F
[cld_frac_mg]
standard_name = cloud_fraction_for_MG
long_name = cloud fraction used by Morrison-Gettelman MP
units = frac
dimensions = (horizontal_loop_extent,vertical_dimension)
type = real
kind = kind_phys
intent = in
optional = F
[do_mynnedmf]
standard_name = do_mynnedmf
long_name = flag to activate MYNN-EDMF
Expand Down Expand Up @@ -307,9 +282,9 @@
intent = in
optional = F
[tracer]
standard_name = chemical_tracers
long_name = chemical tracers
units = g g-1
standard_name = tracer_concentration
long_name = model layer mean tracer concentration
units = kg kg-1
dimensions = (horizontal_loop_extent,vertical_dimension,number_of_tracers)
type = real
kind = kind_phys
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_rrtmgp_zhaocarr_pre.F90
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
! ########################################################################################
module GFS_rrtmgp_zhaocarr_pre
use machine, only: kind_phys
use rrtmgp_aux, only: check_error_msg
use radiation_tools, only: check_error_msg
use funcphys, only: fpvs
use module_radiation_clouds, only: get_alpha_dcorr

Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_rrtmgp_zhaocarr_pre.meta
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = GFS_rrtmgp_zhaocarr_pre
type = scheme
dependencies = rrtmgp_aux.F90
dependencies = radiation_tools.F90

########################################################################
[ccpp-arg-table]
Expand Down
Loading