Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release-v4.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@kkeene44
kkeene44 committed Apr 23, 2020
2 parents 7df4461 + b353810 commit 0d88b58
Show file tree
Hide file tree
Showing 322 changed files with 37,489 additions and 15,834 deletions.
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ README.md @wrf-model/global_owner
/phys/ @wrf-model/physics

/phys/module_mp_thompson.F @gthompsnWRF @wrf-model/physics
/phys/module_diag_nwp.F @gthompsnWRF @wrf-model/physics
/phys/module_mp_jensen_ishmael.F @graupely @wrf-model/physics
/phys/module_mp_gsfcgce_4ice_nuwrf.F @cacruz @wrf-model/physics
/phys/module_sf_noahmp*.F @barlage @wrf-model/physics
Expand All @@ -47,6 +48,9 @@ README.md @wrf-model/global_owner
/phys/module_sf_px*.F @coawstwx @wrf-model/physics
/phys/module_bl_acm.F @coawstwx @wrf-model/physics
/phys/module_sf_ruclsm.F @tanyasmirnova @wrf-model/physics
/phys/module_mp_fast_sbm.F @JS-WRF-SBM @wrf-model/physics
/phys/module_mp_full_sbm.F @JS-WRF-SBM @wrf-model/physics
/phys/module_mp_SBM_polar_radar.F @JS-WRF-SBM @wrf-model/physics

# Shared Physics Between MPAS and WRF

Expand Down
6 changes: 2 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@ SOURCE: Either "developer's name (affiliation)" .XOR. "internal" for a WRF Dev c

DESCRIPTION OF CHANGES: One or more paragraphs describing problem, solution, and required changes.

ISSUE: For use when this PR closes an issue. For issue number 123
```
ISSUE: For use when this PR closes an issue. For example, if this PR closes issue number 123
Fixes #123
```

LIST OF MODIFIED FILES: list of changed files (use `git diff --name-status master` to get formatted list)

TESTS CONDUCTED: Explicitly state if a WTF and or other tests were run, or are pending. For more complicated changes please be explicit!

RELEASE NOTE: Optional, as appropriate. Delete if not used. Included only once for new features requiring several merge cycles. Changes to default behavior are also note worthy.
RELEASE NOTE: Include a stand-alone message suitable for the inclusion in the minor and annual releases. A publication citation is appropriate.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
##############################################################################
# This is the top-level .gitignore file for the WRF model #
# #
# Filenames and wildcards added below will not be tracked by git in any #
Expand Down
4 changes: 4 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,10 @@ em_real : wrf
ln -sf ../../run/RRTMG_LW_DATA_DBL RRTMG_LW_DATA ; \
ln -sf ../../run/RRTMG_SW_DATA_DBL RRTMG_SW_DATA ; \
fi )
( cd test/em_real ; if test -d ../../run/SBM_input_33 ; then \
ln -sf ../../run/SBM_input_33 . ; \
ln -sf ../../run/scattering_tables_2layer_high_quad_1dT_1%fw_110 . ; \
fi )
( cd test/em_real ; /bin/rm -f GENPARM.TBL ; ln -s ../../run/GENPARM.TBL . )
( cd test/em_real ; /bin/rm -f LANDUSE.TBL ; ln -s ../../run/LANDUSE.TBL . )
( cd test/em_real ; /bin/rm -f SOILPARM.TBL ; ln -s ../../run/SOILPARM.TBL . )
Expand Down
3 changes: 2 additions & 1 deletion README
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
WRF Model Version 4.1.5
WRF Model Version 4.2

http://www2.mmm.ucar.edu/wrf/users/

Expand Down Expand Up @@ -40,6 +40,7 @@ doc/README.irr_diag
doc/README.rsl_output
doc/README.windturbine
doc/README_test_cases
doc/README.cygwin.md

- Beginning with version 4.0, for more information on the releases, visit
the WRF GitHub Release Page:
Expand Down
122 changes: 93 additions & 29 deletions Registry/Registry.EM_COMMON
View file

Large diffs are not rendered by default.

18 changes: 14 additions & 4 deletions Registry/Registry.NMM
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ state real dfi_SNOWC ij misc 1 - r "dfi_SNOWC
# module_DYNAM
#
state real dx_nmm ij dyn_nmm 1 - irh023 "DX_NMM" "East-west distance H-to-V points" "m"
state real area_nmm ij dyn_nmm 1 - - "AREA_NMM" "Grid cell area" "m2"
state real wpdar ij dyn_nmm 1 - ir
state real cpgfu ij dyn_nmm 1 - ir
state real curv ij dyn_nmm 1 - ir "CURV" "Curvature term= .5*DT*TAN(phi)/RadEarth" "s m-1"
Expand Down Expand Up @@ -447,6 +448,8 @@ state real deep ij dyn_nmm 1 - r "DEEP" "Deep con
state real rf ij dyn_nmm 1 - r
state real th10 ij dyn_nmm 1 - rh023d=(DownCopy) "TH10" "10-m potential temperature from MYJ" "K"
state real q10 ij dyn_nmm 1 - rh023d=(DownCopy) "Q10" "10-m specific humidity from MYJ" "kg kg-1"
state real u10e ij dyn_nmm 1 - rhd=(DownCopy) "U10E" "Special 10-m U from MYJ" "m s-1"
state real v10e ij dyn_nmm 1 - rhd=(DownCopy) "V10E" "Special 10-m V from MYJ" "m s-1"
state real pshltr ij dyn_nmm 1 - rh023d=(DownCopy) "PSHLTR" "2-m pressure from MYJ" "Pa"
state real tshltr ij dyn_nmm 1 - rh023d=(DownCopy) "TSHLTR" "2-m potential temperature from MYJ" "K"
state real qshltr ij dyn_nmm 1 - rh023d=(DownCopy) "QSHLTR" "2-m specific humidity from MYJ" "kg kg-1"
Expand All @@ -455,6 +458,8 @@ state real t_adj ijk dyn_nmm 1 - rd=(DownNear) "T_ADJ" "T
state real t_old ijk dyn_nmm 1 - r "T_OLD" "T before last call to precip" "K"
state real zero_3d ijk dyn_nmm 1 - r
state real W0AVG ikj dyn_nmm 1 - r "W0AVG" "AVERAGE VERTICAL VELOCITY FOR KF CUMULUS SCHEME" "m s-1"
state real qcconv ikj dyn_nmm 1 - r "QCCONV" "CLOUD MIXING RATIO FOR BMJ CUMULUS SCHEME" "kg kg-1"
state real qiconv ikj dyn_nmm 1 - r "QICONV" "ICE MIXING RATIO FOR BMJ CUMULUS SCHEME" "kg kg-1"
state real AKHS_OUT ij dyn_nmm 1 - rh023 "AKHS_OUT" "Output sfc exch coeff for heat" "m2 s-1"
state real AKMS_OUT ij dyn_nmm 1 - rh023 "AKMS_OUT" "Output sfc exch coeff for momentum" "m2 s-1"
#
Expand Down Expand Up @@ -587,7 +592,9 @@ state real rrw ijkb dyn_nmm 1 - rh "RRW" "Tracer"
state real f_ice ikj dyn_nmm 1 - rh023d=(DownMassIKJ:@EExtrap,0.0)u=(UpMassIKJ:@EExtrap,0.0) "F_ICE" "Frozen fraction of CWM" ""
state real f_rain ikj dyn_nmm 1 - rh023d=(DownMassIKJ:@EExtrap,0.0)u=(UpMassIKJ:@EExtrap,0.0) "F_RAIN" "Rain fraction of liquid part of CWM" ""
state real f_rimef ikj dyn_nmm 1 - rh023d=(DownMassIKJ:@EExtrap,1.0)u=(UpMassIKJ:@EExtrap,1.0) "F_RIMEF" "Rime factor" ""
state real cldfra ijk dyn_nmm 1 - rh023 "CLDFRA" "Cloud fraction" ""
state real cldfra ijk dyn_nmm 1 - rh023 "CLDFRA" "Cloud fraction" ""
state real CONVCLD ij dyn_nmm 1 - r "CONVCLD" "BMJ CONVECTIVE CLOUD" "kg m-2"
state real CCLDFRA ikj dyn_nmm 1 - r "CCLDFRA" "CONVECTIVE CLOUD FRACTION" ""
state real sr ij dyn_nmm 1 - irh023 "SR" "Timestep mass ratio of snow:precip" ""
state real cfrach ij dyn_nmm 1 - rh023d=(DownCopy) "CFRACH" "High cloud fraction" ""
state real cfracl ij dyn_nmm 1 - rh023d=(DownCopy) "CFRACL" "Low cloud fraction" ""
Expand Down Expand Up @@ -1083,7 +1090,7 @@ state real rc_mf ikj misc 1 - r "R
rconfig integer dveg namelist,noah_mp 1 4 h "dveg" "dynamic vegetation (1 -> off ; 2 -> on)" ""
rconfig integer opt_crs namelist,noah_mp 1 1 h "opt_crs" "canopy stomatal resistance (1-> Ball-Berry; 2->Jarvis)" ""
rconfig integer opt_btr namelist,noah_mp 1 1 h "opt_btr" "soil moisture factor for stomatal resistance (1-> Noah; 2-> CLM; 3-> SSiB)" ""
rconfig integer opt_run namelist,noah_mp 1 1 h "opt_run" "runoff and groundwater (1->SIMGM; 2->SIMTOP; 3->Schaake96; 4->BATS)" ""
rconfig integer opt_run namelist,noah_mp 1 1 h "opt_run" "runoff and groundwater (1->SIMGM; 2->SIMTOP; 3->Schaake96; 4->BATS; 5->Miguez-Macho & Fan)" ""
rconfig integer opt_sfc namelist,noah_mp 1 1 h "opt_sfc" "surface layer drag coeff (CH & CM) (1->M-O; 2->Chen97)" ""
rconfig integer opt_frz namelist,noah_mp 1 1 h "opt_frz" "supercooled liquid water (1-> NY06; 2->Koren99)" ""
rconfig integer opt_inf namelist,noah_mp 1 1 h "opt_inf" "frozen soil permeability (1-> NY06; 2->Koren99)" ""
Expand Down Expand Up @@ -1492,8 +1499,9 @@ rconfig real seaice_snowdepth_max namelist,physics 1 1.E10
rconfig real seaice_snowdepth_min namelist,physics 1 0.001 - "seaice_snowdepth_min" "Minimum snow depth (m) on sea ice"
rconfig integer seaice_thickness_opt namelist,physics 1 0 - "seaice_thickness_opt" "Method for setting sea-ice thickness"
rconfig real seaice_thickness_default namelist,physics 1 3.0 - "seaice_thickness_default" "Default value for sea-ice thickness"
rconfig logical tice2tsk_if2cold namelist,physics 1 .false. - "tice2tsk_if2cold" "Avoid low ice temps when ice frac and Tsk are inconsistent"
rconfig logical tice2tsk_if2cold namelist,physics 1 .false. - "tice2tsk_if2cold" "Avoid low ice temps when ice frac and Tsk are inconsistent"
rconfig integer sst_update namelist,physics 1 0 i01rh "sst_update" "update sst from wrflowinp file 0=no, 1=yes" ""
rconfig logical bmj_rad_feedback namelist,physics max_domains .false. - "if true include radiative effects of bmj clouds" ""
rconfig integer sf_urban_physics namelist,physics max_domains 0 h "sf_urban_physics" "activate urban model 0=no, 1=Noah_UCM 2=BEP_UCM" ""
rconfig logical usemonalb namelist,physics 1 .true. h "usemonalb" "use 2d field vs table values false=table, True=2d" ""
rconfig logical rdmaxalb namelist,physics 1 .true. h "rdmaxalb" "false set it to table values" ""
Expand Down Expand Up @@ -1682,6 +1690,7 @@ rconfig logical open_ye namelist,bdy_control max_domains .f
rconfig logical polar namelist,bdy_control max_domains .false. rh "polar" "" ""
rconfig logical nested namelist,bdy_control max_domains .false. rh "nested" "" ""
rconfig integer real_data_init_type namelist,bdy_control 1 1 irh "real_data_init_type" "REAL DATA INITIALIZATION OPTIONS: 1=SI, 2=MM5, 3=GENERIC" "PRE-PROCESSOR TYPES"
rconfig logical multi_bdy_files namelist,bdy_control 1 .false. rh "multi_bdy_files" "" ""

rconfig integer background_proc_id namelist,grib2 1 255 rh "background_proc_id" "Background processing id for grib2" ""
rconfig integer forecast_proc_id namelist,grib2 1 255 rh "forecast_proc_id" "Analysis and forecast processing id for grib2" ""
Expand Down Expand Up @@ -1819,6 +1828,7 @@ package gfdlswscheme ra_sw_physics==99 - -
package hwrfswscheme ra_sw_physics==98 - state:o3rad
package heldsuarez ra_lw_physics==31 - -

package nosfcscheme sf_sfclay_physics==0 - -
package sfclayscheme sf_sfclay_physics==91 - -
package myjsfcscheme sf_sfclay_physics==2 - -
package gfssfcscheme sf_sfclay_physics==3 - -
Expand Down Expand Up @@ -1855,7 +1865,7 @@ package shinhongscheme bl_pbl_physics==11 - -
package fitchscheme windfarm_opt==1 - -

package kfetascheme cu_physics==1 - -
package bmjscheme cu_physics==2 - -
package bmjscheme cu_physics==2 - state:qcconv,qiconv,convcld,ccldfra
package gdscheme cu_physics==93 - -
package sasscheme cu_physics==94 - state:hpbl2d,heat2d,evap2d
package scalesasscheme cu_physics==4 - state:hpbl2d,heat2d,evap2d
Expand Down
17 changes: 3 additions & 14 deletions Registry/registry.chem
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3759,20 +3759,6 @@ rconfig integer biomass_emiss_opt namelist,chem max_domains 0
rconfig integer cam_mam_mode namelist,chem 1 3 irh "cam_mam_mode" "" ""
rconfig integer cam_mam_nspec namelist,chem 1 85 irh "cam_mam_nspec" "" ""
rconfig logical CAM_MP_MAM_cpled namelist,chem 1 .true. irh "CAM_MP_MAM_cpled" "" ""
# Lightning
rconfig integer lightning_opt namelist,chem max_domains 0 rh "lightning_opt" "" ""
rconfig integer lightning_time_step namelist,chem max_domains 0 rh "lightning_time_step" "" ""
rconfig real lightning_start_seconds namelist,chem max_domains 0 rh "lightning_start_seconds" "" ""
rconfig real temp_upper namelist,chem max_domains -45. rh "temp_upper" "" ""
rconfig real temp_lower namelist,chem max_domains -15. rh "temp_lower" "" ""
rconfig real N_IC namelist,chem max_domains 0. rh "N_IC" "" ""
rconfig real N_CG namelist,chem max_domains 0. rh "N_CG" "" ""
rconfig integer passive_ltng namelist,chem max_domains 1 rh "passive_ltng" "" ""
rconfig integer lflash_data namelist,chem 1 1 rh "lflash_data" "" ""
rconfig real flashrate_factor namelist,chem max_domains 1. rh "flashrate_factor" "" ""
rconfig integer flashrate_method namelist,chem max_domains 1 rh "flashrate_method" "" ""
rconfig integer iccg_method namelist,chem max_domains 1 rh "iccg_method" "" ""
rconfig integer cellcount_method namelist,chem max_domains 1 rh "cellcount_method" "" ""

# GHG chemistry namelist options:
rconfig character vprm_opt namelist,chem max_domains "VPRM_param_US" - "the file contains VPRM parameters" "" ""
Expand Down Expand Up @@ -4172,3 +4158,6 @@ package lnox_opt_decaria lnox_opt==2 - tracer:lnox_ic,lnox_cg

# Integrated Reaction Rate option
rconfig integer irr_opt namelist,chem max_domains 0 rh "IRR_OPT" "" ""

# Time series of vertical profiles
state real ts_o3_profile ?!k misc - - - "TS_O3_PROFILE" "O3, vertical profile"
2 changes: 2 additions & 0 deletions Registry/registry.em_shared_collection
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ include registry.lake
include registry.ssib
include registry.noahmp
include registry.sbm
include registry.polrad
include registry.diags
include registry.afwa
include registry.rasm_diag
Expand All @@ -26,3 +27,4 @@ include registry.bdy_perturb
include registry.hyb_coord
include registry.new3d_wif
include registry.trad_fields
include registry.solar_fields
Loading

0 comments on commit 0d88b58

Please sign in to comment.