Skip to content

Fix sorting of ensemble members in fieldsets [MPY-408] #82

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

Merged
iainrussell merged 1 commit into from
Oct 28, 2026
Merged

Fix sorting of ensemble members in fieldsets [MPY-408] #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion metview/metviewpy/indexdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ def ls(self, extra_keys=None, filter=None, no_print=False):
r = df["number"].unique()
skip = False
if len(r) == 1:
skip = r[0] in ["0", None]
skip = r[0] in [0, "0", None]
if skip:
df.drop("number", axis=1, inplace=True)

Expand Down
2 changes: 1 addition & 1 deletion metview/metviewpy/indexer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class GribIndexer:
"step": ("l", "Int32", int, True),
"level": ("l", "Int32", int, True),
"typeOfLevel": ("s", str, str, False),
"number": ("s", str, str, True),
"number": ("l", "Int32", int, True),
"experimentVersionNumber": ("s", str, str, False),
"marsClass": ("s", str, str, False),
"marsStream": ("s", str, str, False),
Expand Down
4 changes: 2 additions & 2 deletions metview/metviewpy/param.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ def describe(db, param=None, no_print=False):
t = {"parameter": [], "typeOfLevel": [], "level": []}
need_number = False
for k, v in db.param_meta.items():
if not v.md.get("number", None) in [["0"], [None]]:
if not v.md.get("number", None) in [[0], ["0"], [None]]:
need_number = True
break

Expand Down Expand Up @@ -437,7 +437,7 @@ def describe(db, param=None, no_print=False):
cnt += 1

for kk, md_v in v.md.items():
if kk == "number" and md_v == ["0"]:
if kk == "number" and md_v == [0]:
continue
if not kk in ["shortName", "paramId"]:
t["key"].append(labels.get(kk, kk))
Expand Down
35 changes: 30 additions & 5 deletions tests/test_indexer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ def test_param_info_from_fs_single_file():
"step": 0,
"level": 700,
"typeOfLevel": "isobaricInhPa",
"number": "0",
"number": 0,
"experimentVersionNumber": "0001",
"marsClass": "od",
"marsStream": "oper",
Expand All @@ -759,7 +759,7 @@ def test_param_info_from_fs_single_file():
"step": 0,
"level": 500,
"typeOfLevel": "isobaricInhPa",
"number": "0",
"number": 0,
"experimentVersionNumber": "0001",
"marsClass": "od",
"marsStream": "oper",
Expand All @@ -783,7 +783,7 @@ def test_param_info_from_fs_single_file():
"step": 0,
"level": 500,
"typeOfLevel": "isobaricInhPa",
"number": "0",
"number": 0,
"experimentVersionNumber": "0001",
"marsClass": "od",
"marsStream": "oper",
Expand All @@ -804,7 +804,7 @@ def test_param_info_from_fs_single_file():
"step": 0,
"level": None,
"typeOfLevel": "isobaricInhPa",
"number": "0",
"number": 0,
"experimentVersionNumber": "0001",
"marsClass": "od",
"marsStream": "oper",
Expand All @@ -827,7 +827,7 @@ def test_param_info_from_fs_single_file():
"step": 0,
"level": 1000,
"typeOfLevel": "isobaricInhPa",
"number": "0",
"number": 0,
"experimentVersionNumber": "0001",
"marsClass": "od",
"marsStream": "oper",
Expand Down Expand Up @@ -911,6 +911,31 @@ def test_indexer_dataframe_sort_value_with_key():
assert False


def test_indexer_dataframe_sort_ens():

md = {
"paramId": [5, 5, 5, 5],
"level": [925, 925, 925, 925],
"step": [12, 12, 12, 12],
"number": [1, 9, 10, 20],
}

md_ref = {
"paramId": [5, 5, 5, 5],
"level": [925, 925, 925, 925],
"step": [12, 12, 12, 12],
"number": [1, 9, 10, 20],
}

df = pd.DataFrame(md)
df = GribIndexer._sort_dataframe(df)
df_ref = pd.DataFrame(md_ref)

if not df.equals(df_ref):
print(df.compare(df_ref))
assert False


def test_describe():

f = mv.read(file_in_testdir("tuv_pl.grib"))
Expand Down