bug(): Removed duplicate pressure output when pressure is specified (#1309)

Author: benflexcompute

flow360/component/simulation/outputs/output_fields.py

@@ -292,7 +292,7 @@ def get_unit_for_field(field_name: str):
     "velocity_x": "velocity_x = primitiveVars[1] * velocityScale;",
     "velocity_y": "velocity_y = primitiveVars[2] * velocityScale;",
     "velocity_z": "velocity_z = primitiveVars[3] * velocityScale;",
-    "pressure": "double gamma = 1.4;pressure = (usingLiquidAsMaterial) ? "
+    "pressure_": "double gamma = 1.4;pressure_ = (usingLiquidAsMaterial) ? "
     + "(primitiveVars[4] - 1.0 / gamma) * (velocityScale * velocityScale) : primitiveVars[4];",
     "wall_shear_stress_magnitude": "wall_shear_stress_magnitude = "
     + "magnitude(wallShearStress) * (velocityScale * velocityScale);",

tests/simulation/outputs/test_output_fields.py

@@ -107,22 +107,14 @@ def test_generate_field_udf_velocity_magnitude(simulation_params):
     assert result == expected
 
 
-def test_generate_field_pressure_no_unit(simulation_params):
-    """Test generating UDF expression for pressure fields."""
-
-    result = generate_predefined_udf("pressure", simulation_params)
-    expected = "double gamma = 1.4;pressure = (usingLiquidAsMaterial) ? (primitiveVars[4] - 1.0 / gamma) * (velocityScale * velocityScale) : primitiveVars[4];"
-    assert result == expected
-
-
 def test_generate_field_udf_pressure(simulation_params):
     """Test generating UDF expression for pressure fields."""
 
     result = generate_predefined_udf("pressure_pa", simulation_params)
     expected = (
-        "double pressure;double gamma = 1.4;"
-        "pressure = (usingLiquidAsMaterial) ? (primitiveVars[4] - 1.0 / gamma) * (velocityScale * velocityScale) : primitiveVars[4];"
-        "pressure_pa = pressure * 141855.01272652458;"
+        "double pressure_;double gamma = 1.4;"
+        "pressure_ = (usingLiquidAsMaterial) ? (primitiveVars[4] - 1.0 / gamma) * (velocityScale * velocityScale) : primitiveVars[4];"
+        "pressure_pa = pressure_ * 141855.01272652458;"
     )
     assert result == expected
 

tests/simulation/translator/test_output_translation.py

@@ -1344,14 +1344,9 @@ def test_dimensioned_output_fields_translation(vel_in_km_per_hr):
     ref = {
         "userDefinedFields": [
             {"name": "my_field", "expression": "1+1", "from_user_variables": False},
-            {
-                "name": "pressure",
-                "expression": "double gamma = 1.4;pressure = (usingLiquidAsMaterial) ? (primitiveVars[4] - 1.0 / gamma) * (velocityScale * velocityScale) : primitiveVars[4];",
-                "from_user_variables": False,
-            },
             {
                 "name": "pressure_pa",
-                "expression": "double pressure;double gamma = 1.4;pressure = (usingLiquidAsMaterial) ? (primitiveVars[4] - 1.0 / gamma) * (velocityScale * velocityScale) : primitiveVars[4];pressure_pa = pressure * 2500000.0;",
+                "expression": "double pressure_;double gamma = 1.4;pressure_ = (usingLiquidAsMaterial) ? (primitiveVars[4] - 1.0 / gamma) * (velocityScale * velocityScale) : primitiveVars[4];pressure_pa = pressure_ * 2500000.0;",
                 "from_user_variables": False,
             },
             {