update solver translator for stopping criteria and fix unit test

angranl-flex · angranl-flex · commit 41dd2cc88f22 · 2025-10-27T15:25:30.000Z
diff --git a/flow360/component/simulation/translator/solver_translator.py b/flow360/component/simulation/translator/solver_translator.py
@@ -1927,12 +1927,11 @@ def get_solver_json(
         translated["runControl"]["monitorProcessorHash"] = calculate_monitor_semaphore_hash(
             input_params
         )
-    translated["runControl"]["stoppingCriteria"] = []
+    stopping_criteria = []
     if input_params.run_control and bool(input_params.run_control.stopping_criteria):
         for criterion in input_params.run_control.stopping_criteria:
-            translated["runControl"]["stoppingCriteria"].append(
-                get_stop_criterion_settings(criterion, input_params)
-            )
+            stopping_criteria.append(get_stop_criterion_settings(criterion, input_params))
+        translated["runControl"]["stoppingCriteria"] = stopping_criteria
 
     translated["usingLiquidAsMaterial"] = isinstance(
         input_params.operating_condition, LiquidOperatingCondition
diff --git a/tests/simulation/ref/value_or_expression/angular_velocity_with_expression.json b/tests/simulation/ref/value_or_expression/angular_velocity_with_expression.json
@@ -124,7 +124,6 @@
         "velocityScale": 20.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
-}
+}
diff --git a/tests/simulation/ref/value_or_expression/liquid_op_vel_mag.json b/tests/simulation/ref/value_or_expression/liquid_op_vel_mag.json
@@ -105,7 +105,6 @@
         "velocityScale": 20.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
-}
+}
diff --git a/tests/simulation/ref/value_or_expression/op_vel_mag.json b/tests/simulation/ref/value_or_expression/op_vel_mag.json
@@ -98,7 +98,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
-}
+}
diff --git a/tests/simulation/ref/value_or_expression/ref_area_with_expression.json b/tests/simulation/ref/value_or_expression/ref_area_with_expression.json
@@ -108,7 +108,6 @@
         "velocityScale": 20.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
-}
+}
diff --git a/tests/simulation/ref/value_or_expression/time_stepping_with_expression.json b/tests/simulation/ref/value_or_expression/time_stepping_with_expression.json
@@ -105,7 +105,6 @@
         "velocityScale": 20.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
-}
+}
diff --git a/tests/simulation/translator/ref/Flow360_CHT_three_cylinders.json b/tests/simulation/translator/ref/Flow360_CHT_three_cylinders.json
@@ -46,7 +46,7 @@
             "absoluteTolerance": 1e-15,
             "maxIterations": 100
         },
-        "modelType":"HeatEquation",
+        "modelType": "HeatEquation",
         "maxForceJacUpdatePhysicalSteps": 0,
         "orderOfAccuracy": 2,
         "relativeTolerance": 0.0,
@@ -187,7 +187,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_NestedCylindersSRF.json b/tests/simulation/translator/ref/Flow360_NestedCylindersSRF.json
@@ -128,13 +128,12 @@
         "v": "v",
         "w": "w"
     },
-    "userDefinedFields":[],
+    "userDefinedFields": [],
     "usingLiquidAsMaterial": false,
     "outputRescale": {
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
-}
+}
diff --git a/tests/simulation/translator/ref/Flow360_TurbFlatPlate137x97_BoxTrip.json b/tests/simulation/translator/ref/Flow360_TurbFlatPlate137x97_BoxTrip.json
@@ -189,7 +189,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_XV15HoverMRF.json b/tests/simulation/translator/ref/Flow360_XV15HoverMRF.json
@@ -141,13 +141,12 @@
         "v": "v",
         "w": "w"
     },
-    "userDefinedFields":[],
+    "userDefinedFields": [],
     "usingLiquidAsMaterial": false,
     "outputRescale": {
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
-}
+}
diff --git a/tests/simulation/translator/ref/Flow360_actuator_disk.json b/tests/simulation/translator/ref/Flow360_actuator_disk.json
@@ -124,7 +124,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": true,
         "monitorProcessorHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
     }
diff --git a/tests/simulation/translator/ref/Flow360_boundaries.json b/tests/simulation/translator/ref/Flow360_boundaries.json
@@ -208,7 +208,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
-}
+}
diff --git a/tests/simulation/translator/ref/Flow360_custom_volume_translation.json b/tests/simulation/translator/ref/Flow360_custom_volume_translation.json
@@ -116,7 +116,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": true,
         "monitorProcessorHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
     }
diff --git a/tests/simulation/translator/ref/Flow360_expression_udf.json b/tests/simulation/translator/ref/Flow360_expression_udf.json
@@ -113,7 +113,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_heatFluxCylinder.json b/tests/simulation/translator/ref/Flow360_heatFluxCylinder.json
@@ -118,13 +118,12 @@
         "v": "v",
         "w": "w"
     },
-    "userDefinedFields":[],
+    "userDefinedFields": [],
     "usingLiquidAsMaterial": false,
     "outputRescale": {
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
-}
+}
diff --git a/tests/simulation/translator/ref/Flow360_initial_condition_v2.json b/tests/simulation/translator/ref/Flow360_initial_condition_v2.json
@@ -90,7 +90,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_liquid.json b/tests/simulation/translator/ref/Flow360_liquid.json
@@ -103,7 +103,6 @@
         "velocityScale": 20.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_liquid_rotation_dd.json b/tests/simulation/translator/ref/Flow360_liquid_rotation_dd.json
@@ -137,7 +137,6 @@
         }
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_liquid_rotation_dd_with_ref_vel.json b/tests/simulation/translator/ref/Flow360_liquid_rotation_dd_with_ref_vel.json
@@ -138,7 +138,6 @@
         }
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_om6Wing.json b/tests/simulation/translator/ref/Flow360_om6Wing.json
@@ -186,7 +186,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_om6Wing_SA_with_low_reynolds_correction.json b/tests/simulation/translator/ref/Flow360_om6Wing_SA_with_low_reynolds_correction.json
@@ -186,7 +186,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_om6Wing_debug_point.json b/tests/simulation/translator/ref/Flow360_om6Wing_debug_point.json
@@ -191,7 +191,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_om6Wing_debug_type.json b/tests/simulation/translator/ref/Flow360_om6Wing_debug_type.json
@@ -187,7 +187,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_om6wing_FS_with_turbulence_quantities.json b/tests/simulation/translator/ref/Flow360_om6wing_FS_with_turbulence_quantities.json
@@ -190,7 +190,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_om6wing_FS_with_vel.json b/tests/simulation/translator/ref/Flow360_om6wing_FS_with_vel.json
@@ -191,7 +191,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_om6wing_FS_with_vel_expression.json b/tests/simulation/translator/ref/Flow360_om6wing_FS_with_vel_expression.json
@@ -191,7 +191,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_om6wing_SA_with_modified_C_w2.json b/tests/simulation/translator/ref/Flow360_om6wing_SA_with_modified_C_w2.json
@@ -186,7 +186,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_om6wing_SST_with_modified_C_sigma_omega1.json b/tests/simulation/translator/ref/Flow360_om6wing_SST_with_modified_C_sigma_omega1.json
@@ -178,13 +178,12 @@
         "v": "v",
         "w": "w"
     },
-    "userDefinedFields":[],
+    "userDefinedFields": [],
     "usingLiquidAsMaterial": false,
     "outputRescale": {
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
-}
+}
diff --git a/tests/simulation/translator/ref/Flow360_om6wing_stopping_criterion_and_moving_statistic.json b/tests/simulation/translator/ref/Flow360_om6wing_stopping_criterion_and_moving_statistic.json
@@ -83,9 +83,18 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": true,
         "externalProcessMonitorOutput": true,
-        "monitorProcessorHash": "4581ab2e4847a22e8e1af690f2f4d57da76110b57c3ba528eabe7b2ad93e4927"
+        "monitorProcessorHash": "4581ab2e4847a22e8e1af690f2f4d57da76110b57c3ba528eabe7b2ad93e4927",
+        "stoppingCriteria": [
+            {
+                "monitoredColumn": "point_legacy1_Point1_Helicity_mean",
+                "monitoredFileName": "monitor_point_legacy1_moving_statistic_v2.csv",
+                "sourceToFlow360Coefficient": 6.9594121562924376e-06,
+                "sourceToFlow360Offset": 0.0,
+                "tolerance": 0.0001298626308364169,
+                "toleranceWindowSize": null
+            }
+        ]
     },
     "sliceOutput": {
         "animationFrequency": -1,
diff --git a/tests/simulation/translator/ref/Flow360_om6wing_streamlines.json b/tests/simulation/translator/ref/Flow360_om6wing_streamlines.json
@@ -251,7 +251,6 @@
         "startAverageIntegrationStep": -1
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_om6wing_wall_model.json b/tests/simulation/translator/ref/Flow360_om6wing_wall_model.json
@@ -152,7 +152,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_periodic_euler_vortex.json b/tests/simulation/translator/ref/Flow360_periodic_euler_vortex.json
@@ -93,13 +93,12 @@
         "outputFormat": "paraview",
         "startAverageIntegrationStep": -1
     },
-    "userDefinedFields":[],
+    "userDefinedFields": [],
     "usingLiquidAsMaterial": false,
     "outputRescale": {
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
-}
+}
diff --git a/tests/simulation/translator/ref/Flow360_plateASI.json b/tests/simulation/translator/ref/Flow360_plateASI.json
@@ -194,7 +194,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     }
 }
diff --git a/tests/simulation/translator/ref/Flow360_porous_jump.json b/tests/simulation/translator/ref/Flow360_porous_jump.json
@@ -70,7 +70,6 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": false
     },
     "surfaceOutput": {
diff --git a/tests/simulation/translator/ref/Flow360_porous_media_box.json b/tests/simulation/translator/ref/Flow360_porous_media_box.json
@@ -198,8 +198,7 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": true,
         "monitorProcessorHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
     }
-}
+}
diff --git a/tests/simulation/translator/ref/Flow360_porous_media_volume_zone.json b/tests/simulation/translator/ref/Flow360_porous_media_volume_zone.json
@@ -189,8 +189,7 @@
         "velocityScale": 1.0
     },
     "runControl": {
-        "shouldCheckStopCriterion": false,
         "externalProcessMonitorOutput": true,
         "monitorProcessorHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
     }
-}
+}
diff --git a/tests/simulation/translator/ref/Flow360_restart_manipulation_v2.json b/tests/simulation/translator/ref/Flow360_restart_manipulation_v2.json
diff --git a/tests/simulation/translator/ref/Flow360_symmetryBC.json b/tests/simulation/translator/ref/Flow360_symmetryBC.json
diff --git a/tests/simulation/translator/ref/Flow360_tutorial_2dcrm.json b/tests/simulation/translator/ref/Flow360_tutorial_2dcrm.json
diff --git a/tests/simulation/translator/ref/Flow360_udf.json b/tests/simulation/translator/ref/Flow360_udf.json
diff --git a/tests/simulation/translator/ref/Flow360_user_variable.json b/tests/simulation/translator/ref/Flow360_user_variable.json
diff --git a/tests/simulation/translator/ref/Flow360_user_variable_heat.json b/tests/simulation/translator/ref/Flow360_user_variable_heat.json
diff --git a/tests/simulation/translator/ref/Flow360_user_variable_isosurface.json b/tests/simulation/translator/ref/Flow360_user_variable_isosurface.json
diff --git a/tests/simulation/translator/ref/Flow360_vortex_propagation.json b/tests/simulation/translator/ref/Flow360_vortex_propagation.json
diff --git a/tests/simulation/translator/ref/Flow360_xv15_bet_disk_nested_rotation.json b/tests/simulation/translator/ref/Flow360_xv15_bet_disk_nested_rotation.json
diff --git a/tests/simulation/translator/ref/Flow360_xv15_bet_disk_steady_airplane.json b/tests/simulation/translator/ref/Flow360_xv15_bet_disk_steady_airplane.json
diff --git a/tests/simulation/translator/ref/Flow360_xv15_bet_disk_steady_hover.json b/tests/simulation/translator/ref/Flow360_xv15_bet_disk_steady_hover.json
diff --git a/tests/simulation/translator/ref/Flow360_xv15_bet_disk_unsteady_hover.json b/tests/simulation/translator/ref/Flow360_xv15_bet_disk_unsteady_hover.json
diff --git a/tests/simulation/translator/ref/Flow360_xv15_bet_disk_unsteady_hover_UDD.json b/tests/simulation/translator/ref/Flow360_xv15_bet_disk_unsteady_hover_UDD.json

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,6 @@`
`124`	`124`	`"velocityScale": 20.0`
`125`	`125`	`},`
`126`	`126`	`"runControl": {`
`127`		`- "shouldCheckStopCriterion": false,`
`128`	`127`	`"externalProcessMonitorOutput": false`
`129`	`128`	`}`
`130`		`-}`
	`129`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,6 @@`
`105`	`105`	`"velocityScale": 20.0`
`106`	`106`	`},`
`107`	`107`	`"runControl": {`
`108`		`- "shouldCheckStopCriterion": false,`
`109`	`108`	`"externalProcessMonitorOutput": false`
`110`	`109`	`}`
`111`		`-}`
	`110`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@`
`98`	`98`	`"velocityScale": 1.0`
`99`	`99`	`},`
`100`	`100`	`"runControl": {`
`101`		`- "shouldCheckStopCriterion": false,`
`102`	`101`	`"externalProcessMonitorOutput": false`
`103`	`102`	`}`
`104`		`-}`
	`103`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,6 @@`
`108`	`108`	`"velocityScale": 20.0`
`109`	`109`	`},`
`110`	`110`	`"runControl": {`
`111`		`- "shouldCheckStopCriterion": false,`
`112`	`111`	`"externalProcessMonitorOutput": false`
`113`	`112`	`}`
`114`		`-}`
	`113`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,6 @@`
`189`	`189`	`"velocityScale": 1.0`
`190`	`190`	`},`
`191`	`191`	`"runControl": {`
`192`		`- "shouldCheckStopCriterion": false,`
`193`	`192`	`"externalProcessMonitorOutput": false`
`194`	`193`	`}`
`195`	`194`	`}`