Fix a bug that an extra "velocity" field appears in the UDF section (#1600)

Author: angranl-flex

flow360/component/simulation/outputs/output_fields.py

@@ -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": {
@@ -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];"

tests/simulation/outputs/test_output_fields.py

@@ -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

tests/simulation/translator/test_output_translation.py

@@ -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,
             },
             {