Skip to content

Make both right_face_value and left_face_value a property. #2078

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
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make both right_face_value and left_face_value a property. #2078

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
8 changes: 3 additions & 5 deletions torax/_src/fvm/cell_variable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ def constrained_grad(
right = jnp.expand_dims(right_grad, axis=0)
return jnp.concatenate([left, inner_grad, right])

@functools.cached_property
def left_face_value(self) -> jt.Float[chex.Array, '']:
"""Calculates the value of the leftmost face."""
if self.left_face_constraint is not None:
Expand Down Expand Up @@ -311,7 +312,7 @@ def face_value(self) -> jt.Float[chex.Array, 'face']:
)

return jnp.concatenate(
[self.left_face_value(), inner, self.right_face_value], axis=-1
[self.left_face_value, inner, self.right_face_value], axis=-1
)

def grad(self) -> jt.Float[chex.Array, 'cell']:
Expand All @@ -338,9 +339,6 @@ def __str__(self) -> str:

def cell_plus_boundaries(self) -> jt.Float[chex.Array, 'cell+2']:
"""Returns the value of this variable plus left and right boundaries."""
right_value = self.right_face_value
left_value = self.left_face_value()
return jnp.concatenate(
[left_value, self.value, right_value],
axis=-1,
[self.left_face_value, self.value, self.right_face_value], axis=-1
)
6 changes: 3 additions & 3 deletions torax/_src/imas_tools/output/core_profiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,11 @@ def _fill_profiles_1d_grid(
[[0.0], geometry_slice.rho, [geometry_slice.rho_b]]
)
ids.profiles_1d[i].grid.psi = cp_state.psi.cell_plus_boundaries()
ids.profiles_1d[i].grid.psi_magnetic_axis = cp_state.psi.left_face_value()[0]
ids.profiles_1d[i].grid.psi_magnetic_axis = cp_state.psi.left_face_value[0]
ids.profiles_1d[i].grid.psi_boundary = cp_state.psi.right_face_value[0]
ids.profiles_1d[i].grid.rho_pol_norm = np.sqrt(
(cp_state.psi.cell_plus_boundaries() - cp_state.psi.left_face_value()[0])
/ (cp_state.psi.right_face_value[0] - cp_state.psi.left_face_value()[0])
(cp_state.psi.cell_plus_boundaries() - cp_state.psi.left_face_value[0])
/ (cp_state.psi.right_face_value[0] - cp_state.psi.left_face_value[0])
)
ids.profiles_1d[i].grid.volume = output.extend_cell_grid_to_boundaries(
[geometry_slice.volume], np.array([geometry_slice.volume_face])
Expand Down
Loading