diff --git a/phys/Makefile b/phys/Makefile index 6988b5cddf..93cc5fcc37 100644 --- a/phys/Makefile +++ b/phys/Makefile @@ -493,7 +493,7 @@ submodules : fi @if [ \( ! -f module_mp_tempo_driver.F90 \) -o \( ! -f module_mp_tempo_main.F90 \) -o \ \( ! -f module_mp_tempo_cfgs.F90 \) -o \( ! -f module_mp_tempo_aerosols.F90 \) -o \ - \( ! -f module_mp_tempo_ml.F90 \) -o \( ! -f modulemp_tempo_diags.F90 \) -o \ + \( ! -f module_mp_tempo_ml.F90 \) -o \( ! -f module_mp_tempo_diags.F90 \) -o \ \( ! -f module_mp_tempo_utils.F90 \) -o \( ! -f module_mp_tempo_params.F90 \) ] ; then \ echo Pulling in TEMPO submodule ; \ ( cd .. ; git submodule update --init --recursive ) ; \ diff --git a/phys/TEMPO b/phys/TEMPO index 2f68b2ce13..881614f68a 160000 --- a/phys/TEMPO +++ b/phys/TEMPO @@ -1 +1 @@ -Subproject commit 2f68b2ce13a3f76fd126b787c0b97c1f4046f611 +Subproject commit 881614f68aa65de8f383d56139162049baf600fa diff --git a/phys/module_microphysics_driver.F b/phys/module_microphysics_driver.F index 34337f6238..4caa1c90ca 100644 --- a/phys/module_microphysics_driver.F +++ b/phys/module_microphysics_driver.F @@ -71,8 +71,8 @@ SUBROUTINE microphysics_driver( & ,f_qns,f_qnr,f_qng,f_qnc,f_qnn,f_qh,f_qnh & , f_qzr,f_qzi,f_qzs,f_qzg,f_qzh & ,f_qvolg,f_qvolh & - ,f_qic,f_qip,f_qid & - ,f_qnic,f_qnip,f_qnid & + ,f_qic,f_qip,f_qid & + ,f_qnic,f_qnip,f_qnid & ,f_qir,f_qib & ! for P3 ,f_qi2,f_qni2,f_qir2,f_qib2 & ! for P3 ,f_qvoli,f_qaoli & ! for Jensen ISHMAEL @@ -1480,12 +1480,12 @@ SUBROUTINE microphysics_driver( & if (config_flags%nwp_diagnostics == 1) then if (present(hail_maxk1)) then if (allocated(tempo_driver_diags%max_hail_diameter_sfc)) then - hail_maxk1(i,j) = tempo_driver_diags%max_hail_diameter_sfc(i,j) + hail_maxk1(i,j) = 1.e-3 * tempo_driver_diags%max_hail_diameter_sfc(i,j) endif endif if (present(hail_max2d)) then if (allocated(tempo_driver_diags%max_hail_diameter_column)) then - hail_max2d(i,j) = tempo_driver_diags%max_hail_diameter_column(i,j) + hail_max2d(i,j) = 1.e-3 * tempo_driver_diags%max_hail_diameter_column(i,j) endif endif endif diff --git a/run/README.namelist b/run/README.namelist index 96207eeb61..1b823f7a87 100644 --- a/run/README.namelist +++ b/run/README.namelist @@ -255,10 +255,10 @@ Namelist variables specifically for the WPS input for real: = 2: it uses an alternative way (less biased when compared against input data) to compute height in program real and pressure in model. - wif_input_opt = 0 ! = 1: option to process the Water Ice Friendly Aerosol input from metgrid for use with mp_physics=28,29 + wif_input_opt = 0 ! = 1: option to process the Water Ice Friendly Aerosol input from metgrid for use with mp_physics=28,29, or 88 with tempo_aerosolaware=1 = 2: since V4.4, option to use black carbon aerosol category with mp_physics=28,29, as well as its radiative effect. Must include file QNWFA_QNIFA_QNBCA_SIGMA_MONTHLY.dat during WPS - num_wif_levels = 30 ! number of levels in the Thompson Water Ice Friendly aerosols (mp_physic=28,29) + num_wif_levels = 30 ! number of levels in the Thompson Water Ice Friendly aerosols (mp_physic=28,29, or 88 with tempo_aerosolaware=1) p_top_requested = 5000 ! p_top (Pa) to use in the model vert_refine_fact = 1 ! vertical refinement factor for ndown, not used for concurrent vertical grid refinement vert_refine_method (max_dom) = 0 ! vertical refinement method @@ -530,7 +530,7 @@ use_rap_aero_icbc = .false. ! Set to .true. to ingest real-t 2 ! continental clean (default), for ntu3m 3 ! continental average, for ntu3m 4 ! continental urban, for ntu3m - + = 88, TEMPO (Thompson-Eidhammer Microphysics Parameterization for Operations) = 95, Ferrier (old Eta) microphysics = 96, Madwrf = 97, Goddard GCE scheme (also uses gsfcgce_hail, gsfcgce_2ice)