Skip to content

Alternative method to iterating over field components #29

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Alternative method to iterating over field components #29

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a36af2
psc: replace field_to_component with func
JamesMcClung Jun 16, 2025
e458357
psc: yield components
JamesMcClung Jun 16, 2025
891dd61
psc: don't batch assignment
JamesMcClung Jun 16, 2025
abf7815
psc: turn off fmt for specific lines
JamesMcClung Jun 16, 2025
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
68 changes: 15 additions & 53 deletions src/pscpy/psc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import annotations

from collections.abc import Iterable
from collections.abc import Generator, Hashable, Iterable
from typing import Any

import numpy as np
Expand Down Expand Up @@ -50,52 +50,16 @@
return f"Psc(gdims={self.gdims}, length={self.length}, corner={self.corner})"


def get_field_to_component(species_names: Iterable[str]) -> dict[str, dict[str, int]]:
field_to_component: dict[str, dict[str, int]] = {}
field_to_component["jeh"] = {
"jx_ec": 0,
"jy_ec": 1,
"jz_ec": 2,
"ex_ec": 3,
"ey_ec": 4,
"ez_ec": 5,
"hx_fc": 6,
"hy_fc": 7,
"hz_fc": 8,
}
field_to_component["dive"] = {"dive": 0}
field_to_component["rho"] = {"rho": 0}
field_to_component["d_rho"] = {"d_rho": 0}
field_to_component["dt_divj"] = {"dt_divj": 0}

# keeping 'all_1st' for backwards compatibility
field_to_component["all_1st"] = {}
field_to_component["all_1st_cc"] = {}
moments = [
"rho",
"jx",
"jy",
"jz",
"px",
"py",
"pz",
"txx",
"tyy",
"tzz",
"txy",
"tyz",
"tzx",
]
for species_idx, species_name in enumerate(species_names):
for moment_idx, moment in enumerate(moments):
field_to_component["all_1st"][f"{moment}_{species_name}"] = (
moment_idx + 13 * species_idx
)
field_to_component["all_1st_cc"][f"{moment}_{species_name}"] = (
moment_idx + 13 * species_idx
)

return field_to_component
def iter_components(field: Hashable, species_names: Iterable[str]) -> Generator[str]:
if field == "jeh":
yield from ["jx_ec", "jy_ec", "jz_ec", "ex_ec", "ey_ec", "ez_ec", "hx_fc", "hy_fc", "hz_fc"] # fmt: off
elif field in ["dive", "rho", "d_rho", "dt_divj"]:
yield str(field)

Check warning on line 57 in src/pscpy/psc.py

View check run for this annotation

Codecov / codecov/patch

src/pscpy/psc.py#L57 

Added line #L57 was not covered by tests
elif field in ["all_1st", "all_1st_cc"]:
moments = ["rho", "jx", "jy", "jz", "px", "py", "pz", "txx", "tyy", "tzz", "txy", "tyz", "tzx"] # fmt: off
for species_name in species_names:
for moment in moments:
yield f"{moment}_{species_name}"


def decode_psc(
Expand All @@ -118,15 +82,13 @@
}
)
ds = ds.squeeze("step")
field_to_component = get_field_to_component(species_names)

data_vars = {}
for var_name in ds:
if var_name in field_to_component:
for field, component_idx in field_to_component[var_name].items(): # type: ignore[index]
data_vars[field] = ds[var_name][component_idx, :, :, :]
for component_idx, component in enumerate(
iter_components(var_name, species_names)
):
ds = ds.assign({component: ds[var_name][component_idx, :, :, :]})
ds = ds.drop_vars([var_name])
ds = ds.assign(data_vars)

run_info = RunInfo(ds, length=length, corner=corner)
coords = {
Expand Down