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

Merge gsd upp #159

Merged
merged 11 commits into from
Aug 24, 2020
Merged

Merge gsd upp #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2be6024
Sync the changes of hrrr4/rap5 from GSD UPP repos.
WenMeng-NOAA Apr 17, 2020
92a303a
Add more sorce code changes.
WenMeng-NOAA Jul 27, 2020
46019f6
Merge remote-tracking branch 'upstream/develop' into post_gsd and sol…
WenMeng-NOAA Aug 1, 2020
13e03cb
Unify params_grib2_tbl_new with GSD UPP.
WenMeng-NOAA Aug 5, 2020
1649d38
1) update avblflds xml; 2) update hrrr and rap control files.
WenMeng-NOAA Aug 7, 2020
f73c828
Merge remote-tracking branch 'upstream/develop' into post_gsd
WenMeng-NOAA Aug 10, 2020
9cb1caf
Clean legacy parm/postcntrl_hrrr.xml.
WenMeng-NOAA Aug 10, 2020
f60c7a2
Revert the changes of icing and gtg in MDL2P.f.
WenMeng-NOAA Aug 11, 2020
9a09e70
Ressign ID 518 through 522 in SURFCE.f to 526 through 530.
WenMeng-NOAA Aug 13, 2020
15da3a5
Merge remote-tracking branch 'upstream/develop' into post_gsd
WenMeng-NOAA Aug 20, 2020
ffb792d
Set bounds for GSD cloud base height from Jaymes.
WenMeng-NOAA Aug 20, 2020
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
345 changes: 160 additions & 185 deletions parm/postcntrl_hrrrsmoke.xml → parm/hrrr_postcntrl.xml
100644 → 100755
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 16 additions & 5 deletions parm/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ GFSFLUXFLATFILENAME = postxconfig-NT-GFS-FLUX.txt
GFSFLUXF00FLATFILENAME = postxconfig-NT-GFS-FLUX-F00.txt
NMMFLATFILENAME = postxconfig-NT-NMM.txt
NGACFLATFILENAME = postxconfig-NT-NGAC.txt
#HRRRFLATFILENAME = postxconfig-NT-HRRR.txt
GEFSFLATFILENAME = postxconfig-NT-GEFS.txt
GEFSANLFLATFILENAME = postxconfig-NT-GEFS-ANL.txt
GEFSF00FLATFILENAME = postxconfig-NT-GEFS-F00.txt
FV3SARFLATFILENAME = postxconfig-NT-fv3sar.txt
HAFSFLATFILENAME = postxconfig-NT-hafs.txt
GFSTWOFLATFILENAME = postxconfig-NT-GFS-TWO.txt
GFSTWOF00FLATFILENAME = postxconfig-NT-GFS-F00-TWO.txt
HRRRFLATFILENAME = postxconfig-NT-hrrr.txt
RAPFLATFILENAME = postxconfig-NT-rap.txt


# Source Post XML file
Expand All @@ -38,8 +39,6 @@ NMMAVAILXMLFILENAME = nam_post_avblflds.xml
NMMCTRLFILENAME = nam_cntrl_cmaq.xml
NGACAVAILXMLFILENAME = ngac_post_avblflds.xml
NGACCTRLFILENAME = ngac_postcntrl.xml
#HRRRAVAILXMLFILENAME = hrrr_post_avblflds.xml
#HRRRCTRLFILENAME = hrrr_postcntrl.xml
GEFSAVAILXMLFILENAME = post_avblflds.xml
GEFSCTRLFILENAME = postcntrl_gefs.xml
GEFSANLCTRLFILENAME = postcntrl_gefs_anl.xml
Expand All @@ -49,6 +48,10 @@ FV3SARCTRLFILENAME = fv3sar.xml
HAFSCTRLFILENAME = hafs.xml
GFSTWOCTRLFILENAME = postcntrl_gfs_two.xml
GFSTWOF00CTRLFILENAME = postcntrl_gfs_f00_two.xml
HRRRAVAILXMLFILENAME = post_avblflds_raphrrr.xml
RAPAVAILXMLFILENAME = post_avblflds_raphrrr.xml
HRRRCTRLFILENAME = hrrr_postcntrl.xml
RAPCTRLFILENAME = rap_postcntrl.xml


# Post flat file generator
Expand All @@ -71,6 +74,8 @@ PERLXMLFV3SAR = /usr/bin/perl $(PERLXML) $(FV3SARCTRLFILENAME) $(FV3SARAVAILXML
PERLXMLHAFS = /usr/bin/perl $(PERLXML) $(HAFSCTRLFILENAME) $(FV3SARAVAILXMLFILENAME) $(HAFSFLATFILENAME)
PERLXMLGFSTWO = /usr/bin/perl $(PERLXML) $(GFSTWOCTRLFILENAME) $(GFSAVAILXMLFILENAME) $(GFSTWOFLATFILENAME)
PERLXMLGFSTWOF00 = /usr/bin/perl $(PERLXML) $(GFSTWOF00CTRLFILENAME) $(GFSAVAILXMLFILENAME) $(GFSTWOF00FLATFILENAME)
PERLXMLHRRR = /usr/bin/perl $(PERLXML) $(HRRRCTRLFILENAME) $(HRRRAVAILXMLFILENAME) $(HRRRFLATFILENAME)
PERLXMLRAP = /usr/bin/perl $(PERLXML) $(RAPCTRLFILENAME) $(RAPAVAILXMLFILENAME) $(RAPFLATFILENAME)


# File to look for change
Expand All @@ -90,10 +95,12 @@ FV3SARXMLS = $(FV3SARAVAILXMLFILENAME) $(FV3SARCTRLFILENAME)
HAFSXMLS = $(FV3SARAVAILXMLFILENAME) $(HAFSCTRLFILENAME)
GFSTWOXMLS = $(GFSAVAILXMLFILENAME) $(GFSTWOCTRLFILENAME)
GFSTWOF00XMLS = $(GFSAVAILXMLFILENAME) $(GFSTWOF00CTRLFILENAME)
HRRRXMLS = $(HRRRAVAILXMLFILENAME) $(HRRRCTRLFILENAME)
RAPXMLS = $(RAPAVAILXMLFILENAME) $(RAPCTRLFILENAME)


# If action is triggered; run the following
all: $(GFSFLATFILENAME) $(GFSGOESFLATFILENAME) $(GFSANLFLATFILENAME) $(GFSF00FLATFILENAME) $(GFSFLUXFLATFILENAME) $(GFSFLUXF00FLATFILENAME) $(NMMFLATFILENAME) $(NGACFLATFILENAME) $(GEFSFLATFILENAME) $(GEFSANLFLATFILENAME) $(GEFSF00FLATFILENAME) $(FV3SARFLATFILENAME) $(HAFSFLATFILENAME) $(GFSTWOFLATFILENAME) $(GFSTWOF00FLATFILENAME)
all: $(GFSFLATFILENAME) $(GFSGOESFLATFILENAME) $(GFSANLFLATFILENAME) $(GFSF00FLATFILENAME) $(GFSFLUXFLATFILENAME) $(GFSFLUXF00FLATFILENAME) $(NMMFLATFILENAME) $(NGACFLATFILENAME) $(GEFSFLATFILENAME) $(GEFSANLFLATFILENAME) $(GEFSF00FLATFILENAME) $(FV3SARFLATFILENAME) $(HAFSFLATFILENAME) $(GFSTWOFLATFILENAME) $(GFSTWOF00FLATFILENAME) $(HRRRFLATFILENAME) $(RAPFLATFILENAME)
$(GFSFLATFILENAME): $(GFSXMLS)
$(PERLXMLGFS)
$(GFSGOESFLATFILENAME): $(GFSGOESXMLS)
Expand Down Expand Up @@ -124,11 +131,15 @@ $(GFSTWOFLATFILENAME): $(GFSTWOXMLS)
$(PERLXMLGFSTWO)
$(GFSTWOF00FLATFILENAME): $(GFSTWOF00XMLS)
$(PERLXMLGFSTWOF00)
$(HRRRFLATFILENAME): $(HRRRXMLS)
$(PERLXMLHRRR)
$(RAPFLATFILENAME): $(RAPXMLS)
$(PERLXMLRAP)


# Make clean

clean:
@echo
@echo '==== CLEAN ==================================================='
/bin/rm -f $(GFSFLATFILENAME) $(GFSGOESFLATFILENAME) $(GFSANLFLATFILENAME) $(GFSF00FLATFILENAME) $(NMMFLATFILENAME) $(NGACFLATFILENAME) $(GEFSFLATFILENAME) $(GEFSANLFLATFILENAME) $(GEFSF00FLATFILENAME) $(FV3SARFLATFILENAME) $(HAFSFLATFILENAME) $(GFSTWOFLATFILENAME) $(GFSTWOF00FLATFILENAME)
/bin/rm -f $(GFSFLATFILENAME) $(GFSGOESFLATFILENAME) $(GFSANLFLATFILENAME) $(GFSF00FLATFILENAME) $(NMMFLATFILENAME) $(NGACFLATFILENAME) $(GEFSFLATFILENAME) $(GEFSANLFLATFILENAME) $(GEFSF00FLATFILENAME) $(FV3SARFLATFILENAME) $(HAFSFLATFILENAME) $(GFSTWOFLATFILENAME) $(GFSTWOF00FLATFILENAME) $(HRRRFLATFILENAME) $(RAPFLATFILENAME)
6 changes: 6 additions & 0 deletions parm/params_grib2_tbl_new
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
0 1 27 0 MAXRH
0 2 220 1 MAXUVV
0 2 222 1 MAXUW
0 1 245 1 MAXVIG
0 2 223 1 MAXVW
10 0 24 0 MAXWH
0 6 4 0 MCDC
Expand Down Expand Up @@ -554,6 +555,7 @@
0 20 16 0 MSSRDRYA
0 20 17 0 MSSRWETA
10 0 20 0 MSSW
0 11 1 0 MSTAV
2 0 11 0 MSTAV
2 0 194 1 MSTAV
2 0 7 0 MTERH
Expand Down Expand Up @@ -699,6 +701,7 @@
0 1 220 1 QMIN
2 0 215 1 QREC
0 1 218 1 QZ0
0 16 201 1 RADARVIL
2 3 202 1 RADT
3 1 8 0 RAZA
2 0 21 0 RCQ
Expand Down Expand Up @@ -1125,6 +1128,8 @@
0 2 208 1 VDFUA
0 2 209 1 VDFVA
0 2 204 1 VEDH
2 0 232 1 VEGMAX
2 0 231 1 VEGMIN
2 0 210 1 VEGT
2 0 4 0 VEG
4 1 1 0 VEL1
Expand Down Expand Up @@ -1242,3 +1247,4 @@
4 8 0 0 XRAYRAD
4 6 2 0 XSHRT
10 2 10 0 ZVCICEP
0 0 0 1
Loading