Skip to content

Feature/fiesta revision #31

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
skuba31 wants to merge 5 commits into
base: development
Choose a base branch
from
Open

Feature/fiesta revision #31

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e92a1a6
Merge pull request #11 from cherab/development
Mateasek Nov 1, 2019
e836d9b
Merge pull request #15 from cherab/development
Mateasek Feb 7, 2020
5293297
Merge pull request #17 from cherab/development
Mateasek Feb 7, 2020
1314bce
Merge pull request #29 from cherab/development
Mateasek Sep 7, 2023
6bbf4cd
Add support for specifying revision to fiesta loading
Feb 5, 2026
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
44 changes: 22 additions & 22 deletions cherab/compass/equilibrium/fiesta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import xarray as xr


def fiesta_from_cudb(shot_number):
def fiesta_from_cudb(shot_number, revision=-1):
"""
Obtains Fiesta equilibrium for COMPASS Upgrade from the cudb database and returns a COMPASSEquilibrium object.
:param shot_number: Shot number to load from cudb
Expand All @@ -18,72 +18,72 @@ def fiesta_from_cudb(shot_number):

shot = cdbxr.Shot(shot_number)

data = shot["psi/fiesta_out"].copy()
data = shot[f"psi/fiesta_out:{shot_number}:{revision}"].copy()
data.name = "psi_grid"
data = data.to_dataset()
data = data.rename({"fiesta_r": "R", "fiesta_z": "Z"})

data = data.merge(shot["psi_0/fiesta_out"].to_dataset())
data = data.merge(shot[f"psi_0/fiesta_out:{shot_number}:{revision}"].to_dataset())
data = data.rename({"psi_0": "psi_axis"})

data = data.merge(shot["psi_boundary/fiesta_out"].to_dataset())
data = data.merge(shot[f"psi_boundary/fiesta_out:{shot_number}:{revision}"].to_dataset())
data = data.rename({"psi_boundary": "psi_lcfs"})

data = data.merge(shot["r_mag/fiesta_out"].to_dataset())
data = data.merge(shot[f"r_mag/fiesta_out:{shot_number}:{revision}"].to_dataset())
data = data.rename({"r_mag": "R_magnetic_axis"})

data = data.merge(shot["z_mag/fiesta_out"].to_dataset())
data = data.merge(shot[f"z_mag/fiesta_out:{shot_number}:{revision}"].to_dataset())
data = data.rename({"z_mag": "Z_magnetic_axis"})

# add xpoint data
tmp = shot["xp_lower_r/fiesta_out"].expand_dims({"xpoint": 1})
tmp = xr.concat((tmp, shot["xp_upper_r/fiesta_out"].expand_dims({"xpoint": 1})), dim="xpoint")
tmp = shot[f"xp_lower_r/fiesta_out:{shot_number}:{revision}"].expand_dims({"xpoint": 1})
tmp = xr.concat((tmp, shot[f"xp_upper_r/fiesta_out:{shot_number}:{revision}"].expand_dims({"xpoint": 1})), dim="xpoint")
tmp.name = "R_xpoint"
tmp = tmp.to_dataset()
data = xr.merge((data, tmp))

tmp = shot["xp_lower_z/fiesta_out"].expand_dims({"xpoint": 1})
tmp = xr.concat((tmp, shot["xp_upper_z/fiesta_out"].expand_dims({"xpoint": 1})), dim="xpoint")
tmp = shot[f"xp_lower_z/fiesta_out:{shot_number}:{revision}"].expand_dims({"xpoint": 1})
tmp = xr.concat((tmp, shot[f"xp_upper_z/fiesta_out:{shot_number}:{revision}"].expand_dims({"xpoint": 1})), dim="xpoint")
tmp.name = "Z_xpoint"
tmp = tmp.to_dataset()
data = xr.merge((data, tmp))

tmp = shot["sp_hfs_r/fiesta_out"].expand_dims({"strike_point": 1})
tmp = xr.concat((tmp, shot["sp_hfs_r/fiesta_out"].expand_dims({"strike_point": 1})), dim="strike_point")
tmp = shot[f"sp_hfs_r/fiesta_out:{shot_number}:{revision}"].expand_dims({"strike_point": 1})
tmp = xr.concat((tmp, shot[f"sp_hfs_r/fiesta_out:{shot_number}:{revision}"].expand_dims({"strike_point": 1})), dim="strike_point")
tmp.name = "R_strike_point"
tmp = tmp.to_dataset()
data = xr.merge((data, tmp))

tmp = shot["sp_hfs_z/fiesta_out"].expand_dims({"strike_point": 1})
tmp = xr.concat((tmp, shot["sp_hfs_z/fiesta_out"].expand_dims({"strike_point": 1})), dim="strike_point")
tmp = shot[f"sp_hfs_z/fiesta_out:{shot_number}:{revision}"].expand_dims({"strike_point": 1})
tmp = xr.concat((tmp, shot[f"sp_hfs_z/fiesta_out:{shot_number}:{revision}"].expand_dims({"strike_point": 1})), dim="strike_point")
tmp.name = "Z_strike_point"
tmp = tmp.to_dataset()

data = xr.merge((data, tmp))

data = data.merge(shot["f/fiesta_out"].to_dataset())
data = data.merge(shot[f"f/fiesta_out:{shot_number}:{revision}"].to_dataset())
data = data.rename({"f": "f_profile"})

data = data.merge(shot["q/fiesta_out"].to_dataset())
data = data.merge(shot[f"q/fiesta_out:{shot_number}:{revision}"].to_dataset())
data = data.rename({"q": "q_profile"})

data = data.merge(shot["Bt_vac_mag_axis/fiesta_out"].to_dataset())
data = data.merge(shot[f"Bt_vac_mag_axis/fiesta_out:{shot_number}:{revision}"].to_dataset())
data = data.rename({"Bt_vac_mag_axis": "Btor_vacuum_magnitude"})

data = data.merge(shot["Bt_vac_mag_axis/fiesta_out"].to_dataset())
data = data.merge(shot[f"Bt_vac_mag_axis/fiesta_out:{shot_number}:{revision}"].to_dataset())
data = data.rename({"Bt_vac_mag_axis": "Btor_vacuum_radius"})

tmp = shot["boundary_closed_r/fiesta_out"].to_dataset().rename({"boundary_closed_r": "R_lcfs",
tmp = shot[f"boundary_closed_r/fiesta_out:{shot_number}:{revision}"].to_dataset().rename({"boundary_closed_r": "R_lcfs",
"boundary_closed_r_axis1": "lcfs_vertex"})
tmp = tmp.merge(shot["boundary_closed_z/fiesta_out"].to_dataset().rename({"boundary_closed_z": "Z_lcfs",
tmp = tmp.merge(shot[f"boundary_closed_z/fiesta_out:{shot_number}:{revision}"].to_dataset().rename({"boundary_closed_z": "Z_lcfs",
"boundary_closed_z_axis1": "lcfs_vertex"}))
data = data.merge(tmp)

tmp = shot["Z_limiter/fiesta_out"]
tmp = shot[f"Z_limiter/fiesta_out:{shot_number}:{revision}"]
tmp = xr.Dataset({"Z_limiter": ("limiter_vertex", tmp.Z_limiter.values)})
data = data.merge(tmp)

tmp = shot["R_limiter/fiesta_out"]
tmp = shot[f"R_limiter/fiesta_out:{shot_number}:{revision}"]
tmp = xr.Dataset({"R_limiter": ("limiter_vertex", tmp.R_limiter.values)})
data = data.merge(tmp)

Expand Down