Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion phys/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) ; \
Expand Down
2 changes: 1 addition & 1 deletion phys/TEMPO
Submodule TEMPO updated 67 files
+2 −2 docs/interface/get_cloud_number.html
+2 −2 docs/module/module_mp_tempo_aerosols.html
+1 −1 docs/module/module_mp_tempo_cfgs.html
+24 −24 docs/module/module_mp_tempo_diags.html
+22 −22 docs/module/module_mp_tempo_driver.html
+6 −6 docs/module/module_mp_tempo_main.html
+1 −1 docs/module/module_mp_tempo_ml.html
+27 −8 docs/module/module_mp_tempo_params.html
+6 −6 docs/module/module_mp_tempo_tables.html
+11 −11 docs/module/module_mp_tempo_utils.html
+1 −1 docs/module/tests.html
+1 −1 docs/proc/activate_cloud_number.html
+2 −2 docs/proc/aerosol_collection_efficiency.html
+1 −1 docs/proc/build_table_qr_acr_qg.html
+2 −2 docs/proc/calc_rsif.html
+2 −2 docs/proc/calc_rslf.html
+2 −2 docs/proc/check_before_table_read.html
+1 −1 docs/proc/complex_ice_maetzler.html
+1 −1 docs/proc/complex_water_ray.html
+3 −3 docs/proc/effective_radius.html
+1 −1 docs/proc/find_melting_level.html
+2 −2 docs/proc/freezing_rain.html
+1 −1 docs/proc/gather.html
+1 −1 docs/proc/get_constant_cloud_number.html
+1 −1 docs/proc/get_index_for_rank.html
+1 −1 docs/proc/get_nuc.html
+1 −1 docs/proc/initialize_arrays_ccn.html
+1 −1 docs/proc/initialize_arrays_freezewater.html
+1 −1 docs/proc/initialize_arrays_qr_acr_qg.html
+1 −1 docs/proc/initialize_arrays_qr_acr_qs.html
+2 −2 docs/proc/max_hail_diam.html
+2 −2 docs/proc/read_table_ccn.html
+2 −2 docs/proc/read_table_freezewater.html
+2 −2 docs/proc/read_table_qr_acr_qg.html
+2 −2 docs/proc/read_table_qr_acr_qs.html
+9 −9 docs/proc/reflectivity_10cm.html
+2 −2 docs/proc/reflectivity_from_melting_graupel.html
+3 −3 docs/proc/reflectivity_from_melting_snow.html
+1 −1 docs/proc/sedimentation.html
+5 −5 docs/proc/snow_moments.html
+2 −2 docs/proc/tempo_build_tables.html
+2 −2 docs/proc/tempo_init.html
+1 −1 docs/proc/tempo_main.html
+1 −1 docs/proc/tempo_ml_predict_cloud_number.html
+5 −5 docs/proc/tempo_run.html
+1 −1 docs/proc/test_cloud_number_ml.html
+1 −1 docs/proc/test_cloud_number_non_aerosolaware.html
+7 −7 docs/program/build_tables.html
+1 −1 docs/search/search_database.json
+1 −1 docs/sourcefile/module_mp_tempo_diags.f90.html
+1 −1 docs/sourcefile/module_mp_tempo_driver.f90.html
+1,659 −1,662 docs/sourcefile/module_mp_tempo_main.f90.html
+700 −699 docs/sourcefile/module_mp_tempo_params.f90.html
+1 −1 docs/sourcefile/module_mp_tempo_tables.f90.html
+1 −1 docs/sourcefile/module_mp_tempo_utils.f90.html
+1 −1 docs/src/module_mp_tempo_driver.F90
+42 −45 docs/src/module_mp_tempo_main.F90
+1 −0 docs/src/module_mp_tempo_params.F90
+1 −1 docs/src/module_mp_tempo_tables.F90
+1 −1 docs/src/module_mp_tempo_utils.F90
+2 −2 docs/type/ty_tempo_cfgs.html
+2 −2 docs/type/ty_tempo_driver_diags.html
+1 −1 src/module_mp_tempo_driver.F90
+42 −45 src/module_mp_tempo_main.F90
+1 −0 src/module_mp_tempo_params.F90
+1 −1 src/module_mp_tempo_tables.F90
+1 −1 src/module_mp_tempo_utils.F90
8 changes: 4 additions & 4 deletions phys/module_microphysics_driver.F
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions run/README.namelist
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down