Skip to content

Commit 6aec51c

Browse files
committed
Add stopping criterion support for imported surface integral
1 parent 681ed25 commit 6aec51c

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed

flow360/component/simulation/translator/solver_translator.py

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,7 +1476,19 @@ def check_external_postprocessing_existence(params: SimulationParams):
14761476
for output in params.outputs:
14771477
if not isinstance(output, get_args(get_args(MonitorOutputType)[0])):
14781478
continue
1479-
if not isinstance(output, ForceOutput) and output.moving_statistic is None:
1479+
if (
1480+
isinstance(output, (ProbeOutput, SurfaceProbeOutput))
1481+
and output.moving_statistic is None
1482+
):
1483+
continue
1484+
if (
1485+
isinstance(output, SurfaceIntegralOutput)
1486+
and output.moving_statistic is None
1487+
and all(
1488+
not isinstance(surface, ImportedSurface)
1489+
for surface in output.entities.stored_entities
1490+
)
1491+
):
14801492
continue
14811493
return True
14821494
return False
@@ -2006,7 +2018,19 @@ def get_columnar_data_processor_json(
20062018
for output in input_params.outputs:
20072019
if not isinstance(output, get_args(get_args(MonitorOutputType)[0])):
20082020
continue
2009-
if not isinstance(output, ForceOutput) and output.moving_statistic is None:
2021+
if (
2022+
isinstance(output, (ProbeOutput, SurfaceProbeOutput))
2023+
and output.moving_statistic is None
2024+
):
2025+
continue
2026+
if (
2027+
isinstance(output, SurfaceIntegralOutput)
2028+
and output.moving_statistic is None
2029+
and all(
2030+
not isinstance(surface, ImportedSurface)
2031+
for surface in output.entities.stored_entities
2032+
)
2033+
):
20102034
continue
20112035
output_dict = output.model_dump(
20122036
exclude_none=True,

tests/simulation/translator/ref/Flow360_user_variable.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@
369369
}
370370
},
371371
"runControl": {
372-
"externalProcessMonitorOutput": false
372+
"externalProcessMonitorOutput": true,
373+
"monitorProcessorHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
373374
}
374375
}

0 commit comments

Comments
 (0)