Skip to content

[Hotfix Main]: [25.7] Fix a bug that an extra "velocity" field appears in the UDF section of the translated solver json #1603

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 2 commits into from
Nov 18, 2025
Merged

[Hotfix Main]: [25.7] Fix a bug that an extra "velocity" field appears in the UDF section of the translated solver json #1603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aef5d80
Fix a bug that an extra "velocity" field appears in the UDF section (…
angranl-flex Nov 18, 2025
426f47e
Merge branch 'main' into hotfix-main-pr1600
angranl-flex Nov 18, 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
8 changes: 4 additions & 4 deletions flow360/component/simulation/outputs/output_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def get_unit_for_field(field_name: str):
FIELD_TYPE_SCALAR = "scalar"

_FIELD_TYPE_INFO = {
"velocity": {
"velocity_": {
"type": FIELD_TYPE_3DVECTOR,
},
"velocity_magnitude": {
Expand Down Expand Up @@ -346,9 +346,9 @@ def get_unit_for_field(field_name: str):

# Predefined UDF expressions
PREDEFINED_UDF_EXPRESSIONS = {
"velocity": "velocity[0] = primitiveVars[1] * velocityScale;"
+ "velocity[1] = primitiveVars[2] * velocityScale;"
+ "velocity[2] = primitiveVars[3] * velocityScale;",
"velocity_": "velocity_[0] = primitiveVars[1] * velocityScale;"
+ "velocity_[1] = primitiveVars[2] * velocityScale;"
+ "velocity_[2] = primitiveVars[3] * velocityScale;",
"velocity_magnitude": "double velocity[3];"
+ "velocity[0] = primitiveVars[1];"
+ "velocity[1] = primitiveVars[2];"
Expand Down
27 changes: 7 additions & 20 deletions tests/simulation/outputs/test_output_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,18 @@ def simulation_params():
return params


def test_generate_field_udf_no_unit(simulation_params):
"""Test generating UDF expression for a field without units."""
result = generate_predefined_udf("velocity", simulation_params)

expected = (
"velocity[0] = primitiveVars[1] * velocityScale;"
"velocity[1] = primitiveVars[2] * velocityScale;"
"velocity[2] = primitiveVars[3] * velocityScale;"
)

assert result == expected


def test_generate_field_udf_with_unit(simulation_params):
"""Test generating UDF expression for a field with units."""
result = generate_predefined_udf("velocity_m_per_s", simulation_params)

expected = (
"double velocity[3];"
"velocity[0] = primitiveVars[1] * velocityScale;"
"velocity[1] = primitiveVars[2] * velocityScale;"
"velocity[2] = primitiveVars[3] * velocityScale;"
"velocity_m_per_s[0] = velocity[0] * 340.2940058082124;"
"velocity_m_per_s[1] = velocity[1] * 340.2940058082124;"
"velocity_m_per_s[2] = velocity[2] * 340.2940058082124;"
"double velocity_[3];"
"velocity_[0] = primitiveVars[1] * velocityScale;"
"velocity_[1] = primitiveVars[2] * velocityScale;"
"velocity_[2] = primitiveVars[3] * velocityScale;"
"velocity_m_per_s[0] = velocity_[0] * 340.2940058082124;"
"velocity_m_per_s[1] = velocity_[1] * 340.2940058082124;"
"velocity_m_per_s[2] = velocity_[2] * 340.2940058082124;"
)

assert result == expected
Expand Down
7 changes: 1 addition & 6 deletions tests/simulation/translator/test_output_translation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1372,18 +1372,13 @@ def test_dimensioned_output_fields_translation(vel_in_km_per_hr):
"expression": "double pressure_;double gamma = 1.4;pressure_ = (usingLiquidAsMaterial) ? (primitiveVars[4] - 1.0 / gamma) * (velocityScale * velocityScale) : primitiveVars[4];pressure_pa = pressure_ * 10000000.0;",
"from_user_variables": False,
},
{
"name": "velocity",
"expression": "velocity[0] = primitiveVars[1] * velocityScale;velocity[1] = primitiveVars[2] * velocityScale;velocity[2] = primitiveVars[3] * velocityScale;",
"from_user_variables": False,
},
{
"name": "velocity_in_km_per_hr",
"expression": "double ___velocity[3];___velocity[0] = primitiveVars[1] * velocityScale;___velocity[1] = primitiveVars[2] * velocityScale;___velocity[2] = primitiveVars[3] * velocityScale;velocity_in_km_per_hr[0] = (___velocity[0] * 360.0); velocity_in_km_per_hr[1] = (___velocity[1] * 360.0); velocity_in_km_per_hr[2] = (___velocity[2] * 360.0);",
},
{
"name": "velocity_m_per_s",
"expression": "double velocity[3];velocity[0] = primitiveVars[1] * velocityScale;velocity[1] = primitiveVars[2] * velocityScale;velocity[2] = primitiveVars[3] * velocityScale;velocity_m_per_s[0] = velocity[0] * 100.0;velocity_m_per_s[1] = velocity[1] * 100.0;velocity_m_per_s[2] = velocity[2] * 100.0;",
"expression": "double velocity_[3];velocity_[0] = primitiveVars[1] * velocityScale;velocity_[1] = primitiveVars[2] * velocityScale;velocity_[2] = primitiveVars[3] * velocityScale;velocity_m_per_s[0] = velocity_[0] * 100.0;velocity_m_per_s[1] = velocity_[1] * 100.0;velocity_m_per_s[2] = velocity_[2] * 100.0;",
"from_user_variables": False,
},
{
Expand Down
Loading