Skip to content

Commit 658d30d

Browse files
JessicaMeixner-NOAAJessicaMeixner-NOAA
authored
Update wave points list and use iniatlization speed-up (#3873)
This PR updates the wave point list including the new points for GFSv17 and updates or removes points that were not in the GFSv17 domain. (Refs #3156 ) This is needed for the unstructured grid. This also allows us to utilize a new fix file added in issue #3863 to improve wave model initialization. This PR realizes the improved wave initialization for the uglo_15m wave grid. Additionally this PR fixes #3819 ensuring that we are only saving files required to COM in the wave binary gridded output. Lastly, this partially addresses some time-out/memory issues for the boundary point jobs for waves when running at C1152. Additional refinement will be required after the new spack-stack modules are used.
1 parent 08c3ddb commit 658d30d

File tree

6 files changed

+143
-68
lines changed

6 files changed

+143
-68
lines changed

‎dev/parm/config/gfs/config.fcst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ case ${RUN} in
4343
export FHOUT_HF=${FHOUT_HF_GFS}
4444
export FHOUT_OCN=${FHOUT_OCN_GFS}
4545
export FHOUT_ICE=${FHOUT_ICE_GFS}
46+
export FHOUT_WAV=${FHOUT_WAV_GFS}
4647
;;
4748
*gdas)
4849
export FHMAX_HF=0

‎dev/parm/config/gfs/config.resources.GAEAC6

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,38 @@ case ${step} in
8686
;;
8787
esac
8888
;;
89+
90+
"wavepostbndpnt")
91+
walltime="01:30:00"
92+
ntasks=1
93+
threads_per_task=1
94+
tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
95+
export is_exclusive=True
96+
NTASKS=${ntasks}
97+
;;
98+
99+
"wavepostbndpntbll")
100+
walltime="00:25:00"
101+
ntasks=2
102+
threads_per_task=1
103+
tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
104+
export is_exclusive=True
105+
NTASKS=${ntasks}
106+
;;
107+
108+
"wavepostpnt")
109+
walltime="00:45:00"
110+
ntasks=3
111+
threads_per_task=1
112+
tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
113+
export is_exclusive=True
114+
if [[ ${tasks_per_node} -gt 40 ]]; then
115+
tasks_per_node=40
116+
export is_exclusive=False
117+
fi
118+
NTASKS=${ntasks}
119+
;;
120+
89121
*)
90122
;;
91123
esac

‎parm/wave/wave_gfs.buoys.dat

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ $ Gulf of Alaska (AG) Spectral data (4) near S/SW Alaska Anchorage (8)
6363
-152.230 59.050 '46079 ' 4.9 DAT NDBC 45
6464
-152.233 59.049 '46105 ' 2.0 DAT NDBC 45
6565
-147.992 59.925 '46107 ' 2.0 DAT NDBC 45
66-
-165.475 64.473 '46265 ' 2.0 DAT NDBC 45
66+
-165.479 64.460 '46265 ' 2.0 DAT NDBC 45
6767
$AGGA48
6868
$
6969
$AGGA47
@@ -210,12 +210,12 @@ $ Hawaiian waters (HW) spectra (4) in Pacific Ocean and Pacific Isles (0)
210210
-158.12 21.28 '51204 ' 999. DAT SCRIPPS 11
211211
-156.42 21.02 '51205 ' 999. DAT SCRIPPS 11
212212
-154.97 19.78 '51206 ' 999. DAT SCRIPPS 11
213-
-157.75 21.48 '51207 ' 999. DAT SCRIPPS 11
213+
$ -157.75 21.48 '51207 ' 999. DAT SCRIPPS 11
214214
-153.87 0.02 '51028 ' 5.0 DAT NDBC 11
215215
-158.303 21.096 '51200 ' 999.0 DAT NDBC 11
216216
-159.574 22.285 '51208 ' 999. DAT SCRIPPS 11
217217
-170.5 -14.273 '51209 ' 999.0 DAT NDBC 360
218-
-157.756 21.477 '51210 ' 999.0 DAT NDBC 11
218+
$ -157.756 21.477 '51210 ' 999.0 DAT NDBC 11
219219
134.670 7.692 '52212 ' 999.0 DAT NDBC 360
220220
-157.959 21.297 '51211 ' 999.0 DAT NDBC 360
221221
-158.150 21.323 '51212 ' 999.0 DAT NDBC 360
@@ -410,13 +410,13 @@ $ Western Atlantic (NT) spectra (4) NE states north of VA (1)
410410
-68.998 44.055 '44033 ' 4.0 DAT NDBC 80
411411
-68.109 44.106 '44034 ' 4.0 DAT NDBC 80
412412
-72.655 41.138 '44039 ' 3.5 DAT NDBC 80
413-
-73.580 40.956 '44040 ' 3.5 DAT NDBC 80
414-
-76.391 39.152 '44043 ' 3.0 DAT NDBC 80
413+
$ -73.580 40.956 '44040 ' 3.5 DAT NDBC 80
414+
$ -76.391 39.152 '44043 ' 3.0 DAT NDBC 80
415415
-75.183 38.883 '44054 ' 999.0 DAT NDBC 80
416416
-75.256 39.122 '44055 ' 999.0 DAT NDBC 80
417417
-76.257 37.567 '44058 ' 3.0 DAT NDBC 80
418418
-72.067 41.263 '44060 ' 3.5 DAT NDBC 80
419-
-77.036 38.788 '44061 ' 2.0 DAT NDBC 80
419+
$ -77.036 38.788 '44061 ' 2.0 DAT NDBC 80
420420
-76.415 38.556 '44062 ' 3.0 DAT NDBC 80
421421
-76.448 38.963 '44063 ' 3.0 DAT NDBC 80
422422
-76.087 36.998 '44064 ' 3.0 DAT NDBC 80

‎parm/wave/wave_gfs.buoys.full

Lines changed: 91 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ $ Gulf of Alaska (AG) Spectral data (4) near S/SW Alaska Anchorage (8)
6767
-152.230 59.050 '46079 ' 4.9 DAT NDBC 45
6868
-152.233 59.049 '46105 ' 2.0 DAT NDBC 45
6969
-147.992 59.925 '46107 ' 2.0 DAT NDBC 45
70-
-165.475 64.473 '46265 ' 2.0 DAT NDBC 45
70+
-165.479 64.460 '46265 ' 2.0 DAT NDBC 45
7171
$AGGA48
7272
$
7373
$AGGA47
@@ -243,12 +243,12 @@ $ Hawaiian waters (HW) spectra (4) in Pacific Ocean and Pacific Isles (0)
243243
-158.12 21.28 '51204 ' 999. DAT SCRIPPS 11
244244
-156.42 21.02 '51205 ' 999. DAT SCRIPPS 11
245245
-154.97 19.78 '51206 ' 999. DAT SCRIPPS 11
246-
-157.75 21.48 '51207 ' 999. DAT SCRIPPS 11
246+
$ -157.75 21.48 '51207 ' 999. DAT SCRIPPS 11
247247
-153.87 0.02 '51028 ' 5.0 DAT NDBC 11
248248
-158.303 21.096 '51200 ' 999.0 DAT NDBC 11
249249
-159.574 22.285 '51208 ' 999. DAT SCRIPPS 11
250250
-170.5 -14.273 '51209 ' 999.0 DAT NDBC 360
251-
-157.756 21.477 '51210 ' 999.0 DAT NDBC 11
251+
$ -157.756 21.477 '51210 ' 999.0 DAT NDBC 11
252252
134.670 7.692 '52212 ' 999.0 DAT NDBC 360
253253
-157.959 21.297 '51211 ' 999.0 DAT NDBC 360
254254
-158.150 21.323 '51212 ' 999.0 DAT NDBC 360
@@ -530,13 +530,13 @@ $ Western Atlantic (NT) spectra (4) NE states north of VA (1)
530530
-68.998 44.055 '44033 ' 4.0 DAT NDBC 80
531531
-68.109 44.106 '44034 ' 4.0 DAT NDBC 80
532532
-72.655 41.138 '44039 ' 3.5 DAT NDBC 80
533-
-73.580 40.956 '44040 ' 3.5 DAT NDBC 80
534-
-76.391 39.152 '44043 ' 3.0 DAT NDBC 80
533+
$ -73.580 40.956 '44040 ' 3.5 DAT NDBC 80
534+
$ -76.391 39.152 '44043 ' 3.0 DAT NDBC 80
535535
-75.183 38.883 '44054 ' 999.0 DAT NDBC 80
536536
-75.256 39.122 '44055 ' 999.0 DAT NDBC 80
537537
-76.257 37.567 '44058 ' 3.0 DAT NDBC 80
538538
-72.067 41.263 '44060 ' 3.5 DAT NDBC 80
539-
-77.036 38.788 '44061 ' 2.0 DAT NDBC 80
539+
$ -77.036 38.788 '44061 ' 2.0 DAT NDBC 80
540540
-76.415 38.556 '44062 ' 3.0 DAT NDBC 80
541541
-76.448 38.963 '44063 ' 3.0 DAT NDBC 80
542542
-76.087 36.998 '44064 ' 3.0 DAT NDBC 80
@@ -583,9 +583,9 @@ $ Tropical Belt (XT) spectra (4) near South America (3)
583583
-36.25 -3.00 'FORTALEZA ' 999. VBY NCEP 360
584584
-47.50 3.00 'AMAZON ' 999. VBY NCEP 360
585585
-30.00 1.00 'PETER_PAUL' 999. VBY NCEP 360
586-
-5.7833 35.7833 'TANGER ' 999. VBY WMO 360
586+
-5.783 35.9 'TANGER ' 999. VBY WMO 360
587587
-9.6333 30.4167 'AGADIR ' 999. VBY WMO 360
588-
-7.6167 33.6000 'CASABLANCA' 999. VBY WMO 360
588+
-7.617 33.7000 'CASABLANCA' 999. VBY WMO 360
589589
3.5 6.0 'LAGOS ' 999. VBY WMO 360
590590
5.0 5.0 'FORCADOS ' 999. VBY WMO 360
591591
7.0 4.0 'NIGERDELTA' 999. VBY WMO 360
@@ -769,10 +769,10 @@ $ Indian Ocean (I) spectra (4) non-descript (5)
769769
68.97 7.13 '23495 ' 999. DAT UNKNOWN 120
770770
24.988 -34.060 'JEFFREYBAY' 999. VBY NCEP 360
771771
27.933 -33.033 'EASTLONDON' 999. VBY NCEP 360
772-
17.967 -33.050 'SALDANHABY' 999. VBY NCEP 360
772+
17.9 -33.055 'SALDANHABY' 999. VBY NCEP 360
773773
18.283 -34.200 'CAPEPOINT ' 999. VBY NCEP 360
774774
22.167 -34.967 'FAPLATFORM' 999. VBY NCEP 360
775-
22.150 -34.117 'MOSSELBAY ' 999. VBY NCEP 360
775+
22.170 -34.15 'MOSSELBAY ' 999. VBY NCEP 360
776776
$AGIO45
777777
$
778778
$ END of AWIPS Section
@@ -1058,6 +1058,28 @@ $ Boundary Points for Kenya , Madagascar and Seychelles
10581058
50.000 -6.000 'SYC69 ' 999. BPT WMO 360
10591059
50.000 -8.000 'SYC70 ' 999. BPT WMO 360
10601060
50.000 -10.000 'SYC71 ' 999. BPT WMO 360
1061+
$
1062+
$ NASA
1063+
$
1064+
-117.8 32.333 'SITE3 ' 999. VBY NASA 360
1065+
-117.8 32.8 'SITEX ' 999. VBY NASA 360
1066+
-80.595 28.615 'CAPC ' 999. VBY NASA 360
1067+
-75.758 32.516 'ATX1 ' 999. VBY NASA 360
1068+
-75.570 32.671 'ATX2 ' 999. VBY NASA 360
1069+
-80.25 28.25 'CAP1 ' 999. VBY NASA 360
1070+
-80.23 28.85 'CAPN ' 999. VBY NASA 360
1071+
-80.6 28.8 'DAB ' 999. VBY NASA 360
1072+
-80.25 30.918 'JAX ' 999. VBY NASA 360
1073+
-83.75 28.5 'TPA ' 999. VBY NASA 360
1074+
-84.2 29.25 'TLH ' 999. VBY NASA 360
1075+
-86.028 29.766 'PAN ' 999. VBY NASA 360
1076+
-87.5 29.8 'PEN ' 999. VBY NASA 360
1077+
-64.970 42.054 'ECALE ' 999. VBY NASA 360
1078+
-54.250 45.875 'ECALL ' 999. VBY NASA 360
1079+
-9.253 51.226 'SHAN ' 999. VBY NASA 360
1080+
-53.005 46.350 'STJO ' 999. VBY NASA 360
1081+
-75.048 33.501 'CMFS ' 999. VBY NASA 360
1082+
-143.638 -21.942 'TAHI ' 999. VBY NASA 360
10611083
$
10621084
$ Hawaii BPT
10631085
$
@@ -1487,7 +1509,7 @@ $
14871509
-71.05 41.25 'NW-NYC60 ' 999. IBP NCEP 45
14881510
-71.05 41.38 'NW-NYC61 ' 999. IBP NCEP 45
14891511
$
1490-
-75.25 38.20 'NW-PHI51 ' 999. IBP NCEP 45
1512+
-75.1 38.20 'NW-PHI51 ' 999. IBP NCEP 45
14911513
-74.75 38.20 'NW-PHI52 ' 999. IBP NCEP 45
14921514
-74.25 38.20 'NW-PHI53 ' 999. IBP NCEP 45
14931515
-73.75 38.20 'NW-PHI54 ' 999. IBP NCEP 45
@@ -1520,7 +1542,7 @@ $
15201542
-76.50 34.00 'NW-ILM62 ' 999. IBP NCEP 45
15211543
-76.50 34.50 'NW-ILM63 ' 999. IBP NCEP 45
15221544
$
1523-
-70.86 42.40 'NW-GYX51 ' 999. IBP NCEP 45
1545+
-70.80 42.40 'NW-GYX51 ' 999. IBP NCEP 45
15241546
-70.36 42.40 'NW-GYX52 ' 999. IBP NCEP 45
15251547
-69.86 42.40 'NW-GYX53 ' 999. IBP NCEP 45
15261548
-69.36 42.40 'NW-GYX54 ' 999. IBP NCEP 45
@@ -1985,7 +2007,7 @@ $
19852007
-170.00 53.15 'NW-ALU177 ' 999. IBP NCEP 45
19862008
-169.50 53.15 'NW-ALU178 ' 999. IBP NCEP 45
19872009
-169.00 53.15 'NW-ALU179 ' 999. IBP NCEP 45
1988-
-168.50 53.15 'NW-ALU180 ' 999. IBP NCEP 45
2010+
-168.18 53.15 'NW-ALU180 ' 999. IBP NCEP 45
19892011
-168.00 53.15 'NW-ALU181 ' 999. IBP NCEP 45
19902012
-167.50 53.15 'NW-ALU182 ' 999. IBP NCEP 45
19912013
-167.00 53.15 'NW-ALU183 ' 999. IBP NCEP 45
@@ -2206,42 +2228,52 @@ $
22062228
148.29 17.34 'NW-GUM112 ' 999. IBP NCEP 45
22072229
148.29 16.84 'NW-GUM113 ' 999. IBP NCEP 45
22082230
$
2209-
-172.50 -15.25 'NW-PGG51 ' 999. IBP NCEP 45
2210-
-172.50 -14.75 'NW-PGG52 ' 999. IBP NCEP 45
2211-
-172.50 -14.25 'NW-PGG53 ' 999. IBP NCEP 45
2212-
-172.50 -13.75 'NW-PGG54 ' 999. IBP NCEP 45
2213-
-172.50 -13.25 'NW-PGG55 ' 999. IBP NCEP 45
2214-
-172.50 -12.75 'NW-PGG56 ' 999. IBP NCEP 45
2215-
-172.50 -12.25 'NW-PGG57 ' 999. IBP NCEP 45
2216-
-172.50 -11.75 'NW-PGG58 ' 999. IBP NCEP 45
2217-
-172.50 -11.25 'NW-PGG59 ' 999. IBP NCEP 45
2218-
-172.50 -10.75 'NW-PGG60 ' 999. IBP NCEP 45
2219-
-172.50 -10.25 'NW-PGG61 ' 999. IBP NCEP 45
2220-
-172.00 -10.25 'NW-PGG62 ' 999. IBP NCEP 45
2221-
-171.50 -10.25 'NW-PGG63 ' 999. IBP NCEP 45
2222-
-171.00 -10.25 'NW-PGG64 ' 999. IBP NCEP 45
2223-
-170.50 -10.25 'NW-PGG65 ' 999. IBP NCEP 45
2224-
-170.00 -10.25 'NW-PGG66 ' 999. IBP NCEP 45
2225-
-169.50 -10.25 'NW-PGG67 ' 999. IBP NCEP 45
2226-
-169.00 -10.25 'NW-PGG68 ' 999. IBP NCEP 45
2227-
-168.50 -10.25 'NW-PGG69 ' 999. IBP NCEP 45
2228-
-168.50 -10.75 'NW-PGG70 ' 999. IBP NCEP 45
2229-
-168.50 -11.25 'NW-PGG71 ' 999. IBP NCEP 45
2230-
-168.50 -11.75 'NW-PGG72 ' 999. IBP NCEP 45
2231-
-168.50 -12.25 'NW-PGG73 ' 999. IBP NCEP 45
2232-
-168.50 -12.75 'NW-PGG74 ' 999. IBP NCEP 45
2233-
-168.50 -13.25 'NW-PGG75 ' 999. IBP NCEP 45
2234-
-168.50 -13.75 'NW-PGG76 ' 999. IBP NCEP 45
2235-
-168.50 -14.25 'NW-PGG77 ' 999. IBP NCEP 45
2236-
-168.50 -14.75 'NW-PGG78 ' 999. IBP NCEP 45
2237-
-168.50 -15.24 'NW-PGG79 ' 999. IBP NCEP 45
2238-
-169.00 -15.25 'NW-PGG80 ' 999. IBP NCEP 45
2239-
-169.50 -15.25 'NW-PGG81 ' 999. IBP NCEP 45
2240-
-170.00 -15.25 'NW-PGG82 ' 999. IBP NCEP 45
2241-
-170.50 -15.25 'NW-PGG83 ' 999. IBP NCEP 45
2242-
-171.00 -15.25 'NW-PGG84 ' 999. IBP NCEP 45
2243-
-171.50 -15.25 'NW-PGG85 ' 999. IBP NCEP 45
2244-
-172.00 -15.25 'NW-PGG86 ' 999. IBP NCEP 45
2231+
-172.68 -15.69 'NW-PGG50 ' 999. IBP NCEP 45
2232+
-172.68 -15.19 'NW-PGG51 ' 999. IBP NCEP 45
2233+
-172.68 -14.69 'NW-PGG52 ' 999. IBP NCEP 45
2234+
-172.68 -14.19 'NW-PGG53 ' 999. IBP NCEP 45
2235+
-172.68 -13.69 'NW-PGG54 ' 999. IBP NCEP 45
2236+
-172.68 -13.19 'NW-PGG55 ' 999. IBP NCEP 45
2237+
-172.68 -12.69 'NW-PGG56 ' 999. IBP NCEP 45
2238+
-172.68 -12.19 'NW-PGG57 ' 999. IBP NCEP 45
2239+
-172.68 -11.69 'NW-PGG58 ' 999. IBP NCEP 45
2240+
-172.68 -11.19 'NW-PGG59 ' 999. IBP NCEP 45
2241+
-172.68 -10.69 'NW-PGG60 ' 999. IBP NCEP 45
2242+
-172.68 -10.19 'NW-PGG61 ' 999. IBP NCEP 45
2243+
-172.68 -9.7 'NW-PGG62 ' 999. IBP NCEP 45
2244+
-172.18 -9.7 'NW-PGG63 ' 999. IBP NCEP 45
2245+
-171.68 -9.7 'NW-PGG64 ' 999. IBP NCEP 45
2246+
-171.18 -9.7 'NW-PGG65 ' 999. IBP NCEP 45
2247+
-170.68 -9.7 'NW-PGG66 ' 999. IBP NCEP 45
2248+
-170.18 -9.7 'NW-PGG67 ' 999. IBP NCEP 45
2249+
-169.68 -9.7 'NW-PGG68 ' 999. IBP NCEP 45
2250+
-169.18 -9.7 'NW-PGG69 ' 999. IBP NCEP 45
2251+
-168.68 -9.7 'NW-PGG70 ' 999. IBP NCEP 45
2252+
-168.18 -9.7 'NW-PGG71 ' 999. IBP NCEP 45
2253+
-167.68 -9.7 'NW-PGG72 ' 999. IBP NCEP 45
2254+
-167.0 -9.7 'NW-PGG73 ' 999. IBP NCEP 45
2255+
-167.0 -10.19 'NW-PGG74 ' 999. IBP NCEP 45
2256+
-167.0 -10.69 'NW-PGG75 ' 999. IBP NCEP 45
2257+
-167.0 -11.19 'NW-PGG76 ' 999. IBP NCEP 45
2258+
-167.0 -11.69 'NW-PGG77 ' 999. IBP NCEP 45
2259+
-167.0 -12.19 'NW-PGG78 ' 999. IBP NCEP 45
2260+
-167.0 -12.69 'NW-PGG79 ' 999. IBP NCEP 45
2261+
-167.0 -13.19 'NW-PGG80 ' 999. IBP NCEP 45
2262+
-167.0 -13.69 'NW-PGG81 ' 999. IBP NCEP 45
2263+
-167.0 -14.19 'NW-PGG82 ' 999. IBP NCEP 45
2264+
-167.0 -14.69 'NW-PGG83 ' 999. IBP NCEP 45
2265+
-167.0 -15.19 'NW-PGG84 ' 999. IBP NCEP 45
2266+
-167.0 -15.69 'NW-PGG85 ' 999. IBP NCEP 45
2267+
-167.68 -15.69 'NW-PGG86 ' 999. IBP NCEP 45
2268+
-168.18 -15.69 'NW-PGG87 ' 999. IBP NCEP 45
2269+
-168.68 -15.69 'NW-PGG88 ' 999. IBP NCEP 45
2270+
-169.18 -15.69 'NW-PGG89 ' 999. IBP NCEP 45
2271+
-169.68 -15.69 'NW-PGG90 ' 999. IBP NCEP 45
2272+
-170.18 -15.69 'NW-PGG91 ' 999. IBP NCEP 45
2273+
-170.68 -15.69 'NW-PGG92 ' 999. IBP NCEP 45
2274+
-171.18 -15.69 'NW-PGG93 ' 999. IBP NCEP 45
2275+
-171.68 -15.69 'NW-PGG94 ' 999. IBP NCEP 45
2276+
-172.18 -15.69 'NW-PGG95 ' 999. IBP NCEP 45
22452277
$
22462278
$
22472279
-80.00 27.50 'NW-OPC51 ' 999. IBP NCEP 45
@@ -2355,7 +2387,7 @@ $
23552387
$
23562388
$ HWRF wave grid boundary points -- Region c (CPAC)
23572389
$
2358-
125.00 1.50 'HWRFc-50 ' 999. IBP NCEP 360
2390+
125.35 1.50 'HWRFc-50 ' 999. IBP NCEP 360
23592391
126.00 1.50 'HWRFc-51 ' 999. IBP NCEP 360
23602392
127.00 1.50 'HWRFc-52 ' 999. IBP NCEP 360
23612393
128.00 1.50 'HWRFc-53 ' 999. IBP NCEP 360
@@ -2580,7 +2612,7 @@ $
25802612
133.00 41.50 'HWRFc-272 ' 999. IBP NCEP 360
25812613
132.00 41.50 'HWRFc-273 ' 999. IBP NCEP 360
25822614
125.00 39.50 'HWRFc-274 ' 999. IBP NCEP 360
2583-
125.00 38.50 'HWRFc-275 ' 999. IBP NCEP 360
2615+
125.00 38.70 'HWRFc-275 ' 999. IBP NCEP 360
25842616
125.00 37.50 'HWRFc-276 ' 999. IBP NCEP 360
25852617
125.00 36.50 'HWRFc-277 ' 999. IBP NCEP 360
25862618
125.00 35.50 'HWRFc-278 ' 999. IBP NCEP 360
@@ -2606,14 +2638,14 @@ $
26062638
125.00 15.50 'HWRFc-298 ' 999. IBP NCEP 360
26072639
125.00 14.50 'HWRFc-299 ' 999. IBP NCEP 360
26082640
125.00 13.50 'HWRFc-300 ' 999. IBP NCEP 360
2609-
125.00 12.50 'HWRFc-301 ' 999. IBP NCEP 360
2610-
125.00 11.50 'HWRFc-302 ' 999. IBP NCEP 360
2611-
125.00 10.50 'HWRFc-303 ' 999. IBP NCEP 360
2641+
125.00 13.00 'HWRFc-301 ' 999. IBP NCEP 360
2642+
125.00 12.60 'HWRFc-302 ' 999. IBP NCEP 360
2643+
125.00 10.00 'HWRFc-303 ' 999. IBP NCEP 360
26122644
125.00 9.50 'HWRFc-304 ' 999. IBP NCEP 360
2613-
125.00 8.50 'HWRFc-305 ' 999. IBP NCEP 360
2614-
125.00 7.50 'HWRFc-306 ' 999. IBP NCEP 360
2615-
125.00 6.50 'HWRFc-307 ' 999. IBP NCEP 360
2616-
125.00 5.50 'HWRFc-308 ' 999. IBP NCEP 360
2645+
125.00 9.00 'HWRFc-305 ' 999. IBP NCEP 360
2646+
125.00 5.75 'HWRFc-306 ' 999. IBP NCEP 360
2647+
125.00 5.50 'HWRFc-307 ' 999. IBP NCEP 360
2648+
125.00 5.00 'HWRFc-308 ' 999. IBP NCEP 360
26172649
125.00 4.50 'HWRFc-309 ' 999. IBP NCEP 360
26182650
125.00 3.50 'HWRFc-310 ' 999. IBP NCEP 360
26192651
125.00 2.50 'HWRFc-311 ' 999. IBP NCEP 360
@@ -3212,7 +3244,7 @@ $
32123244
141.00 -42.50 'HWRFp-58 ' 999. IBP NCEP 360
32133245
143.00 -42.50 'HWRFp-59 ' 999. IBP NCEP 360
32143246
145.00 -42.50 'HWRFp-60 ' 999. IBP NCEP 360
3215-
147.00 -42.50 'HWRFp-61 ' 999. IBP NCEP 360
3247+
148.20 -42.50 'HWRFp-61 ' 999. IBP NCEP 360
32163248
149.00 -42.50 'HWRFp-62 ' 999. IBP NCEP 360
32173249
151.00 -42.50 'HWRFp-63 ' 999. IBP NCEP 360
32183250
153.00 -42.50 'HWRFp-64 ' 999. IBP NCEP 360

‎ush/forecast_postdet.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,14 +461,18 @@ WW3_postdet() {
461461
# Loop for gridded output (uses FHINC)
462462
local fhr fhr3 vdate FHINC ww3_grid
463463
fhr=${FHMIN_WAV}
464-
fhinc=${FHOUT_WAV}
464+
if [[ ${FHMAX_HF_WAV} -gt 0 && ${FHOUT_HF_WAV} -gt 0 && ${fhr} -lt ${FHMAX_HF_WAV} ]]; then
465+
fhinc=${FHOUT_HF_WAV}
466+
else
467+
fhinc=${FHOUT_WAV}
468+
fi
465469
while (( fhr <= FHMAX_WAV )); do
466470
fhr3=$(printf '%03d' "${fhr}")
467471
vdate=$(date --utc -d "${current_cycle:0:8} ${current_cycle:8:2} + ${fhr} hours" +%Y%m%d.%H0000)
468472
${NLN} "${COMOUT_WAVE_HISTORY}/${wavprfx}.${waveGRD}.f${fhr3}.bin" "${DATA}/${vdate}.out_grd.ww3"
469473

470-
if (( FHMAX_HF_WAV > 0 && FHOUT_HF_WAV > 0 && fhr < FHMAX_HF_WAV )); then
471-
fhinc=${FHOUT_HF_WAV}
474+
if (( fhr >= FHMAX_HF_WAV )); then
475+
fhinc=${FHOUT_WAV}
472476
fi
473477
fhr=$((fhr + fhinc))
474478
done

‎ush/forecast_predet.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,12 @@ WW3_predet(){
649649
#if shel, only 1 waveGRD which is linked to mod_def.ww3
650650
cpreq "${COMIN_WAVE_PREP}/${RUN}.wave.t${cyc}z.mod_def.${waveGRD}.bin" "${DATA}/mod_def.ww3"
651651

652+
#If pnt_wght file exists, use it to speed up initialization for unstructured grids
653+
# this file does not exist for structured, and the model can run without it (just slower init)
654+
if [[ -f "${FIXgfs}/wave/pnt_wght.${waveGRD}.nc" ]]; then
655+
cpreq "${FIXgfs}/wave/pnt_wght.${waveGRD}.nc" "${DATA}/pnt_wght.ww3.nc"
656+
fi
657+
652658
if [[ "${WW3ICEINP}" == "YES" ]]; then
653659
local wavicefile="${COMIN_WAVE_PREP}/${RUN}wave.${WAVEICE_FID}.t${current_cycle:8:2}z.ice"
654660
if [[ ! -f "${wavicefile}" ]]; then

0 commit comments

Comments
 (0)