Skip to content

Scheduled sync: main → develop #1537

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
angranl-flex merged 1 commit into from
Oct 28, 2025
Merged

Scheduled sync: main → develop #1537

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
27 changes: 18 additions & 9 deletions flow360/component/simulation/models/volume_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
_check_bet_disk_sectional_radius_and_polars,
)
from flow360.component.simulation.primitives import (
AxisymmetricBody,
Box,
CustomVolume,
Cylinder,
Expand Down Expand Up @@ -111,9 +112,10 @@ def preprocess(self, **kwargs):
# locate t_seconds and convert it to (t*flow360_time_to_seconds)
params = kwargs.get("params")
one_sec_to_flow360_time = params.convert_unit(
value=1 * u.s, target_system="flow360" # pylint:disable=no-member
value=1 * u.s, # pylint:disable=no-member
target_system="flow360",
)
flow360_time_to_seconds_expression = f"({1.0/one_sec_to_flow360_time.value} * t)"
flow360_time_to_seconds_expression = f"({1.0 / one_sec_to_flow360_time.value} * t)"
self.value = re.sub(r"\bt_seconds\b", flow360_time_to_seconds_expression, self.value)

return super().preprocess(**kwargs)
Expand Down Expand Up @@ -562,7 +564,10 @@ def _extract_content(cls, input_data):

file_content = get_file_content(input_data["file_path"])

return {"file_path": os.path.basename(input_data["file_path"]), "content": file_content}
return {
"file_path": os.path.basename(input_data["file_path"]),
"content": file_content,
}


class AuxiliaryPolarFile(BETSingleInputFileBaseModel):
Expand Down Expand Up @@ -1200,21 +1205,25 @@ class Rotation(Flow360BaseModel):

name: Optional[str] = pd.Field("Rotation", description="Name of the `Rotation` model.")
type: Literal["Rotation"] = pd.Field("Rotation", frozen=True)
entities: EntityListWithCustomVolume[GenericVolume, Cylinder, CustomVolume] = pd.Field(
entities: EntityListWithCustomVolume[
GenericVolume, Cylinder, AxisymmetricBody, CustomVolume
] = pd.Field(
alias="volumes",
description="The entity list for the `Rotation` model. "
+ "The entity should be :class:`Cylinder` or :class:`GenericVolume` type.",
+ "The entity should be :class:`Cylinder` or :class:`AxisymmetricBody` or :class:`GenericVolume` type.",
)

# TODO: Add test for each of the spec specification.
spec: Union[AngleExpression, FromUserDefinedDynamics, AngularVelocity] = pd.Field(
discriminator="type_name",
description="The angular velocity or rotation angle as a function of time.",
)
parent_volume: Optional[Union[GenericVolume, Cylinder, CustomVolume]] = pd.Field(
None,
description="The parent rotating entity in a nested rotation case."
+ "The entity should be :class:`Cylinder` or :class:`GenericVolume` type.",
parent_volume: Optional[Union[GenericVolume, Cylinder, AxisymmetricBody, CustomVolume]] = (
pd.Field(
None,
description="The parent rotating entity in a nested rotation case."
+ "The entity should be :class:`Cylinder` or :class:`AxisymmetricBody` or :class:`GenericVolume` type.",
)
)
rotating_reference_frame_model: Optional[bool] = pd.Field(
None,
Expand Down
Loading