Skip to content

Commit

Permalink
Bug fix for merra2 aerosol setup in physics/MP/Thompson/mp_thompson.F90
Browse files Browse the repository at this point in the history
  • Loading branch information
@climbfuji
climbfuji committed May 10, 2024
1 parent 81793d1 commit e2c1010
Showing 1 changed file with 43 additions and 1 deletion.
44 changes: 43 additions & 1 deletion physics/MP/Thompson/mp_thompson.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ subroutine mp_thompson_run(ncol, nlev, con_g, con_rd, &
qcten3 => diag3d(:,:,37:37)
end if set_extended_diagnostic_pointers
!> - Call mp_gt_driver() with or without aerosols, with or without effective radii, ...
if (is_aerosol_aware .or. merra2_aerosol_aware) then
if (is_aerosol_aware) then
call mp_gt_driver(qv=qv, qc=qc, qr=qr, qi=qi, qs=qs, qg=qg, ni=ni, nr=nr, &
nc=nc, nwfa=nwfa, nifa=nifa, nwfa2d=nwfa2d, nifa2d=nifa2d, &
tt=tgrs, p=prsl, w=w, dz=dz, dt_in=dtstep, dt_inner=dt_inner, &
Expand Down Expand Up @@ -732,6 +732,48 @@ subroutine mp_thompson_run(ncol, nlev, con_g, con_rd, &
qvten3=qvten3, qrten3=qrten3, qsten3=qsten3, qgten3=qgten3, &
qiten3=qiten3, niten3=niten3, nrten3=nrten3, ncten3=ncten3, &
qcten3=qcten3, pfils=pfils, pflls=pflls)
else if (merra2_aerosol_aware) then
call mp_gt_driver(qv=qv, qc=qc, qr=qr, qi=qi, qs=qs, qg=qg, ni=ni, nr=nr, &
nc=nc, nwfa=nwfa, nifa=nifa, &
tt=tgrs, p=prsl, w=w, dz=dz, dt_in=dtstep, dt_inner=dt_inner, &
sedi_semi=sedi_semi, decfl=decfl, lsm=islmsk, &
rainnc=rain_mp, rainncv=delta_rain_mp, &
snownc=snow_mp, snowncv=delta_snow_mp, &
icenc=ice_mp, icencv=delta_ice_mp, &
graupelnc=graupel_mp, graupelncv=delta_graupel_mp, sr=sr, &
refl_10cm=refl_10cm, &
diagflag=diagflag, do_radar_ref=do_radar_ref_mp, &
max_hail_diam_sfc=max_hail_diam_sfc, &
has_reqc=has_reqc, has_reqi=has_reqi, has_reqs=has_reqs, &
aero_ind_fdb=aero_ind_fdb, rand_perturb_on=spp_mp_opt, &
kme_stoch=kme_stoch, &
rand_pert=spp_wts_mp, spp_var_list=spp_var_list, &
spp_prt_list=spp_prt_list, n_var_spp=n_var_spp, &
spp_stddev_cutoff=spp_stddev_cutoff, &
ids=ids, ide=ide, jds=jds, jde=jde, kds=kds, kde=kde, &
ims=ims, ime=ime, jms=jms, jme=jme, kms=kms, kme=kme, &
its=its, ite=ite, jts=jts, jte=jte, kts=kts, kte=kte, &
fullradar_diag=fullradar_diag, istep=istep, nsteps=nsteps, &
first_time_step=first_time_step, errmsg=errmsg, errflg=errflg, &
! Extended diagnostics
ext_diag=ext_diag, &
! vts1=vts1, txri=txri, txrc=txrc, &
prw_vcdc=prw_vcdc, &
prw_vcde=prw_vcde, tpri_inu=tpri_inu, tpri_ide_d=tpri_ide_d, &
tpri_ide_s=tpri_ide_s, tprs_ide=tprs_ide, &
tprs_sde_d=tprs_sde_d, &
tprs_sde_s=tprs_sde_s, tprg_gde_d=tprg_gde_d, &
tprg_gde_s=tprg_gde_s, tpri_iha=tpri_iha, &
tpri_wfz=tpri_wfz, tpri_rfz=tpri_rfz, tprg_rfz=tprg_rfz, &
tprs_scw=tprs_scw, tprg_scw=tprg_scw, tprg_rcs=tprg_rcs, &
tprs_rcs=tprs_rcs, &
tprr_rci=tprr_rci, tprg_rcg=tprg_rcg, tprw_vcd_c=tprw_vcd_c, &
tprw_vcd_e=tprw_vcd_e, tprr_sml=tprr_sml, tprr_gml=tprr_gml, &
tprr_rcg=tprr_rcg, tprr_rcs=tprr_rcs, &
tprv_rev=tprv_rev, tten3=tten3, &
qvten3=qvten3, qrten3=qrten3, qsten3=qsten3, qgten3=qgten3, &
qiten3=qiten3, niten3=niten3, nrten3=nrten3, ncten3=ncten3, &
qcten3=qcten3, pfils=pfils, pflls=pflls)
else
call mp_gt_driver(qv=qv, qc=qc, qr=qr, qi=qi, qs=qs, qg=qg, ni=ni, nr=nr, &
tt=tgrs, p=prsl, w=w, dz=dz, dt_in=dtstep, dt_inner=dt_inner, &
Expand Down

0 comments on commit e2c1010

Please sign in to comment.