Skip to content
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

sync up develop branch #2

Merged
merged 93 commits into from
Mar 31, 2021
Merged

sync up develop branch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
aa83299
Fix DA ingesting ep (ensemble perturbation) of hydrometeors in ep_for…
jamiebresch Sep 16, 2020
9bbb00a
Fix DA use_obs_errfac for multiple outerloops (#1288)
jamiebresch Sep 18, 2020
75e865a
Chem: Prevent seg fault due to numgas==0 (#1294)
lpilz Oct 7, 2020
3337022
Bug fixes in deng shallow cumulus parameterization (#1277)
pedro-jm Oct 7, 2020
e3456da
Fix vertical indices of c1h and c2h in ideal case init of ph_1 (#1280)
traupach Oct 9, 2020
5296b78
fixes irrigation module (#1283)
arjanna Oct 14, 2020
306616c
Background effective radius consistency fix (#1295)
juhyejuhye Oct 20, 2020
ac76162
Fix MPI synchronization in real namelist processing (#1299)
honnorat Oct 23, 2020
be098d9
Fix horizontal advection flag usage when "mom" != "sca" (#1302)
MicroTed Oct 23, 2020
28c18ee
Temporary fix for gfortran/10 compiler argument mismatches (#1251)
syalavarthi Oct 23, 2020
2d70219
Fixes occasional inestabilities in surface layer option 1 (#1286)
pedro-jm Oct 23, 2020
ad348f5
Enhancement for crop-specific parameters in Noah-MP-Crop (#1256)
CharlesZheZhang Oct 23, 2020
76943c1
Inconsistent arg types (integer kind) across subroutine call (#1300)
davegill Oct 27, 2020
3e5d624
TYPE: bug fix (#1321)
Neeldip Nov 10, 2020
a271d9a
Add new capability for surface chemical DA (#1348)
liujake Dec 29, 2020
774acb5
Update check_a_mundo to make FARMS work correctly (#1332)
juhyejuhye Dec 29, 2020
8752b39
Fix saturation vapor pressure at low temperatures (#1328)
hmorrison100 Dec 29, 2020
6a98943
fix on time constraints (#1315)
arjanna Dec 29, 2020
b21c918
Fix for QSFC when fractional sea-ice is used with MYJSFC and QNSESFC …
dudhia Dec 29, 2020
61029b1
Add factor when converting surface heat fluxes from dry to moist thet…
matzegoebel Dec 29, 2020
93ccd18
Prevent divide by zero in km_opt=5 (#1304)
matzegoebel Dec 29, 2020
f3bec85
Bug fixes for RRTMG-K option (#1317)
dudhia Dec 29, 2020
e5755c1
use tke_seed_value only when necessary for km_opt = 2, 5 (#1307)
matzegoebel Dec 29, 2020
d1fce1f
1st gfortran stanza target for raspberry pi (add aarch64 and armv7l) …
davegill Dec 30, 2020
fe7d9d6
bug fix: improper indexing in add aircraft emissions (#1327)
jordanschnell Dec 30, 2020
f7ed785
Update vertical interpolation stand-alone, fix vert_interp call (#1337)
davegill Jan 4, 2021
d609495
km_opt=5 heat flux fix should just use lowest level qv (#1352)
dudhia Jan 4, 2021
ce5b0cb
Return type on wrf_dm_max_int should be an integer (#1339)
davegill Jan 7, 2021
432f33d
Fix examples.namelist info RE: trajectories (#1340)
davegill Jan 7, 2021
0a9c2eb
Add missing compiler name for two Intel config stanzas (#1326)
rcabell Jan 8, 2021
062b451
Remove obsolescent and non-standard features in physics modules (#1273)
milancurcic Jan 12, 2021
650be0c
Bug fixes related to solar diag package: COS(zenith angle), non-exist…
twjuliano Jan 12, 2021
9ef0fd7
Corrected bug in mixactivate for diagnostic CCN in sectional schemes …
brigaudet Jan 12, 2021
eb90823
Fixed boundary issues in rhs_ph with advection orders < 5 (#1336)
matzegoebel Jan 13, 2021
b317750
Fix for lh_urb2d diagnostics in NoahMP (#1363)
weiwangncar Jan 13, 2021
5d02c18
Fix for symmetric boundary conditions applied to 3D variables (#1314)
matzegoebel Jan 14, 2021
1e93b7e
Prepare for the release of WRFv4.2.2 (#1365)
smileMchen Jan 15, 2021
fb60d61
Merge remote-tracking branch 'origin/release-v4.2.2'
smileMchen Jan 15, 2021
2036c2a
Merge remote-tracking branch 'origin/master' into develop
smileMchen Jan 15, 2021
cedd4b3
Bug fix: Adding `chem_opt = 202` to `n2o5_hetchem` conditional (#1368)
Feb 9, 2021
25fbbfc
Chem: Wet scavenging optional for MP schemes (#1358)
jordanschnell Feb 9, 2021
9f9bc61
Add pH diagnostics for mozart_mosaic_4bin_aq chemistry (#1342)
jordanschnell Feb 9, 2021
46a037a
Remove UM trajectory initialization from real (#1353)
smileMchen Feb 9, 2021
3a2e4e8
height-level diagnostic fixes: add p_zl, use ln(p) interp for pressur…
jaredalee Feb 9, 2021
1ec55bf
Remove HLC.TBL and wind-turbine-1.tbl when running clean -a (#1395)
weiwangncar Feb 9, 2021
ae26bd5
update namelist.input to current recommendations and newer case (#1306)
kkeene44 Feb 9, 2021
54644eb
Update hydro component to WRF-Hydro v5.2.0 (#1392)
rcabell Feb 10, 2021
cca5c2e
Alter graupel Y-intercept parameter diagnosis (#1389)
gthompsnWRF Feb 10, 2021
979d624
Remove unused i1 array rho phy (#1393)
weiwangncar Feb 10, 2021
f9e3e7c
Limit value of NK for cloud top calculation (#1387)
twjuliano Feb 11, 2021
b71e0a8
Fix for instances of time step dt becoming 0 when using adaptive time…
weiwangncar Feb 12, 2021
8da0684
Moving check of Ptau after conditional statements to prevent negative…
twjuliano Feb 12, 2021
20812e1
Add git hash and indication of files changed to output (#1399)
davegill Feb 15, 2021
0e7f6c2
Chem: Adding two improvements related to convective transport of trac…
jordanschnell Feb 17, 2021
6c4aef8
Possibility to insert initial clouds into cold-start (#1388)
gthompsnWRF Feb 18, 2021
5abb46c
Created README.physics_files to describe dependencies with linked fil…
kkeene44 Feb 22, 2021
a128d0c
Add dynamic irrigation management practices to Noah-MP (#1372)
prasanthvkrishna Feb 23, 2021
4cf81a9
Noah mp snow (#1403)
cenlinhe Feb 23, 2021
5694ffc
Add Noah-MP output variable QRAINXY (#1405)
cenlinhe Feb 23, 2021
ca6c977
Fix to allow use_theta_m=1 with vertical nesting and simplify rebalan…
rsarthur Feb 23, 2021
dd7547d
NTU microphysics scheme (#1364)
tzuchin12 Feb 24, 2021
ba98c77
Add Montornes's solar eclipse modelling (#1285)
irowebbn Feb 24, 2021
85d7606
Clear sky 3D radiative heat tendencies added as output variables with…
jhruppert Feb 24, 2021
4c07069
updates to P3, including a new 3-moment option (#1356)
hmorrison100 Feb 25, 2021
812c7f4
Bug fix to use correct rho value in cal_titau subroutines (#1396)
rsarthur Feb 25, 2021
bd2cde6
Avoid double staggering of ww in vertical advection of geopotential (…
matzegoebel Feb 25, 2021
3c38cd3
Add multilayer UCMs to YSU PBL parameterization (#1305)
eahendricks Feb 25, 2021
398dca0
Remove necessity to run 'run_me_first' scripts for ideal cases (#1415)
davegill Feb 25, 2021
0fff69a
Change default fractional_seaice option from 0 to 1 (#1401)
weiwangncar Feb 25, 2021
1430495
Add a new E-epsilon PBL scheme: (#1303)
ChunxiZhang-NOAA Feb 26, 2021
56ae40c
Add the NOAA/GSL enhanced orographic drag suite used in the RAP/HRRR …
Feb 27, 2021
f87b449
Fix for fractional_seaice option, again (#1422)
weiwangncar Mar 1, 2021
236c1de
remove temporary landFilenames from test/em_real (#1424)
davegill Mar 3, 2021
c54cc0a
Thompson MP: reduce fake aerosol emissions by 4x (#1423)
davegill Mar 3, 2021
c261bfa
Adding the MAD-WRF model (#1417)
davegill Mar 3, 2021
c2f9b99
Implementation of WUDAPT (31-41) landuse classes along with standard …
davegill Mar 3, 2021
d24be28
Develop new CLM / MEGANv2.1 interface (#1425)
davegill Mar 4, 2021
d994880
urban updates: solar panel, green roof, building drag coefficient (#1…
davegill Mar 5, 2021
a457133
Modifications to improve WRF-CTSM coupling (#1355)
negin513 Mar 5, 2021
46d07e6
Add new options to readme (#1438)
kkeene44 Mar 22, 2021
b9d9e94
Removed 'max_rot_angle_gwd' from Registry - no longer used. (#1439)
kkeene44 Mar 22, 2021
1c81f28
Bug fix: RRTMG SW solar source function calculation (#1436)
twjuliano Mar 22, 2021
c771642
Fix to enable vertical refinement with hybrid vertical coordinate (#1…
rsarthur Mar 22, 2021
3f0aae4
Bug fix in buoyancy diagnostic function (#1430)
zhixiaozhang Mar 22, 2021
4412521
Implicit Explicit Vertical Advection (IEVA) (#1373)
louiswicker Mar 22, 2021
0d93150
bug fix: initialize lat/lon with zeros only for nested fire runs (#1434)
masih-e Mar 23, 2021
6273be2
removing dxy from GOCART dust emission schemes (#1431)
saneku Mar 24, 2021
c25b4d9
Fix bit for bit error in OpenMP IEVA (#1442)
davegill Mar 27, 2021
a710259
IEVA: change local array dimensions from memory to tile sizes (#1443)
weiwangncar Mar 27, 2021
1bb84ab
US EPA ACM2 and PX LSM updates Mar 2021 (#1433)
coastwx Mar 27, 2021
59242de
Corrections for ntu_init (#1441)
tzuchin12 Mar 28, 2021
510483c
Remove ASCII chars outside of 32-127 range (#1446)
davegill Mar 28, 2021
c0f8a6c
BF: IEVA changes to solve required also in WRFPlus (#1447)
davegill Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
47 changes: 36 additions & 11 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 @@ -151,7 +155,7 @@ all_wrfvar :
fi
if [ $(BUFR) ] ; then \
(cd var/external/bufr; \
$(MAKE) $(J) FC="$(SFC)" CC="$(SCC)" CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" FFLAGS="$(FCOPTIM) $(FORMAT_FIXED)" RANLIB="$(RANLIB)" AR="$(AR)" ARFLAGS="$(ARFLAGS)" ) ; \
$(MAKE) $(J) FC="$(SFC)" CC="$(SCC)" CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" FFLAGS="$(FCOPTIM) $(FORMAT_FIXED) $(FCCOMPAT)" RANLIB="$(RANLIB)" AR="$(AR)" ARFLAGS="$(ARFLAGS)" ) ; \
fi
### Use 'make' to avoid '-i -r' above:
if [ $(WAVELET) ] ; then \
Expand Down Expand Up @@ -396,7 +400,9 @@ em_seabreeze2d_x : wrf
( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=ideal em_ideal )
( cd test/em_seabreeze2d_x ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . )
( cd test/em_seabreeze2d_x ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . )
( cd test/em_seabreeze2d_x ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . )
( cd test/em_seabreeze2d_x ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \
ln -sf ../../run/LANDUSE.TBL . ; \
ln -sf ../../run/RRTM_DATA . )
( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . )
( cd run ; if test -f namelist.input ; then \
/bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \
Expand Down Expand Up @@ -427,7 +433,13 @@ em_convrad : wrf
( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=ideal em_ideal )
( cd test/em_convrad ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . )
( cd test/em_convrad ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . )
( cd test/em_convrad ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . )
( cd test/em_convrad ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \
ln -sf ../../run/LANDUSE.TBL . ; \
ln -sf ../../run/RRTMG_LW_DATA . ; \
ln -sf ../../run/RRTMG_SW_DATA . ; \
ln -sf ../../run/ozone.formatted . ; \
ln -sf ../../run/ozone_lat.formatted . ; \
ln -sf ../../run/ozone_plev.formatted . )
( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . )
( cd run ; if test -f namelist.input ; then \
/bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \
Expand All @@ -443,7 +455,8 @@ em_tropical_cyclone : wrf
( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=tropical_cyclone em_ideal )
( cd test/em_tropical_cyclone ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . )
( cd test/em_tropical_cyclone ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . )
( cd test/em_tropical_cyclone ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . )
( cd test/em_tropical_cyclone ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \
ln -sf ../../run/LANDUSE.TBL . )
( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . )
( cd run ; if test -f namelist.input ; then \
/bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \
Expand Down Expand Up @@ -476,7 +489,12 @@ em_scm_xy : wrf
( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=scm_xy em_ideal )
( cd test/em_scm_xy ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . )
( cd test/em_scm_xy ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . )
( cd test/em_scm_xy ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . )
( cd test/em_scm_xy ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \
ln -sf ../../run/GENPARM.TBL . ; \
ln -sf ../../run/LANDUSE.TBL . ; \
ln -sf ../../run/SOILPARM.TBL . ; \
ln -sf ../../run/VEGPARM.TBL . ; \
ln -sf ../../run/RRTM_DATA . )
( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . )
( cd run ; if test -f namelist.input ; then \
/bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \
Expand Down Expand Up @@ -555,9 +573,11 @@ em_real : wrf
ln -sf ../../run/aerosol_lat.formatted . ; \
ln -sf ../../run/aerosol_lon.formatted . ; \
ln -sf ../../run/aerosol_plev.formatted . ; \
ln -sf ../../run/eclipse_besselian_elements.dat . ; \
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 @@ -587,6 +607,7 @@ em_real : wrf
( cd test/em_real ; /bin/rm -f tc.exe ; ln -s ../../main/tc.exe . )
( cd test/em_real ; /bin/rm -f ndown.exe ; ln -s ../../main/ndown.exe . )
( cd test/em_real ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . )
( cd test/em_real ; /bin/rm -f README.physics_files ; ln -s ../../run/README.physics_files . )
( cd test/em_real ; /bin/rm -f ETAMPNEW_DATA.expanded_rain ETAMPNEW_DATA RRTM_DATA RRTMG_LW_DATA RRTMG_SW_DATA ; \
ln -sf ../../run/ETAMPNEW_DATA . ; \
ln -sf ../../run/ETAMPNEW_DATA.expanded_rain . ; \
Expand Down Expand Up @@ -616,6 +637,7 @@ em_real : wrf
ln -sf ../../run/aerosol_lat.formatted . ; \
ln -sf ../../run/aerosol_lon.formatted . ; \
ln -sf ../../run/aerosol_plev.formatted . ; \
ln -sf ../../run/eclipse_besselian_elements.dat . ; \
ln -sf ../../run/capacity.asc . ; \
ln -sf ../../run/coeff_p.asc . ; \
ln -sf ../../run/coeff_q.asc . ; \
Expand All @@ -627,8 +649,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 @@ -910,6 +933,7 @@ nmm_real : nmm_wrf
ln -sf ../../run/aerosol_lat.formatted . ; \
ln -sf ../../run/aerosol_lon.formatted . ; \
ln -sf ../../run/aerosol_plev.formatted . ; \
ln -sf ../../run/eclipse_besselian_elements.dat . ; \
ln -sf ../../run/capacity.asc . ; \
ln -sf ../../run/coeff_p.asc . ; \
ln -sf ../../run/coeff_q.asc . ; \
Expand All @@ -921,8 +945,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
2 changes: 1 addition & 1 deletion README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
WRF Model Version 4.2.1
WRF Model Version 4.2.2

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

Expand Down
5 changes: 5 additions & 0 deletions Registry/Registry.EM
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ state real tr17_6 ikjftb tracer 1 - irhusdf=(bdy_in
state real tr17_7 ikjftb tracer 1 - irhusdf=(bdy_interp:dt) "tr17_7" "tr17_7" "Dimensionless"
state real tr17_8 ikjftb tracer 1 - irhusdf=(bdy_interp:dt) "tr17_8" "tr17_8" "Dimensionless"

# MAD-WRF
state real tr_qc ikjftb tracer 1 - irhusdf=(bdy_interp:dt) "tr_qcloud" "Tracer with the liquid content" "Kg Kg-1"
state real tr_qi ikjftb tracer 1 - irhusdf=(bdy_interp:dt) "tr_qice" "Tracer with the ice content" "Kg Kg-1"
state real tr_qs ikjftb tracer 1 - irhusdf=(bdy_interp:dt) "tr_qsnow" "Tracer with the snow content" "Kg Kg-1"

package tracer_test1 tracer_opt==2 - tracer:tr17_1,tr17_2,tr17_3,tr17_4,tr17_5,tr17_6,tr17_7,tr17_8

package restofwrf use_wps_input==0 - -
Expand Down
Loading