Skip to content
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

Jump to bottom

Add default values for bout_tdim, bout_xdim, bout_ydim, bout_zdim, so that they always exist #179

Closed
wants to merge 1 commit into from
Closed

Add default values for bout_tdim, bout_xdim, bout_ydim, bout_zdim, so that they always exist #179

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
16 changes: 11 additions & 5 deletions xbout/geometries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,18 @@ def _set_default_toroidal_coordinates(coordinates, ds):
coordinates = {}

# Replace any values that have not been passed in with defaults
coordinates["t"] = coordinates.get("t", ds.metadata.get("bout_tdim", "t"))
coordinates["x"] = coordinates.get(
"x", ds.metadata.get("bout_xdim", "psi_poloidal")
coordinates["t"] = coordinates.get("t", ds.metadata["bout_tdim"])

default_x = (
ds.metadata["bout_xdim"] if ds.metadata["bout_xdim"] != "x" else "psi_poloidal"
)
coordinates["y"] = coordinates.get("y", ds.metadata.get("bout_ydim", "theta"))
coordinates["z"] = coordinates.get("z", ds.metadata.get("bout_zdim", "zeta"))
coordinates["x"] = coordinates.get("x", default_x)

default_y = ds.metadata["bout_ydim"] if ds.metadata["bout_ydim"] != "y" else "theta"
coordinates["y"] = coordinates.get("y", default_y)

default_z = ds.metadata["bout_zdim"] if ds.metadata["bout_zdim"] != "z" else "zeta"
coordinates["z"] = coordinates.get("z", default_z)

return coordinates

Expand Down
7 changes: 7 additions & 0 deletions xbout/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ def _separate_metadata(ds):
metadata_vals = [ds[var].values.item() for var in scalar_vars]
metadata = dict(zip(scalar_vars, metadata_vals))

# Add default values for dimensions to metadata. These may be modified later by
# apply_geometry()
metadata["bout_tdim"] = "t"
metadata["bout_xdim"] = "x"
metadata["bout_ydim"] = "y"
metadata["bout_zdim"] = "z"

return ds.drop_vars(scalar_vars), metadata


Expand Down