Skip to content

Commit 6c08971

Browse files
BinLiu-NOAABinLiu-NOAA
committed
Merge commit 'e5f9fcb5d4607e3576c7d507da594a9d3b516adc' into feature/hafs.v2.1.1
2 parents 5919cc6 + e5f9fcb commit 6c08971

File tree

12 files changed

+330
-207
lines changed

12 files changed

+330
-207
lines changed

‎.github/workflows/intel.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ env:
3333

3434
jobs:
3535
setup:
36-
runs-on: ubuntu-20.04
36+
runs-on: ubuntu-22.04
3737

3838
steps:
3939
- name: checkout-upp # This is for getting spack.yaml
@@ -80,7 +80,7 @@ jobs:
8080
8181
build:
8282
needs: setup
83-
runs-on: ubuntu-20.04
83+
runs-on: ubuntu-22.04
8484

8585
steps:
8686
- name: checkout-upp

‎ci/jobs-dev/run_post_fv3gfs_ORION.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ ulimit -s unlimited
4343
msg="Starting fv3gfs test"
4444
postmsg "$logfile" "$msg"
4545

46-
export cmp_grib2_grib2=${homedir}/test_suite/scripts/cmp_grib2_grib2_new
46+
export cmp_grib2_grib2=${homedir}/scripts/cmp_grib2_grib2_new
4747
export POSTGPEXEC=${svndir}/exec/upp.x
4848

4949

‎parm/params_grib2_tbl_new‎

100755100644
Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
0 1 224 1 ACPCPN
1818
0 1 10 0 ACPCP
1919
0 18 2 0 ACRADP
20+
0 18 26 0 ACTEMM
2021
10 4 13 0 ACWSRD
2122
1 2 11 0 ACWSR
2223
0 20 105 0 AECOEF
2324
0 20 3 0 AEMFLX
2425
0 13 0 0 AEROT
2526
0 2 36 0 AFRWE
27+
1 0 196 1 AHD
2628
0 20 50 0 AIA
2729
0 18 10 0 AIRCON
2830
10 0 82 0 AIRDENOC
@@ -60,6 +62,7 @@
6062
0 1 8 0 APCP
6163
0 0 21 0 APTMP
6264
0 1 221 1 ARAIN
65+
1 2 23 0 ARCRF
6366
0 20 8 0 AREMFLX
6467
0 3 24 0 ASGSO
6568
10 3 198 1 ASHFL
@@ -135,6 +138,8 @@
135138
0 17 2 0 CDGDLTFD
136139
0 3 43 0 CDGFLUX
137140
0 20 80 0 CDIVMF
141+
0 18 21 0 CDLACTA
142+
0 18 22 0 CDLACTE
138143
0 6 14 0 CDLYR
139144
0 6 192 1 CDLYR
140145
0 1 163 0 CDRMF
@@ -306,6 +311,8 @@
306311
0 2 61 0 DEC
307312
0 3 14 0 DENALT
308313
0 3 10 0 DEN
314+
0 18 19 0 DEPACTA
315+
0 18 20 0 DEPACTE
309316
0 0 7 0 DEPR
310317
1 0 13 0 DEPWSS
311318
20 1 6 0 DFPRATIO
@@ -392,6 +399,7 @@
392399
0 1 137 0 EFARRAIN
393400
0 1 142 0 EFARSIC
394401
0 1 139 0 EFARSNOW
402+
0 18 23 0 EFFDOSER
395403
20 0 5 0 EFFTEMP
396404
0 7 204 1 EFHL
397405
0 1 129 0 EFRCCWAT
@@ -465,6 +473,7 @@
465473
1 0 0 0 FFLDG
466474
1 0 1 0 FFLDRO
467475
2 4 6 0 FFMCODE
476+
1 0 194 1 FHO
468477
0 1 228 1 FICEAC
469478
0 6 21 0 FICE
470479
0 6 199 1 FICE
@@ -473,6 +482,11 @@
473482
2 4 1 0 FIREODT
474483
2 4 0 0 FIREOLK
475484
2 3 203 1 FLDCP
485+
1 0 19 0 FLDPATHOW
486+
1 2 17 0 FLDPDEPTH
487+
1 2 19 0 FLDPFLAR
488+
1 2 18 0 FLDPFLFR
489+
1 0 18 0 FLDPOW
476490
1 0 12 0 FLDPSW
477491
0 19 205 1 FLGHT
478492
0 7 18 0 FLXRN
@@ -484,6 +498,7 @@
484498
2 4 36 0 FRADPOW
485499
0 1 43 0 FRAIN
486500
0 1 202 1 FRAIN
501+
1 2 22 0 FRCRF
487502
4 5 2 0 FREQ
488503
10 0 63 0 FREWWW
489504
10 0 17 0 FRICVW
@@ -504,6 +519,7 @@
504519
10 4 30 0 FWFSW
505520
2 4 5 0 FWINX
506521
0 1 95 0 FZPRATE
522+
0 18 25 0 GAMDOSER
507523
0 3 33 0 GAMSL
508524
0 18 3 0 GDCES
509525
0 18 4 0 GDIOD
@@ -519,6 +535,7 @@
519535
2 5 1 0 GLACTMP
520536
0 19 47 0 GLIRRTS
521537
20 0 3 0 GLOBETMP
538+
10 0 98 0 GODAPEAK
522539
0 3 9 0 GPA
523540
0 1 75 0 GPRATE
524541
0 3 4 0 GP
@@ -570,6 +587,7 @@
570587
0 3 7 0 HSTDV
571588
10 0 3 0 HTSGW
572589
20 0 4 0 HUMIDX
590+
0 191 5 0 HURTSV
573591
0 3 44 0 HWBT
574592
0 3 3 0 ICAHT
575593
1 2 7 0 ICECIL
@@ -745,9 +763,9 @@
745763
0 20 16 0 MSSRDRYA
746764
0 20 17 0 MSSRWETA
747765
10 0 20 0 MSSW
766+
2 3 204 1 MSTAVTOP
748767
2 0 11 0 MSTAV
749768
2 0 194 1 MSTAV
750-
2 3 204 1 MSTAV
751769
2 0 7 0 MTERH
752770
10 4 1 0 MTHA
753771
10 4 0 0 MTHD
@@ -1016,6 +1034,9 @@
10161034
1 0 2 0 RSSC
10171035
0 191 194 1 RTSEC
10181036
10 3 206 1 RUNUP
1037+
1 2 21 0 RVERAR
1038+
1 2 20 0 RVERFR
1039+
1 0 17 0 RVEROW
10191040
1 0 11 0 RVERSW
10201041
10 0 80 0 RWAVEAFW
10211042
0 1 24 0 RWMR
@@ -1104,6 +1125,7 @@
11041125
0 20 6 0 SDDMFLX
11051126
0 1 61 0 SDEN
11061127
0 3 38 0 SDFSO
1128+
0 22 6 0 SDI
11071129
3 1 99 0 SDMPEMRR
11081130
0 3 20 0 SDSGSO
11091131
0 1 60 0 SDWE
@@ -1189,6 +1211,7 @@
11891211
2 0 41 0 SMRATE
11901212
2 3 7 0 SMREF
11911213
2 3 195 1 SMREF
1214+
0 22 5 0 SMRI
11921215
0 19 18 0 SNFALB
11931216
0 19 193 1 SNFALB
11941217
0 1 25 0 SNMR
@@ -1233,8 +1256,10 @@
12331256
4 6 4 0 SPECIRR
12341257
10 0 88 0 SPECWI
12351258
4 1 0 0 SPEED
1259+
0 22 1 0 SPEI
12361260
0 1 0 0 SPFH
12371261
10 0 45 0 SPFTR
1262+
0 22 0 0 SPI
12381263
0 1 102 0 SPNCG
12391264
0 1 103 0 SPNCH
12401265
0 1 100 0 SPNCR
@@ -1254,13 +1279,17 @@
12541279
3 192 49 0 SRFAGR4
12551280
3 192 50 0 SRFAGR5
12561281
3 192 51 0 SRFAGR6
1282+
0 22 3 0 SRSI
12571283
0 1 144 0 SRWATERC
12581284
0 1 12 0 SRWEQ
12591285
0 20 103 0 SSALBK
1286+
0 22 2 0 SSFI
12601287
0 3 22 0 SSGSO
12611288
10 3 19 0 SSHGTPARM
12621289
10 3 195 1 SSHG
12631290
3 5 2 0 SSKSSTMP
1291+
3 192 86 0 SSMS1712
1292+
3 192 87 0 SSMS1713
12641293
3 192 62 0 SSMS1715
12651294
3 192 63 0 SSMS1716
12661295
3 192 64 0 SSMS1717
@@ -1305,6 +1334,7 @@
13051334
10 0 48 0 SWHSSWEL
13061335
10 0 49 0 SWHTSWEL
13071336
0 19 202 1 SWINDPRO
1337+
0 22 4 0 SWI
13081338
10 0 9 0 SWPER
13091339
3 1 194 1 SWQI
13101340
0 4 6 0 SWRAD
@@ -1357,11 +1387,13 @@
13571387
0 2 31 0 TDCMOM
13581388
10 0 94 0 TDMCREST
13591389
10 0 95 0 TDMWAVE
1390+
0 191 7 0 TDTSV
13601391
2 0 36 0 TFRCT
13611392
10 3 9 0 THERCSSH
13621393
0 0 197 1 THFLX
13631394
0 3 12 0 THICK
13641395
0 6 10 0 THUNC
1396+
0 18 24 0 THYDOSER
13651397
0 0 203 1 THZ0
13661398
0 18 6 0 TIACCP
13671399
0 18 7 0 TIACIP
@@ -1416,6 +1448,7 @@
14161448
0 1 53 0 TSRWE
14171449
0 19 203 1 TSTMC
14181450
0 19 2 0 TSTM
1451+
0 191 6 0 TSTSV
14191452
0 0 19 0 TTCHT
14201453
0 0 198 1 TTDIA
14211454
10 4 2 0 TTHDP
@@ -1576,6 +1609,7 @@
15761609
10 4 19 0 WATPDEN
15771610
10 4 18 0 WATPTEMP
15781611
2 0 5 0 WATR
1612+
1 0 20 0 WATSURF
15791613
10 0 79 0 WAVEFDIR
15801614
10 0 78 0 WAVEFMAG
15811615
10 0 62 0 WAVEFREW

‎parm/params_grib2_tbl_new.text‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
!2023-12-07 A. BENJAMIN Added new parameters, and
2323
! new tables: 4.2-2-6
2424
! 4.2-4-5,10 4.2-20-0,1,2,3
25+
!2024-07-17 A. BENJAMIN GRIB2 v33.0 update, new parameters
26+
!
27+
!
2528
!
2629
!GRIB2 parameter table for all disciplines and categories
2730
!The fields in order are grib2_discipline grib2_category
@@ -839,6 +842,15 @@
839842
! Added more parameters in 7/2/2019
840843
0 18 17 0 CIAIRC
841844
0 18 18 0 CAACL
845+
! New parameters added 07/17/2024
846+
0 18 19 0 DEPACTA
847+
0 18 20 0 DEPACTE
848+
0 18 21 0 CDLACTA
849+
0 18 22 0 CDLACTE
850+
0 18 23 0 EFFDOSER
851+
0 18 24 0 THYDOSER
852+
0 18 25 0 GAMDOSER
853+
0 18 26 0 ACTEMM
842854
!
843855
! GRIB2 - TABLE 4.2-0-19 PARAMETERS FOR DISCIPLINE 0 CATEGORY 19
844856
!
@@ -1046,6 +1058,17 @@
10461058
! Added new parameter 12/15/2023
10471059
0 21 22 0 EADYGR
10481060
!
1061+
! GRIB2 - TABLE 4.2-0-22 PARAMETERS FOR DISCIPLINE 0 CATEGORY 22
1062+
!
1063+
! New table and parameters added 07/17/2024
1064+
0 22 0 0 SPI
1065+
0 22 1 0 SPEI
1066+
0 22 2 0 SSFI
1067+
0 22 3 0 SRSI
1068+
0 22 4 0 SWI
1069+
0 22 5 0 SMRI
1070+
0 22 6 0 SDI
1071+
!
10491072
! GRIB2 - TABLE 4.2-0-190 PARAMETERS FOR DISCIPLINE 0 CATEGORY 190
10501073
!
10511074
0 190 0 0 ATEXT
@@ -1059,6 +1082,10 @@
10591082
0 191 3 0 DSLOBS
10601083
! Added new parameter 12/15/2023
10611084
0 191 4 0 TCDTRACK
1085+
! New parameters added 07/17/2024
1086+
0 191 5 0 HURTSV
1087+
0 191 6 0 TSTSV
1088+
0 191 7 0 TDTSV
10621089
! NCEP Local use
10631090
0 191 192 1 NLAT
10641091
0 191 193 1 ELON
@@ -1105,9 +1132,17 @@
11051132
1 0 14 0 UPAPCP
11061133
1 0 15 0 UPASM
11071134
1 0 16 0 PERRATE
1135+
! New parameters added 07/17/2024
1136+
1 0 17 0 RVEROW
1137+
1 0 18 0 FLDPOW
1138+
1 0 19 0 FLDPATHOW
1139+
1 0 20 0 WATSURF
11081140
! NCEP Local use
11091141
1 0 192 1 BGRUN
11101142
1 0 193 1 SSRUN
1143+
! New parameters added 02/14/2025
1144+
1 0 194 1 FHO
1145+
1 0 196 1 AHD
11111146
!
11121147
! GRIB2 - TABLE 4.2-1-1 PARAMETERS FOR DISCIPLINE 1 CATEGORY 1
11131148
!
@@ -1145,6 +1180,14 @@
11451180
! Added new parameters 12/15/2023
11461181
1 2 15 0 LDEPTH
11471182
1 2 16 0 RDEPTH
1183+
! New parameters added 07/17/2024
1184+
1 2 17 0 FLDPDEPTH
1185+
1 2 18 0 FLDPFLFR
1186+
1 2 19 0 FLDPFLAR
1187+
1 2 20 0 RVERFR
1188+
1 2 21 0 RVERAR
1189+
1 2 22 0 FRCRF
1190+
1 2 23 0 ARCRF
11481191
!
11491192
! GRIB2 - TABLE 4.2-2-0 PARAMETERS FOR DISCIPLINE 2 CATEGORY 0
11501193
!
@@ -1324,7 +1367,7 @@
13241367
2 3 201 1 AVSFT
13251368
2 3 202 1 RADT
13261369
2 3 203 1 FLDCP
1327-
2 3 204 1 MSTAV
1370+
2 3 204 1 MSTAVTOP
13281371
!
13291372
! GRIB2 - TABLE 4.2-2-4 PARAMETERS FOR DISCIPLINE 2 CATEGORY 4
13301373
!
@@ -1607,6 +1650,9 @@
16071650
3 192 83 0 SBTA1814
16081651
3 192 84 0 SBTA1815
16091652
3 192 85 0 SBTA1816
1653+
! Added more parameters in 03/11/2025
1654+
3 192 86 0 SSMS1712
1655+
3 192 87 0 SSMS1713
16101656
!
16111657
! GRIB2 - TABLE 4.2-4-0 PARAMETERS FOR DISCIPLINE 4 CATEGORY 0
16121658
!
@@ -1821,6 +1867,8 @@
18211867
10 0 95 0 TDMWAVE
18221868
10 0 96 0 STMCREST
18231869
10 0 97 0 STMWAVE
1870+
! New parameters added 07/17/2024
1871+
10 0 98 0 GODAPEAK
18241872
! NCEP Local use
18251873
10 0 192 1 WSTP
18261874
! Added parameter in 8/26/2015

‎parm/post_avblflds.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7446,6 +7446,22 @@
74467446
<scale>4.0</scale>
74477447
</param>
74487448

7449+
<param>
7450+
<post_avblfldidx>829</post_avblfldidx>
7451+
<shortname>SSMS1712_ON_TOP_OF_ATMOS</shortname>
7452+
<pname>SSMS1712</pname>
7453+
<fixed_sfc1_type>top_of_atmos</fixed_sfc1_type>
7454+
<scale>4.0</scale>
7455+
</param>
7456+
7457+
<param>
7458+
<post_avblfldidx>830</post_avblfldidx>
7459+
<shortname>SSMS1713_ON_TOP_OF_ATMOS</shortname>
7460+
<pname>SSMS1713</pname>
7461+
<fixed_sfc1_type>top_of_atmos</fixed_sfc1_type>
7462+
<scale>4.0</scale>
7463+
</param>
7464+
74497465
<param>
74507466
<post_avblfldidx>890</post_avblfldidx>
74517467
<shortname>GSD_MAX_REL_VORT_ON_SPEC_HGT_LVL_HYBRID1</shortname>

0 commit comments

Comments
 (0)