Skip to content

updates to P3, including a new 3-moment option #1356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davegill merged 19 commits into from
Feb 25, 2021
Merged

updates to P3, including a new 3-moment option #1356

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
64c05a9
Add files via upload
hmorrison100 Dec 30, 2020
cb9b6eb
Add files via upload
hmorrison100 Dec 30, 2020
ebadb86
Add files via upload
hmorrison100 Dec 30, 2020
c32fccc
Delete p3_lookup_table_1.dat-v4.1
hmorrison100 Dec 30, 2020
4634f20
Delete p3_lookup_table_2.dat-v4.1
hmorrison100 Dec 30, 2020
74b594c
Added zipped 3-moment lookup table
Dec 31, 2020
9964a35
Added updated P3 module v4.0.7-HM2
Dec 31, 2020
1dc01a5
updates to Registry.NMM and module_mp_p3.F to address WRF crash
Jan 4, 2021
6053c2b
Handle file movement for new p3 lookup table
davegill Jan 4, 2021
dd6ba27
gunzip --keep option not available, req'd for p3 gzip'ed data
davegill Jan 4, 2021
619d280
Infrastructure for new p3 files
davegill Jan 5, 2021
e3d7585
p3 - wrong file name: no "v" in v4.1
davegill Jan 5, 2021
8fab6a5
trigger jenkins
davegill Jan 7, 2021
7b53da5
Test 1 | Jan 8th 2021
vlakshmanan-scala Jan 8, 2021
7f3766a
Scala Test 2 | Jan 8 2021
vlakshmanan-scala Jan 8, 2021
2337703
trigger jenkins
davegill Jan 8, 2021
b7cce16
remove commented-out previous line in Makefile 10:31
davegill Feb 9, 2021
8230b00
Merge branch 'develop' into master
davegill Feb 16, 2021
108c98b
Merge branch 'develop' into master
davegill Feb 24, 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
19 changes: 13 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ wrf : framework_only
if [ $(ESMF_COUPLING) -eq 1 ] ; then \
( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em em_wrf_SST_ESMF ) ; \
fi
if [ ! -f run/p3_lookupTable_1.dat-3momI_v5.1.6 ] ; then \
( cd run ; cp p3_lookupTable_1.dat-3momI_v5.1.6.gz hold.gz ; \
gunzip hold.gz ; mv hold p3_lookupTable_1.dat-3momI_v5.1.6 ) ; \
fi
@echo "build started: $(START_OF_COMPILE)"
@echo "build completed:" `date`

Expand Down Expand Up @@ -556,8 +560,9 @@ em_real : wrf
ln -sf ../../run/aerosol_lon.formatted . ; \
ln -sf ../../run/aerosol_plev.formatted . ; \
ln -sf ../../run/CCN_ACTIVATE.BIN . ; \
ln -sf ../../run/p3_lookup_table_1.dat-v4.1 . ; \
ln -sf ../../run/p3_lookup_table_2.dat-v4.1 . ; \
ln -sf ../../run/p3_lookupTable_1.dat-2momI_v5.1.6_oldDimax . ; \
ln -sf ../../run/p3_lookupTable_1.dat-3momI_v5.1.6 . ; \
ln -sf ../../run/p3_lookupTable_2.dat-4.1 . ; \
ln -sf ../../run/HLC.TBL . ; \
ln -sf ../../run/wind-turbine-1.tbl . ; \
ln -sf ../../run/ishmael-gamma-tab.bin . ; \
Expand Down Expand Up @@ -627,8 +632,9 @@ em_real : wrf
ln -sf ../../run/bulkdens.asc_s_0_03_0_9 . ; \
ln -sf ../../run/bulkradii.asc_s_0_03_0_9 . ; \
ln -sf ../../run/CCN_ACTIVATE.BIN . ; \
ln -sf ../../run/p3_lookup_table_1.dat-v4.1 . ; \
ln -sf ../../run/p3_lookup_table_2.dat-v4.1 . ; \
ln -sf ../../run/p3_lookupTable_1.dat-2momI_v5.1.6_oldDimax . ; \
ln -sf ../../run/p3_lookupTable_1.dat-3momI_v5.1.6 . ; \
ln -sf ../../run/p3_lookupTable_2.dat-4.1 . ; \
ln -sf ../../run/HLC.TBL . ; \
ln -sf ../../run/wind-turbine-1.tbl . ; \
ln -sf ../../run/ishmael-gamma-tab.bin . ; \
Expand Down Expand Up @@ -921,8 +927,9 @@ nmm_real : nmm_wrf
ln -sf ../../run/bulkdens.asc_s_0_03_0_9 . ; \
ln -sf ../../run/bulkradii.asc_s_0_03_0_9 . ; \
ln -sf ../../run/CCN_ACTIVATE.BIN . ; \
ln -sf ../../run/p3_lookup_table_1.dat-v4.1 . ; \
ln -sf ../../run/p3_lookup_table_2.dat-v4.1 . ; \
ln -sf ../../run/p3_lookupTable_1.dat-2momI_v5.1.6_oldDimax . ; \
ln -sf ../../run/p3_lookupTable_1.dat-3momI_v5.1.6 . ; \
ln -sf ../../run/p3_lookupTable_2.dat-4.1 . ; \
ln -sf ../../run/HLC.TBL . ; \
ln -sf ../../run/wind-turbine-1.tbl . ; \
ln -sf ../../run/ishmael-gamma-tab.bin . ; \
Expand Down
4 changes: 4 additions & 0 deletions Registry/Registry.EM_COMMON
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,8 @@ state real qir2 ikjftb scalar 1 - \
i0rhusdf=(bdy_interp:dt) "QIR2" "Rime ice mass-2 mixing ratio" "kg kg(-1)"
state real qib2 ikjftb scalar 1 - \
i0rhusdf=(bdy_interp:dt) "QIB2" "Rime ice volume-2 mixing ratio" "m(3) kg(-1)"
state real qzi ikjftb scalar 1 - \
i0rhusdf=(bdy_interp:dt) "QZI" "Sixth moment ice mixing ratio" "m(6) kg(-1)"
state real qvoli ikjftb scalar 1 - \
i0rhusdf=(bdy_interp:dt) "QVOLI" "Ice volume-1 mixing ratio" "m(3) kg(-1)"
state real qaoli ikjftb scalar 1 - \
Expand Down Expand Up @@ -2822,6 +2824,7 @@ package thompsonaero mp_physics==28 - moist:qv,qc
package p3_1category mp_physics==50 - moist:qv,qc,qr,qi;scalar:qni,qnr,qir,qib;state:re_cloud,re_ice,vmi3d,rhopo3d,di3d,refl_10cm,th_old,qv_old
package p3_1category_nc mp_physics==51 - moist:qv,qc,qr,qi;scalar:qnc,qni,qnr,qir,qib;state:re_cloud,re_ice,vmi3d,rhopo3d,di3d,refl_10cm,th_old,qv_old
package p3_2category mp_physics==52 - moist:qv,qc,qr,qi,qi2;scalar:qnc,qni,qnr,qir,qib,qni2,qir2,qib2;state:re_cloud,re_ice,vmi3d,rhopo3d,di3d,vmi3d_2,rhopo3d_2,di3d_2,refl_10cm,th_old,qv_old
package p3_1cat_3mom mp_physics==53 - moist:qv,qc,qr,qi;scalar:qnc,qni,qnr,qir,qib,qzi;state:re_cloud,re_ice,vmi3d,rhopo3d,di3d,refl_10cm,th_old,qv_old
Comment thread
davegill marked this conversation as resolved.
package morr_tm_aero mp_physics==40 - moist:qv,qc,qr,qi,qs,qg;scalar:qnc,qni,qns,qnr,qng;state:rqrcuten,rqscuten,rqicuten,EFCG,EFIG,EFSG,WACT,CCN1_GS,CCN2_GS,CCN3_GS,CCN4_GS,CCN5_GS,CCN6_GS,CCN7_GS,re_cloud,re_ice,re_snow,mskf_refl_10cm
package jensen_ishmael mp_physics==55 - moist:qv,qc,qr,qi,qi2,qi3;scalar:qnr,qni,qvoli,qaoli,qni2,qvoli2,qaoli2,qni3,qvoli3,qaoli3;state:re_cloud,re_ice,vmi3d,rhopo3d,di3d,phii3d,itype,vmi3d_2,rhopo3d_2,di3d_2,phii3d_2,itype_2,vmi3d_3,rhopo3d_3,di3d_3,phii3d_3,itype_3,refl_10cm
package etampnew mp_physics==95 - moist:qv,qc,qr,qs;scalar:qt;state:f_ice_phy,f_rain_phy,f_rimef_phy
Expand Down Expand Up @@ -2857,6 +2860,7 @@ package thompsonaero_dfi mp_physics_dfi==28 - dfi_moist:dfi
package p3_1category_dfi mp_physics_dfi==50 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi;dfi_scalar:dfi_qni,dfi_qnr,dfi_qir,dfi_qib;state:dfi_re_cloud,dfi_re_ice
package p3_1category_nc_dfi mp_physics_dfi==51 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi;dfi_scalar:dfi_qnc,dfi_qni,dfi_qnr,dfi_qir,dfi_qib;state:dfi_re_cloud,dfi_re_ice
package p3_2category_dfi mp_physics_dfi==52 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qi2;dfi_scalar:dfi_qnc,dfi_qni,dfi_qnr,dfi_qir,dfi_qib,dfi_qni2,dfi_qir2,dfi_qib2;state:dfi_re_cloud,dfi_re_ice
package p3_1cat_3mom_dfi mp_physics_dfi==53 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi;dfi_scalar:dfi_qni,dfi_qnr,dfi_qir,dfi_qib,dfi_qzi;state:dfi_re_cloud,dfi_re_ice
package jensen_ishmael_dfi mp_physics_dfi==55 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qi2,dfi_qi3;dfi_scalar:dfi_qnr,dfi_qni,dfi_qvoli,dfi_qaoli,dfi_qni2,dfi_qvoli2,dfi_qaoli2,dfi_qni3,dfi_qvoli3,dfi_qaoli3;state:dfi_re_cloud,dfi_re_ice
package etampnew_dfi mp_physics_dfi==95 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qs;dfi_scalar:dfi_qt
package gsfcgcescheme_dfi mp_physics_dfi==97 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg
Expand Down
1 change: 1 addition & 0 deletions Registry/Registry.NMM
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1775,6 +1775,7 @@ package wdm7scheme mp_physics==26 - moist:qv,qc,q
package p3_1category mp_physics==50 - moist:qv
package p3_1category_nc mp_physics==51 - moist:qv
package p3_2category mp_physics==52 - moist:qv
package p3_1cat_3mom mp_physics==53 - moist:qv
package jensen_ishmael mp_physics==86 - moist:qv
package etamp_hwrf mp_physics==85 - moist:qv,qc,qr,qi,qs;state:f_ice,f_rain,f_rimef
package etampnew mp_physics==95 - moist:qv,qc,qr,qs;state:f_ice,f_rain,f_rimef
Expand Down
6 changes: 3 additions & 3 deletions clean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if ( "$arg" == '-a' || "$arg" == '-aa' ) then
/bin/rm -f configure.wrf >& /dev/null
endif
if ( "$arg" != '-aa' ) then
( cd run ; /bin/rm -f gm* out* fort* ideal* *.exe input_sounding ; \
( cd run ; /bin/rm -f gm* out* fort* ideal* *.exe input_sounding p3_lookupTable_1.dat-3momI_v5.1.6 ; \
/bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; \
/bin/rm -f namelist.input ) >& /dev/null
( cd test/exp_real ; /bin/rm -f gm* out* fort* real* ) >& /dev/null
Expand All @@ -58,11 +58,11 @@ if ( "$arg" == '-a' || "$arg" == '-aa' ) then
*/CAMtr_volume_mixing_ratio.RCP4.5 */CAMtr_volume_mixing_ratio.RCP6 */CAMtr_volume_mixing_ratio.RCP8.5 \
*/CAMtr_volume_mixing_ratio.A1B */CAMtr_volume_mixing_ratio.A2 */CAMtr_volume_mixing_ratio \
*/CLM_*DATA */RRTMG_LW_DATA */RRTMG_SW_DATA \
*/p3_lookup_table_?.dat* */BROADBAND_CLOUD_GODDARD.bin \
*/p3_lookup* */BROADBAND_CLOUD_GODDARD.bin \
*/ozone.formatted */ozone_lat.formatted */ozone_plev.formatted \
*/aerosol.formatted */aerosol_lat.formatted */aerosol_plev.formatted */aerosol_lon.formatted \
*/kernels.asc_s_0_03_0_9 */bulkradii.asc_s_0_03_0_9 */bulkdens.asc_s_0_03_0_9 \
*/constants.asc */p3_lookup_table_1.dat \
*/constants.asc \
*/masses.asc */kernels_z.asc */capacity.asc */termvels.asc */coeff_p.asc */coeff_q.asc \
*/gribmap.txt */tr??t?? */co2_trans */namelist.output */ishmael-gamma-tab.bin \
*/HLC.TBL */wind-turbine-1.tbl \
Expand Down
47 changes: 46 additions & 1 deletion phys/module_microphysics_driver.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ SUBROUTINE microphysics_driver( &
,NSSL_1MOM,NSSL_1MOMLFO, FER_MP_HIRES_ADVECT & ! ,NSSL_3MOM &
,WSM7SCHEME, WDM7SCHEME &
,NUWRF4ICESCHEME &
,MILBRANDT2MOM , CAMMGMPSCHEME,FULL_KHAIN_LYNN, P3_1CATEGORY, P3_1CATEGORY_NC, P3_2CATEGORY, MORR_TM_AERO, JENSEN_ISHMAEL,SPRINKLER !,MILBRANDT3MOM
,MILBRANDT2MOM , CAMMGMPSCHEME,FULL_KHAIN_LYNN, P3_1CATEGORY, P3_1CATEGORY_NC, P3_2CATEGORY, P3_1CAT_3MOM, MORR_TM_AERO, JENSEN_ISHMAEL,SPRINKLER !,MILBRANDT3MOM
#if ( WRFPLUS == 1 )
USE module_state_description, ONLY : LSCONDSCHEME, MKESSLERSCHEME
#endif
Expand Down Expand Up @@ -1501,6 +1501,51 @@ SUBROUTINE microphysics_driver( &
,diag_di2_3d=di3d_2 &
,diag_rhopo2_3d=rhopo3d_2 &
)

CASE (P3_1CAT_3MOM)
CALL wrf_debug(100, 'microphysics_driver: calling p3 one category 3 moment')

CALL mp_p3_wrapper_wrf( &
ITIMESTEP=itimestep, &
TH_3d=th, &
QV_3d=qv_curr, &
QC_3d=qc_curr, &
QR_3d=qr_curr, &
QNR_3d=qnr_curr, &
QI1_3d=qi_curr, &
QIR1_3d=qir_curr, &
QNI1_3d=qni_curr, &
QIB1_3d=qib_curr, &
th_old_3d=th_old, &
qv_old_3d=qv_old, &
nc_3d=qnc_curr, &
PII=pi_phy, &
P=p, &
DT=dt, &
DZ=dz8w, &
W=w &
,RAINNC=RAINNC &
,RAINNCV=RAINNCV &
,SR=SR &
,SNOWNC=SNOWNC &
,SNOWNCV=SNOWNCV &
,N_ICECAT=1 &
,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 &
,diag_zdbz_3d=refl_10cm, &
diag_effc_3d=re_cloud, &
diag_effi_3d=re_ice &
,diag_vmi_3d=vmi3d &
,diag_di_3d=di3d &
,diag_rhopo_3d=rhopo3d &
,QZI1_3d=qzi_curr &
! not currently output
! ,diag_dhmax_3d=dhmax3d &
! ,diag_lami_3d=lami3d &
! ,diag_mui_3d=mui3d &
)

#endif


Expand Down
Loading