Skip to content

Commit 8149f7d

Browse files
authored
Merge pull request #529 from jacob1299/fix/rrfs-2dfld-product
Register RRFS 2dfld product after NOAA file split
2 parents 81b7f59 + 36b1817 commit 8149f7d

3 files changed

Lines changed: 18 additions & 1 deletion

File tree

docs/gallery/noaa_models/rrfs.ipynb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,8 @@
633633
"source": [
634634
"### Other products\n",
635635
"\n",
636+
"RRFS also publishes `natlev` (native model levels), `2dfld` (2D surface/post-processed fields), `testbed`, and `ififip` products.\n",
637+
"\n",
636638
"> Reading natlev data into xarray causes my kernel to crash\n"
637639
]
638640
},

src/herbie/models/rrfs.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Herbie(date, model='rrfs', ...)
77
88
fxx : int
9-
product : {"prs", "nat", "testbed", "ififip"}
9+
product : {"prs", "nat", "2dfld", "testbed", "ififip"}
1010
member : {None, int}
1111
None for deterministic run, int (1-5) for ensemble members
1212
domain : {"conus", "alaska", "hawaii", "puerto rico", "na"}
@@ -26,6 +26,7 @@ def template(self):
2626
self.PRODUCTS = {
2727
"prslev": "pressure level fields",
2828
"natlev": "native level fields",
29+
"2dfld": "2D surface/post-processed fields",
2930
"testbed": "testbed fields",
3031
"ififip": "icing/freezing fields",
3132
}

tests/test_rrfs.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,17 @@ def test_rrfs_natlev_file_exists():
9797
)
9898
assert H.grib, "RRFS natlev grib2 file not found"
9999
assert H.idx, "RRFS natlev index file not found"
100+
101+
102+
def test_rrfs_2dfld_product_accepted():
103+
"""2dfld should be a valid product and default to domain='conus'."""
104+
H = Herbie(
105+
today,
106+
model="rrfs",
107+
product="2dfld",
108+
fxx=0,
109+
save_dir=save_dir,
110+
)
111+
assert H.product == "2dfld"
112+
assert H.domain == "conus"
113+
assert "2dfld" in H.SOURCES["aws"]

0 commit comments

Comments
 (0)