Skip to content

Commit f83d17a

Browse files
KateFriedman-NOAAKateFriedman-NOAA
authored
Clean out non-gfs top level variables (#2366)
Clean out non-gfs top level variables that are duplicates or no longer needed. Also standardize how we set these variables in scripts. Refs #2332
1 parent c7b306e commit f83d17a

File tree

161 files changed

+543
-933
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+543
-933
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ fix/chem
3030
fix/cice
3131
fix/cpl
3232
fix/datm
33-
fix/gldas
3433
fix/gdas
3534
fix/gsi
3635
fix/lut

‎gempak/fix/gfs_meta

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
$USHgempak/gfs_meta_us.sh 36 84 126 216
2-
$USHgempak/gfs_meta_bwx.sh 36 84 126 180
3-
$USHgempak/gfs_meta_comp.sh 36 84 126
4-
$USHgempak/gfs_meta_ak.sh 36 84 132 216
5-
$USHgempak/gfs_meta_crb.sh 126
6-
$USHgempak/gfs_meta_hur.sh 36 84 126
7-
$USHgempak/gfs_meta_qpf.sh 36 84 132 216
8-
$USHgempak/gfs_meta_precip.sh 36 84 132 216 384
9-
$USHgempak/gfs_meta_sa.sh 126
10-
$USHgempak/gfs_meta_ver.sh 126
11-
$USHgempak/gfs_meta_hi.sh 384
12-
$USHgempak/gfs_meta_nhsh.sh 384
13-
$USHgempak/gfs_meta_trop.sh 384
14-
$USHgempak/gfs_meta_usext.sh 384
15-
$USHgempak/gfs_meta_mar_ql.sh 24 48 96 180
16-
$USHgempak/gfs_meta_mar_comp.sh 126
17-
$USHgempak/gfs_meta_opc_na_ver 126
18-
$USHgempak/gfs_meta_opc_np_ver 126
19-
$USHgempak/gfs_meta_mar_atl.sh 180
20-
$USHgempak/gfs_meta_mar_pac.sh 180
21-
$USHgempak/gfs_meta_mar_ver.sh 48
22-
$USHgempak/gfs_meta_mar_skewt.sh 72
23-
$USHgempak/gfs_meta_sa2.sh 144
1+
${HOMEgfs}/gempak/ush/gfs_meta_us.sh 36 84 126 216
2+
${HOMEgfs}/gempak/ush/gfs_meta_bwx.sh 36 84 126 180
3+
${HOMEgfs}/gempak/ush/gfs_meta_comp.sh 36 84 126
4+
${HOMEgfs}/gempak/ush/gfs_meta_ak.sh 36 84 132 216
5+
${HOMEgfs}/gempak/ush/gfs_meta_crb.sh 126
6+
${HOMEgfs}/gempak/ush/gfs_meta_hur.sh 36 84 126
7+
${HOMEgfs}/gempak/ush/gfs_meta_qpf.sh 36 84 132 216
8+
${HOMEgfs}/gempak/ush/gfs_meta_precip.sh 36 84 132 216 384
9+
${HOMEgfs}/gempak/ush/gfs_meta_sa.sh 126
10+
${HOMEgfs}/gempak/ush/gfs_meta_ver.sh 126
11+
${HOMEgfs}/gempak/ush/gfs_meta_hi.sh 384
12+
${HOMEgfs}/gempak/ush/gfs_meta_nhsh.sh 384
13+
${HOMEgfs}/gempak/ush/gfs_meta_trop.sh 384
14+
${HOMEgfs}/gempak/ush/gfs_meta_usext.sh 384
15+
${HOMEgfs}/gempak/ush/gfs_meta_mar_ql.sh 24 48 96 180
16+
${HOMEgfs}/gempak/ush/gfs_meta_mar_comp.sh 126
17+
${HOMEgfs}/gempak/ush/gfs_meta_opc_na_ver 126
18+
${HOMEgfs}/gempak/ush/gfs_meta_opc_np_ver 126
19+
${HOMEgfs}/gempak/ush/gfs_meta_mar_atl.sh 180
20+
${HOMEgfs}/gempak/ush/gfs_meta_mar_pac.sh 180
21+
${HOMEgfs}/gempak/ush/gfs_meta_mar_ver.sh 48
22+
${HOMEgfs}/gempak/ush/gfs_meta_mar_skewt.sh 72
23+
${HOMEgfs}/gempak/ush/gfs_meta_sa2.sh 144

‎gempak/ush/gdas_meta_na.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ PROJ = str/90;-105;0
5151
LATLON = 1
5252
5353
54-
restore $USHgempak/restore/pmsl_thkn.2.nts
54+
restore ${HOMEgfs}/gempak/ush/restore/pmsl_thkn.2.nts
5555
CLRBAR = 1
5656
HLSYM = 2;1.5//21//hw
5757
TEXT = 1/21//hw
@@ -60,7 +60,7 @@ l
6060
ru
6161
6262
63-
restore $USHgempak/restore/850mb_hght_tmpc.2.nts
63+
restore ${HOMEgfs}/gempak/ush/restore/850mb_hght_tmpc.2.nts
6464
CLRBAR = 1
6565
TEXT = 1/21//hw
6666
SKIP = 0 !0 !0 !0 !/3
@@ -70,23 +70,23 @@ l
7070
ru
7171
7272
73-
restore $USHgempak/restore/700mb_hght_relh_omeg.2.nts
73+
restore ${HOMEgfs}/gempak/ush/restore/700mb_hght_relh_omeg.2.nts
7474
CLRBAR = 1
7575
TEXT = 1/21//hw
7676
TITLE = 5/-2/~ ? $m_title @ HGT, REL HUMIDITY AND OMEGA|~@ HGT, RH AND OMEGA!0
7777
l
7878
ru
7979
8080
81-
restore $USHgempak/restore/500mb_hght_absv.2.nts
81+
restore ${HOMEgfs}/gempak/ush/restore/500mb_hght_absv.2.nts
8282
CLRBAR = 1
8383
TEXT = 1/21//hw
8484
TITLE = 5/-2/~ ? $m_title @ HGT AND VORTICITY|~@ HGT AND VORTICITY!0
8585
l
8686
ru
8787
8888
89-
restore $USHgempak/restore/250mb_hght_wnd.2.nts
89+
restore ${HOMEgfs}/gempak/ush/restore/250mb_hght_wnd.2.nts
9090
CLRBAR = 1
9191
TEXT = 1/21//hw
9292
TITLE = 5/-2/~ ? $m_title @ HGT, ISOTACHS AND WIND (KTS)|~@ HGT AND WIND!0

‎gempak/ush/gfs_meta_hi.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ MAP = 1
4545
CLEAR = yes
4646
CLRBAR = 1
4747
48-
restore ${USHgempak}/restore/garea_hi.nts
48+
restore ${HOMEgfs}/gempak/ush/restore/garea_hi.nts
4949
50-
restore ${USHgempak}/restore/pmsl_thkn.2.nts
50+
restore ${HOMEgfs}/gempak/ush/restore/pmsl_thkn.2.nts
5151
CLRBAR = 1
5252
HLSYM = 2;1.5//21//hw
5353
TEXT = 1/21//hw
@@ -56,47 +56,47 @@ l
5656
ru
5757
5858
59-
restore ${USHgempak}/restore/850mb_hght_tmpc.2.nts
59+
restore ${HOMEgfs}/gempak/ush/restore/850mb_hght_tmpc.2.nts
6060
CLRBAR = 1
6161
TEXT = 1/21//hw
6262
TITLE = 5/-2/~ ? $m_title @ HGHTS, TEMPERATURE AND WIND (KTS)|~@ HGHT, TMP, WIND!0!0!0
6363
l
6464
ru
6565
6666
67-
restore ${USHgempak}/restore/700mb_hght_relh_omeg.2.nts
67+
restore ${HOMEgfs}/gempak/ush/restore/700mb_hght_relh_omeg.2.nts
6868
CLRBAR = 1
6969
TEXT = 1/21//hw
7070
TITLE = 5/-2/~ ? $m_title @ HGHTS, REL HUMIDITY AND OMEGA|~@ HGHT, RH AND OMEGA!0
7171
l
7272
ru
7373
7474
75-
restore ${USHgempak}/restore/500mb_hght_absv.2.nts
75+
restore ${HOMEgfs}/gempak/ush/restore/500mb_hght_absv.2.nts
7676
CLRBAR = 1
7777
TEXT = 1/21//hw
7878
TITLE = 5/-2/~ ? $m_title @ HEIGHTS AND VORTICITY|~@ HGHT AND VORTICITY!0
7979
l
8080
ru
8181
8282
83-
restore ${USHgempak}/restore/200mb_hght_wnd.2.nts
83+
restore ${HOMEgfs}/gempak/ush/restore/200mb_hght_wnd.2.nts
8484
CLRBAR = 1
8585
TEXT = 1/21//hw
8686
TITLE = 5/-2/~ ? $m_title @ HEIGHTS, ISOTACHS AND WIND (KTS)|~@ HGHT AND WIND!0
8787
l
8888
ru
8989
9090
91-
restore ${USHgempak}/restore/250mb_hght_wnd.2.nts
91+
restore ${HOMEgfs}/gempak/ush/restore/250mb_hght_wnd.2.nts
9292
CLRBAR = 1
9393
TEXT = 1/21//hw
9494
TITLE = 5/-2/~ ? $m_title @ HEIGHTS, ISOTACHS AND WIND (KTS)|~@ HGHT AND WIND!0
9595
l
9696
ru
9797
9898
99-
restore ${USHgempak}/restore/300mb_hght_wnd.2.nts
99+
restore ${HOMEgfs}/gempak/ush/restore/300mb_hght_wnd.2.nts
100100
CLRBAR = 1
101101
TEXT = 1/21//hw
102102
TITLE = 5/-2/~ ? $m_title @ HEIGHTS, ISOTACHS AND WIND (KTS)|~@ HGHT AND WIND!0
@@ -149,7 +149,7 @@ CLRBAR = 1
149149
r
150150
151151
152-
restore ${USHgempak}/restore/precip.2.nts
152+
restore ${HOMEgfs}/gempak/ush/restore/precip.2.nts
153153
CLRBAR = 1
154154
TEXT = 1/21//hw
155155
GDATTIM = F12-F192-06; F214-F384-12

‎gempak/ush/gfs_meta_nhsh.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ MAP = 1
4343
CLEAR = yes
4444
CLRBAR = 1
4545
46-
restore ${USHgempak}/restore/garea_nh.nts
46+
restore ${HOMEgfs}/gempak/ush/restore/garea_nh.nts
4747
48-
restore ${USHgempak}/restore/500mb_hght_absv.2.nts
48+
restore ${HOMEgfs}/gempak/ush/restore/500mb_hght_absv.2.nts
4949
CLRBAR = 1
5050
TEXT = 1/21//hw
5151
SKIP = 0 !0 !1
@@ -65,18 +65,18 @@ l
6565
ru
6666
6767
68-
restore ${USHgempak}/restore/garea_sh.nts
68+
restore ${HOMEgfs}/gempak/ush/restore/garea_sh.nts
6969
7070
DEVICE = nc | Nmeta_sh
7171
TITLE = 5//~ ? $m_title @ HEIGHTS AND VORTICITY|~ @ HGHT AND VORTICITY!0
7272
l
7373
ru
7474
7575
76-
restore ${USHgempak}/restore/garea_nh.nts
76+
restore ${HOMEgfs}/gempak/ush/restore/garea_nh.nts
7777
DEVICE = nc | Nmeta_nh
7878
79-
restore ${USHgempak}/restore/250mb_hght_wnd.2.nts
79+
restore ${HOMEgfs}/gempak/ush/restore/250mb_hght_wnd.2.nts
8080
CLRBAR = 1
8181
TEXT = 1/21//hw
8282
GDPFUN = knts((mag(wnd))) !sm9s(hght)
@@ -85,11 +85,11 @@ l
8585
ru
8686
8787
88-
restore ${USHgempak}/restore/garea_sh.nts
88+
restore ${HOMEgfs}/gempak/ush/restore/garea_sh.nts
8989
DEVICE = nc | Nmeta_sh
9090
ru
9191
92-
restore ${USHgempak}/restore/precip.2.nts
92+
restore ${HOMEgfs}/gempak/ush/restore/precip.2.nts
9393
CLRBAR = 1
9494
TEXT = 1/21//hw
9595
GDATTIM = F12-F240-12
@@ -99,7 +99,7 @@ TITLE = 5//~ ? $m_title 12-HOUR TOTAL PRECIPITATION (IN)|~ 12-HOURLY TOTAL PCP
9999
l
100100
r
101101
102-
restore ${USHgempak}/restore/garea_sh.nts
102+
restore ${HOMEgfs}/gempak/ush/restore/garea_sh.nts
103103
DEVICE = nc | Nmeta_sh
104104
ru
105105

‎gempak/ush/gfs_meta_us.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ GAREA = 17.529;-129.296;53.771;-22.374
5353
PROJ = str/90;-105;0
5454
LATLON = 0
5555
56-
restore $USHgempak/restore/pmsl_thkn.2.nts
56+
restore ${HOMEgfs}/gempak/ush/restore/pmsl_thkn.2.nts
5757
CLRBAR = 1
5858
HLSYM = 2;1.5//21//hw
5959
TEXT = 1/21//hw
@@ -62,7 +62,7 @@ l
6262
run
6363
6464
65-
restore $USHgempak/restore/850mb_hght_tmpc.2.nts
65+
restore ${HOMEgfs}/gempak/ush/restore/850mb_hght_tmpc.2.nts
6666
CLRBAR = 1
6767
HLSYM = 2;1.5//21//hw
6868
TEXT = 1/21//hw
@@ -71,7 +71,7 @@ l
7171
run
7272
7373
74-
restore $USHgempak/restore/700mb_hght_relh_omeg.2.nts
74+
restore ${HOMEgfs}/gempak/ush/restore/700mb_hght_relh_omeg.2.nts
7575
CLRBAR = 1
7676
HLSYM = 2;1.5//21//hw
7777
TEXT = 1/21//hw
@@ -80,7 +80,7 @@ l
8080
run
8181
8282
83-
restore $USHgempak/restore/500mb_hght_absv.2.nts
83+
restore ${HOMEgfs}/gempak/ush/restore/500mb_hght_absv.2.nts
8484
CLRBAR = 1
8585
HLSYM = 2;1.5//21//hw
8686
TEXT = 1/21//hw
@@ -89,7 +89,7 @@ l
8989
run
9090
9191
92-
restore $USHgempak/restore/250mb_hght_wnd.2.nts
92+
restore ${HOMEgfs}/gempak/ush/restore/250mb_hght_wnd.2.nts
9393
CLRBAR = 1
9494
HLSYM = 2;1.5//21//hw
9595
TEXT = 1/21//hw
@@ -98,7 +98,7 @@ l
9898
run
9999
100100
101-
restore $USHgempak/restore/p06m_pmsl.2.nts
101+
restore ${HOMEgfs}/gempak/ush/restore/p06m_pmsl.2.nts
102102
CLRBAR = 1
103103
HLSYM = 2;1.5//21//hw
104104
HLSYM = 2;1.5//21//hw

‎gempak/ush/gfs_meta_usext.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,43 +71,43 @@ GAREA = 17.529;-129.296;53.771;-22.374
7171
PROJ = str/90;-105;0
7272
LATLON = 18/2
7373
74-
restore ${USHgempak}/restore/pmsl_thkn.2.nts
74+
restore ${HOMEgfs}/gempak/ush/restore/pmsl_thkn.2.nts
7575
CLRBAR = 1
7676
HLSYM = 2;1.5//21//hw
7777
TEXT = 1/21//hw
7878
TITLE = 1/-2/~ ? $m_title PMSL, 1000-500 MB THICKNESS|~MSLP, 1000-500 THKN!0
7979
l
8080
run
8181
82-
restore ${USHgempak}/restore/850mb_hght_tmpc.2.nts
82+
restore ${HOMEgfs}/gempak/ush/restore/850mb_hght_tmpc.2.nts
8383
CLRBAR = 1
8484
TEXT = 1/21//hw
8585
TITLE = 1/-2/~ ? $m_title @ HGT, TEMPERATURE AND WIND (KTS)|~@ HGT, TMP, WIND!0
8686
l
8787
run
8888
89-
restore ${USHgempak}/restore/700mb_hght_relh_omeg.2.nts
89+
restore ${HOMEgfs}/gempak/ush/restore/700mb_hght_relh_omeg.2.nts
9090
CLRBAR = 1
9191
TEXT = 1/21//hw
9292
TITLE = 1/-2/~ ? $m_title @ HGT, REL HUMIDITY AND OMEGA|~@ HGT, RH AND OMEGA!0
9393
l
9494
run
9595
96-
restore ${USHgempak}/restore/500mb_hght_absv.2.nts
96+
restore ${HOMEgfs}/gempak/ush/restore/500mb_hght_absv.2.nts
9797
CLRBAR = 1
9898
TEXT = 1/21//hw
9999
TITLE = 1/-2/~ ? $m_title @ HGT AND VORTICITY|~@ HGT AND VORTICITY!0
100100
l
101101
run
102102
103-
restore ${USHgempak}/restore/500mb_hght_gabsv.2.nts
103+
restore ${HOMEgfs}/gempak/ush/restore/500mb_hght_gabsv.2.nts
104104
CLRBAR = 1
105105
TEXT = 1/21//hw
106106
TITLE = 1/-2/~ ? $m_title @ HGT AND GEO ABS VORT|~@ HGT, GEO ABS VORT!0
107107
l
108108
run
109109
110-
restore ${USHgempak}/restore/250mb_hght_wnd.2.nts
110+
restore ${HOMEgfs}/gempak/ush/restore/250mb_hght_wnd.2.nts
111111
CLRBAR = 1
112112
TEXT = 1/21//hw
113113
TITLE = 1/-2/~ ? $m_title @ HGT, ISOTACHS AND WIND (KTS)|~@ HGT AND WIND!0
@@ -137,7 +137,7 @@ CLEAR = YES
137137
l
138138
run
139139
140-
restore ${USHgempak}/restore/precip.2.nts
140+
restore ${HOMEgfs}/gempak/ush/restore/precip.2.nts
141141
CLRBAR = 1
142142
TEXT = 1/21//hw
143143
HILO = 31;0/x#2/.25-10///y

‎jobs/JGDAS_ATMOS_GEMPAK

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak" -c "base gempak"
55

66
# TODO (#1219) This j-job is not part of the rocoto suite
77

8-
################################
9-
# Set up the HOME directory
10-
export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
11-
export PARMgfs=${PARMgfs:-${HOMEgfs}/parm}
12-
export PARMwmo=${PARMwmo:-${HOMEgfs}/parm/wmo}
13-
export PARMproduct=${PARMproduct:-${HOMEgfs}/parm/product}
14-
export USHgempak=${USHgempak:-${HOMEgfs}/gempak/ush}
15-
export SRCgfs=${SRCgfs:-${HOMEgfs}/scripts}
16-
export UTILgfs=${UTILgfs:-${HOMEgfs}/util}
17-
188
############################################
199
# Set up model and cycle specific variables
2010
############################################
@@ -58,12 +48,12 @@ fi
5848

5949
########################################################
6050
# Execute the script.
61-
echo "${SRCgfs}/exgdas_atmos_nawips.sh gdas 009 GDAS_GEMPAK ${COM_ATMOS_GEMPAK_1p00}" >> poescript
51+
echo "${SCRgfs}/exgdas_atmos_nawips.sh gdas 009 GDAS_GEMPAK ${COM_ATMOS_GEMPAK_1p00}" >> poescript
6252
########################################################
6353

6454
########################################################
6555
# Execute the script for quater-degree grib
66-
echo "${SRCgfs}/exgdas_atmos_nawips.sh gdas_0p25 009 GDAS_GEMPAK ${COM_ATMOS_GEMPAK_0p25}" >> poescript
56+
echo "${SCRgfs}/exgdas_atmos_nawips.sh gdas_0p25 009 GDAS_GEMPAK ${COM_ATMOS_GEMPAK_0p25}" >> poescript
6757
########################################################
6858

6959
cat poescript

0 commit comments

Comments
 (0)